diff --git a/.achievement_data/state.json b/.achievement_data/state.json
new file mode 100644
index 0000000..6939f24
--- /dev/null
+++ b/.achievement_data/state.json
@@ -0,0 +1 @@
+[4,1784091728,["39.16.75","39.16.105","39.16.123","39.16.60","39.16.74","39.16.137","39.16.104"],["first_birth","natural_zunchi_slave","natural_tarinai_king","self_zunchi_death","zunchi_collision_death","natural_zunchi_slave_5_generations","natural_tarinai_king_3_generations","death_50_in_10_seconds","birth_50_in_60_seconds","great_mother_1000_births","lifespan_completed","soccer_ball_death","fight_pair_danger_kill","all_non_sleep_diseased_25","colony_happy","direct_feed_33","ignite_during_birth_ritual","laxative_starvation","idle_observer_5_minutes","placed_objects_100","mechanized_industry","safe_colony_25_5_minutes","ants_alive_25","ants_killed_100","secret_collection_9_slots","pause_spam_4_in_1_second","continuous_play_1_hour","below_absolute_zero_item","undo_mass_revival","robot_cleaner_100","held_30_seconds","minimalist_happy","overprotective","self_sufficient","unplanned_city_30","sauna_cold_plunge","rain_shelter_all","medicine_ledger_all","mercury_lifespan","enemy_enemy_friend","revolution","fuel_to_fire","undo_20","redo_20","eternal_history_generation_10","king_full_satisfaction","slave_zero_satisfaction","town_doctor_50","poke_plushie_fling","chaos_seeker_666_fights","clean_freak_robot_only","true_tarinai_observer","sniper_333_shots","megalopolis","fertility_seeker_721_love_births","low_fps_single_digit","continuous_play_24_hours","sandbox_five_toilets","park_ground_changed","ground_change_4_in_1_second","ant_nest_without_tarinai","sticky_bomb_15_passes","daily_play_7_days","wire_shock_7_tarinai","information_industry","strength_in_numbers","elite_few","zunchi_overflow","comfortable_beds","stone_pillow","across_seasons","favorite_one","statistician","well_informed","lively_making","memento_mori","mad_scientist"],[["AT7UX0vQQHSjDSsx7ntrcA",115523,0,4],["AXHGXDetQkWuJ2vrhLVrsw",191206,599],["AZOq9iLdRLiVs_J1HNcdNg",26632,311131,1],["AgioecJAT9-DyKM9rBWwFg",354351,233,1],["An-kM9_1Rkuiu0eIHnJROw",24687,416999,5],["A9UhC-axRtWKy4Vw8NRLjA",225077,15],["BmyezTENRtm5ekkH3z99qg",289868,146256,5],["BsqXI2J_RTCLzl9rK-WTVQ",201094,16],["B5myaZslQwSnpkvoGpknsA",37613,1800,3],["C0tajnOTT1K0FgIfEGVsGA",256959,2973],["C4GRUxmdRbWZzHJ0V9JpsQ",17432,357474,2],["C8XqqJ5rTHa6qw-z8Y88jA",365330,744,1],["DFKBeF9-RpKfjhRhQx2ZRg",174267,14974],["DGPMjLtqRaCtHIptLtkjdw",221295,2546],["DyaOro6TQ5G_TeHnltFK0g",67643,146960],["EGSebCuwSk6FKdPePBeDOg",118168,1199,4],["EgkHNUQJQPat3FM4ZIU59w",156003,0],["EyToTt3-RX26J-6eJ-xpPw",191733,6600],["E0HXsU6-RYCO91MK9M07bw",9762,104722,4],["E2ldSdcxQN-zZ9xTBzDE1g",368929,299,2],["Gr93GoiFQkGMHKs2Mw4AaQ",97655,9130,3],["G2o3yC0MTIKMLhDk2o6YDA",245190,7797],["HYkDqmCsS8aiMrUThI4fcQ",201617,13],["Hns48Q0MQJ2H-lFEmwxfQw",23523,603,3],["HwT0Sk-XSGahzteQS7FPzQ",287737,92777,2],["H5ZDYEFvQ0e-3JC0xPTx-Q",27702,421,3],["ITRYJzo5QYaSkjLYaaJ6Yg",40636,46882,3],["ItNN0heHRqiNHc-OoGoSMA",297825,1298,1],["JuwFpfb1QJeYfGvWpzy3IA",63369,126598],["J7uf1v88T3mSFs1ptKO9RQ",120239,25],["KSZ59taVRJmYmVYVhe99hg",77159,1800,3],["KwJlifxVSh-GUDpUNABzrw",369833,308,2],["LDAWke6kRbutWe3r9dfLdQ",318649,776,1],["Li2NtIyOQpGHzFaEovEoYg",100406,0,4],["MEMut_ufQsmx1rPi45G81Q",36627,395276,2],["Mpv6WJHGTw6YwQQ70mk7BA",13479,80,3],["Nf-0jB-JQ0-UZnRWPHS98A",300640,4006,1],["Nhx8JhVfTOWAYRt1vRuQow",113724,74645],["NjK9LbETSzOX-LpfqL0nxg",255226,103273,1],["Nj7jeXEWTXa6Sm5VPRlmEg",206684,123],["NkwzEL98Rzi4GwdSd5A3ng",20301,0,3],["NuaRm_fYR7Sz8nVs4P4yCg",114763,34,4],["Nvzk_2oQQbawaZca4Pww2Q",291531,73544,1],["NxW5_hQ1SoO5iSuv66RCfg",270726,299,1],["Nx2nfW9iRpeJXcFw7IOdIA",283823,976,1],["QD38IUY8RJeCcN0xwmTyTQ",269572,9325,1],["QQx3jG6FR2-TJx80sIlCUA",241410,16],["QoCQg7HPQYKYtzZY6V5tTQ",375227,2400,2],["Q-YwoP68T6anCkkhU6gLAg",234541,3300],["RB-Tlne5T4OxgjAQO0_ysg",381794,740,2],["RB_DGMVqRV-QbX2uFDTRpA",365383,1322,1],["RVu0RBgqRbipwYNU50e9qQ",343860,0,1],["RrNxNSRsSiKVxmeMQo6lPg",433513,222,2],["R6bORyS0QYGxKejqyoB10A",303512,14,1],["SG0ktBVwR5Os_MDzYJoawQ",39040,599,3],["SfZYmhpyRZCwrqBiw9kqUA",132898,357],["SjYuiyoHTeivYcMyKoRGNg",337249,104061,5],["S5DpVCRaThahOqTSMlWPDA",89164,337690,2],["TUKrrmrET2ypgp5DaU4tlA",18426,0,3],["T9GkyS2HSqKbKoqMiC7WXg",47094,16,3],["URXE_032StGQlEl3V17HXQ",374574,2899,2],["UdLsI4uyQ_S-XN7a4N5CvQ",34688,392712,2],["UqaJ9nvhQl-eT-Bey1m8Rw",16731,420407,5],["U2UehYHxQ5248yI8fy7_iw",145756,39],["VRG1ggLhStGW9MXAb65Btw",31668,17,3],["WQ3Ku6CJTWaCLabPhA951w",363389,625,1],["W_G-e_6AT4qICRL-Hz05sA",119138,14,4],["XNVK7HGDTMiNp8dsEPgM2A",52741,13,3],["XdDGg7MrTG2ZNpPIVpk3VA",119422,14,4],["YIXXT1hTSrS0ESGYH59www",422182,1798,2],["YKJXT2URTSydN9aUmkJOKA",179869,1221],["YYaufcmaQ4GiD9Q_MZuMWw",299654,335,1],["Yads3JcpTMymeKumAQcF6Q",362480,16,1],["YkBYIYwHRYOwkX0fmeqT4w",249642,299],["ZBBiN426T3WEYxVBXituGQ",90719,15103,4],["ZHedzwwERgmbHhpZuIEoeg",110056,94,4],["ZO4ZHBKxRyu5IlOdEiaMjQ",173877,0],["Z2KTakqhSTuWysEEAKyGXA",195554,109463,1],["a7UWcDOyToOQycGTu33MeQ",214800,148558,1],["bFoT0vGfRSapP6saKj_L6g",423544,3600,2],["bP42-AJoR4CDwWnCKWHocQ",232663,300],["bcxw7HujQFi5Y1YOMwQOfA",121952,23511],["b-Q9bhMZTHGa_blAGuZseQ",341953,599,1],["cnupw5mWSfS4hwLnV1L2XA",248428,106847,1],["csNqBKPtRNe25Pr757SKaA",203517,9051],["dQ3Y_1tPRZ6oPIRWPKo4aQ",194363,0],["dqOnFoBXTlqwDr8C2mv5yw",25033,404829,2],["eKNNK69YS6-iu0qhfQ6p9A",125751,14],["eifTn_kTRgSMWj6KYbalIg",100380,14,4],["fGJd8BQqRkai1XTM6B7nEw",13459,279970,1],["fJLe4FHgS2O9b-hFtG9Ldw",344682,594,1],["gAlvRzRXTLOxqgdwcRxLQw",421603,301,2],["gMC_86VbT7uIH8B0fdKxlA",14550,0,3],["gVlK1ilNRPeMIPUAA-JRtQ",221160,13],["gcRLtucSTrGWq7WYznfTmQ",290969,899,1],["i8Ff_VXpTFORsOhh4jZHbQ",280665,51,1],["jAw6RpvST3OEMAvbeH77LA",240387,221],["j-mNs4bdSI2XqAhGb4p3Hw",88836,20,3],["kBFvt4RRSai3DmGuyfgf6w",19817,2574,3],["kUEPr6JJTz6mCwWJDLv-aQ",115199,2400,4],["mlBIJs6mT52AX2Ahpgh7sw",196651,3934],["mswKVgE5Qxqta4NAHvVkoQ",437951,14,5],["nTWtsnADSv648AxbFz4Lcg",212355,9300],["nVUbi4OmT6-J9byg8-q97g",32001,1123,3],["nxblVyMLTrSZAkfPf2FWwg",383336,26486,2],["n-SY48K2QeqzCkb7yTZPpQ",259675,1200],["n_tcf3j7S6yBYt2Y7yM85A",293624,169,1],["odJ_h7oUS1yB_7p6LB4w7w",112982,342,4],["oe139e_bR4WtnCcqSe2jBQ",332048,0,1],["o4yHwSx2SX24OE9qPkJHsw",432488,825,2],["pQFs21PfTXuXeaf1tEVdMQ",129750,4545],["qTwJtmQESIC3jAtmz_8sTg",423097,13,2],["qnK6RnesT2igW_HcZssIdA",97976,334829,2],["qs3rnavAT4acYZvaEeI5oQ",129913,1199],["qxGFhkHZTduV9YYYWyDSUg",147480,273846,2],["r75L6GPkR4uVqBqO_1aSyA",355137,2246,1],["sSCrwsqiSyqBVgz7Matzww",299588,101812,2],["s3O6OZTBRz6O0TUBQC64QA",23489,245,3],["s_uTFGOTQdKTmWoJ9Vbzpg",24710,357292,2],["tMDzFziXTJ2CYoBLWq9H9Q",8579,433201,5],["tWF1yvWnTfOaaaBAbXwtPA",29003,17,3],["taU6vA6PTjWhKC6V43YplA",24383,411287,2],["t2UqLSrEREKy0Ai8JSYKGQ",203662,113],["t7tpQzqNRV6-tLSbunsDfg",302098,133,1],["t_SyOC8gTi218xAe4vOGgw",382434,7684,2],["uAtfx_GBRvmJCP6E9UWmzg",100421,15175,4],["uU2jxY3bRBe7AtfHRFGSIA",34810,299,3],["uqFbOGx4S_6ZvjcQrWE2Bw",26634,346405,2],["v1K6sNSCRdWXvmk8Jl91sQ",20955,298322,1],["wBeR6TKiQ1SnWlxO6HjxUg",208309,1199],["wF4aj-hSTl-BSuCbVRywOA",429094,2999,2],["wK3oJUoHT5Kb0jeLIzFJJQ",184790,16],["wM8XiYo0R9SEcCkDjO2bxQ",390457,1499,2],["wQwjJN_pSSOryn69Y8lqyA",16767,418804,2],["when_J1OTpScd-vaA2i6xw",341088,309,1],["xhjNabCzQHGEWRw9eEFAYQ",101690,275766,2],["xnEBJGKVSSC7--M0K_e2JA",364391,1764,1],["yYHnh-RxQaOcASVbQj6gOg",297672,2435,1],["yp2M01VvTle5xgXu7ZNzqg",204919,14],["ys4oahR7TDm9WW5zOKyShA",30073,1310,3],["zJtKDIeiTM2oegMGMt3nvg",343271,0,1],["zLFzVsWhSTOYU6rJsMsi1Q",20602,1472,3],["zOC7w26xQYiGnLQy3x504A",57982,44,3],["zmEzLb-1Q6m08t7dLiqFdw",11424,599,3],["zn1ecYMwRNKrJukPfPFoXQ",103760,282772,2],["zsuxu35fRq6bIZCvcC3iag",106311,285,4],["0Ekuj3W8Qpm_EwKpSXYdXw",377873,19,2],["0KpzjsoqQYaN_S2X8ySd7w",22236,352889,2],["0ia10T1pSZmAKukutrEaIA",31969,87661,4],["0lcgISlzQEej3cvhI-e-Ww",289089,82410,2],["0y4SH2FXRYGK1d0FCkOUjw",378025,6741,2],["00Z1M7PFTqq9iwnnCxiZTA",269597,166,1],["1dKF4NRHRfaJtfQr4lafCg",40381,1201,3],["2Bdkm5NaSY2lY1VMj_1Mqw",69602,16,3],["2jtrVkYNQtGpp7Y2wSOwZQ",304589,74,1],["2rseIRu9RAuvUuNOsSO_-Q",26626,18,3],["28TEqRx1QuK-TmIYSLzL1Q",34802,0,3],["3E-4jv0QSPq33RbRg4B3Aw",423829,7130,2],["3XJWUCjdRgSxmd5Z1hfDcw",16826,420725,5],["3cXtHb7yRQSBcQK7yx-_zw",232365,465],["3mSl6ER2RtSj9a0p-sNDMA",430880,299,2],["4JrymWEKThuc99N1_G1_rQ",11020,430720,5],["4XM-EZ63SiSRpbvcIqdZyw",133745,183813,1],["4u-CXB7uTwuNWoFuQ2ZO9g",196903,14],["5aQrgazaTe2oNgyFnFVOFA",25453,8280,3],["5c9NjVEiSOGVeFiQ9tdHYg",217415,3322],["5woLhtEbSPuhPazSSQoluA",197842,0],["6kdvBVYWSuuyehSCCPGLYw",11195,237,3],["6ryKJq12TO-2vFdLKAIPXw",100122,163,4],["7587mqPLR3iJGXGBXjcDIQ",194177,56975],["8M_zxblPSkGw-_mE0gJUXQ",364739,2101,1],["9OZ_7xz9SkS56dk0cpJsLA",279830,659,1],["9UnXYYzZSYiFRDOzfNeCvw",264541,6248,1],["9gX-Lr9aTTKqMIA4Mb5MGg",28665,254163,1],["9pgiN8b5R8CzMX_G28g_Xg",388466,3300,2],["9uEITVHeQXegRVD6lXnz8w",297708,5964,1],["90eBgHt_S0Gai4x7q3f8eA",10519,253386],["92hhaxj2R1mlus6Ck9XBPQ",268366,15,6],["-Haa3Cb8RzO-mee5e4tggA",147060,1287],["-Rrwi9qrTv2pEbUgjIPivw",142099,14],["-3NMp6qyR9q05KN8ZX48Dg",33123,33796,3],["_MZl_4kLSDGUuDuNMl1-6g",369100,2265,2],["_QIygAxARMO5xTL3TO8SKg",90452,14,3],["_66f6qhySiOVSH5VcwD-kQ",293656,137,1],["_7nqDabvQF2tbBmkp4eb6Q",386660,0,2]],[[0,1,191271,2,26643,3,354359,4,24701,5,225088,6,289885,7,201106,8,37620,9,256968,10,17452,11,365338,12,174277,13,221305,14,67654,15,118185,17,191745,18,9776,19,369026,20,97667,21,245351,22,201626,23,23539,24,287749,25,27715,26,40652,28,63416,29,120261,30,77482,31,369844,32,318670,34,36639,35,13497,36,301783,37,113723,38,358493,39,206694,41,114776,42,291542,43,270735,45,269660,46,241420,47,375235,48,234562,49,381817,50,365395,52,433544,53,303521,54,39051,55,132912,56,337258,57,89223,59,47106,60,374592,61,34699,62,16742,63,145791,64,31682,65,363398,66,119148,67,52752,68,119433,69,422209,70,179877,72,362490,73,249681,74,90750,75,110092,77,195567,78,214810,79,423559,80,232673,81,121976,82,341963,83,248473,84,209959,86,25044,87,125762,88,100391,89,13473,90,344691,91,421843,93,221169,94,290981,95,280684,96,240401,97,88854,98,20420,99,115231,100,196666,101,437964,102,212360,103,32024,104,383388,105,259692,106,293635,107,112992,109,432574,111,423110,112,97987,113,129925,114,147489,115,355186,116,299605,117,23525,118,24722,119,20,120,29018,121,24421,122,203672,123,302108,124,382456,125,100417,126,34821,127,26661,128,20967,129,208332,130,429106,131,184801,132,390470,133,16796,134,341114,135,101701,136,364515,137,297724,138,204929,139,30097,141,20613,142,58021,143,11514,144,103781,145,106348,146,377892,147,22247,148,31993,149,289102,150,379181,151,269607,152,40388,153,69615,154,304597,155,26641,157,424098,158,16839,159,232374,160,430897,161,11034,162,192807,163,196695,164,25878,165,217502,167,11258,168,100136,169,194187,170,364747,171,279840,172,266280,173,28677,174,388528,175,297712,176,10531,177,268378,178,147110,179,142110,180,33135,181,369117,182,90463,183,293665],[1,1,191403,2,26877,4,25011,6,290244,8,38012,10,135101,11,365564,12,174521,13,221461,14,70866,15,118434,17,194565,18,10436,19,369151,21,245755,25,27750,26,40966,28,63838,30,78953,31,369987,34,271072,36,302091,42,292625,45,269918,47,375662,48,234981,49,382343,50,365969,56,337683,61,35564,62,17369,65,363850,70,180343,73,249848,74,93618,77,281773,78,214997,81,145234,83,248720,84,210906,86,25873,89,13762,90,344778,98,21616,99,115359,100,196869,102,214588,103,33124,106,293788,109,432827,113,130388,114,419890,115,355381,116,300912,118,24984,119,25211,124,385030,126,35004,128,21266,129,208665,130,429479,135,377244,139,30472,141,20849,144,290828,147,374711,149,371387,150,380038,157,425942,158,17350,159,232638,161,11255,169,251142,172,266492,173,200146,174,388714,175,298220,176,116422,180,33438,181,370575],[2,1,191761,2,26936,4,25652,6,290128,10,135093,11,365556,12,174506,13,222661,14,204836,15,119256,17,194663,18,112037,21,245876,26,41195,28,63729,36,302040,42,292786,45,269974,47,375721,48,234981,50,366237,56,337503,61,35520,62,17526,65,363886,70,180169,74,96379,77,282412,81,145315,83,248754,84,211047,86,25686,89,13752,90,344804,99,115637,100,197049,102,216835,113,130997,114,419917,115,355380,118,25605,119,25371,124,383289,128,21230,130,429474,135,377269,139,30496,141,20917,144,385343,150,379732,158,17595,159,232666,161,11354,171,280197,172,266472,173,200160,174,389034,175,298714,176,116572,181,370591],[5,74,101510,89,120349,128,22252,173,200261],[6,2,27153,12,174657,14,207834,89,13796,128,21666,173,200632],[7,1,191426,4,26737,6,290782,8,38242,9,259927,14,83478,23,24000,25,28120,30,78409,32,319011,34,38178,37,188014,43,270914,47,376773,49,382530,54,39411,61,35165,62,18098,74,91322,77,283158,81,122210,82,342359,83,249109,89,15076,102,212507,104,408595,105,260129,115,356759,121,25152,124,382604,127,27380,128,55608,129,209435,133,108888,135,147785,136,365613,137,299395,141,21485,149,289208,152,41570,157,424893,158,17870,161,280009,162,235865,170,364915,172,268642,173,113688,175,297802,176,10914,181,369796],[8,1,191304,2,27344,4,24911,6,290372,8,37848,9,257230,11,365879,12,174714,14,67718,17,197179,18,113098,21,245454,23,23612,25,27763,26,41186,30,78269,32,318871,34,36704,37,187874,42,294092,47,375996,48,235366,49,382263,54,39237,57,89275,61,34845,62,16821,74,90789,77,195597,78,294671,82,342519,83,248882,86,25562,89,14016,90,345085,100,198235,102,213131,104,408208,105,259742,112,98505,115,357048,119,267855,121,24568,124,382481,127,26894,128,22228,129,209359,132,391324,133,108196,136,365559,137,298989,141,21239,148,114644,149,290977,150,379324,157,424728,158,17014,161,11623,162,235545,164,27402,165,217591,167,11431,172,266558,173,28743,174,390487,175,297945,176,10852,181,369155,183,293764],[9,4,24947,14,124595,21,251727,34,254051,89,204437,121,24568,133,108196,158,20008,172,268084],[10,10,374646,11,365856,18,29044,21,246093,36,302622,42,293318,45,270168,61,35664,70,181083,74,94416,77,282919,84,211479,89,14055,99,116043,102,218148,115,355704,116,303469,124,384432,128,55963,130,431869,157,430786,158,24354,172,265911,173,282338,174,390520],[11,4,26736,17,192182,34,120809,36,304372,47,376752,48,237261,49,382325,61,426657,62,17177,74,92754,77,283423,83,249108,100,197742,102,213730,112,98720,114,420746,124,385160,128,318806,136,365447,137,299353,144,289095,149,290481,158,20965,160,431153,161,280037,172,264711,173,114102,175,300912],[12,1,191425,4,24722,6,290787,8,38527,10,374316,14,121713,17,196675,18,107315,20,97778,21,252728,23,24000,25,28120,30,78592,32,319011,34,108438,36,303508,37,113790,42,291912,47,376820,49,382397,50,365551,54,39407,56,337608,57,90476,61,206402,62,16919,74,91648,77,281947,78,294736,81,122083,82,342093,83,353761,84,211929,89,43353,94,291137,96,240608,100,197078,102,212515,103,32514,105,260264,107,113267,113,130585,114,419848,116,300962,124,382645,127,27423,128,55609,132,391032,133,108887,135,147784,136,365614,137,299469,143,11706,144,104301,145,106594,147,374763,149,289257,150,384351,151,269757,152,41479,157,425607,158,18012,161,110764,162,235879,168,100284,172,270247,173,113699,175,297801,176,10593,178,147214,181,370718],[13,4,24758,14,71230,34,242398,48,235358,61,35471,74,98685,133,108887,158,78115],[14,45,273422,78,215806,84,204504,110,132675,116,401030,124,383690,130,431406,136,365236,158,74280,175,298584],[16,4,26004,8,38458,14,210165,17,196587,18,10744,20,98085,25,27833,42,291833,47,376752,48,236419,54,39421,57,303665,62,18071,74,91316,77,301630,78,294675,81,122023,83,355044,94,291093,96,240572,102,213445,104,383590,115,357109,116,398245,118,380402,124,384746,128,56573,135,376985,137,299172,148,32382,157,425513,158,17750,161,11805,175,297873,181,369640],[17,3,354469,4,25296,6,290190,12,175855,14,103020,17,194491,28,64429,30,78286,31,369999,34,182984,54,39586,55,133085,57,302318,61,207064,62,179559,74,92764,77,282434,78,286253,82,342039,83,248781,89,42902,100,197667,102,212649,109,432657,112,98249,113,130070,114,420504,116,300601,118,25397,121,26268,124,383302,126,35081,130,431627,132,391584,136,365374,137,299921,143,11632,157,429460,158,21084,161,11375,173,113883,175,300479],[18,4,25332,10,135105,11,365623,12,175107,14,71139,17,196976,18,112078,21,245597,36,304490,42,292808,45,272914,48,234998,56,346890,61,206011,70,180164,73,249874,74,99353,77,284595,78,215864,81,145286,86,429778,89,13788,90,344982,98,21613,99,115373,100,198070,102,212467,105,259888,115,355780,119,25912,121,26268,124,388453,128,21255,130,429684,141,20897,144,384877,149,291763,150,384742,158,24245,162,288310,165,217575,172,267542,175,299709],[19,1,191505,4,25153,6,290163,8,37859,9,258622,13,222651,14,124567,17,195544,18,107317,21,251485,23,23627,25,27916,28,188921,30,78400,32,319421,34,36844,37,187526,42,292712,47,376156,48,236882,49,382399,50,365450,57,302393,61,34956,62,17794,74,91304,77,281875,78,363130,81,122066,82,342083,83,249043,84,208552,89,43348,96,240575,102,212853,104,408403,105,260336,109,432658,113,130646,114,419593,116,300144,118,25369,119,267176,121,24824,124,382580,127,26983,128,57118,129,209100,130,431893,132,391901,133,108754,136,365494,137,298902,139,30309,143,11760,144,288492,145,106522,147,374823,148,116020,149,289201,152,40754,157,425760,158,17343,161,279984,170,366547,172,266672,173,113460,174,390196,175,297850,176,116964,181,369630],[20,4,25189,121,24824,124,385693,133,108754],[21,2,26996,61,427115,89,195346,157,428408,158,263423,162,287847,172,267224,173,281557],[22,14,123728,17,197312,18,107323,21,252670,47,377566,62,17096,74,91943,77,281723,83,354448,100,198850,102,213072,107,113311,116,304590,124,382583,127,372792,132,391115,136,365580,137,300102,150,384682,152,41478,158,22009,172,269722,173,201023,175,297768],[23,74,92072,77,302595,102,213092,124,384683,158,106247,172,269734,175,300252],[25,1,191404,14,210559,74,103507,77,282901,78,214910,82,342291,83,249655,102,212392,124,384532,127,112599,133,108407,149,289120,175,298129,181,369126],[26,12,185477,14,109479,17,195329,21,248783,42,295126,45,273163,56,346839,74,96996,77,208550,84,207107,89,110513,102,215942,110,134283,116,304075,119,110526,121,114968,124,386037,128,60621,133,108407,144,386532,148,117825,150,381627,157,429459,158,25016,175,303068],[27,61,36271,121,114968,124,383305,133,434195,139,30359,149,290550,175,302397],[28,102,216662,124,382614,175,297813],[29,1,191381,2,26831,4,25093,6,290187,8,38238,10,296441,11,365547,12,174667,13,223097,14,71264,15,118514,17,194670,18,10718,19,369203,20,98030,21,245525,23,24040,25,27853,26,41154,28,63954,30,77655,32,319016,34,36880,36,302068,42,291863,43,270947,45,269762,47,375812,48,235044,50,365896,54,39410,55,133254,56,337622,57,89600,61,35319,62,16966,65,363856,69,423612,70,180530,73,249892,74,91305,77,281807,81,122103,83,248967,84,211240,86,26562,90,344834,94,291135,96,240590,98,22085,99,115666,100,197074,102,212540,103,32485,104,383811,107,113262,109,432692,112,98804,113,130302,114,419910,115,355419,116,303556,118,25022,119,526,121,25203,124,382636,126,35057,127,26920,128,21320,129,208926,130,429477,132,391434,133,109367,135,377050,136,365057,137,298037,139,30386,141,20839,143,11694,144,103933,148,114947,149,289297,150,379630,152,41539,157,424904,158,17243,159,232762,161,11410,162,287928,164,28962,165,217992,170,365437,171,280205,172,265906,173,28954,174,389148,175,297884,176,10921,181,369297],[30,4,25129,121,25203,133,109367,161,369733],[31,10,374525,12,176382,13,221895,14,126836,18,10417,21,246095,25,28086,30,78065,32,319287,37,188289,42,292307,45,270035,47,377041,50,366703,56,338039,57,90141,61,207037,70,180845,74,93795,78,215776,83,249727,84,204362,89,107481,99,115724,100,199494,102,214010,110,130215,114,420164,115,356298,116,301335,119,0,124,383030,127,27602,130,429954,136,364827,141,21112,157,427514,158,72072,170,366834,171,280483,172,265218,175,300421,176,263900],[33,1,191776,10,296506,11,365621,34,38079,36,302337,42,293115,47,375844,62,59047,65,364009,77,282254,81,145459,115,355837,118,122093,124,387234,128,21571,130,429714,158,19455,173,200446,174,389493],[34,8,38404,25,28065,57,302660,61,34870,74,92335,83,250320,102,213816,105,260325,116,300730,124,386317,144,289116,158,22018],[35,4,25269,6,290038,8,38275,13,222496,17,195112,18,10633,25,27809,28,64123,30,77500,34,254918,36,303374,42,360305,45,276602,48,235550,57,303544,61,36191,74,92915,83,248885,94,291731,99,115630,100,199950,102,219571,113,130782,116,401290,118,25594,121,432761,124,383293,127,27750,128,318631,132,391465,137,298306,139,30513,141,21378,148,118915,157,424086,172,270124,174,389200,175,299106],[36,4,25305,121,432761],[37,57,302377,74,92225,102,213565,119,261,124,382877,158,22256,172,266074,175,297740],[38,45,272277,74,94416,84,211479,102,218148,124,384432,158,110089,172,265911],[39,74,97963,77,281739,102,213091,124,382613,136,365592,158,173209,172,269542,173,281466,175,299583],[40,74,105068],[41,4,25170,6,289906,12,174728,14,67955,17,195667,18,113027,25,27722,50,365707,54,39168,57,90303,62,17228,69,423455,74,93501,77,301283,89,15351,91,421743,95,280710,99,116177,102,215121,103,32636,109,432665,113,129984,115,356679,116,400156,121,25726,124,384916,132,390794,135,377118,136,365993,139,31379,143,11571,145,106322,147,22462,158,17208,159,232523,161,284364,162,235523,173,113389,175,299541,176,116451],[42,4,25206,74,94427,102,216172,121,25726,124,384484,175,297822],[43,124,384494],[44,2,27065,4,24998,8,37896,9,258677,10,296542,11,365657,12,174379,14,67808,17,195704,18,112952,21,245429,23,23733,25,27777,26,41035,34,36980,36,302570,37,187908,42,292948,45,269903,47,375938,48,235017,54,39380,57,304103,61,35232,62,16865,74,90988,77,282572,80,232782,83,249042,86,25894,89,13885,90,344901,100,197788,102,214872,105,259819,112,98560,114,421048,115,355470,119,268540,121,24838,124,388670,127,26880,128,21985,129,208847,130,430084,141,21325,144,385312,148,116181,150,381354,157,425400,158,17056,161,11575,162,235759,164,28303,165,218031,172,266620,173,28827,174,389351,175,299217,176,263299],[45,4,25034,50,365924,74,105201,83,355113,99,115884,110,130804,112,98230,121,24838,137,298117,158,22765,172,265327],[46,137,299323,158,22601],[47,4,24994,13,223105,15,119001,28,189088,32,319329,48,235877,50,366471,56,337483,61,426414,74,90941,78,285331,83,249081,86,25500,89,43893,90,345028,102,213712,115,355381,116,400930,121,284262,124,386720,128,56235,129,209262,137,297767,144,385207,157,426525,158,21129,161,284250,172,265124,180,33620],[48,4,25030,49,381894,60,374700,69,423497,74,97521,75,110145,80,232716,102,213657,118,121940,119,30130,121,284262,141,22071,161,369609,169,250908,171,279948],[49,14,204027,102,221572,158,17815,175,299731],[52,42,291797,61,36074,74,97029,83,354951,102,213336,127,373039,128,318977,144,380529,173,281527,175,298219],[53,74,93052,83,353710,129,209051,158,255175,172,269548],[54,14,119904,21,248936,34,108044,61,207416,74,95588,89,14524,128,58042,157,427025,158,18504,172,268247,175,301597],[55,1,191428,2,337581,4,441091,6,290458,9,257426,10,374408,12,174844,14,118370,15,118168,17,192183,19,369078,21,245638,31,370134,32,319005,34,101422,36,301967,37,188018,42,291882,45,270154,47,376752,50,365565,60,374729,61,206787,71,299651,74,103186,77,283094,78,294682,81,122391,82,342350,84,203514,86,429769,89,192464,90,345160,99,116281,100,196668,102,212862,104,383348,105,259936,114,420753,115,355426,118,380896,121,111372,124,382565,127,372529,128,317960,129,209107,132,390869,133,107924,136,365542,137,298946,144,384220,148,114234,149,289184,150,379157,157,424868,158,106762,161,280010,162,235590,165,217561,172,266631,173,200315,174,388467,175,297857,181,369188,183,293788],[56,121,111372,133,107924],[57,6,289972,114,420957,119,266958,121,111565,127,372077,144,288507,158,110162,175,302496],[58,17,197366,21,245231,74,104124,78,215230,102,213041,121,111565,124,384598,144,287805,158,173028,165,217445,172,269648,175,297908],[59,34,391437,61,114991,65,363441,74,105537,78,215231,89,106995,90,344794,102,212810,124,384583,136,365953,158,196543,175,297902],[60,14,123957,18,107350,21,252949,36,303740,49,382413,56,346880,74,102675,77,301840,78,215467,82,342336,84,212308,94,291699,100,198904,102,215489,107,113320,114,420022,124,384639,127,372776,136,365686,150,384747,158,106330,173,201096,175,299916,176,116916],[61,1,191420,13,221449,17,197118,18,113400,32,318997,34,194687,42,291861,48,236805,57,302135,61,206823,62,179418,69,422282,77,281930,78,363173,81,122369,83,250206,100,199717,102,212500,113,130376,114,419958,116,302518,118,381733,124,382618,133,108810,135,376961,144,103912,145,106400,147,374707,149,289246,154,304637,157,424849,158,353670,161,279995,172,269968,173,113543,175,297846,181,369686],[62,133,108810],[63,1,191363,14,127000,24,288037,28,189890,34,365376,48,236230,56,441217,57,302789,74,105340,78,284879,96,240556,102,213420,104,384238,124,385272,135,377004,137,298932,148,118495,158,107956,161,110547,170,366328,173,113261,175,303255],[65,2,337650,4,441098,6,290343,32,318924,34,372242,42,294133,47,375872,49,382321,61,427163,77,281660,78,294667,83,353649,89,282739,90,345104,104,408130,115,357049,119,267398,121,432547,124,382456,127,372515,128,317930,132,391156,133,430633,136,365533,137,298941,149,289151,150,379391,157,424757,158,272882,161,279952,162,287535,172,266559,173,281659,174,390786,175,297783,181,369141,183,293771],[66,36,304038,42,292535,45,270412,50,366698,56,338296,57,302887,69,423947,78,285653,114,421210,115,356053,116,302761,121,431688,124,383151,128,318191,130,431526,133,430633,136,364820,144,385684,157,429858,158,273730,172,265210,175,298518],[67,3,354577,4,440718,6,290151,10,374475,11,365914,31,369952,32,319012,34,373125,36,302051,42,291840,43,270912,45,269845,47,375384,49,382019,50,365552,57,304793,60,374837,61,427278,69,422650,77,281802,78,294678,82,342332,83,353757,86,428257,94,291103,104,384609,106,293733,109,432623,114,419903,115,355827,116,299864,118,380748,119,267188,121,284856,124,382605,127,372765,128,318014,130,430679,132,390903,134,341283,136,365614,137,297904,144,289098,147,374717,149,289252,157,424893,158,273017,161,279922,170,364913,171,280210,172,268962,175,297805,181,369750],[68,6,290183,10,374344,19,368988,27,299118,32,319041,34,271673,36,303683,42,291901,43,270914,44,284640,45,269651,47,376863,49,382406,50,365594,56,337726,57,302995,62,436784,71,299742,77,282733,78,285959,82,342332,83,353823,86,329345,90,344859,91,421617,94,291406,104,383983,114,419928,115,355154,116,299868,121,283727,124,382755,127,292292,128,318045,130,430698,132,391737,134,341392,136,364394,137,297941,144,289066,147,374832,149,289418,150,379152,154,304658,157,424484,158,273073,160,430905,161,283747,170,364972,171,280265,172,264794,173,282819,174,388508,175,299623],[69,10,296402,11,365566,34,365234,36,302688,43,270772,47,375632,49,381976,57,302134,61,426392,65,363478,78,294665,83,354920,89,282426,94,291007,106,293677,115,355666,116,300288,118,380568,121,432498,123,302226,124,382445,130,429727,132,390515,136,365522,137,299237,147,374645,149,290945,157,424893,158,273019,161,279942,162,287388,170,365279,171,280084,172,267250,173,282165,174,390615,175,297916,181,369369],[70,10,374721,11,366069,36,303579,42,292886,45,270377,57,304625,77,284531,86,429861,89,284239,115,356053,116,302978,121,432498,124,384000,128,318581,130,431496,136,365520,144,385719,157,430156,158,276314,172,268248,175,300409],[71,118,380826,124,386975,158,283967],[73,45,271543,89,282703],[74,6,290345,34,380603,61,427400,77,282057,104,408098,115,357053,124,384549,127,372524,132,391057,133,430683,136,365533,137,298936,144,383554,149,289152,158,272891,161,279950,172,267329,175,297791,181,369145],[75,133,430683,149,292107,158,349944],[76,132,391517]]]
\ No newline at end of file
diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index 7c69165..0000000
--- a/.gitignore
+++ /dev/null
@@ -1,9 +0,0 @@
-.tmp-edge-profile/
-__pycache__/
-*.pyc
-
-# Local browser smoke/probe artifacts.
-*probe*.html
-*probe*.png
-*smoke*.html
-*smoke*.png
diff --git a/.htaccess b/.htaccess
index 1a8ccd5..fedc16b 100644
--- a/.htaccess
+++ b/.htaccess
@@ -1,3 +1,5 @@
+AddType application/manifest+json .webmanifest
+
 <IfModule mod_expires.c>
   ExpiresActive On
   ExpiresByType text/html "access plus 0 seconds"
@@ -21,15 +23,22 @@
     Header set Pragma "no-cache"
     Header set Expires "0"
   </FilesMatch>
+  <FilesMatch "\.(css|js|json|webmanifest|ico|png|webp|mp3|wav)$">
+    Header set Cache-Control "public, max-age=2592000, immutable"
+  </FilesMatch>
   <FilesMatch "service-worker\.js$">
     Header set Cache-Control "no-cache, no-store, must-revalidate"
     Header set Pragma "no-cache"
     Header set Expires "0"
   </FilesMatch>
-  <FilesMatch "\.(css|js|json|png|webp|mp3|wav)$">
-    Header set Cache-Control "public, max-age=2592000, immutable"
-  </FilesMatch>
 </IfModule>
 <IfModule mod_deflate.c>
   AddOutputFilterByType DEFLATE text/html text/css application/javascript application/json text/plain
 </IfModule>
+
+
+# Never serve hidden server-data paths.
+<IfModule mod_rewrite.c>
+  RewriteEngine On
+  RewriteRule (^|/)\. - [R=404,L]
+</IfModule>
diff --git a/.vscode/settings.json b/.vscode/settings.json
new file mode 100644
index 0000000..6f3a291
--- /dev/null
+++ b/.vscode/settings.json
@@ -0,0 +1,3 @@
+{
+    "liveServer.settings.port": 5501
+}
\ No newline at end of file
diff --git a/ACHIEVEMENT_AUDIT.md b/ACHIEVEMENT_AUDIT.md
deleted file mode 100644
index 5f3a086..0000000
--- a/ACHIEVEMENT_AUDIT.md
+++ /dev/null
@@ -1,268 +0,0 @@
-# 実績システム再監査レポート v39.16.78
-
-対象: 全72実績、解除イベント、判定順序、進捗リセット、保存・復元、Undo/Redo、サーバー同期  
-方針: 前回重点対象だった「自分のずんち」「敵の敵は味方」だけでなく、これまで大きく取り上げていなかった実績を再度コード経路から監査した。明確な不具合は修正し、ゲームデザイン判断が必要な条件は変更していない。
-
-## 1. 今回新たに確定・修正した不具合
-
-### 1.1 「ミニマリスト」: プレイヤー設置物情報が保存されなくなる
-
-`ミニマリスト` は「現在存在するプレイヤー設置物が10個以下」を判定するため、各アイテムの `_achievementPlayerPlaced` を必要とする。
-
-旧実装では、この情報を保存する条件が実質的に `無計画都市` の未解除状態へ依存していた。そのため、`無計画都市` を先に解除した後にセーブ・ロードすると、既存アイテムのプレイヤー設置情報が失われ、`ミニマリスト` の物数判定が過少になる可能性があった。
-
-**修正:** `無計画都市` と `ミニマリスト` のどちらかが未解除なら、プレイヤー設置情報を保存する。30秒削除用の設置時刻は従来どおり `無計画都市` に必要な場合だけ保存する。
-
----
-
-### 1.2 「サウナ水風呂」: 高温開始時刻が更新され続ける
-
-条件は「暑すぎる状態になった個体を15秒以内に寒すぎる状態へ移す」だが、旧実装は高温状態を評価するたびに開始時刻を現在時刻へ更新していた。
-
-このため、長時間高温に置いた後でも、寒冷へ移した直前の評価時刻との差だけで15秒以内と判定され得た。
-
-**修正:** 快適域外の高温状態へ**入った瞬間**だけ開始時刻を記録し、連続して高温にいる間は更新しない。高温状態を離れてから再び入った場合は新しい試行として時刻を記録する。
-
----
-
-### 1.3 「抵抗器じゃない」: 致死感電した7体目がカウントされない
-
-旧実装では感電ダメージを与えた後に実績カウントを行っていた。感電が致死になると対象は死亡済みになり、`recordWireShock` の生存チェックで除外されるため、7体目がその感電で死亡すると解除できない場合があった。
-
-**修正:** 有効な感電を確認した時点で、ダメージ適用より先に実績カウントを行う。致死・非致死のどちらでも、その感電自体は1体分として扱う。
-
----
-
-### 1.4 実績リセット後に隠れた途中進捗が残る
-
-全実績リセット後も、World・たりない・アイテム本体に直接保持された一部の途中状態が残っていた。そのため、リセット直後に少ない追加操作だけで再解除できる実績があった。
-
-**修正したリセット対象:** 
-
-- 同一個体への直接給餌回数・直接治療回数
-- サウナ開始時刻・直前高温状態
-- たりない保持開始時刻
-- 喧嘩餅から喧嘩開始までの一時情報
-- 粘着爆弾の受け渡し回数
-- `無計画都市` 用の配置時刻
-- 自然奴隷・自然王の世代進捗
-
-`ミニマリスト` が現在の配置物を正しく識別するため、既存アイテムの「プレイヤーが配置した物か」という事実自体はリセットで消していない。
-
----
-
-### 1.5 「監視カメラ」: Undo/Redo・地面変更が介入になっていない
-
-配置・削除・給餌・つつく・射撃などは観察タイマーをリセットしていた一方、Undo、Redo、有効な地面変更は世界状態を変更する操作なのに観察タイマーをリセットしていなかった。
-
-**修正:** 成功したUndo/Redo、および実際に地面種別が変わった操作を介入として記録する。
-
----
-
-## 2. 前回重点対象の修正状態
-
-### 「あぁ＾～ たまらねぇぜ」
-
-現在の条件は次の経路で成立する。
-
-`おしり鋲でずんち蓄積 → おしり鋲を抜いて排出 → 排出ずんちが本人から一度離れる → バウンス柵等で反射・加速 → 本人へ帰還して致死衝突`
-
-- 生成直後の本人との重なりは衝突扱いしない。
-- 本人から一度離れた後に帰還した衝突だけを自己帰還として扱う。
-- 非致死では解除しない。
-- バウンス柵による反射・加速は資格を失わせない。
-- 停止済み・プレイヤー保持済みの排出ずんちは対象外。
-- 致死処理で本人の生存IDが解放されても、ダメージ前に所有者一致を保持するため解除可能。
-
-### 「敵の敵は味方」
-
-30体以上の状態で稼いだ連続数は、生存たりないが30体未満になった時点で0へ戻る。危険カテゴリのアイテムによるたりないへのダメージでも従来どおりリセットする。
-
-前回ユーザー確認済みの「無傷」の範囲、戦闘ペア危険死の期限、機械化産業の履歴AND条件は現行仕様のまま変更していない。
-
----
-
-## 3. これまで大きく取り上げていなかった実績の再監査結果
-
-### 生態・繁殖
-
-- `はじめての繁殖`、`ベビーブーム`、`大いなる母` は実際の繁殖成功イベントから接続されている。
-- `天寿`、`水銀で天寿` は最終確定した死亡理由を受けた後に判定される。
-- `25体全員が病気` は睡眠病だけを除外し、ずんち病・爆発病・喧嘩病を対象としている。
-- `管理された楽園` は6日目以降から連続1ゲーム日を計測する。
-- `安全第一` は25体以上を300ゲーム秒維持し、天寿以外の死亡で再計測する。天寿後に25体を下回れば人数条件によって停止する。
-- `自給自足` は20体以上・複製機なし・直接給餌なしを600ゲーム秒維持するフィールド内条件。
-- `雨宿り完了` は現行の雨天である小雨時に、パラソル・巣箱・土管の保護判定を使う。
-- `町のお医者さん` は応急手当を使った回数ではなく、実際にHPが1以上回復した回数だけを累計する。
-- `豊穣ヲ希求スル者` はラブ餅の影響下で成立した繁殖だけを累計する。
-
-**追加の到達不能・イベント未接続は確認されなかった。**
-
-### 実験・危険行動
-
-- `6番目の大量絶滅` は同一Worldの10ゲーム秒ローリング区間で死亡50件。
-- `豆野、殺ッカーやろうぜ！` は通常ボールの速度条件を満たした致死衝突から直接接続される。
-- `ヘコヘコ中に着火` は着火処理が繁殖儀式状態を消す前に判定される。
-- `下剤中の餓死` は死亡フレームの下剤状態を保持して判定する。
-- `物理法則を下側に超越` はアイテム位置の実温度計算を走査しており、温度効果の重畳で到達可能。
-- `おくすり手帳全埋め` は現行仕様どおり11種類を対象とし、鎖・王冠は除外する。
-- `革命` は王の喧嘩死と、直前0.1ゲーム秒以内の奴隷による喧嘩ダメージを照合する。
-- `火に油` は喧嘩餅を受けた個体が30ゲーム秒以内に参加する喧嘩開始を判定する。
-- `五体満足` / `零体満足` は状態効果付与時と自然ステータス変化時の双方から再評価される。
-- `混沌ヲ希求スル者` は喧嘩餅影響下の喧嘩開始だけを永続累計する。
-- `命のバトン` は同じ生存中の粘着爆弾の受け渡し回数を保存・復元する。
-- `情報化産業` は別々の2基盤を電線類で直接つなぎ、信号が実際に伝達された経路から解除される。
-
-**追加の確定不具合は「抵抗器じゃない」の致死感電順序だけで、修正済み。**
-
-### 建築・環境
-
-- `物でいっぱい` はプレイヤー配置イベントを永続累計し、リンク類の配置も配置として数える。
-- `清掃業者` はロボット掃除機による有効な清掃200回のフィールド内進捗で、現行ドキュメントと一致する。
-- `潔癖症` は生存たりない0、生存アリ0、生存アイテムがロボット掃除機のみ、かつ条件を満たす稼働掃除機が存在する場合に成立する。死亡たりないは死亡直後に非表示となり定期圧縮されるため、画面上の死体残留との矛盾は確認されなかった。
-- `メガロポリス` は100体・複製機10・草ベッド/巣箱/土管合計15の境界値で評価される。
-- `砂場` は生存中のトイレ5個で成立する。
-- `そこ公共空間だよ？` は公園フィールドで実際に地面変更が成立した時だけ解除する。
-- `破格の工事費用` は壁時計1秒以内の有効な地面変更4回を数える。
-
-**追加の確定不具合は「ミニマリスト」の保存メタデータだけで、修正済み。**
-
-### 操作・継続
-
-- `秘密のコレクション` は9スロットすべてに実セーブハッシュがあることを確認する。
-- `何やってるの？` は空フィールドへのクリックだけを壁時計1秒内に4回数える。
-- `見なかったことにしよう` は1回のUndo前後で死亡個体が10体以上減った場合に成立する。
-- `やっぱなし` / `やっぱあり` は成功したUndo/Redoだけを永続累計する。
-- `割とふわふわ` は共通の「つつく」対象判定からぬいぐるみを飛ばした場合に成立する。
-- `狙撃手` は命中ではなく発砲333回を永続累計する。
-- `スペックがたりない` は有効な計測FPSが10未満になった場合で、非表示タブ由来の異常なフレーム間隔を除外する。
-- `毎日たりない観察` はローカル暦の日付単位の7日連続起動。
-- `寝ろ` / `めっちゃたりない観察` は壁時計の連続経過で、現行仕様どおりタブ非表示時間も継続として扱う。
-- `真・たりない観察` は自身以外の71実績が解除済みかを判定する。
-
-**追加の確定不具合は「監視カメラ」の介入漏れと、全実績リセット後の隠れ進捗残留で、修正済み。**
-
----
-
-## 4. 仕様確認が必要な曖昧点 — 現在は未変更
-
-以下は実装が壊れているとは断定できず、表示文から複数の解釈が成立するため、回答を受けるまで条件変更を行っていない。
-
-### Q1. 「ずんちどれい」「たりない王」の「出現」範囲
-
-現行は**喧嘩戦績による自然変身だけ**で解除する。
-
-- 鎖を付けて奴隷化 → 対象外
-- 王冠で王化 → 対象外
-- 奴隷同士から生まれた生来の奴隷 → 対象外
-
-候補:
-
-- **A: 現行どおり** — 喧嘩戦績による変身だけ
-- **B: 人工付与以外** — 喧嘩戦績変身 + 生来の奴隷を対象。鎖・王冠は除外
-- **C: 文字どおり全出現** — 鎖・王冠を含め、状態になった時点で解除
-
-### Q2. 「末代までの恥」「華麗なる王族」の「○代連続」
-
-現行は**同じ家系でなくても、自然変身した個体の世代番号が連番なら成立**する。例えば無関係な家系の2代・3代・4代・5代・6代に自然奴隷が1体ずついれば5代連続になる。
-
-候補:
-
-- **A: 現行どおり** — 世界内の世代番号の連続
-- **B: 直系家系限定** — 親子関係を辿って同じ系譜で連続して状態が続く必要がある
-
-Q1で生来の奴隷を対象にする場合、Q2の奴隷5代判定にもその出生を含めるかを合わせて決める必要がある。
-
-### Q3. 「過保護」の「薬で治療」
-
-現行は、薬カテゴリの直接使用なら効果の善悪を問わず治療回数に加算する。対象には応急手当だけでなく、睡眠薬、下剤、プロテイン、ニテロプ、弾薬、水銀、巨大化薬、小型化薬なども含まれる。
-
-候補:
-
-- **A: 現行どおり** — 薬カテゴリの直接使用3回
-- **B: 治療系アイテムだけ** — 対象薬を明示的に限定
-- **C: 実際に有益な回復が発生した使用だけ**
-
-### Q4. 「無計画都市」の「削除する操作を累計30回」
-
-現行は**操作回数ではなく、30秒以内に削除された対象物1個につき1回**進む。範囲削除1回で対象物を10個消した場合、最大10進む。
-
-候補:
-
-- **A: 現行どおり** — 削除した対象物数を数える
-- **B: 削除コマンド単位** — クリック/範囲削除の1実行を1回として数える
-- **C: 連続削除ジェスチャ単位** — 押している間の連続削除を1回として数える
-
-### Q5. 「監視カメラ」の5分と「見るだけ」の意味
-
-現行は**300ゲーム秒**。高速化すれば実時間5分より早く解除できる。今回、世界を変更するUndo/Redo・地面変更も介入として追加したが、UI操作、セーブ、速度変更、ポーズ、空クリックなど世界を直接変更しない操作はタイマーを止めない。
-
-時間基準:
-
-- **A: 現行どおり300ゲーム秒**
-- **B: 実時間5分**
-
-「見るだけ」の入力基準:
-
-- **1: 現行どおり世界への介入だけでリセット**
-- **2: ほぼすべてのユーザー操作でリセット**
-
-例: `Q5 = A1` のように指定可能。
-
-### Q6. 「抵抗器じゃない」のセーブ/Undo跨ぎ
-
-現行の「同じ1本」はランタイム中の同一電線オブジェクト。セーブロードやUndo/RedoでWorldが再構築されると、1～6体までの途中人数は失われる。
-
-候補:
-
-- **A: 現行どおり** — 7体すべてを同じランタイム中に感電させる
-- **B: 同じ保存上の電線なら継続** — セーブロード後も電線ごとの途中人数を保存する
-
-### Q7. 「害虫駆除」の「アリを倒す」主体
-
-現行は**アリが死亡した事実をすべて累計**する。プレイヤーの危険アイテムだけでなく、たりないとの戦闘、設備・環境など別要因で死亡しても1体として数える。
-
-候補:
-
-- **A: 現行どおり** — 死亡したアリをすべて数える
-- **B: プレイヤー由来の撃破だけ**
-- **C: プレイヤーまたはたりない陣営が倒した場合だけ**
-
----
-
-## 5. 前回ユーザー確認済みの仕様 — 変更なし
-
-以下は前回の確認により現行仕様を維持している。
-
-- 戦闘ペア危険死: 第1死亡から第2死亡まで同一World内で明示的な時間制限なし。
-- 機械化産業: ロープ・棒・ばねの配置履歴と信号作動履歴のAND。現在同時に存在する必要なし。
-- 敵の敵は味方: 「無傷」は危険カテゴリ由来のたりないへのダメージをリセット対象とし、あらゆるダメージを禁止する意味ではない。
-
----
-
-## 6. 検証結果
-
-v39.16.78 に対して以下を実行し、すべて成功した。
-
-- JavaScript全ファイル・監査スクリプトの `node --check`
-- 全72実績の定義・カテゴリUI・同期監査
-- プレイスタイル実績の境界値・リセット範囲・永続化・フック監査
-- 「あぁ＾～ たまらねぇぜ」専用の生成直後除外 / 離脱 / 帰還 / 致死・非致死回帰テスト
-- サウナ開始時刻、実績リセット、監視介入、ミニマリスト保存情報、致死感電の追加回帰テスト
-- 実績イベント統合監査
-- サーバー状態・旧形式移行・並行同期監査
-- 全体回帰監査 `scripts/regression_check.py`
-- Python監査スクリプトのコンパイル確認
-- `achievement_api.php` のPHP構文確認
-
-結果はすべて `[OK]`。今回の再監査で新たに確認した**確定不具合は5系統で、すべて修正済み**。上記Q1～Q7は仕様回答待ちのため、v39.16.78では現行挙動を維持している。
-
-
-## Confirmed specification decisions (39.16.78)
-- ずんちどれい / たりない王: birth-status appearances also qualify.
-- 末代までの恥 / 華麗なる王族: only a direct qualifying parent-child lineage counts.
-- 過保護: a treatment counts only when the direct use actually improves the health need.
-- 無計画都市: one deletion operation counts once, even if area deletion removes multiple objects.
-- 監視カメラ: requires 3 uninterrupted game days; gameplay operations are interventions.
-- 抵抗器じゃない: partial wire progress remains nonpersistent across save/load and Undo.
-- 害虫駆除: only player-caused ant deaths count.
diff --git a/AI_MAP.md b/AI_MAP.md
deleted file mode 100644
index 820acb1..0000000
--- a/AI_MAP.md
+++ /dev/null
@@ -1,105 +0,0 @@
-# tarinai_ AI map
-
-Purpose: static Japanese browser simulation/game. Optimize context by reading this file only after `README.md`, then open the relevant subsystem files. For exact file expansion, use `scripts/ai_inventory.ps1` or `scripts/ai_inventory.py`.
-
-## Architecture
-
-- Entrypoint: `index.html` defines the app shell, canvas, dialogs, right panels, and exact script order.
-- Runtime style: plain browser JS, global IIFEs, exports on `window`, no bundler/module loader.
-- Version/cache: `app_manifest.json`, `js/version.js`, generated `service-worker.js`, and `index.html` query params share `39.16.78`.
-- Main loop: `js/main.js` initializes assets/audio/world/UI/save, then drives update/render.
-- Performance/display settings: `js/perf_profiler.js` owns manual visual settings and profiler buckets; display tiers affect rendering/visuals, not simulation-quality branches.
-- Update order: `js/system_order.js` calls phase facades from `js/simulation_systems.js`.
-- Command path: UI/input emits command objects; `js/command_dispatcher.js` routes tool, pointer, selection, save, reset, and UI intents.
-- Persistence: save files are schema/codec/storage/coordinator modules; snapshot/history modules keep world restoration and stats consistent.
-
-## Subsystem Map
-
-- Core/bootstrap: `js/version.js`, `js/event_bus.js`, registries, `js/data.js`, `js/ground_types.js`, `js/health.js`, `js/main.js`, `js/debug_tools.js`, `js/perf_profiler.js`.
-- Rendering/assets/audio: `js/assets.js`, `js/audio.js`, `js/render.js`, `js/tarinai_render.js`, `js/item_render_runtime.js`, `js/sound_pack.js`.
-- Simulation phases: `js/sim_core.js`, `js/simulation*.js`, `js/world_update*.js`, `js/system_order.js`.
-- World domain: `js/world*.js`, `js/weather_system.js`; covers state, camera/view, environment, combat/effects, placement/history, tools, family/social, ants, spatial budgets.
-- Creature domain: `js/tarinai*.js`; covers state, identity, needs, actions, forced behavior, social life, item effects, disease/nests, movement/update pipeline, rendering.
-- Item/structure domain: `js/item*.js`, `js/items.js`, `js/structures.js`, `js/structure_lifecycle.js`; covers definitions, spawning defaults, lifecycle, dynamic behavior, rendering.
-- Physics/mechanics: `js/physics*.js`, `js/mechanical_system.js`, `js/constraint_system.js`, `js/collision_footprint_system.js`.
-- UI/input: `js/ui*.js`, `js/text_catalog.js`, `js/command_dispatcher.js`; covers panels, tools, selected creature, logs, charts, family tree, mouse/touch, dialogs, labels.
-- Family tree: `js/family_graph.js`, `js/ui_family_*.js`; data transform, layout, paths, async rendering, validation.
-- Save/history: `js/save*.js`, `js/snapshot_system.js`, `js/restore_coordinator.js`, `js/history_system.js`.
-- Scripts: `scripts/generate_app_files.py`, `scripts/generate_item_icons.py`, `scripts/regression_check.py`, `scripts/ai_inventory.py`, `scripts/ai_inventory.ps1`.
-
-## File Pattern Semantics
-
-- `*_pipeline.js`: ordered runner/facade for update or lifecycle work.
-- `*_step_*.js`: narrow pipeline step wrapper.
-- `*_system.js`: domain service, phase service, or compatibility facade.
-- `*_runtime.js`: stable runtime-facing facade around split modules.
-- `*_registry.js`: definition registry and lookup/normalization helpers.
-- `world_*`: world-owned behavior; `tarinai_*`: creature-owned behavior; `item_*`: item-owned behavior; `ui_*`: DOM/input/panel behavior.
-- `assets/sprites/tarinai_*.webp`: creature visual state sprites; numeric prefix is stable asset ID/order.
-- `assets/ui/tool_*`: tool palette icons; `assets/ui/favicon*`, `apple-touch-icon`, `ecology_*` are app/help icons.
-- `assets/objects/*`: field object sprites for ants, zunchi, pushpin, oshibyo, genkotsu, plushie.
-- `assets/sounds/voice_*`: creature voice samples; `shoot_*`, `major_damage_*`, `firecracker_*` are SFX.
-
-## Task-Oriented Read Sets
-
-- UI/layout bug: `index.html`, relevant `css/*.css`, `js/ui_bind.js`, `js/ui_layout_dialogs.js`, matching `js/ui_*.js`.
-- Tool behavior: `js/command_dispatcher.js`, `js/world_tool_actions.js`, `js/item_registry.js`, relevant `js/item_*` or `js/tarinai_item_*`.
-- Creature behavior: `js/tarinai.js`, `js/tarinai_update_pipeline.js`, relevant `js/tarinai_*`, `js/system_order.js`.
-- World/environment/combat: matching `js/world_*`, `js/simulation_*`, `js/system_order.js`.
-- Fire/burning behavior: `js/fire_runtime_system.js`, `js/item_dynamic_tool_system.js`, relevant item definitions, `js/world_combat_effects.js`, and nearby environment helpers.
-- Performance/crowding: `js/perf_profiler.js`, `js/item_update_scheduler.js`, `js/tarinai_update_policy.js`, `js/constraint_system.js`, `js/world_spatial_budget.js`, and render/detail code.
-- Save/load: `js/save_schema.js`, `js/save_codec.js`, `js/save_system.js`, `js/snapshot_system.js`, `js/restore_coordinator.js`.
-- Family tree: `js/world_family_social.js`, `js/family_graph.js`, `js/ui_family_*.js`.
-- Static app/cache/version: `app_manifest.json`, `scripts/generate_app_files.py`, `service-worker.js`, `js/version.js`, `index.html`.
-
-## Invariants
-
-- Preserve `index.html` script order unless all dependent manifests/generated files are updated together.
-- Keep `app_manifest.json`, `js/version.js`, `service-worker.js`, and cache query versions synchronized.
-- Keep intentional global exports for compatibility with regression checks and browser runtime; remove public facades only after repo-wide caller checks.
-- Prefer focused edits in the owning subsystem; split modules are intentional compatibility boundaries.
-- Avoid reintroducing `simulationQualityTier` branches unless a real simulation-quality setting is restored; current quality controls are visual/detail controls.
-- `High` display quality may include quality-preserving optimizations, but should not reduce simulation cadence, object limits, or visible fidelity in a noticeable way.
-- Save format compatibility with old text saves is not required when intentionally shortening/replacing save hash text; keep current save/load internally consistent instead.
-- Run `node --check js/*.js` and `python scripts/regression_check.py` for behavior changes.
-
-## Current Maintenance Notes
-
-This section records current boundaries only. Version-by-version cleanup history and completed work logs are intentionally omitted.
-
-### Live Compatibility Surfaces
-
-- Ordered global-IIFE loading is still part of the app contract; check repo-wide callers before removing bare globals or facade objects.
-- Keep public event names with active listeners: `audio:play`, `selection:changed`, `tool:selected`, `world:phase`, `log:entry`, and `tool:placed`. Telemetry-only emit calls should stay removed.
-- Save compatibility with old exported text is not required, but the current save/load round-trip must remain internally consistent.
-- Tool icon ownership is `TOOL_DEFINITIONS.icon`; UI code converts asset paths for CSS variables. Avoid restoring CSS-local `url(...)` definitions.
-- Shared geometry/display/domain helpers should stay in their owning helper modules unless a dedicated namespace migration is being done.
-
-### Open Architecture Candidates
-
-- Full namespace migration for behavior/action/needs/tool helpers. This requires rewriting many bare global call sites and updating regression contracts.
-- Effect-specific spatial indexing, fuller delta-history storage, and high-speed collision partitioning. These need new indexes or semantics beyond cleanup.
-- UI/text-side meaning consolidation, including labels, wrapping/measurement helpers, and duplicated scalar helpers such as `num`, `finiteOr`, `isObject`, and `clonePlain`.
-- Further `World.prototype` reduction is possible, but only for helpers proven not to be runtime-facing canvas/UI/tool APIs.
-
-## Current Feature Routing
-
-- Achievement system: `js/achievements.js`, `achievement_api.php`, `js/save_schema.js`, `js/save_codec.js`, `js/snapshot_system.js`, and achievement audit scripts. Current save schema is `49`; current app/cache version is `39.16.78`.
-- Achievement UI: `index.html` achievement dialog, `css/components.css` achievement rows/toast styles, and `js/achievements.js` DOM rendering.
-- Achievement spell payload: `TarinaiAchievements.exportSpellState()`, `snapshot.g.s`, `save_system.js` spell export inclusion, and `save_codec.js` achievement metadata readers/writers.
-- Logic board: `js/circuit_board_system.js`, `js/signal_system.js`, signal-related item definitions/metadata, and the generated circuit editor markup/styles.
-- Shared play: `js/seesaw_system.js`, tarinai action/need modules, placement preview, and item/structure definitions.
-- Reset presets: `js/world_reset_presets.js`; UI reset selection is in `js/ui_layout_dialogs.js`; social archive reset/fallback routing touches `js/world_family_social.js`.
-- Physics tool icons and previews: `js/ui_tools.js`, `js/render.js`, `js/placement_preview_system.js`, `js/physics_shape_editor_system.js`, and `js/item_tool_metadata.js`.
-
-## Cleanup Candidate Audit - resolved
-
-The previous cleanup candidate queue has been applied or adjusted. Current state:
-
-- Version/docs routing was aligned to `39.16.78`; `js/version.js` build identity now matches the app version, and `README.md` no longer points at an older cache-query script URL.
-- One-version and overlapping audit scripts from the candidate list were removed; the broad audit suite remains `scripts/achievement_audit.js`, `scripts/playstyle_achievement_audit.js`, `scripts/achievement_integration_audit.py`, `scripts/achievement_server_state_audit.py`, and `scripts/regression_check.py`.
-- Shared scalar/object/clone/hash/text helpers now live on `TarinaiCoreHelpers` in `js/deterministic_helpers.js`; action, behavior, structure, snapshot, save, geometry, physics, seesaw, placement-preview, circuit, and signal code route repeated helper logic through that shared surface or through `TarinaiGeometry`.
-- UI HTML escaping is owned by `js/ui_helpers.js`; consumers bind explicitly to `TarinaiUIHelpers.htmlEscape`, and `index.html` loads `ui_helpers.js` before the consumers that need it.
-- `js/achievements.js` uses `renderIfDialogOpen()` for progress refreshes instead of repeating the hidden-dialog check at each event recorder.
-- `js/world_placement_log.js` uses shared close/backdrop binding for editor dialogs; deeper editor extraction can still be done as feature work, but the repeated close process from the cleanup list is removed.
-- `FILES.json` now includes JavaScript audit scripts and newer core bootstrap files (`domain_ids`, deterministic helpers, item registries/definitions) in machine routing.
diff --git a/BUILD_NOTE.txt b/BUILD_NOTE.txt
deleted file mode 100644
index 55074fa..0000000
--- a/BUILD_NOTE.txt
+++ /dev/null
@@ -1,262 +0,0 @@
-tarinai_compact_save_stage4
-- Save schema 33 omits standard item amounts and stores only an optional non-standard block base plus per-item differences.
-- Relationship targets are sorted and delta-encoded within each Tarinai row.
-- World seeds use a canonical 64-bit hexadecimal identity and occupy exactly 8 bytes in the binary save.
-- The binary header contains one schema byte; its high bit signals whether a string table follows. Empty string tables and the duplicate snapshot version are omitted.
-- Deflate state is folded into the low bit of the frame-length varuint, eliminating the separate compression byte.
-- 15-bit text conversion uses arithmetic Unicode range mapping instead of a 32768-character string and reverse Map.
-- Binary schema 51 is the current save format; schemas 49 and 50 remain readable. Achievement payload v6 stores 72 unlock bits and persistent statistician progress while v5 remains importable.
-- Version: 39.16.94
-- CompressionStream and DecompressionStream are drained concurrently to avoid browser backpressure stalls.
-
-- Load confirmation uses the in-game dialog; fan wind is realtime; zunchi tool preview opacity, carried plushie depth, and blanket grass rules were corrected.
-
-- Passive spring: removed time-driven oscillation; force now depends on extension/compression and relative endpoint velocity.
-- Signal effects use the exported TarinaiEffect constructor.
-- Pressure-switch placement/editor overlays display the configured detection radius.
-
-- v39.16.18: removed redundant physics normalization, dirty-marking, compaction, pickup, and collision bookkeeping; unified one-way-fence and bounce corrections while retaining debug diagnostics and defensive recovery paths.
-
-- Earlier mechanism pass: stronger passive spring, persistent detector ranges, robot-cleaner signal power, and electric shock effect.
-
-- v39.16.17: fixed the undefined bodyFor reference in mechanical one-way-fence contact handling by using the canonical body velocity helper.
-
-- v39.16.16: link rendering no longer depends on midpoint spatial visibility; bounce fences launch Tarinai without shock damage; passive springs are more under-damped and elastic.
-
-- v39.16.16: population chart includes per-bucket births/deaths; rotators accept signed motor speed; champion personality bonuses inherit through descendants; champion-pair mate weighting is moderately reduced.
-- v39.16.16: colony population chart records births/deaths, rotators accept negative motor speed, champion personality boosts inherit through descendants, champion-pair mating is slightly reduced, and one-way fence previews/pathfinding honor the passable direction.
-
-- v39.16.16: one-way fences allow Tarinai forward crossing in swept collision; chart legend dots toggle series; wire tools attach to Tarinai/ants; energized living endpoints panic and take damage; selected data reports electrocution.
-
-- v39.16.19: added direct food/medicine giving by placement or pinched drop, with a give overlay, stronger food-gift personality change, and heart bursts; removed unused collision reasons and duplicate constraint projection dirty checks.
-
-- v39.16.20: localized the direct-feeding personality reason, normalized electrocution deaths to the Japanese electrocution label, added detector-controlled gate fences, made chart legend labels fully clickable, and escaped non-ASCII runtime source.
-
-- v39.16.21: hid pinch overlays for rope/rod/spring/wire connection items and added detector time schedules with a dual-thumb range control, overnight ranges, and persistent copy/save state.
-
-- v39.16.22: shortened detector copy, removed the time-range explanatory hint, cascaded connection-item removal when any endpoint disappears, and repaired detached plushies so they return to a living owner or disappear with a missing owner.
-
-- v39.16.23: excluded transient splat effects from all connection endpoint selection and renamed the user-facing feeding need from the formal feeding term to the appetite label.
-- v39.16.25: added toilet-seeking before normal defecation; renamed rain shelter to parasol; added sunny +3.5C and unsheltered rain -3.5C felt-temperature corrections; parasols neutralize both and block sunbathing. Pet food, first aid, and sedative remain included.
-
-- v39.16.29: replaced toilet-seeking with walkable toilet sand that immediately removes poop spawned on its surface; added a parasol ground shadow and explicit hot-sun/cold-rain temperature-seeking targets; fixed null candidate temperatures being interpreted as 0C.
-
-- v39.16.29: aligned parasol placement overlay with its shade, made toilet sand absorb rain water, expanded Happy/Athletic/War presets, simplified Athletic rotators, and reserved their full rotation envelope from fences.
-
-- v39.16.30: added a few bounce fences to War, reduced ordinary-fence restitution, restored ball collisions for visible sleeping Tarinai, moved nest-box tooltips closer, allowed movable-item placement overlap, and fixed delete-tool target lookup.
-
-- v39.16.31: unified in-world tooltip spacing, added the Hair Trigger preset, and replaced physics-category line-like tool icons with distinct semantic silhouettes.
-
-- v39.16.35: moved snap-mode switching to a dedicated operation control with Free/20px/40px/60px cycling, removed F/G from size badges, allowed valid placement against the field top edge, and standardized preset descriptions with Japanese full stops.
-
-- v39.16.37: unified biological/environmental conditions into the detector, removed the standalone sensor and relay types with no save migration, folded temperature/limits, moved secondary controls into the header menu, preserved tool mode while browsing tarinai data, and added five-second mobile selection tips.
-
-- v39.16.38: detector numeric sliders match the time-control presentation; colony settings are unified; display settings are inline; meter colors, snap control, range-delete icon, and ant chart defaults are revised.
-
-- v39.16.39: restored the compact sticky operation palette, added exact-match panel search, reorganized colony settings/stats, and refreshed range-delete and mechanism icons.
-- v39.16.40: moved partial panel search to the header with previous/next navigation and tooltip text indexing; localized snap mode labels; simplified bounce-fence and reciprocator icons; matched expanded colony settings to the chart background.
-
-39.16.41: Added local achievements and optional self-hosted shared unlock percentage API.
-
-39.16.42: Expanded achievements to ten conditions, added local/shared reset, rapid-event windows, generation streaks, and special collision tracking.
-
-39.16.44: Expanded achievements to fifteen conditions, changed rapid deaths to 50 in 10 seconds, moved conditions into game tooltips, added toast-to-button absorption, and added colony disease/happiness, cumulative hand feeding, ritual ignition, and laxative-starvation achievements.
-
-39.16.44: Audited all achievements; fixed impossible slave generation tracking, persisted generation runs, queued simultaneous unlock toasts, hardened launched-zunchi stop detection, and preserved laxative-at-death timing.
-
-39.16.45: Added seven play-style achievements for passive observation, fifty world placements, detector automation, rope/rod/spring coverage, a five-minute death-free 25-Tarinai colony, 25 live ants, and 30 cumulative ant kills; persisted world-scoped timers and placement progress.
-
-39.16.46: Revised achievement naming and disclosure UI, replaced achievement tooltips with inline post-unlock descriptions and horizontal shared-rate bars, merged detector automation plus link coverage into 機械化産業, changed placement and ant-kill goals to persistent totals of 100, and made direct-feeding progress reset with the field.
-
-39.16.47: Added 大いなる母 and 喧嘩両成敗, renamed five achievements, revised five revealed descriptions, and added a debug-only all-achievements button.
-
-39.16.48: Corrected the zunchi-slave fight-record threshold text to 30%; fixed wire placement totals, danger-kill attribution for 喧嘩両成敗, partial legacy link migration, strict player-ID validation, post-unlock storage writes, and debug-only unlock isolation from shared statistics.
-
-39.16.49: Added additive client-to-server full-state synchronization for automatic aggregate recovery after server-side achievement data loss.
-
-39.16.51: Expanded achievements from 27 to 43 with history, cleanup, care, ecology, temperature, weather, medicine, combat, and ant-experiment conditions; persisted the required reset-scoped metadata in a new incompatible save schema; made nest-box and pipe occupants weather-protected; and added false-positive guards for time-zero markers and stale ant damage attribution.
-
-39.16.52: Reorganized achievements into four collapsible categories, removed achievement tooltips, surfaced pre-unlock disclosures in the achievement UI, and replaced native browser confirmations with a shared in-game dialog.
-
-
-39.16.53: Renamed the four achievement categories to 生態/実験/建築/その他, moved unlocked achievements to the top of their own categories, disclosed four additional conditions before unlock, raised 大いなる母 to 3333 births, and moved achievement unlock toasts to the upper-left.
-
-39.16.54: Added 真・たりない観察, 悠久の歴史, 五体満足, and 零体満足; disclosed 悠久の歴史 before unlock; reduced achievement overhead by skipping closed-dialog list rebuilds, caching category mappings, debouncing pending sync, and retaining periodic full recovery sync.
-
-39.16.55: Added 町のお医者さん and 割とふわふわ; changed ベビーブーム to 30 births per minute and 管理された楽園 to one uninterrupted happy in-game day from play day 6; repaired shared つつく targeting, damage, plushie fling, and hover overlay; corrected manual rotator/reciprocator push direction; tightened tool/limit typography; reduced periodic achievement scans; and changed server aggregate writes to compact v2 JSON with legacy-state migration.
-39.16.56: Added 混沌ヲ希求スル者 and 潔癖症; made fight progress persistent; revised ミニマリスト, おくすり手帳全埋め, and 清掃業者; and made achievement-rate bars visible on unlocked cards.
-
-39.16.57: Compactly embeds unlocked achievements and persistent achievement progress in exported spell saves; spell loads merge achievements without erasing local progress and resync restored unlocks to the server.
-
-39.16.59: Replaced JSON-string achievement metadata in spell/save binaries with a sparse binary schema; achievement unlock masks are raw bits, progress is bit-packed, timestamps use minute deltas, and old v39.16.57 spells remain readable.
-39.16.60: Added persistent sniper, megalopolis, and love-mochi fertility achievements; changed chaos progress to fight-mochi-influenced fights only; extended compact spell progress without migrating obsolete generic fight counts; omitted completed achievement counters from spell metadata; and tightened population-limit labels/layout.
-
-39.16.62: Expanded achievements from 54 to 59 with single-digit FPS, 24-hour continuous play, five toilet-sand placements, park-ground editing, and four ground changes per second; revised safety, observation, and empty-click conditions; moved the two observation achievements to the bottom of その他; and expanded binary achievement masks to eight bytes while retaining schemas 41–43.
-
-39.16.63: Fixed achievement progress typography and tab-switch observation continuity; added アリ観察 and 命のバトン; persisted sticky-bomb pass counts; aligned sauna/enemy-ant conditions; removed obsolete spell compatibility; current exports use schema 45 and achievement payload v4.
-
-## v39.16.64
-- Added 毎日たりない観察 and 抵抗器じゃない.
-- Daily streak state is carried by achievement payload v5 and binary schema 46.
-- Achievement aggregate JSON migrates compact v2/verbose input to compact v3 automatically under the API file lock.
-
-## v39.16.65
-- Re-audited the not-yet-deployed shared achievement server with generated randomized unlock data instead of a fixed production sample.
-- Shared summaries are read-only; only POST session/unlock/sync/reset calls register or update players, and GET mutations are rejected.
-- State writes now use a separate lock file plus atomic same-directory replacement, preserving the previous state across interrupted writes.
-- Invalid or structurally unknown JSON returns `storage_corrupt` without overwriting the source file.
-- `completionistEligible: false` now prevents `true_tarinai_observer` from being re-added by the same sync payload.
-- The randomized server audit covers 32 v2/verbose migrations and 72 concurrent player syncs with exact semantic comparison.
-
-## v39.16.66
-- Added seesaw cooperative play and friendship growth.
-- Added circuit-board editor with positioned input/output terminals and AND/OR/NOT gates.
-- Added electrical control for fan, stove, dry ice, and duplicator.
-- Added connectable-item and circuit-terminal highlights while wiring.
-- Save snapshot/schema: 38/47.
-
-## v39.16.67
-- Circuit board editor now uses a grid canvas with direct gate placement and cursor-drawn wiring.
-- Legacy circuit layouts are intentionally not converted.
-- Colony state evaluates every two in-game hours; growing populations cannot be classified as Weakened.
-- Seesaw action selection, fixed orientation, and placement preview were corrected.
-
-## v39.16.68
-- Seesaw leisure can start at a lower boredom threshold, and a waiting rider raises the second rider's action priority.
-- Active paired play is shown as 「シーソーをしている。」 in selected Tarinai data.
-- Seesaws render in the low/back item layer instead of covering Tarinai sprites.
-- AND/OR gate input pins and gate outputs are snapped to the same 40px circuit-editor grid used by cursor wiring.
-
-## v39.16.69
-- Circuit-board internal wiring now uses straight grid segments with explicit branch junctions and unlimited fan-out per terminal.
-- Removed OR and added a one-input/one-output rectifier; internal logic parts rotate in 90-degree steps.
-- Circuit-board external terminal counts and positions are editable; the board footprint and default terminal spacing were expanded.
-- Detector numeric conditions now use a dual-thumb minimum/maximum range plus direct numeric inputs.
-- Seesaw riders render slightly above the seat surface.
-- Save snapshot/schema: 39/48. Older saves are intentionally unsupported.
-
-
-## v39.16.70
-- The default circuit-board grid is now 10x6, one quarter of the previous editor area, with a correspondingly smaller world footprint.
-- Circuit-board width and height are editable; the board world size follows the grid dimensions.
-- Input/output terminal count is limited by board height, and every external terminal can be dragged independently onto the left, right, top, or bottom edge.
-- Branch junctions can be moved directly; all connected straight segments follow the junction.
-- NOT and rectifier bodies are visually smaller while their pins remain on grid intersections.
-- Existing external wires follow terminal positions after a board resize or terminal move.
-- Seesaw action reasons now use play-specific wording instead of inheriting unrelated fulfillment reasons such as bed demand.
-- Save snapshot/schema: 40/49. Older saves are intentionally unsupported.
-
-
-## v39.16.71
-- Circuit-board external terminals are now placed directly with IN/OUT terminal tools; the +/- terminal-count controls were removed.
-- Disconnected external terminals are dimmed in the circuit-board editor; connected terminals retain their signal colors and cannot be deleted until their world wire is removed.
-- Placement previews no longer use the generic ellipse fallback: circle items use circles, obstacle/mechanical items use their collision footprints, and special items use dedicated shapes.
-- Detector, wire, insulated wire, and circuit board moved from the Physics palette section to a new Electrical section.
-- Clicking a detector dual-range track outside either thumb teleports the nearer thumb to the clicked value.
-- Save snapshot/schema remains 40/49; the persisted circuit-board v4 structure is unchanged.
-
-
-## v39.16.72
-- Circuit-board default grid is 10x10 and both dimensions can grow to 20x20; the world footprint scales proportionally in both axes.
-- AND gate body height is two grid cells. Compact one-input parts can be placed one grid row from the top/bottom edges when their rotated pins remain in bounds.
-- Placement previews prefer shared occupancy/collision footprints; the dedicated seesaw preview was removed and circuit boards use their rectangular board footprint.
-- Internal combinational feedback loops are explicitly detected and forced OFF; a NOT self-loop is unstable and does not provide power.
-- Save snapshot/schema remains 40/49; the persisted circuit-board v4 structure is unchanged.
-
-
-## v39.16.73
-- Circuit-board editing shows placement ghosts for pending internal parts and terminals.
-- Q/E rotates pending internal parts by 90 degrees before placement.
-- The ON constant source is documented in the editor.
-- Wire and insulated-wire palette silhouettes render correctly in the Electrical category.
-- Save snapshot/schema remains 40/49.
-
-
-## v39.16.76
-- Removed the circuit-board OFF constant source.
-- Added the achievement 「情報化産業」 for transmitting an active signal directly from one circuit board output to another circuit board input through wire or insulated wire.
-- Extended the 8-byte achievement mask to use its final bit, supporting all 64 current achievements.
-- Save snapshot/schema remains 40/49.
-
-
-## v39.16.78
-- Fixed 「あぁ＾～ たまらねぇぜ」: burst zunchi no longer treat their spawn overlap with the owner as a collision.
-- A burst zunchi now becomes eligible only after it has cleared the owner once; a later fatal return collision unlocks the achievement, including routes that reflect and accelerate on a bounce fence.
-- Preserved the existing nonfatal, stopped, and player-held disqualification behavior.
-- Fixed ミニマリスト placement-origin metadata so it remains saveable after 無計画都市 has already unlocked.
-- Fixed サウナ水風呂 to measure 15 seconds from genuine entry into a hot state instead of refreshing the hot timestamp on every hot evaluation.
-- Fixed 抵抗器じゃない so a Tarinai killed by the qualifying shock still counts before death clears its live state.
-- Achievement reset now clears reset-scoped hidden per-Tarinai and per-item progress, including care counts, sauna state, held duration, fight-mochi metadata, sticky-bomb pass count, and quick-delete timestamps.
-- Undo/Redo and valid ground changes now reset 監視カメラ observation progress as world interventions.
-- Added route-level and secondary regression coverage for these achievement paths. Ambiguous achievement semantics identified by the renewed audit remain unchanged pending explicit specification.
-
-39.16.78: Applied confirmed achievement semantics: birth-status slave/king appearances count; dynasty achievements require direct parent-child qualifying lineage; Overprotective treatment counts only actual beneficial health recovery; Unplanned City counts deletion operations rather than removed objects; Surveillance Camera requires 3 uninterrupted game days and resets on gameplay interventions; wire-shock partial progress remains nonpersistent; Pest Control counts only player-caused ant deaths.
-
-
-## v39.16.80
-- Optimized Tarinai social-neighbor scans with squared-distance filtering, nearest-N partial selection, pair-deduplicated symmetric work, cached personality profiles, and shared disease spread logic.
-- Added personality-derived crowd comfort bounds. Overcrowded Tarinai flee toward less crowded space with the specified behavior text; undercrowded Tarinai become stressed and approach the nearest living Tarinai with the specified loneliness text.
-
-
-## v39.16.85
-- Replaced Undo/Redo object snapshots and recursive patch history with the existing synchronous binary save codec payload.
-- Exposed binary snapshot encode/decode helpers from TarinaiSaveCodec for internal history reuse without Base32768 text conversion or asynchronous compression.
-- Replaced JSON.stringify-based duplicate detection with a compact dual 32-bit fingerprint over the encoded history bytes.
-- Unified Undo and Redo stack movement through a shared history transition path while preserving synchronous behavior and the 48-entry limit.
-- Added binary-history regression coverage for storage shape, duplicate suppression, Undo restoration, and Redo restoration.
-
-
-## v39.16.85
-- Render stack optimization: static visible stacks are cached by static spatial generation and camera region, while dynamic stacks reuse previous-frame order before insertion sorting and are merged linearly.
-- Link rendering now uses dedicated AABB spatial cells instead of per-frame full type-bucket fallback scans.
-- Carried plushies render at owner-relative positions without mutating simulation coordinates during rendering.
-- Fixed render culling radii are cached on eligible static entities.
-- Render-layer sort keys are computed once per stack insertion.
-
-
-## v39.16.85
-- Reduced fixed render cost by skipping the fallback full-screen gradient whenever the transformed field fully covers the viewport.
-- Cached full-screen fallback gradients and rebuilt atmospheric full-screen lighting at 8 Hz instead of constructing multiple full-screen gradients every frame.
-- Reused dynamic render-layer entries, sort maps, and previous-order ID arrays to reduce per-frame garbage collection as population grows.
-
-
-## v39.16.86
-- Removed social crowd-retreat selection and the overcrowded colony-state distance scan.
-- Removed the unconditional three-second full terrain-cache invalidation; cached terrain now refreshes only from real terrain changes, with splat fading invalidating local chunks.
-- Throttled structure dependency safety sweeps, staggered item/ant compaction, and stopped timer-only item bucket rebuilds.
-- Deferred periodic statistics UI refreshes and collapsed population statistics into a single pass.
-- Ordinary item additions/removals no longer invalidate the full terrain cache unless cached terrain items actually changed.
-
-## v39.16.88
-- Large-save restore uses an adaptive non-damaging settling phase for dense loaded populations, preventing synthetic body-overlap and obstacle-correction impulses from cascading into impact deaths.
-- Duplicator loading takes priority over direct feeding when a Tarinai overlaps the machine.
-- Save schema 50 explicitly stores elapsed completed days; total simulation time is restored monotonically and seasons/climate derive from elapsed days. Schema 49 spells remain readable.
-
-
-## v39.16.89
-- Moved the ずんちどれい and たりない王 population-chart toggles to immediately after 死亡数.
-- Removed the 12-second periodic Tarinai runtime-cache full sweep that caused large-population performance regressions.
-- Runtime relationship/cache cleanup is now scheduled only after accumulated deaths reach max(20, floor(living population * 15%)), then runs once during the next Tarinai compaction and resets its counter.
-
-
-## v39.16.90
-- Added eight playstyle-survey achievements: 数こそ力, 少数精鋭, 踩屎感, 快適な寝床, 石に枕す, 季節を越えて, 推し, and 統計学者.
-- 数こそ力 unlocks at 100 living Tarinai. 少数精鋭 requires 1-25 living Tarinai continuously for five game days and discloses its condition/progress before unlock.
-- 統計学者 counts 30 statistics-tab or chart-series visibility button presses in persistent achievement state, so field resets do not clear its progress.
-- Achievement spell payload v6 and binary save schema 51 expand the unlock mask from 64 to 72 achievements while retaining v5/schema 49-50 read compatibility.
-- Updated the Item lifecycle pipeline regression to validate local bucket/spatial invalidation when passive serving-food decay actually changes its visual footprint.
-
-
-## v39.16.94
-- Removed previous-order render Maps and custom insertion sorting; dynamic visible lists now use native Array.sort after culling.
-- Removed the shared route cache while retaining actor-local route throttling.
-- Disabled detailed performance counters in normal play; diagnostics remain available only in explicit debug/perf mode.
-- Isolated obstacle-query cache invalidation to routing-obstacle generations instead of generic spatial movement.
-- Replaced per-frame full Tarinai spatial-grid rebuilds with cell-crossing incremental updates.
-- Added sustained hysteresis to automatic performance-profile transitions to prevent rapid quality oscillation.
-- Death-reference cleanup now executes in bounded per-frame chunks after the existing adaptive death threshold.
-
-## v39.16.94
-- Fixed dense-population birth regression caused by incremental Tarinai spatial-grid bucket ordering interacting with an early 20-candidate contact cutoff. Contact interactions now consider the complete already-fetched local candidate set while retaining only the nearest bounded interaction list.
-- Moved the "季節を越えて" achievement from the ecology category to "その他".
-39.16.96: UI input/limits/zoom refinements, infection chance reduced to one-third, 75 achievements, grass spatial/hot-path optimization, summer flat temperature bonus removed.
diff --git a/FILES.json b/FILES.json
deleted file mode 100644
index 22c5608..0000000
--- a/FILES.json
+++ /dev/null
@@ -1,191 +0,0 @@
-{
-  "purpose": "Token-efficient machine-readable routing for tarinai_. Use scripts/ai_inventory.py for exact current file expansion.",
-  "version": "39.16.98",
-  "entrypoints": {
-    "app": "index.html",
-    "runtime": "js/main.js",
-    "update_order": "js/system_order.js",
-    "manifest": "app_manifest.json",
-    "service_worker": "service-worker.js"
-  },
-  "read_strategy": {
-    "default": [
-      "README.md"
-    ],
-    "architecture": [
-      "README.md",
-      "AI_MAP.md"
-    ],
-    "exact_inventory": [
-      "powershell -NoProfile -ExecutionPolicy Bypass -File scripts/ai_inventory.ps1 -All",
-      "python scripts/ai_inventory.py --all"
-    ],
-    "machine_routing": [
-      "FILES.json"
-    ]
-  },
-  "groups": [
-    {
-      "id": "root",
-      "patterns": [
-        ".gitignore",
-        ".htaccess",
-        "app_manifest.json",
-        "favicon.ico",
-        "index.html",
-        "README.md",
-        "AI_MAP.md",
-        "GAME_FEATURES.md",
-        "FILES.json",
-        "service-worker.js",
-        "achievement_api.php",
-        ".achievement_data/.htaccess"
-      ],
-      "meaning": "Repo/app shell metadata, server/static cache config, docs, manifest, entrypoint."
-    },
-    {
-      "id": "css",
-      "patterns": [
-        "css/*.css"
-      ],
-      "meaning": "Base, layout, panel, component, and mobile responsive styling."
-    },
-    {
-      "id": "scripts",
-      "patterns": [
-        "scripts/*.js",
-        "scripts/*.py",
-        "scripts/*.ps1"
-      ],
-      "meaning": "Generators, regression checks, version-specific audits, and token-aware AI inventory tooling."
-    },
-    {
-      "id": "core",
-      "patterns": [
-        "js/version.js",
-        "js/event_bus.js",
-        "js/domain_ids.js",
-        "js/registry_base.js",
-        "js/disease_registry.js",
-        "js/sound_pack.js",
-        "js/deterministic_helpers.js",
-        "js/item_tool_metadata.js",
-        "js/item_tool_definitions.js",
-        "js/item_visual_definitions.js",
-        "js/item_food_definitions.js",
-        "js/item_effect_definitions.js",
-        "js/item_registry.js",
-        "js/data.js",
-        "js/ground_types.js",
-        "js/health.js",
-        "js/input_mode_manager.js",
-        "js/main.js",
-        "js/math.js",
-        "js/perf_profiler.js",
-        "js/debug_tools.js",
-        "js/update_step_pipeline_runner.js",
-        "js/burn_motion_util.js"
-      ],
-      "meaning": "Bootstrap, shared constants/helpers, registries, config, profiling/debug."
-    },
-    {
-      "id": "assets_runtime",
-      "patterns": [
-        "js/assets.js",
-        "js/audio.js",
-        "js/render.js",
-        "js/tarinai_render.js",
-        "js/item_render_runtime.js"
-      ],
-      "meaning": "Image/audio loading and canvas rendering."
-    },
-    {
-      "id": "simulation",
-      "patterns": [
-        "js/sim_core.js",
-        "js/simulation*.js",
-        "js/system_order.js"
-      ],
-      "meaning": "Simulation primitives, concrete systems, phase ordering."
-    },
-    {
-      "id": "world",
-      "patterns": [
-        "js/world*.js",
-        "js/weather_system.js"
-      ],
-      "meaning": "World state/view/update/tools/environment/combat/family/social/ants."
-    },
-    {
-      "id": "physics",
-      "patterns": [
-        "js/physics*.js",
-        "js/mechanical_system.js",
-        "js/constraint_system.js",
-        "js/collision_footprint_system.js"
-      ],
-      "meaning": "Geometry, collisions, constraints, mechanical item behavior."
-    },
-    {
-      "id": "items",
-      "patterns": [
-        "js/item*.js",
-        "js/items.js",
-        "js/structures.js",
-        "js/structure_lifecycle.js",
-        "js/circuit_board_system.js"
-      ],
-      "meaning": "Item/structure registry, lifecycle, dynamic behavior, rendering."
-    },
-    {
-      "id": "tarinai",
-      "patterns": [
-        "js/tarinai*.js",
-        "js/ants.js",
-        "js/seesaw_system.js"
-      ],
-      "meaning": "Creature state/actions/needs/social life/item effects/disease/rendering plus ant actor model."
-    },
-    {
-      "id": "save",
-      "patterns": [
-        "js/save*.js",
-        "js/snapshot_system.js",
-        "js/restore_coordinator.js",
-        "js/history_system.js"
-      ],
-      "meaning": "Snapshot schema/codec/storage/restore/history."
-    },
-    {
-      "id": "ui",
-      "patterns": [
-        "js/ui*.js",
-        "js/text_catalog.js",
-        "js/command_dispatcher.js",
-        "js/family_graph.js",
-        "js/achievements.js"
-      ],
-      "meaning": "DOM UI, input, tools, selected panel, logs, charts, family tree, text labels, command routing."
-    },
-    {
-      "id": "assets",
-      "patterns": [
-        "assets/sprites/tarinai_*.webp",
-        "assets/ui/tool_*",
-        "assets/ui/favicon*",
-        "assets/ui/apple-touch-icon.png",
-        "assets/ui/ecology_*.webp",
-        "assets/objects/*",
-        "assets/sounds/*"
-      ],
-      "meaning": "Creature sprites, UI/tool icons, field object images, voice/SFX samples."
-    }
-  ],
-  "conventions": {
-    "*_pipeline.js": "ordered runner/facade",
-    "*_step_*.js": "pipeline stage wrapper",
-    "*_system.js": "domain service or compatibility facade",
-    "*_runtime.js": "stable runtime-facing facade",
-    "*_registry.js": "definition lookup/normalization"
-  }
-}
diff --git a/GAME_FEATURES.md b/GAME_FEATURES.md
deleted file mode 100644
index 89ef423..0000000
--- a/GAME_FEATURES.md
+++ /dev/null
@@ -1,100 +0,0 @@
-# tarinai_ Game Features
-
-`tarinai_` is an observation sandbox about small creatures called tarinai. The player shapes a field with food, medicine, furniture, hazards, machines, weather, and ground choices, then watches how the colony reacts. The game is about cause and effect: small changes in the environment can alter movement, stress, disease, relationships, reproduction, accidents, cleanup, and survival.
-
-## Core Play
-
-The player starts by choosing a field and ground, then places objects or uses direct tools on the colony. Tarinai continue acting on their own while the player observes, edits the environment, removes problems, or creates new ones. The colony panel, event log, selected-tarinai data, and family tree help explain what is happening without taking control away from the simulation.
-
-The game supports quiet observation and chaotic experiments. A player can build a comfortable habitat with beds, food, grass, and cleaning tools, or create a dangerous machine field with rotators, fences, stones, pins, explosions, ants, and poison.
-
-## Tarinai
-
-Tarinai are autonomous creatures with HP, needs, stress, personality, age, family links, diseases, item effects, and behavior states. They choose actions from their current condition and surroundings instead of following a fixed script. Hunger can make them seek grass or food, sleepiness can make them find a bed, fear can make them flee, and social state can make them follow, fight, avoid, or approach another tarinai.
-
-Each tarinai has individual tendencies. Aggressive tarinai fight more easily, social tarinai seek others more often, nervous tarinai react strongly to danger, and inherited traits can make children resemble their parents. Selecting a tarinai shows health, needs, stress, effects, relations, inventory, family information, and the reason for its current behavior.
-
-Tarinai can be damaged by hazards, pushed by physics objects, carried by ants, attached to links, blocked by fences, affected by medicine, frightened by accidents, comforted by habitat items, or preserved when outside the active field. Some objects can become emotionally important, so losing them may cause panic.
-
-## Food And Consumables
-
-Grass is both food and habitat material. Tarinai can eat it, feel comfort near it, gather it for simple beds, and interact with it through ground and weather systems. Water can be drunk, can appear from rain, and can be generated or copied by tools.
-
-Sweet food helps satisfy hunger and can support recovery in some cases. Love mochi makes reproduction behavior more likely for a while, while fight mochi pushes the colony toward conflict. Zunda juice clears item effects, making it useful after medicine or special consumables have changed a tarinai too much.
-
-Medicine changes the simulation more aggressively than normal food. Sleep drugs push tarinai toward sleep or sleep disease, laxatives create repeated zunchi and reduce food benefit, protein makes a stronger permanent mode with lower disease risk, and niteropu makes a weaker permanent mode with higher disease risk. Ammo creates temporary speed and impact danger. Mystery drugs choose from eligible effects unpredictably. Mercury changes lifespan, while giant and dwarf drugs reshape size, movement, power, and ongoing damage risk.
-
-## Habitat And Cleanup
-
-Zunchi is waste, but it is also part of the ecology. It affects hygiene and disease risk and can fertilize grass. Beds and nest boxes give tarinai safer or better sleep options, reduce stress around resting areas, and help recovery. Balls give tarinai something to play with and can also become part of physics experiments.
-
-Robot cleaners are mobile cleanup items. They scan for selected target types, pursue matching waste or corpses, and remove them on contact. The water hose gives the player direct cleanup control by washing dirt, zunchi, corpses, stains, and similar field problems. Signboards are editable objects that can be inspected after placement, useful for labeling areas or experiments.
-
-## Physics And Machines
-
-Physics items turn the field into a mechanical sandbox. Ropes connect two targets with a flexible link that can go slack but should not stretch freely. Rods create a rigid connection. Springs connect targets with elastic motion, allowing linked objects to pull back and oscillate.
-
-Fences block movement and can be rotated for layout control. Gates can be opened or closed after placement. One-way fences allow passage from one direction while blocking the opposite direction. Bounce fences launch colliding targets more strongly than normal fences, which makes them useful for traps or kinetic experiments.
-
-Rotators are editable mechanical shapes that spin and push nearby targets. Their shape and speed can create conveyors, crushers, traps, or chaotic collision fields. Reciprocators move back and forth along a line, so they can shove objects repeatedly. Poison blocks are custom hazard shapes that damage on contact.
-
-## Electrical And Automation
-
-Detectors, wires, insulated wires, and circuit boards are grouped in the Electrical tool category. Normal energized wire can hurt living targets on contact, while insulated wire is safer for incidental contact. Detectors can sense target ranges or time windows and send signals; clicking either dual-range track moves the nearer thumb directly to the clicked value. Circuit-board external input and output terminals are placed directly on the board edge, can be moved around all four sides, and appear dim in the editor until a world wire is actually connected.
-
-## Danger Tools
-
-Danger tools create immediate or ongoing pressure. Stones are heavy objects that become dangerous when dropped, thrown, or moved by machines. Genkotsu creates a large impact on the ground. Firecrackers cause explosions, with flame variants adding fire while respecting active-fire limits.
-
-Pushpins can roll, lodge in tarinai, cause panic, and deal continuous damage. Oshibyo blocks zunchi while lodged and releases stored zunchi when removed. Shooting is a direct attack tool that can hit tarinai, ants, items, pins, balloons, or placed objects depending on the target under the aim point.
-
-Ant nests introduce an enemy system. Ants search for tarinai, carry captured targets back to the nest, and can be shot or killed. Worker ants and queen ants have separate HP values, and ant counts are shown through colony statistics.
-
-## Operation Tools
-
-The observe tool selects tarinai or compatible objects and opens their data. The add tool introduces new tarinai. Poke applies a small interaction or push, while pinch lets the player drag tarinai and some objects. Copy duplicates placed items with their settings so setups can be repeated quickly. The operation palette also provides a dedicated snap control shared by placement and pinch movement; it cycles through Free, 20px, 40px, and 60px.
-
-Undo and redo reverse or reapply placement and edit actions. Delete removes a specific object or stain, while area delete removes many nearby targets at once. These tools let the player repair a field after experiments without resetting the whole colony.
-
-## Grounds And Environment
-
-Fields define the playable space and boundary style. Grounds change the character of the colony: sand, dirt, concrete, blanket, foot massage, ice, and laboratory-style surfaces can affect movement, stress, comfort, and grass behavior. Ground choice matters because tarinai react not only to objects, but also to the surface they live on.
-
-Weather changes the field over time. Rain can create water and affect comfort, shade can protect from weather or sun, and temperature changes how tarinai experience the environment. Grass, zunchi, splats, corpses, ant corpses, rain drops, and stains all feed into hygiene, disease, cleanup, rendering, and observation.
-
-## Colony Statistics
-
-The colony panel summarizes population, sick tarinai, juveniles, elders, deaths, mood, temperature, population limits, and object limits. Graph tabs show population, needs, and environment. Total ants are included in the environment statistics so active ant pressure can be read alongside other field signals.
-
-The event panel records important simulation events such as birth, death, fights, accidents, weather, grass changes, and relation changes. The family tree shows parent-child structure, generations, inherited stats, personality tags, and family links.
-
-## Save, Display, And Performance
-
-Manual save and restore use browser storage. Reset returns to field selection and starts a new state. Service worker caching can keep the static app shell available after the first successful load when the browser supports it.
-
-Display settings control effects, shadows, drawing detail, and quality choices for crowded scenes. Crowded fields are an intended part of the sandbox, so the game uses spatial lookup, scheduling, cached drawing, and incremental maintenance systems to keep large colonies and many objects playable.
-
-
-## Achievement system (v39.16.78)
-- Sixty-four achievements track reproduction, natural status changes, generation runs, rapid population events, special deaths, colony conditions, individual care, autonomous ecology, history usage, cleanup, rapid deletion, temperature transitions, weather shelter, medicine-category completion, combat reversals, circuit-board signaling, and ant-related play styles.
-- Locked rows reveal only the configured condition allowlist; all others show `？？？`. There are no achievement tooltips. 大いなる母, めっちゃたりない観察, 敵の敵は味方, 混沌ヲ希求スル者, and 豊穣ヲ希求スル者 include local progress percentages, and unlocked achievements are sorted first inside each category.
-- Each achievement row behaves as a horizontal bar chart. Its background fill visualizes the optional global completion percentage from 0–100%, and the global achiever count is displayed beside it.
-- `物でいっぱい` requires 100 cumulative player placements across field resets. `害虫駆除` requires 100 cumulative ant kills across field resets.
-- `餌やりじいさん` requires 33 direct feedings in one field; resetting the field resets this progress.
-- `機械化産業` replaces the former detector-automation and link-craftsman achievements and unlocks only when both requirements are met.
-- v39.16.56 adds 混沌ヲ希求スル者 and 潔癖症, raises 清掃業者 to 200, starts ミニマリスト from day 6, excludes chain/crown from おくすり手帳全埋め, and keeps shared-rate bars visible after unlock.
-- v39.16.54 added 真・たりない観察, 悠久の歴史, 五体満足, and 零体満足. v39.16.55 added 町のお医者さん for 50 effective first-aid recoveries and 割とふわふわ for flinging a plushie with つつく. ベビーブーム now requires 30 births in one minute; 管理された楽園 starts tracking from play day 6 and requires one uninterrupted happy in-game day.
-- Local unlocks and persistent totals live in browser storage. Field-scoped direct-feeding, cleaner, self-sufficiency, enemy-ant, generation, observation, safety, and per-entity/item progress follow current-format saves where applicable. Nest-box and pipe occupants block rain/weather effects and count as sheltered for 雨宿り完了.
-- Achievement evaluation is primarily event-driven; periodic world scans skip completed or irrelevant conditions. The server writes compact v3 achievement aggregate JSON while migrating older aggregate formats on read.
-- v39.16.78 fixes achievement edge paths found by a renewed 64-condition audit: Minimalist placement metadata survives unrelated unlocks, Sauna/Cold-Plunge uses true hot-entry timing, lethal qualifying wire shocks count before death cleanup, reset clears hidden reset-scoped progress, and Undo/Redo/ground changes interrupt passive observation. Ambiguous semantics are intentionally unchanged pending specification.
-
-### Achievement spell persistence (v39.16.78)
-- Exported spells compactly include non-debug achievement unlocks, unlock times, and persistent progress.
-- Loading a spell merges achievements and keeps the greater progress instead of erasing local achievement data.
-- Restored unlocks are queued for the existing server recovery synchronization. Save slots remain world-only.
-
-- Spell achievement metadata uses a sparse binary encoding: raw unlock bits, bit-packed persistent progress, minute-delta unlock timestamps, and sparse per-entity state. Binary save schema 51 is current; schemas 49 and 50 remain readable. Achievement payload v6 stores 72 unlock bits and statistician progress, while legacy payload v5 remains importable.
-- v39.16.60: Added 狙撃手, メガロポリス, and 豊穣ヲ希求スル者; restricted 混沌ヲ希求スル者 to fight-mochi-influenced fights; extended compact achievement spell progress and omitted counters for already-unlocked achievements.
-- v39.16.62: Added five achievements for low FPS, uninterrupted 24-hour play, toilet-sand placement, park-ground editing, and rapid ground changes. 寿命 deaths are excluded from 安全第一 failures, empty-field clicks replace pause-button clicks for 何やってるの？, and the two long observation achievements are last in その他.
-
-- v39.16.63: Added アリ観察 and 命のバトン; stabilized progress-row typography; continuous-play observation no longer resets on tab changes; corrected sauna wording and enemy-ant streak reset behavior; obsolete spell formats are rejected.
diff --git a/README.md b/README.md
index ea6631c..8b20754 100644
--- a/README.md
+++ b/README.md
@@ -1,112 +1,60 @@
-# tarinai_
+# たりない観察 v39.18.6
 
-AI-first entrypoint for a static browser simulation/game. Keep this file small; read deeper docs only when needed.
+## 実績システム
 
-## Read Strategy
+実績定義は `js/achievement_catalog.js` を唯一のカタログとして管理します。表示名、説明、カテゴリ、未解除時の公開設定、同期可能な進捗条件、累積上限は、クライアントと `achievement_api.php` が同じカタログから読み取ります。
 
-- Start here for architecture, script order constraints, and where to look next.
-- For game mechanics, UI, items, and tarinai behavior, read `GAME_FEATURES.md`.
-- For subsystem work, read `AI_MAP.md` plus only the matching files.
-- For exact file inventory, run `powershell -NoProfile -ExecutionPolicy Bypass -File scripts/ai_inventory.ps1 -All` or narrow it: `powershell -NoProfile -ExecutionPolicy Bypass -File scripts/ai_inventory.ps1 ui`. Python equivalent: `python scripts/ai_inventory.py --all`.
-- For machine-readable routing, read `FILES.json`.
-- Avoid loading all assets into context; asset filenames are mostly self-describing and grouped by glob.
+累積進捗の正規データは端末・タブ別の増加台帳です。表示用 `progress` に同じ累積値を重複保存しません。旧形式の重複カウンターと `synced` 一覧は読込時だけ移行し、現行形式では保存しません。
 
-## Runtime Shape
+「敵の敵は味方」は実績画面の「生態」カテゴリに掲載されます。
 
-- v39.16.37 changes: biological and environmental conditions are unified into the detector; the standalone sensor and relay are removed; temperature and limits are folded; ecology, sound, display settings, and credits are in the header menu; reset remains outside in red; tarinai-data navigation preserves the active tool; mobile tool descriptions appear at the top for five seconds. Snap mode remains Free/20px/40px/60px, top-edge placement is fixed, and preset descriptions end with punctuation.
-- v39.16.38 changes: detector numeric controls use value-labelled sliders like the time control; colony temperature and limits share one Colony settings fold; display settings use an inline menu matching sound settings; HP/stress meter colors are fixed; the snap control follows Clear with a faint grid icon; area-delete has a new icon; the Ant chart series is renamed and hidden initially.
-- v39.16.55 changes: expanded the achievement set to 49 with 町のお医者さん and 割とふわふわ; changed ベビーブーム to 30 births per minute and 管理された楽園 to one happy in-game day from play day 6; restored shared poke targeting/highlights and plushie fling; corrected manual rotator/reciprocator push direction; tightened tool/limit UI; reduced periodic achievement scans; and introduced compact achievement aggregate storage.
-- v39.16.52 changes: reorganized achievements into collapsible categories, removed achievement tooltips, and moved confirmation flows into the game UI. Previous v39.16.51 changes: expanded the achievement set to 43 with sixteen play-style and special-action conditions; added persistent Undo/Redo and quick-delete counters, field-local cleaner/automation-free ecology progress, individual care/temperature/fight tracking, complete medicine-category collection, protected rain shelter in nest boxes and pipes, and stricter ant-kill attribution.
-- v39.16.49 changes: added additive full-state synchronization so shared achievement aggregates can be rebuilt as players return after server data loss.
-- v39.16.48 changes: corrected the zunchi-slave threshold text to 30%; repaired wire placement counting, danger-kill attribution, partial legacy link migration, UUID validation, and debug-only achievement isolation.
-- v39.16.47 changes: Two achievements are added (大いなる母 and 喧嘩両成敗); five names and five revealed descriptions are revised; `?debug=1` exposes an all-achievements button.
-- v39.16.46 changes: achievement names and presentation are revised; conditions are revealed only after unlock; shared completion rates render as horizontal background bars; automation and link coverage merge into 機械化産業; placement and ant-kill targets are persistent totals of 100; direct feeding resets with the field.
-- v39.16.45 changes: seven play-style achievements add passive observation, cumulative placement, detector automation, link-tool coverage, safe large-colony operation, ant population, and ant elimination measurements. World-scoped timers and placement counts persist in current-format saves.
-- No bundler; `index.html` loads ordered global-IIFE scripts with `?v=39.16.78`.
-- v39.16.31 changes: all in-world tooltips use the closer offset; Hair Trigger adds a central bounce-fence ball enclosure with Tarinai and pet-food duplicators outside; physics tools use distinct icons.
-- v39.16.29 changes: parasol placement preview now uses the exact shade center and footprint; toilet sand absorbs rain-created water drops. Happy adds parasols, water balloons, and toilet sand beneath each duplicator; Athletic uses fence-safe single-bar rotators and water balloons; War adds rotating fans.
-- v39.16.19 changes: food and medicine can be given directly by placement or pinched drop, with a dedicated overlay, food heart bursts, and stronger personality effects; unused collision reasons and duplicate constraint projection dirty checks were removed.
-- Mutable runtime lives on `window`; primary entities are `World`, `Tarinai`, items, structures, ants, family graph, weather, and save snapshots.
-- Update loop: `main.js` creates the world/UI loop; `World.update` delegates to `TarinaiSystemOrder.update`; `system_order.js` runs named phases.
-- UI loop: pointer/tool/UI intents go through `command_dispatcher.js`; canvas drawing is in render modules; side panels are `ui_*.js`.
-- Generated/static app shell: `app_manifest.json`, `service-worker.js`, `FILES.json`, and `js/version.js` must stay version-aligned.
+## ローカル保存
 
-## File Routing
+実績状態とサーバー資格情報は、通常保存、予備保存、同一タブ保存、IndexedDBへ世代付きで保存します。起動時は同じ世代の状態を追加方向に統合し、明示的な実績リセット時だけ世代を進めます。
 
-- `index.html`: DOM shell, CSS/JS load order, panels/dialogs/canvas.
-- `css/*.css`: base/layout/panel/components/mobile styling.
-- `js/domain_ids.js`, `js/item_type_catalog.js`, `js/data.js`, `js/ground_types.js`: stable domain ids, current item-type save catalog, core config, field/ground definitions.
-- `js/world*.js`: world state, view, update phases, tools, placement, combat, environment, family/social, ants.
-- `js/tarinai*.js`: creature state, needs, actions, behavior, social life, item effects, update pipeline, rendering.
-- `js/item*.js`, `js/structures*.js`: item registry/runtime/lifecycle/dynamic behavior/rendering plus structures.
-- `js/simulation*.js`, `js/system_order.js`, `js/sim_core.js`: concrete update systems and phase ordering.
-- `js/ui*.js`, `js/text_catalog.js`, `js/command_dispatcher.js`: DOM UI, input, selected panel, logs, charts, family tree, tools, labels.
-- `js/save*.js`, `js/snapshot_system.js`, `js/restore_coordinator.js`, `js/history_system.js`: persistence and history.
-- `js/physics*.js`, `js/mechanical_system.js`, `js/constraint_system.js`, `js/collision_footprint_system.js`: geometry, mechanics, constraints, collisions.
-- `assets/sprites/tarinai_*.webp`: creature state sprites.
-- `assets/ui/tool_*`: tool palette icons; other `assets/ui/*` are app/help icons.
-- `assets/objects/*`: field object images.
-- `assets/sounds/*`: voice and SFX samples.
-- `scripts/*`: generators, regression checks, and AI inventory.
+v39.18.6は、v39.18.0以前の実績保存、旧ワールド実績メタデータ、実績スペルv9・v10、旧バイナリセーブを読み込めます。旧データは現行形式へ正規化され、新規保存には廃止済みフィールドを書きません。
 
-## Conventions
+## サーバー同期
 
-- `*_pipeline` = ordered runner/facade.
-- `*_step_*` = pipeline stage wrapper.
-- `*_system` = domain service or compatibility facade.
-- `*_runtime` = stable runtime-facing facade.
-- `*_registry` = definition lookup/normalization.
-- Many split files preserve regression contracts; do not collapse them casually.
+同期プロトコルはv5です。
 
-## Checks
+- 解除状態と途中進捗を追加型で統合
+- 同じ端末台帳の再送を重複加算しない
+- リセット要求の再送を無害化
+- 古いサーバーバックアップから新しいローカル世代を復旧
+- 古い端末からリセット前の状態を復活させない
+- プレイヤーIDと所有秘密鍵を耐久保存から復旧
 
-- Syntax: `node --check js/*.js`
-- Regression: `python scripts/regression_check.py`
-- Inventory sanity: `powershell -NoProfile -ExecutionPolicy Bypass -File scripts/ai_inventory.ps1 -All`
+共有達成率は、サーバーがゲームシミュレーションを再実行した検証値ではなく、クライアント端末の報告値です。UIでは共有値を「達成率」「達成人数」と表示します。
+
+## 旧サーバーデータの自動移行
+
+データディレクトリ、またはアプリ直下の `.achievement_data` に旧コンパクト形式の `state.json`（スキーマ4）がある場合、最初のAPI要求時に現行形式へ自動移行します。環境変数で新保存先を指定した場合や、v39.18.1が空の現行保存先を先に作成済みの場合も検出します。
+
+- 原本は `legacy-backup/` へSHA-256付きで保存
+- 旧プレイヤーIDから決定的なUUIDを生成
+- プレイヤー数、解除実績、解除時刻、実績別集計を移行
+- 旧データに存在しない途中進捗は0から開始
+- `legacy-v4-migration.json` に完了件数を記録
+- 中断時は次のAPI要求で冪等に再開
+- 切替中にコピー元の旧 `state.json` が更新された場合も、内容ハッシュを再確認して追加方向で再取込
+- ファイルサイズとmtimeが同じ更新もSHA-256比較で検出
+
+旧ブラウザーに22文字のプレイヤーIDが残っている場合、クライアントはUUIDへ上書きする前に専用領域へ退避し、初回セッションで一度だけ新しい所有秘密鍵へ引き継ぎます。引継ぎ済みの旧IDを別の秘密鍵で再取得することはできません。
+
+旧版から直接v39.18.6へ更新したブラウザーは自動引継ぎできます。v39.18.1を既に起動して旧22文字IDがブラウザーから失われている場合、サーバーデータだけから端末との本人対応を再構成することはできません。解除履歴と共有集計自体は正常に移行されます。
+
+## 実績APIの保存先
+
+本番環境では、PHP実行ユーザーが書き込める非公開ディレクトリを用意し、環境変数 `TARINAI_ACHIEVEMENT_DATA_DIR` に絶対パスを設定してください。未設定時は、HTTP公開ディレクトリ外の安定したユーザーデータ領域を使用します。
 
 
-### v39.16.16
-Colony birth/death chart lines, reverse rotators, champion-trait inheritance, reduced champion-pair mating, and directional one-way-fence routing.
+## PHP組み込みサーバーでの起動
 
+PHP組み込みサーバーは `.htaccess` を解釈しません。旧 `.achievement_data/state.json` には引継ぎ用IDが含まれるため、必ず同梱のルーターを使用してください。
 
-- v39.16.39 changes: restored the compact sticky operation palette, added exact-match right-panel search, reorganized colony settings, and refreshed tool icons.
+```sh
+./start_server.sh 8000
+```
 
-
-## Achievement system (v39.16.78)
-- Sixty-four local achievements cover biological events, special deaths, colony conditions, individual care, passive ecology, Undo/Redo behavior, rapid deletion, cleaner use, temperature transitions, medicine-category completion, weather shelter, combat reversals, circuit-board signaling, and ant-related play styles.
-- Locked entries show the configured pre-unlock disclosure directly in the row; all other locked entries show `？？？`. 大いなる母, めっちゃたりない観察, and 敵の敵は味方 show local progress percentages. Unlocked entries appear first within each category.
-- Each entry is a horizontal completion-rate bar whose background fill reflects the optional shared global unlock percentage; the shared achiever count appears beside the percentage.
-- v39.16.64 adds 毎日たりない観察（7 calendar days） and 抵抗器じゃない（7 distinct tarinai shocked by one energized bare wire）. v39.16.54 added 真・たりない観察, 悠久の歴史, 五体満足, and 零体満足. v39.16.55 added 町のお医者さん for 50 effective first-aid recoveries and 割とふわふわ for flinging a plushie with つつく; both are event-driven and 町のお医者さん is disclosed before unlock. v39.16.56 added two achievements, persistent fight progress, stricter robot-only evaluation, revised thresholds, and unlocked-card rate bars. v39.16.60 adds three achievements and restricts the chaos counter to fight-mochi-influenced fights.
-- Persistent totals include 物でいっぱい, 害虫駆除, 大いなる母（3333体）, 無計画都市, やっぱなし, and やっぱあり. Field-local progress includes 餌やりじいさん, 清掃業者, 自給自足, and 敵の敵は味方; applicable field-local metadata follows current-format saves.
-- `自動化の第一歩` and `リンク職人` are retired and replaced by `機械化産業`, which requires both detector-driven activation and rope/rod/spring coverage. Existing players with both retired achievements migrate automatically.
-- Optional same-origin PHP API aggregates anonymous player counts and global unlock percentages. Raw aggregate data is stored under `.achievement_data/state.json` in compact v3 positional arrays. Compact v2 and the prior verbose object are accepted only as migration inputs and are automatically rewritten under a separate server lock with atomic file replacement on the next API read. UUIDs are binary/base64url encoded, achievement IDs are indexed, timestamps are delta-coded, and repeated game versions use a dictionary.
-- On startup, shared-stat refresh, achievement-screen opening, and every five minutes, the client sends its complete non-debug unlock set with original local timestamps. Ordinary unlock bursts send only unsynchronized records after a short debounce. The server adds only missing records, so a lost `state.json` is rebuilt incrementally as players return without overwriting surviving records.
-
-### Shared achievement percentage deployment
-- Upload `achievement_api.php` and the hidden `.achievement_data` directory with the game.
-- PHP must be enabled, and `.achievement_data` must be writable by the PHP process.
-- On a static-only host, local unlocks still work; the global percentage is shown as unavailable.
-- Set `window.TARINAI_ACHIEVEMENT_API` before `achievements.js` to use a different same-origin endpoint.
-- The current release tracks sixty-four achievement IDs, supports per-player reset, and accepts additive bulk synchronization for automatic recovery after aggregate-data loss. A separate backup remains necessary to recover players who never return.
-- `python3 scripts/achievement_server_state_audit.py` creates deterministic randomized achievement histories at runtime; it does not require or modify a production `state.json`.
-- v39.16.60 changes: achievement metadata in spells is now encoded as sparse binary data instead of embedded JSON; unlock masks, progress, timestamps, per-entity counters, and placement metadata are compactly packed and spell data is accepted only from the current format.
-- v39.16.60: Added 狙撃手, メガロポリス, and 豊穣ヲ希求スル者; restricted 混沌ヲ希求スル者 to fight-mochi-influenced fights; extended compact achievement spell progress and omitted counters for already-unlocked achievements.
-- v39.16.62: Added スペックがたりない, 寝ろ, 砂場, そこ公共空間だよ？, and 破格の工事費用; 寿命 deaths no longer reset 安全第一; 何やってるの？ now uses empty-field clicks; and save schema 44 expands the achievement mask while decoding schemas 41–43.
-
-- v39.16.63: Fixed achievement progress text weight and continuous-play tab switching; added アリ観察 and 命のバトン; corrected サウナ水風呂 and 敵の敵は味方 condition mismatches; save/spell data accepts only schema 45 and achievement payload v4.
-- v39.16.64: Added 毎日たりない観察 and 抵抗器じゃない; introduced calendar-day streak persistence; and migrated server aggregate JSON to compact v3 positional data automatically on read.
-- v39.16.65: Hardened pre-deployment server migration with read-only summaries, POST-only mutations, corruption-safe decoding, atomic writes under a separate lock, completionist eligibility filtering, and seeded randomized/concurrent migration audits.
-
-- v39.16.66: Added two-user seesaw play, an editable AND/OR/NOT circuit board with positioned terminals, signal control for fan/stove/dry ice/duplicator, and wire-target highlighting.
-
-- v39.16.67: Replaced the circuit-board dropdown editor with direct grid placement and cursor-drawn wiring; changed colony-state evaluation to every two in-game hours and excluded growing populations from Weakened; fixed seesaw action selection, fixed its orientation, and matched the placement overlay to its shape.
-- v39.16.69: Reworked circuit-board wiring into straight grid segments with branches and multi-connect terminals; removed OR and added a rectifier; made internal parts rotatable and external terminal count/positions editable; expanded board terminal spacing; changed detector numeric conditions to min/max dual sliders with number inputs; and raised seesaw riders slightly above the seats.
-- v39.16.68: Fixed seesaw participation so idle/bored Tarinai can initiate play and a waiting rider strongly recruits a partner; selected data reports active play as 「シーソーをしている。」; moved seesaws behind sprite layers; and aligned all two-input circuit gate pins to the 40px wiring grid.
-- v39.16.70: Reduced the default circuit-board footprint to one quarter of the previous area; made grid width/height editable; made external terminals movable on all four edges with a height-dependent count limit; made branch junctions movable; reduced NOT/rectifier body sizes; and corrected seesaw action-reason text.
-
-- v39.16.71: Replaced circuit-board terminal +/- controls with direct IN/OUT terminal placement and erasing, dimmed terminals without external world wires, removed generic elliptical placement previews, added an Electrical tool category for detector/wires/circuit board, and made detector range-track clicks move the nearest thumb.
-
-- v39.16.72: Circuit boards now default to 10x10 with a 20x20 maximum, AND uses a two-cell height, compact gates can sit closer to top/bottom edges, placement previews follow occupancy footprints more directly, and unstable internal logic loops are explicitly forced OFF.
-- v39.16.73: Circuit-board editing now shows placement ghosts for internal parts and terminals, Q/E rotates the pending internal part by 90 degrees, ON constant sources are explained in the editor, and wire/insulated-wire palette silhouettes render correctly after the Electrical category move.
-- v39.16.78: Fixed 「あぁ＾～ たまらねぇぜ」 so burst zunchi ignore their spawn overlap with the owner, arm only after clearing the owner once, and unlock on a later fatal return collision including bounce-fence reflections. The renewed achievement audit also fixes ミニマリスト save metadata, サウナ水風呂 hot-entry timing, lethal wire-shock counting, reset-scoped hidden progress cleanup, and 監視カメラ intervention gaps for Undo/Redo and ground changes.
-- v39.16.76: Removed the circuit-board OFF constant part and added the 「情報化産業」 achievement for carrying an active signal directly from one circuit board to another over wire or insulated wire.
+Windowsでは `start_server.bat 8000` を使用します。本番環境では引き続き `TARINAI_ACHIEVEMENT_DATA_DIR` をHTTP公開ディレクトリ外へ設定してください。
diff --git a/achievement_api.php b/achievement_api.php
index d439797..22fbb63 100644
--- a/achievement_api.php
+++ b/achievement_api.php
@@ -4,89 +4,63 @@ declare(strict_types=1);
 header('Content-Type: application/json; charset=utf-8');
 header('Cache-Control: no-store, no-cache, must-revalidate, max-age=0');
 header('X-Content-Type-Options: nosniff');
+header('Referrer-Policy: no-referrer');
+header('X-Frame-Options: DENY');
+
+function load_achievement_catalog(): array {
+    $path = __DIR__ . DIRECTORY_SEPARATOR . 'js' . DIRECTORY_SEPARATOR . 'achievement_catalog.js';
+    $raw = @file_get_contents($path);
+    if (!is_string($raw)) throw new RuntimeException('achievement_catalog_unavailable');
+    $prefix = 'window.TARINAI_ACHIEVEMENT_CATALOG = ';
+    $trimmed = trim($raw);
+    if (!str_starts_with($trimmed, $prefix) || !str_ends_with($trimmed, ';')) {
+        throw new RuntimeException('achievement_catalog_invalid');
+    }
+    $json = substr($trimmed, strlen($prefix), -1);
+    try { $catalog = json_decode($json, true, 512, JSON_THROW_ON_ERROR); }
+    catch (JsonException) { throw new RuntimeException('achievement_catalog_invalid'); }
+    if (!is_array($catalog) || !is_array($catalog['definitions'] ?? null)) {
+        throw new RuntimeException('achievement_catalog_invalid');
+    }
+    return $catalog;
+}
+
+$achievementCatalog = load_achievement_catalog();
+$achievementDefinitions = [];
+$achievementIds = [];
+$progressRules = [];
+foreach ($achievementCatalog['definitions'] as $definition) {
+    if (!is_array($definition)) continue;
+    $id = (string)($definition['id'] ?? '');
+    if ($id === '' || isset($achievementDefinitions[$id])) throw new RuntimeException('achievement_catalog_invalid');
+    $achievementDefinitions[$id] = $definition;
+    $achievementIds[] = $id;
+    if (is_array($definition['progress'] ?? null)) $progressRules[$id] = $definition['progress'];
+}
+define('ACHIEVEMENT_IDS', $achievementIds);
+define('ACHIEVEMENT_DEFINITIONS', $achievementDefinitions);
+define('PROGRESS_RULES', $progressRules);
+define('COMPLETIONIST_ID', (string)($achievementCatalog['completionistId'] ?? 'true_tarinai_observer'));
+define('CATALOG_REVISION', (string)($achievementCatalog['revision'] ?? 'unknown'));
+define('ADDITIVE_PROGRESS_CAPS', is_array($achievementCatalog['additiveProgressCaps'] ?? null) ? $achievementCatalog['additiveProgressCaps'] : []);
+define('MEDICINE_LEDGER_TYPES', is_array($achievementCatalog['medicineLedgerTypes'] ?? null) ? array_values($achievementCatalog['medicineLedgerTypes']) : []);
+define('LINK_PROGRESS_TYPES', is_array($achievementCatalog['linkProgressTypes'] ?? null) ? array_values($achievementCatalog['linkProgressTypes']) : []);
+define('MAD_SCIENTIST_TARGET', max(1, (int)($progressRules['mad_scientist']['target'] ?? 10)));
 
-const ACHIEVEMENT_IDS = [
-    'first_birth',
-    'natural_zunchi_slave',
-    'natural_tarinai_king',
-    'self_zunchi_death',
-    'natural_zunchi_slave_5_generations',
-    'natural_tarinai_king_3_generations',
-    'death_50_in_10_seconds',
-    'birth_50_in_60_seconds',
-    'great_mother_1000_births',
-    'lifespan_completed',
-    'soccer_ball_death',
-    'fight_pair_danger_kill',
-    'all_non_sleep_diseased_25',
-    'colony_happy',
-    'direct_feed_33',
-    'ignite_during_birth_ritual',
-    'laxative_starvation',
-    'idle_observer_5_minutes',
-    'placed_objects_100',
-    'mechanized_industry',
-    'safe_colony_25_5_minutes',
-    'ants_alive_25',
-    'ants_killed_100',
-    'secret_collection_9_slots',
-    'pause_spam_4_in_1_second',
-    'continuous_play_1_hour',
-    'below_absolute_zero_item',
-    'undo_mass_revival',
-    'robot_cleaner_100',
-    'held_30_seconds',
-    'minimalist_happy',
-    'overprotective',
-    'self_sufficient',
-    'unplanned_city_30',
-    'sauna_cold_plunge',
-    'rain_shelter_all',
-    'medicine_ledger_all',
-    'mercury_lifespan',
-    'enemy_enemy_friend',
-    'revolution',
-    'fuel_to_fire',
-    'undo_20',
-    'redo_20',
-    'eternal_history_generation_10',
-    'king_full_satisfaction',
-    'slave_zero_satisfaction',
-    'town_doctor_50',
-    'poke_plushie_fling',
-    'chaos_seeker_666_fights',
-    'clean_freak_robot_only',
-    'true_tarinai_observer',
-    'sniper_333_shots',
-    'megalopolis',
-    'fertility_seeker_721_love_births',
-    'low_fps_single_digit',
-    'continuous_play_24_hours',
-    'sandbox_five_toilets',
-    'park_ground_changed',
-    'ground_change_4_in_1_second',
-    'ant_nest_without_tarinai',
-    'sticky_bomb_15_passes',
-    'daily_play_7_days',
-    'wire_shock_7_tarinai',
-    'information_industry',
-    'strength_in_numbers',
-    'elite_few',
-    'zunchi_overflow',
-    'comfortable_beds',
-    'stone_pillow',
-    'across_seasons',
-    'favorite_one',
-    'statistician',
-    'well_informed',
-    'lively_making',
-    'memento_mori',
-];
-const DATA_DIR_NAME = '.achievement_data';
-const DATA_FILE_NAME = 'state.json';
-const LOCK_FILE_NAME = 'state.lock';
-const STATE_SCHEMA_VERSION = 3;
 const MAX_REQUEST_BYTES = 131072;
+const RATE_WINDOW_SECONDS = 60;
+const RATE_READ_LIMIT = 240;
+const RATE_SESSION_IP_LIMIT = 120;
+const RATE_WRITE_IP_LIMIT = 600;
+const RATE_PLAYER_WRITE_LIMIT = 120;
+const QUALIFY_MIN_ACTIVITY = 2;
+const QUALIFY_MIN_AGE_SECONDS = 30;
+const SESSION_COOKIE_NAME = 'tarinai_achievement_session_v2';
+const SESSION_COOKIE_MAX_AGE = 31536000;
+const IDENTITY_ISSUE_WINDOW_SECONDS = 86400;
+const IDENTITY_ISSUE_LIMIT_PER_IP = 512;
+const SYNC_PROTOCOL_VERSION = 5;
+
 
 function respond(array $payload, int $status = 200): never {
     http_response_code($status);
@@ -95,280 +69,962 @@ function respond(array $payload, int $status = 200): never {
 }
 
 function valid_player_id(string $value): bool {
-    return preg_match('/^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i', $value) === 1;
+    return preg_match('/^[0-9a-f]{8}-[0-9a-f]{4}-4[0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/i', $value) === 1;
 }
 
-function empty_state(): array {
-    return ['players' => [], 'unlocks' => []];
+function valid_player_secret(string $value): bool {
+    return preg_match('/^[0-9a-f]{64}$/i', $value) === 1;
 }
 
-function compact_player_id(string $value): string {
-    $hex = str_replace('-', '', strtolower($value));
-    if (strlen($hex) !== 32 || !ctype_xdigit($hex)) return '';
-    $binary = hex2bin($hex);
-    if ($binary === false) return '';
-    return rtrim(strtr(base64_encode($binary), '+/', '-_'), '=');
+function client_ip(): string {
+    return substr((string)($_SERVER['REMOTE_ADDR'] ?? 'unknown'), 0, 128);
 }
 
-function expand_player_id(string $value): string {
-    if (strlen($value) !== 22 || preg_match('/^[A-Za-z0-9_-]{22}$/', $value) !== 1) return '';
-    $binary = base64_decode(strtr($value, '-_', '+/') . '==', true);
-    if ($binary === false || strlen($binary) !== 16) return '';
-    $hex = bin2hex($binary);
-    return substr($hex, 0, 8) . '-' . substr($hex, 8, 4) . '-' . substr($hex, 12, 4) . '-' . substr($hex, 16, 4) . '-' . substr($hex, 20, 12);
+function directory_has_achievement_data(string $path): bool {
+    return is_file($path . DIRECTORY_SEPARATOR . 'state.json')
+        || is_file($path . DIRECTORY_SEPARATOR . 'summary.json')
+        || is_file($path . DIRECTORY_SEPARATOR . 'session-key.json')
+        || is_dir($path . DIRECTORY_SEPARATOR . 'players');
 }
 
-function detect_state_format(mixed $value): string {
-    if (!is_array($value)) return 'invalid';
-    if ($value === []) return 'empty';
-    if (array_is_list($value)) {
-        return (($value[0] ?? null) === STATE_SCHEMA_VERSION
-            && isset($value[1], $value[2], $value[3], $value[4])
-            && is_array($value[2]) && is_array($value[3]) && is_array($value[4]))
-            ? 'v3' : 'invalid';
+function copy_directory_tree(string $source, string $target): void {
+    ensure_directory($target);
+    $items = @scandir($source);
+    if (!is_array($items)) throw new RuntimeException('storage_unavailable');
+    foreach ($items as $name) {
+        if ($name === '.' || $name === '..') continue;
+        $from = $source . DIRECTORY_SEPARATOR . $name;
+        $to = $target . DIRECTORY_SEPARATOR . $name;
+        if (is_dir($from)) copy_directory_tree($from, $to);
+        elseif (is_file($from) && !is_file($to) && !@copy($from, $to)) throw new RuntimeException('storage_write_failed');
     }
-    if (($value['v'] ?? null) === 2 && isset($value['p'], $value['u']) && is_array($value['p']) && is_array($value['u'])) {
-        return 'v2';
-    }
-    if (array_key_exists('players', $value) || array_key_exists('unlocks', $value)) return 'verbose';
-    return 'invalid';
 }
 
-function normalize_state(mixed $value): array {
-    if (!is_array($value)) return empty_state();
-    $players = [];
-    $unlocks = [];
-
-    // v3 positional form: [version, baseTime, versions, players, unlocks].
-    if (($value[0] ?? null) === STATE_SCHEMA_VERSION && isset($value[1], $value[2], $value[3], $value[4])
-        && is_array($value[2]) && is_array($value[3]) && is_array($value[4])) {
-        $baseTime = max(1, (int)$value[1]);
-        $versions = array_map(static fn($entry): string => substr((string)$entry, 0, 32), $value[2]);
-        $playerIds = [];
-        foreach ($value[3] as $row) {
-            if (!is_array($row) || !isset($row[0]) || !is_string($row[0])) continue;
-            $id = expand_player_id($row[0]);
-            if (!valid_player_id($id)) continue;
-            $firstSeen = $baseTime + max(0, (int)($row[1] ?? 0));
-            $lastSeen = $firstSeen + max(0, (int)($row[2] ?? 0));
-            $versionIndex = max(0, (int)($row[3] ?? 0));
-            $playerIds[] = $id;
-            $players[$id] = [
-                'firstSeen' => max(1, $firstSeen),
-                'lastSeen' => max(1, $lastSeen),
-                'gameVersion' => $versions[$versionIndex] ?? '',
-            ];
-        }
-        foreach ($value[4] as $row) {
-            if (!is_array($row) || count($row) < 3) continue;
-            $achievementIndex = (int)$row[0];
-            $achievementId = ACHIEVEMENT_IDS[$achievementIndex] ?? '';
-            if ($achievementId === '') continue;
-            $records = [];
-            $count = count($row);
-            for ($i = 1; $i + 1 < $count; $i += 2) {
-                $playerIndex = (int)$row[$i];
-                if (!isset($playerIds[$playerIndex])) continue;
-                $records[$playerIds[$playerIndex]] = $baseTime + max(0, (int)$row[$i + 1]);
-            }
-            if ($records) $unlocks[$achievementId] = $records;
-        }
-    // v2 is an on-read migration source and is always rewritten as v3.
-    } elseif (($value['v'] ?? null) === 2 && isset($value['p'], $value['u']) && is_array($value['p']) && is_array($value['u'])) {
-        $playerIds = [];
-        foreach ($value['p'] as $row) {
-            if (!is_array($row) || !isset($row[0]) || !is_string($row[0]) || !valid_player_id($row[0])) continue;
-            $id = strtolower($row[0]);
-            $playerIds[] = $id;
-            $players[$id] = [
-                'firstSeen' => max(1, (int)($row[1] ?? 1)),
-                'lastSeen' => max(1, (int)($row[2] ?? ($row[1] ?? 1))),
-                'gameVersion' => substr((string)($row[3] ?? ''), 0, 32),
-            ];
-        }
-        foreach ($value['u'] as $achievementId => $flat) {
-            if (!is_string($achievementId) || (!in_array($achievementId, ACHIEVEMENT_IDS, true) && !in_array($achievementId, ['signal_automation_first', 'link_craftsman'], true)) || !is_array($flat)) continue;
-            $records = [];
-            $count = count($flat);
-            for ($i = 0; $i + 1 < $count; $i += 2) {
-                $playerIndex = (int)$flat[$i];
-                if (!isset($playerIds[$playerIndex])) continue;
-                $records[$playerIds[$playerIndex]] = max(1, (int)$flat[$i + 1]);
-            }
-            if ($records) $unlocks[$achievementId] = $records;
-        }
-    } else {
-        $rawPlayers = isset($value['players']) && is_array($value['players']) ? $value['players'] : [];
-        foreach ($rawPlayers as $id => $player) {
-            if (!is_string($id) || !valid_player_id($id) || !is_array($player)) continue;
-            $players[strtolower($id)] = [
-                'firstSeen' => max(1, (int)($player['firstSeen'] ?? 1)),
-                'lastSeen' => max(1, (int)($player['lastSeen'] ?? ($player['firstSeen'] ?? 1))),
-                'gameVersion' => substr((string)($player['gameVersion'] ?? ''), 0, 32),
-            ];
-        }
-        $rawUnlocks = isset($value['unlocks']) && is_array($value['unlocks']) ? $value['unlocks'] : [];
-        foreach ($rawUnlocks as $achievementId => $records) {
-            if (!is_string($achievementId) || (!in_array($achievementId, ACHIEVEMENT_IDS, true) && !in_array($achievementId, ['signal_automation_first', 'link_craftsman'], true)) || !is_array($records)) continue;
-            foreach ($records as $id => $timestamp) {
-                $normalizedId = strtolower((string)$id);
-                if (!isset($players[$normalizedId])) continue;
-                $unlocks[$achievementId][$normalizedId] = max(1, (int)$timestamp);
-            }
-        }
-    }
-
-    $legacySignal = isset($unlocks['signal_automation_first']) && is_array($unlocks['signal_automation_first'])
-        ? $unlocks['signal_automation_first'] : [];
-    $legacyLinks = isset($unlocks['link_craftsman']) && is_array($unlocks['link_craftsman'])
-        ? $unlocks['link_craftsman'] : [];
-    if ($legacySignal && $legacyLinks) {
-        if (!isset($unlocks['mechanized_industry']) || !is_array($unlocks['mechanized_industry'])) {
-            $unlocks['mechanized_industry'] = [];
-        }
-        foreach ($legacySignal as $playerId => $signalTime) {
-            if (!isset($legacyLinks[$playerId])) continue;
-            $unlocks['mechanized_industry'][$playerId] = max((int)$signalTime, (int)$legacyLinks[$playerId]);
-        }
-    }
-    unset($unlocks['signal_automation_first'], $unlocks['link_craftsman']);
-
-    return ['players' => $players, 'unlocks' => $unlocks];
+function legacy_state_snapshot(string $path): ?array {
+    if (!is_file($path)) return null;
+    $bytes = @file_get_contents($path);
+    if (!is_string($bytes) || trim($bytes) === '') throw new RuntimeException('legacy_state_unreadable');
+    return [
+        'path' => $path,
+        'bytes' => $bytes,
+        'hash' => hash('sha256', $bytes),
+        'size' => strlen($bytes),
+        'mtime' => max(0, (int)@filemtime($path)),
+    ];
 }
 
-function compact_state(array $state): array {
-    $playerIds = array_keys($state['players']);
-    sort($playerIds, SORT_STRING);
-    $playerIndex = [];
-    $timestamps = [];
-    $versionCounts = [];
-    foreach ($playerIds as $id) {
-        $player = is_array($state['players'][$id] ?? null) ? $state['players'][$id] : [];
-        $timestamps[] = max(1, (int)($player['firstSeen'] ?? 1));
-        $timestamps[] = max(1, (int)($player['lastSeen'] ?? ($player['firstSeen'] ?? 1)));
-        $version = substr((string)($player['gameVersion'] ?? ''), 0, 32);
-        $versionCounts[$version] = ($versionCounts[$version] ?? 0) + 1;
+function remember_legacy_state_source(string $target, array $source): void {
+    atomic_write_json($target . DIRECTORY_SEPARATOR . 'legacy-v4-source.json', [
+        'schema' => 1,
+        'sourcePath' => (string)$source['path'],
+        'sourceHash' => (string)$source['hash'],
+        'sourceSize' => (int)$source['size'],
+        'sourceMtime' => (int)$source['mtime'],
+        'copiedAt' => time(),
+    ]);
+}
+
+function copy_legacy_state_snapshot(string $target, array $source): void {
+    atomic_write_bytes($target . DIRECTORY_SEPARATOR . 'state.json', (string)$source['bytes']);
+    remember_legacy_state_source($target, $source);
+}
+
+function migrate_legacy_data_root(string $target, array $legacyRoots): void {
+    $targetCurrent = is_file($target . DIRECTORY_SEPARATOR . 'summary.json')
+        || is_file($target . DIRECTORY_SEPARATOR . 'session-key.json')
+        || is_dir($target . DIRECTORY_SEPARATOR . 'players');
+    $targetStatePath = $target . DIRECTORY_SEPARATOR . 'state.json';
+    $targetState = legacy_state_snapshot($targetStatePath);
+
+    $candidates = [];
+    $stateCandidates = [];
+    foreach ($legacyRoots as $legacy) {
+        $path = rtrim((string)$legacy, DIRECTORY_SEPARATOR);
+        if ($path === '' || $path === $target || !is_dir($path) || !directory_has_achievement_data($path)) continue;
+        $directoryMtime = max(
+            (int)@filemtime($path),
+            (int)@filemtime($path . DIRECTORY_SEPARATOR . 'state.json'),
+            (int)@filemtime($path . DIRECTORY_SEPARATOR . 'summary.json')
+        );
+        $candidates[$path] = $directoryMtime;
+        $snapshot = legacy_state_snapshot($path . DIRECTORY_SEPARATOR . 'state.json');
+        if ($snapshot !== null) $stateCandidates[$path] = $snapshot;
     }
-    foreach ($state['unlocks'] as $achievementId => $records) {
-        if (!is_string($achievementId) || !in_array($achievementId, ACHIEVEMENT_IDS, true) || !is_array($records)) continue;
-        foreach ($records as $timestamp) $timestamps[] = max(1, (int)$timestamp);
-    }
-    $baseTime = $timestamps ? min($timestamps) : 1;
-    uksort($versionCounts, static function (string $a, string $b) use ($versionCounts): int {
-        $countOrder = ($versionCounts[$b] ?? 0) <=> ($versionCounts[$a] ?? 0);
-        return $countOrder !== 0 ? $countOrder : strcmp($a, $b);
+    arsort($candidates, SORT_NUMERIC);
+    uasort($stateCandidates, static function (array $a, array $b): int {
+        $mtime = ((int)$b['mtime']) <=> ((int)$a['mtime']);
+        if ($mtime !== 0) return $mtime;
+        return ((int)$b['size']) <=> ((int)$a['size']);
     });
-    $versions = array_keys($versionCounts);
-    if (!$versions) $versions = [''];
-    $versionIndex = array_flip($versions);
 
-    $players = [];
-    foreach ($playerIds as $index => $id) {
-        $playerIndex[$id] = $index;
-        $player = is_array($state['players'][$id] ?? null) ? $state['players'][$id] : [];
-        $firstSeen = max(1, (int)($player['firstSeen'] ?? 1));
-        $lastSeen = max($firstSeen, (int)($player['lastSeen'] ?? $firstSeen));
-        $version = substr((string)($player['gameVersion'] ?? ''), 0, 32);
-        $row = [compact_player_id($id), $firstSeen - $baseTime, $lastSeen - $firstSeen];
-        $indexValue = (int)($versionIndex[$version] ?? 0);
-        if ($indexValue !== 0) $row[] = $indexValue;
-        $players[] = $row;
+    // When a compact source was copied into a private current root, keep
+    // comparing the original source on later requests. This captures final
+    // writes made by the legacy server during cut-over instead of freezing the
+    // first copied snapshot forever.
+    if ($targetState !== null && $stateCandidates) {
+        $sourceMarker = read_json_file($target . DIRECTORY_SEPARATOR . 'legacy-v4-source.json', []);
+        $migrationMarker = read_json_file($target . DIRECTORY_SEPARATOR . 'legacy-v4-migration.json', []);
+        $preferredPath = (string)($sourceMarker['sourcePath'] ?? '');
+        $source = $preferredPath !== '' && isset($stateCandidates[dirname($preferredPath)])
+            ? $stateCandidates[dirname($preferredPath)]
+            : reset($stateCandidates);
+        if (is_array($source) && !hash_equals((string)$targetState['hash'], (string)$source['hash'])) {
+            $trackedSource = $preferredPath !== '' && (string)$source['path'] === $preferredPath;
+            $targetIsLastImportedSnapshot = hash_equals(
+                strtolower((string)($migrationMarker['sourceHash'] ?? '')),
+                strtolower((string)$targetState['hash'])
+            );
+            $sourceIsNotOlder = (int)$source['mtime'] >= (int)$targetState['mtime'];
+            if ($trackedSource || $targetIsLastImportedSnapshot || $sourceIsNotOlder) {
+                copy_legacy_state_snapshot($target, $source);
+                $targetState = $source;
+            }
+        }
+        return;
     }
 
-    $unlocks = [];
-    foreach (ACHIEVEMENT_IDS as $achievementIndex => $achievementId) {
-        $records = $state['unlocks'][$achievementId] ?? null;
-        if (!is_array($records) || !$records) continue;
-        $pairs = [];
-        foreach ($records as $id => $timestamp) {
-            if (!isset($playerIndex[$id])) continue;
-            $pairs[] = [$playerIndex[$id], max(1, (int)$timestamp) - $baseTime];
-        }
-        usort($pairs, static fn(array $a, array $b): int => $a[0] <=> $b[0]);
-        if (!$pairs) continue;
-        $row = [$achievementIndex];
-        foreach ($pairs as [$indexValue, $timestampDelta]) {
-            $row[] = $indexValue;
-            $row[] = max(0, $timestampDelta);
-        }
-        $unlocks[] = $row;
+    if (!$candidates) return;
+
+    // A prior current build may already have created an empty summary/player
+    // tree. Copy the newest compact source into it so the importer can merge it
+    // without discarding current records.
+    if ($targetCurrent) {
+        $source = $stateCandidates ? reset($stateCandidates) : null;
+        if (is_array($source)) copy_legacy_state_snapshot($target, $source);
+        return;
     }
-    return [STATE_SCHEMA_VERSION, $baseTime, $versions, $players, $unlocks];
+
+    $sourcePath = (string)array_key_first($candidates);
+    ensure_directory(dirname($target));
+    if (isset($stateCandidates[$sourcePath])) {
+        copy_directory_tree($sourcePath, $target);
+        remember_legacy_state_source($target, $stateCandidates[$sourcePath]);
+        return;
+    }
+    if (!file_exists($target) && @rename($sourcePath, $target)) {
+        // A separate compact source may coexist with a current-format legacy
+        // directory. Merge the compact snapshot as well.
+        $stateSource = $stateCandidates ? reset($stateCandidates) : null;
+        if (is_array($stateSource)) copy_legacy_state_snapshot($target, $stateSource);
+        return;
+    }
+    copy_directory_tree($sourcePath, $target);
+    $stateSource = $stateCandidates ? reset($stateCandidates) : null;
+    if (is_array($stateSource) && !is_file($targetStatePath)) copy_legacy_state_snapshot($target, $stateSource);
 }
 
-function encode_compact_state(array $state): string {
+function data_root(): string {
+    $configured = trim((string)(getenv('TARINAI_ACHIEVEMENT_DATA_DIR') ?: ''));
+    if ($configured !== '') {
+        $target = rtrim($configured, DIRECTORY_SEPARATOR);
+        migrate_legacy_data_root($target, [
+            __DIR__ . DIRECTORY_SEPARATOR . '.achievement_data',
+            dirname(__DIR__) . DIRECTORY_SEPARATOR . '.achievement_data',
+        ]);
+        return $target;
+    }
+
+    $documentRoot = realpath((string)($_SERVER['DOCUMENT_ROOT'] ?? ''));
+    $publicRoot = is_string($documentRoot) && $documentRoot !== '' ? $documentRoot : __DIR__;
+    $installPath = realpath(__DIR__) ?: __DIR__;
+    $installKey = substr(hash('sha256', $installPath), 0, 16);
+    $legacyParent = dirname($publicRoot);
+    $legacyRoots = [
+        $legacyParent . DIRECTORY_SEPARATOR . '.tarinai-achievements-' . $installKey,
+        __DIR__ . DIRECTORY_SEPARATOR . '.achievement_data',
+        $publicRoot . DIRECTORY_SEPARATOR . '.achievement_data',
+    ];
+    $globbed = glob($legacyParent . DIRECTORY_SEPARATOR . '.tarinai-achievements-*', GLOB_ONLYDIR);
+    if (is_array($globbed)) $legacyRoots = array_merge($legacyRoots, $globbed);
+
+    // Keep local-server data independent of the ZIP extraction directory and
+    // listening port. This makes upgrades and side-by-side extracted versions
+    // share one persistent achievement identity and server record.
+    $xdg = trim((string)(getenv('XDG_DATA_HOME') ?: ''));
+    $home = trim((string)(getenv('HOME') ?: getenv('USERPROFILE') ?: ''));
+    if ($xdg !== '') $target = rtrim($xdg, DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR . 'tarinai-observer' . DIRECTORY_SEPARATOR . 'achievements';
+    elseif ($home !== '') $target = rtrim($home, DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR . '.tarinai-observer' . DIRECTORY_SEPARATOR . 'achievements';
+    else $target = $legacyParent . DIRECTORY_SEPARATOR . '.tarinai-achievements';
+
     try {
-        return json_encode(compact_state($state), JSON_UNESCAPED_SLASHES | JSON_INVALID_UTF8_SUBSTITUTE | JSON_THROW_ON_ERROR);
-    } catch (JsonException $error) {
-        throw new RuntimeException('storage_encode_failed', 0, $error);
+        migrate_legacy_data_root($target, $legacyRoots);
+        return $target;
+    } catch (RuntimeException) {
+        // Hosted environments may not permit writes under HOME. The fallback
+        // remains outside the document root and is stable across sibling builds.
+        $fallback = $legacyParent . DIRECTORY_SEPARATOR . '.tarinai-achievements';
+        migrate_legacy_data_root($fallback, $legacyRoots);
+        return $fallback;
     }
 }
 
-function decode_stored_state(string $contents): array {
-    if (trim($contents) === '') return [empty_state(), 'empty'];
+function ensure_directory(string $path): void {
+    if (!is_dir($path) && !mkdir($path, 0770, true) && !is_dir($path)) throw new RuntimeException('storage_unavailable');
+}
+
+
+function protect_data_root(string $path): void {
+    ensure_directory($path);
+    $rules = "Options -Indexes\n<IfModule mod_authz_core.c>\n  Require all denied\n</IfModule>\n<IfModule !mod_authz_core.c>\n  Deny from all\n</IfModule>\n";
+    $htaccess = $path . DIRECTORY_SEPARATOR . '.htaccess';
+    if (!is_file($htaccess)) @file_put_contents($htaccess, $rules, LOCK_EX);
+    $index = $path . DIRECTORY_SEPARATOR . 'index.html';
+    if (!is_file($index)) @file_put_contents($index, '', LOCK_EX);
+}
+
+function read_json_file(string $path, array $fallback): array {
+    if (!is_file($path)) return $fallback;
+    $raw = file_get_contents($path);
+    if (!is_string($raw)) throw new RuntimeException('storage_unavailable');
+    if (trim($raw) === '') return $fallback;
     try {
-        $decoded = json_decode($contents, true, 512, JSON_THROW_ON_ERROR);
+        $value = json_decode($raw, true, 128, JSON_THROW_ON_ERROR);
     } catch (JsonException $error) {
         throw new RuntimeException('storage_corrupt', 0, $error);
     }
-    $format = detect_state_format($decoded);
-    if ($format === 'invalid') throw new RuntimeException('storage_corrupt');
-    return [normalize_state($decoded), $format];
+    return is_array($value) ? $value : $fallback;
 }
 
-function atomic_write_state(string $dataPath, string $encoded): void {
-    $dataDir = dirname($dataPath);
-    $tempPath = tempnam($dataDir, DATA_FILE_NAME . '.tmp.');
-    if ($tempPath === false) throw new RuntimeException('storage_unavailable');
-    $handle = @fopen($tempPath, 'wb');
-    if ($handle === false) {
-        @unlink($tempPath);
-        throw new RuntimeException('storage_unavailable');
-    }
+function atomic_write_json(string $path, array $value): void {
+    ensure_directory(dirname($path));
+    try {
+        $encoded = json_encode($value, JSON_UNESCAPED_SLASHES | JSON_INVALID_UTF8_SUBSTITUTE | JSON_THROW_ON_ERROR);
+    } catch (JsonException $error) {
+        throw new RuntimeException('storage_encode_failed', 0, $error);
+    }
+    $temp = tempnam(dirname($path), basename($path) . '.tmp.');
+    if ($temp === false) throw new RuntimeException('storage_unavailable');
+    $handle = @fopen($temp, 'wb');
+    if ($handle === false) { @unlink($temp); throw new RuntimeException('storage_unavailable'); }
     try {
-        $length = strlen($encoded);
         $offset = 0;
+        $length = strlen($encoded);
         while ($offset < $length) {
             $written = fwrite($handle, substr($encoded, $offset));
             if ($written === false || $written === 0) throw new RuntimeException('storage_write_failed');
             $offset += $written;
         }
         if (!fflush($handle)) throw new RuntimeException('storage_write_failed');
-        if (function_exists('fsync') && !fsync($handle)) throw new RuntimeException('storage_write_failed');
+        if (function_exists('fsync')) @fsync($handle);
     } catch (Throwable $error) {
-        fclose($handle);
-        @unlink($tempPath);
-        throw $error;
+        fclose($handle); @unlink($temp); throw $error;
     }
     fclose($handle);
-    @chmod($tempPath, 0664);
-    if (!@rename($tempPath, $dataPath)) {
-        @unlink($tempPath);
-        throw new RuntimeException('storage_write_failed');
-    }
+    @chmod($temp, 0660);
+    if (!@rename($temp, $path)) { @unlink($temp); throw new RuntimeException('storage_write_failed'); }
 }
 
-function build_summary(array $state): array {
-    $total = count($state['players']);
-    $achievements = [];
-    foreach (ACHIEVEMENT_IDS as $id) {
-        $unlocked = isset($state['unlocks'][$id]) && is_array($state['unlocks'][$id])
-            ? count($state['unlocks'][$id])
-            : 0;
-        $percentage = $total > 0 ? round(($unlocked / $total) * 100, 1) : 0.0;
-        $achievements[$id] = [
-            'unlockedPlayers' => $unlocked,
-            'percentage' => $percentage,
-        ];
+
+function atomic_write_bytes(string $path, string $bytes): void {
+    ensure_directory(dirname($path));
+    $temp = tempnam(dirname($path), basename($path) . '.tmp.');
+    if ($temp === false) throw new RuntimeException('storage_unavailable');
+    $handle = @fopen($temp, 'wb');
+    if ($handle === false) { @unlink($temp); throw new RuntimeException('storage_unavailable'); }
+    try {
+        $offset = 0;
+        $length = strlen($bytes);
+        while ($offset < $length) {
+            $written = fwrite($handle, substr($bytes, $offset));
+            if ($written === false || $written === 0) throw new RuntimeException('storage_write_failed');
+            $offset += $written;
+        }
+        if (!fflush($handle)) throw new RuntimeException('storage_write_failed');
+        if (function_exists('fsync')) @fsync($handle);
+    } catch (Throwable $error) {
+        fclose($handle); @unlink($temp); throw $error;
     }
+    fclose($handle);
+    @chmod($temp, 0660);
+    if (!@rename($temp, $path)) { @unlink($temp); throw new RuntimeException('storage_write_failed'); }
+}
+
+function valid_legacy_player_id(string $value): bool {
+    return preg_match('/^[A-Za-z0-9_-]{22}$/', $value) === 1;
+}
+
+function legacy_player_uuid(string $legacyId): string {
+    if (!valid_legacy_player_id($legacyId)) throw new RuntimeException('legacy_state_invalid');
+    $decoded = base64_decode(strtr($legacyId, '-_', '+/') . '==', true);
+    if (!is_string($decoded) || strlen($decoded) !== 16) throw new RuntimeException('legacy_state_invalid');
+    $bytes = $decoded;
+    $bytes[6] = chr((ord($bytes[6]) & 0x0f) | 0x40);
+    $bytes[8] = chr((ord($bytes[8]) & 0x3f) | 0x80);
+    $hex = bin2hex($bytes);
+    return substr($hex, 0, 8) . '-' . substr($hex, 8, 4) . '-' . substr($hex, 12, 4) . '-' . substr($hex, 16, 4) . '-' . substr($hex, 20, 12);
+}
+
+/**
+ * Imports the compact schema-4 state.json used by the pre-credential server.
+ * The source remains untouched and is copied byte-for-byte into legacy-backup.
+ * Player writes are deterministic and idempotent, so a process interruption is
+ * safely resumed on the next request before the completion marker is written.
+ */
+function migrate_legacy_compact_state_v4(string $root, string $summaryPath): ?array {
+    $sourcePath = $root . DIRECTORY_SEPARATOR . 'state.json';
+    if (!is_file($sourcePath)) return null;
+    $markerPath = $root . DIRECTORY_SEPARATOR . 'legacy-v4-migration.json';
+    $marker = read_json_file($markerPath, []);
+    $sourceSize = max(0, (int)@filesize($sourcePath));
+    $sourceMtime = max(0, (int)@filemtime($sourcePath));
+    $sourceRaw = @file_get_contents($sourcePath);
+    if (!is_string($sourceRaw) || trim($sourceRaw) === '') throw new RuntimeException('legacy_state_unreadable');
+    $sourceHash = hash('sha256', $sourceRaw);
+    if (($marker['status'] ?? '') === 'complete'
+        && hash_equals((string)($marker['sourceHash'] ?? ''), $sourceHash)) {
+        $marker['sourceSize'] = $sourceSize;
+        $marker['sourceMtime'] = $sourceMtime;
+        atomic_write_json($markerPath, $marker);
+        return $marker;
+    }
+    // If the legacy server wrote a final update during cut-over, import the
+    // changed snapshot again. The merge is grow-only and deterministic.
+
+    try {
+        $data = json_decode($sourceRaw, true, 256, JSON_THROW_ON_ERROR);
+    } catch (JsonException $error) {
+        throw new RuntimeException('legacy_state_invalid', 0, $error);
+    }
+    if (!is_array($data) || count($data) !== 6 || ($data[0] ?? null) !== 4) throw new RuntimeException('legacy_state_invalid');
+    $baseTimestamp = $data[1] ?? null;
+    $versions = $data[2] ?? null;
+    $catalogIds = $data[3] ?? null;
+    $playerRows = $data[4] ?? null;
+    $unlockRows = $data[5] ?? null;
+    if (!is_int($baseTimestamp) || $baseTimestamp < 946684800 || !is_array($versions) || !$versions
+        || !is_array($catalogIds) || !is_array($playerRows) || !is_array($unlockRows)) {
+        throw new RuntimeException('legacy_state_invalid');
+    }
+    foreach ($versions as $version) {
+        if (!is_string($version) || $version === '' || strlen($version) > 32) throw new RuntimeException('legacy_state_invalid');
+    }
+    if (array_values($catalogIds) !== array_values(ACHIEVEMENT_IDS)) throw new RuntimeException('legacy_catalog_mismatch');
+
+    $perPlayerUnlocks = array_fill(0, count($playerRows), []);
+    $legacyCounts = array_fill_keys(ACHIEVEMENT_IDS, 0);
+    $seenAchievements = [];
+    $unlockAssignments = 0;
+    foreach ($unlockRows as $unlockRow) {
+        if (!is_array($unlockRow) || count($unlockRow) < 3 || count($unlockRow) % 2 !== 1) throw new RuntimeException('legacy_state_invalid');
+        $achievementIndex = $unlockRow[0] ?? null;
+        if (!is_int($achievementIndex) || $achievementIndex < 0 || $achievementIndex >= count(ACHIEVEMENT_IDS)
+            || isset($seenAchievements[$achievementIndex])) throw new RuntimeException('legacy_state_invalid');
+        $seenAchievements[$achievementIndex] = true;
+        $achievementId = ACHIEVEMENT_IDS[$achievementIndex];
+        $seenPlayers = [];
+        for ($offset = 1; $offset < count($unlockRow); $offset += 2) {
+            $playerIndex = $unlockRow[$offset] ?? null;
+            $timeOffset = $unlockRow[$offset + 1] ?? null;
+            if (!is_int($playerIndex) || $playerIndex < 0 || $playerIndex >= count($playerRows)
+                || isset($seenPlayers[$playerIndex]) || !is_int($timeOffset) || $timeOffset < 0) {
+                throw new RuntimeException('legacy_state_invalid');
+            }
+            $timestamp = $baseTimestamp + $timeOffset;
+            if ($timestamp < 946684800) throw new RuntimeException('legacy_state_invalid');
+            $seenPlayers[$playerIndex] = true;
+            $perPlayerUnlocks[$playerIndex][$achievementId] = $timestamp;
+            $legacyCounts[$achievementId]++;
+            $unlockAssignments++;
+        }
+    }
+
+    $backupPath = $root . DIRECTORY_SEPARATOR . 'legacy-backup' . DIRECTORY_SEPARATOR . 'state-v4-' . $sourceHash . '.json';
+    if (!is_file($backupPath)) atomic_write_bytes($backupPath, $sourceRaw);
+    $backupRaw = @file_get_contents($backupPath);
+    if (!is_string($backupRaw) || !hash_equals($sourceHash, hash('sha256', $backupRaw))) throw new RuntimeException('legacy_backup_failed');
+
+    atomic_write_json($markerPath, [
+        'schema' => 1,
+        'status' => 'in_progress',
+        'sourceSchema' => 4,
+        'sourceHash' => $sourceHash,
+        'sourceSize' => $sourceSize,
+        'sourceMtime' => $sourceMtime,
+        'startedAt' => time(),
+        'expectedPlayers' => count($playerRows),
+        'expectedUnlockAssignments' => $unlockAssignments,
+        'backup' => basename(dirname($backupPath)) . '/' . basename($backupPath),
+    ]);
+
+    $legacyIdsSeen = [];
+    $migratedPlayerIds = [];
+    foreach ($playerRows as $index => $row) {
+        if (!is_array($row) || count($row) < 3 || count($row) > 4) throw new RuntimeException('legacy_state_invalid');
+        $legacyId = $row[0] ?? null;
+        $firstOffset = $row[1] ?? null;
+        $duration = $row[2] ?? null;
+        $versionIndex = $row[3] ?? 0;
+        if (!is_string($legacyId) || !valid_legacy_player_id($legacyId) || isset($legacyIdsSeen[$legacyId])
+            || !is_int($firstOffset) || $firstOffset < 0 || !is_int($duration) || $duration < 0
+            || !is_int($versionIndex) || $versionIndex < 0 || $versionIndex >= count($versions)) {
+            throw new RuntimeException('legacy_state_invalid');
+        }
+        $legacyIdsSeen[$legacyId] = true;
+        $playerId = legacy_player_uuid($legacyId);
+        if (isset($migratedPlayerIds[$playerId])) throw new RuntimeException('legacy_player_collision');
+        $migratedPlayerIds[$playerId] = true;
+        $claimHash = hash('sha256', $legacyId);
+        $path = player_path($root, $playerId);
+        if (is_file($path)) {
+            $existingRaw = read_json_file($path, []);
+            $existingClaimHash = strtolower((string)($existingRaw['legacyClaimHash'] ?? ''));
+            if ($existingClaimHash !== '' && !hash_equals($existingClaimHash, $claimHash)) throw new RuntimeException('legacy_player_collision');
+            if ($existingClaimHash === '' && (string)($existingRaw['ownerHash'] ?? '') !== '') throw new RuntimeException('legacy_player_collision');
+            $player = normalize_player($existingRaw, $playerId);
+        } else {
+            $player = default_player($playerId, '', $baseTimestamp + $firstOffset);
+        }
+        $player['schema'] = 5;
+        $player['legacyClaimHash'] = $claimHash;
+        $player['legacyClaimedAt'] = max(0, (int)($player['legacyClaimedAt'] ?? 0));
+        $player['firstSeen'] = min((int)$player['firstSeen'], $baseTimestamp + $firstOffset);
+        $player['lastSeen'] = max((int)$player['lastSeen'], $baseTimestamp + $firstOffset + $duration);
+        $player['activityCount'] = max(2, (int)$player['activityCount']);
+        $player['qualified'] = true;
+        if ((string)$player['gameVersion'] === '') $player['gameVersion'] = $versions[$versionIndex];
+        // A later explicit reset must remain authoritative if migration is
+        // resumed after the player has already advanced to a newer generation.
+        if ((int)$player['generation'] === 0) {
+            foreach ($perPlayerUnlocks[$index] as $achievementId => $timestamp) {
+                if (!isset($player['unlocked'][$achievementId])) $player['unlocked'][$achievementId] = $timestamp;
+                else $player['unlocked'][$achievementId] = min((int)$player['unlocked'][$achievementId], $timestamp);
+            }
+        }
+        reconcile_completionist($player['unlocked'], $player['lastSeen']);
+        atomic_write_json($path, $player);
+    }
+
+    $verifiedAssignments = 0;
+    foreach ($playerRows as $index => $row) {
+        $legacyId = (string)$row[0];
+        $playerId = legacy_player_uuid($legacyId);
+        $player = normalize_player(read_json_file(player_path($root, $playerId), []), $playerId);
+        if (!hash_equals(hash('sha256', $legacyId), (string)$player['legacyClaimHash'])) throw new RuntimeException('legacy_migration_verify_failed');
+        if ((int)$player['generation'] === 0) {
+            foreach ($perPlayerUnlocks[$index] as $achievementId => $timestamp) {
+                if (!isset($player['unlocked'][$achievementId]) || (int)$player['unlocked'][$achievementId] > $timestamp) {
+                    throw new RuntimeException('legacy_migration_verify_failed');
+                }
+                $verifiedAssignments++;
+            }
+        }
+    }
+    if ($verifiedAssignments !== $unlockAssignments) throw new RuntimeException('legacy_migration_verify_failed');
+
+    $summary = repair_summary_cache($root, $summaryPath);
+    if ((int)$summary['totalPlayers'] < count($playerRows)) throw new RuntimeException('legacy_migration_verify_failed');
+    foreach ($legacyCounts as $achievementId => $count) {
+        if ((int)($summary['counts'][$achievementId] ?? 0) < $count) throw new RuntimeException('legacy_migration_verify_failed');
+    }
+    $complete = [
+        'schema' => 1,
+        'status' => 'complete',
+        'sourceSchema' => 4,
+        'sourceHash' => $sourceHash,
+        'sourceSize' => $sourceSize,
+        'sourceMtime' => $sourceMtime,
+        'completedAt' => time(),
+        'migratedPlayers' => count($playerRows),
+        'migratedUnlockAssignments' => $unlockAssignments,
+        'summaryPlayers' => (int)$summary['totalPlayers'],
+        'backup' => basename(dirname($backupPath)) . '/' . basename($backupPath),
+    ];
+    atomic_write_json($markerPath, $complete);
+    return $complete;
+}
+
+function with_lock(string $path, int $mode, callable $callback): mixed {
+    ensure_directory(dirname($path));
+    $handle = @fopen($path, 'c');
+    if ($handle === false || !flock($handle, $mode)) {
+        if (is_resource($handle)) fclose($handle);
+        throw new RuntimeException('storage_locked');
+    }
+    try { return $callback(); } finally { flock($handle, LOCK_UN); fclose($handle); }
+}
+
+function player_path(string $root, string $playerId): string {
+    $bucket = substr(hash('sha256', $playerId), 0, 2);
+    return $root . DIRECTORY_SEPARATOR . 'players' . DIRECTORY_SEPARATOR . $bucket . DIRECTORY_SEPARATOR . hash('sha256', $playerId) . '.json';
+}
+
+function default_summary(): array {
     return [
-        'ok' => true,
-        'totalPlayers' => $total,
-        'achievements' => $achievements,
+        'schema' => 1,
+        'totalPlayers' => 0,
+        'counts' => array_fill_keys(ACHIEVEMENT_IDS, 0),
     ];
 }
 
-$method = strtoupper($_SERVER['REQUEST_METHOD'] ?? 'GET');
+function normalize_summary(array $summary): array {
+    $out = default_summary();
+    $out['totalPlayers'] = max(0, (int)($summary['totalPlayers'] ?? 0));
+    $counts = is_array($summary['counts'] ?? null) ? $summary['counts'] : [];
+    foreach (ACHIEVEMENT_IDS as $id) $out['counts'][$id] = max(0, (int)($counts[$id] ?? 0));
+    return $out;
+}
+
+function default_progress_state(): array {
+    return [
+        'progress' => [
+            'linkTypes' => [],
+            'signalActivated' => false,
+            'medicineTypes' => [],
+            'dailyPlayStreak' => 0,
+            'dailyPlayLastDay' => 0,
+            'mysteryDrugTarinaiIds' => [],
+        ],
+        'ledger' => [
+            'base' => array_fill_keys(array_keys(ADDITIVE_PROGRESS_CAPS), 0),
+            'shards' => array_fill_keys(array_keys(ADDITIVE_PROGRESS_CAPS), []),
+        ],
+    ];
+}
+
+function progress_counter_value(array $progressState, string $key): int {
+    $cap = (int)(ADDITIVE_PROGRESS_CAPS[$key] ?? 0);
+    if ($cap <= 0) return 0;
+    $base = bounded_int($progressState['ledger']['base'][$key] ?? 0, 0, $cap);
+    $shards = is_array($progressState['ledger']['shards'][$key] ?? null) ? $progressState['ledger']['shards'][$key] : [];
+    $sum = $base;
+    foreach ($shards as $value) $sum += bounded_int($value, 0, $cap);
+    return min($cap, $sum);
+}
+
+function bounded_int(mixed $value, int $minimum, int $maximum): int {
+    if (!is_int($value) && !is_float($value) && !is_string($value)) return $minimum;
+    if (!is_numeric($value)) return $minimum;
+    $numeric = (float)$value;
+    if (!is_finite($numeric)) return $minimum;
+    return max($minimum, min($maximum, (int)floor($numeric)));
+}
+
+function unique_allowed_strings(mixed $input, array $allowed): array {
+    if (!is_array($input)) return [];
+    $lookup = array_fill_keys($allowed, true);
+    $out = [];
+    foreach ($input as $value) {
+        $text = (string)$value;
+        if (isset($lookup[$text])) $out[$text] = true;
+    }
+    return array_keys($out);
+}
+
+function normalize_progress_state(mixed $input): array {
+    $out = default_progress_state();
+    if (!is_array($input)) return $out;
+    $progressSource = is_array($input['progress'] ?? null) ? $input['progress'] : [];
+    $ledgerSource = is_array($input['ledger'] ?? null) ? $input['ledger'] : [];
+    $baseSource = is_array($ledgerSource['base'] ?? null) ? $ledgerSource['base'] : [];
+    $shardsSource = is_array($ledgerSource['shards'] ?? null) ? $ledgerSource['shards'] : [];
+
+    foreach (ADDITIVE_PROGRESS_CAPS as $key => $rawCap) {
+        $cap = max(0, (int)$rawCap);
+        $base = bounded_int($baseSource[$key] ?? 0, 0, $cap);
+        $shards = [];
+        $rawShards = is_array($shardsSource[$key] ?? null) ? $shardsSource[$key] : [];
+        foreach ($rawShards as $actorId => $rawValue) {
+            $id = substr((string)$actorId, 0, 160);
+            if ($id === '' || preg_match('/[\x00-\x1F\x7F]/', $id) === 1) continue;
+            $value = bounded_int($rawValue, 0, $cap);
+            if ($value > 0) $shards[$id] = max((int)($shards[$id] ?? 0), $value);
+        }
+        $total = min($cap, $base + array_sum($shards));
+        // Protocol v4 and older duplicated additive counters in progress. Read
+        // them as a one-time migration floor, but never emit them again.
+        $legacyFloor = bounded_int($progressSource[$key] ?? 0, 0, $cap);
+        if ($legacyFloor > $total) {
+            $base = min($cap, $base + ($legacyFloor - $total));
+            $total = $legacyFloor;
+        }
+        if ($total >= $cap) {
+            $base = $cap;
+            $shards = [];
+        }
+        $out['ledger']['base'][$key] = $base;
+        $out['ledger']['shards'][$key] = $shards;
+    }
+
+    $out['progress']['linkTypes'] = unique_allowed_strings($progressSource['linkTypes'] ?? [], LINK_PROGRESS_TYPES);
+    $out['progress']['signalActivated'] = (bool)($progressSource['signalActivated'] ?? false);
+    $out['progress']['medicineTypes'] = unique_allowed_strings($progressSource['medicineTypes'] ?? [], MEDICINE_LEDGER_TYPES);
+    $out['progress']['dailyPlayStreak'] = bounded_int($progressSource['dailyPlayStreak'] ?? 0, 0, 7);
+    $out['progress']['dailyPlayLastDay'] = bounded_int($progressSource['dailyPlayLastDay'] ?? 0, 0, 1000000);
+    $ids = [];
+    foreach ((array)($progressSource['mysteryDrugTarinaiIds'] ?? []) as $rawId) {
+        $id = substr(trim((string)$rawId), 0, 160);
+        if ($id !== '' && preg_match('/[\x00-\x1F\x7F]/', $id) !== 1) $ids[$id] = true;
+        if (count($ids) >= MAD_SCIENTIST_TARGET) break;
+    }
+    $out['progress']['mysteryDrugTarinaiIds'] = array_keys($ids);
+    return $out;
+}
+
+function merge_progress_state(mixed $targetInput, mixed $sourceInput): array {
+    $target = normalize_progress_state($targetInput);
+    $source = normalize_progress_state($sourceInput);
+    foreach (ADDITIVE_PROGRESS_CAPS as $key => $cap) {
+        $target['ledger']['base'][$key] = max((int)$target['ledger']['base'][$key], (int)$source['ledger']['base'][$key]);
+        foreach ($source['ledger']['shards'][$key] as $actorId => $value) {
+            $target['ledger']['shards'][$key][$actorId] = max((int)($target['ledger']['shards'][$key][$actorId] ?? 0), (int)$value);
+        }
+    }
+    $targetDay = (int)$target['progress']['dailyPlayLastDay'];
+    $sourceDay = (int)$source['progress']['dailyPlayLastDay'];
+    if ($sourceDay > $targetDay) {
+        $target['progress']['dailyPlayLastDay'] = $sourceDay;
+        $target['progress']['dailyPlayStreak'] = (int)$source['progress']['dailyPlayStreak'];
+    } elseif ($sourceDay === $targetDay) {
+        $target['progress']['dailyPlayStreak'] = max((int)$target['progress']['dailyPlayStreak'], (int)$source['progress']['dailyPlayStreak']);
+    }
+    $target['progress']['signalActivated'] = (bool)$target['progress']['signalActivated'] || (bool)$source['progress']['signalActivated'];
+    $target['progress']['linkTypes'] = array_values(array_unique(array_merge($target['progress']['linkTypes'], $source['progress']['linkTypes'])));
+    $target['progress']['medicineTypes'] = array_values(array_unique(array_merge($target['progress']['medicineTypes'], $source['progress']['medicineTypes'])));
+    $target['progress']['mysteryDrugTarinaiIds'] = array_slice(array_values(array_unique(array_merge(
+        $target['progress']['mysteryDrugTarinaiIds'],
+        $source['progress']['mysteryDrugTarinaiIds']
+    ))), 0, MAD_SCIENTIST_TARGET);
+    return normalize_progress_state($target);
+}
+
+function progress_unlock_satisfied(string $id, array $progressState): ?bool {
+    $rule = PROGRESS_RULES[$id] ?? null;
+    if (!is_array($rule)) return null;
+    $type = (string)($rule['type'] ?? '');
+    $key = (string)($rule['key'] ?? '');
+    $target = max(0, (int)($rule['target'] ?? 0));
+    $progress = $progressState['progress'];
+    if ($type === 'counter') return progress_counter_value($progressState, $key) >= $target;
+    if ($type === 'value') return bounded_int($progress[$key] ?? 0, 0, max($target, 1000000)) >= $target;
+    if ($type === 'set') {
+        $required = (string)($rule['required'] ?? '');
+        $requiredValues = $required === 'medicineLedgerTypes' ? MEDICINE_LEDGER_TYPES : [];
+        return count(array_intersect($requiredValues, (array)($progress[$key] ?? []))) === count($requiredValues);
+    }
+    if ($type === 'unique') return count((array)($progress[$key] ?? [])) >= $target;
+    if ($type === 'mechanized') {
+        return (bool)($progress['signalActivated'] ?? false)
+            && count(array_intersect(LINK_PROGRESS_TYPES, (array)($progress['linkTypes'] ?? []))) === count(LINK_PROGRESS_TYPES);
+    }
+    return null;
+}
+
+function reconcile_progress_unlocks(array &$unlocked, array $progressState, int $now): void {
+    foreach (ACHIEVEMENT_IDS as $id) {
+        if ($id === COMPLETIONIST_ID || isset($unlocked[$id])) continue;
+        if (progress_unlock_satisfied($id, $progressState) === true) $unlocked[$id] = $now;
+    }
+}
+
+function default_player(string $playerId, string $ownerHash, int $now): array {
+    return [
+        'schema' => 5,
+        'playerId' => $playerId,
+        'ownerHash' => $ownerHash,
+        'firstSeen' => $now,
+        'lastSeen' => $now,
+        'activityCount' => 0,
+        'qualified' => false,
+        'gameVersion' => '',
+        'generation' => 0,
+        'unlocked' => [],
+        'progressState' => default_progress_state(),
+    ];
+}
+
+function normalize_player(array $player, string $playerId): array {
+    $now = time();
+    $unlocked = [];
+    foreach ((array)($player['unlocked'] ?? []) as $id => $timestamp) {
+        if (is_string($id) && in_array($id, ACHIEVEMENT_IDS, true)) $unlocked[$id] = max(1, (int)$timestamp);
+    }
+    return [
+        'schema' => 5,
+        'playerId' => $playerId,
+        'ownerHash' => (string)($player['ownerHash'] ?? ''),
+        'firstSeen' => max(1, (int)($player['firstSeen'] ?? $now)),
+        'lastSeen' => max(1, (int)($player['lastSeen'] ?? $now)),
+        'activityCount' => max(0, (int)($player['activityCount'] ?? 0)),
+        'qualified' => (bool)($player['qualified'] ?? false),
+        'gameVersion' => substr((string)($player['gameVersion'] ?? ''), 0, 32),
+        'generation' => max(0, (int)($player['generation'] ?? 0)),
+        'unlocked' => $unlocked,
+        'progressState' => normalize_progress_state($player['progressState'] ?? null),
+        'legacyClaimHash' => preg_match('/^[0-9a-f]{64}$/', strtolower((string)($player['legacyClaimHash'] ?? ''))) === 1
+            ? strtolower((string)$player['legacyClaimHash']) : '',
+        'legacyClaimedAt' => max(0, (int)($player['legacyClaimedAt'] ?? 0)),
+    ];
+}
+
+/**
+ * The summary is a derived cache, never the source of truth. Rebuilding it from
+ * player records makes a corrupt/missing summary self-healing and repairs a
+ * process interruption between the player and summary renames.
+ */
+function rebuild_summary_from_players(string $root): array {
+    $summary = default_summary();
+    $playersRoot = $root . DIRECTORY_SEPARATOR . 'players';
+    if (!is_dir($playersRoot)) return $summary;
+    try {
+        $iterator = new RecursiveIteratorIterator(
+            new RecursiveDirectoryIterator($playersRoot, FilesystemIterator::SKIP_DOTS)
+        );
+        foreach ($iterator as $file) {
+            if (!$file->isFile() || strtolower($file->getExtension()) !== 'json') continue;
+            try {
+                $raw = read_json_file($file->getPathname(), []);
+                $playerId = strtolower((string)($raw['playerId'] ?? ''));
+                if (!valid_player_id($playerId)) continue;
+                $player = normalize_player($raw, $playerId);
+            } catch (Throwable) {
+                // One damaged player record must not take down every player.
+                continue;
+            }
+            if (!(bool)$player['qualified']) continue;
+            $summary['totalPlayers']++;
+            foreach (array_keys($player['unlocked']) as $id) {
+                if (isset($summary['counts'][$id])) $summary['counts'][$id]++;
+            }
+        }
+    } catch (UnexpectedValueException) {
+        throw new RuntimeException('storage_unavailable');
+    }
+    return normalize_summary($summary);
+}
+
+function repair_summary_cache(string $root, string $summaryPath): array {
+    $summary = rebuild_summary_from_players($root);
+    atomic_write_json($summaryPath, $summary);
+    return $summary;
+}
+
+function verify_owner(array &$player, string $secret): void {
+    $submitted = hash('sha256', strtolower($secret));
+    $stored = (string)($player['ownerHash'] ?? '');
+    if ($stored === '' || !hash_equals($stored, $submitted)) respond(['ok' => false, 'error' => 'invalid_owner'], 403);
+}
+
+function reconcile_completionist(array &$unlocked, int $now): void {
+    $latestPrerequisite = 0;
+    foreach (ACHIEVEMENT_IDS as $id) {
+        if ($id === COMPLETIONIST_ID) continue;
+        if (!isset($unlocked[$id])) { unset($unlocked[COMPLETIONIST_ID]); return; }
+        $latestPrerequisite = max($latestPrerequisite, max(1, (int)$unlocked[$id]));
+    }
+    $completionTime = max(1, $latestPrerequisite ?: $now);
+    if (!isset($unlocked[COMPLETIONIST_ID])) $unlocked[COMPLETIONIST_ID] = $completionTime;
+    else $unlocked[COMPLETIONIST_ID] = max((int)$unlocked[COMPLETIONIST_ID], $completionTime);
+}
+
+function normalize_client_unlock_time(mixed $value, int $now): int {
+    if (!is_int($value) && !is_float($value) && !is_string($value)) return $now;
+    if (!is_numeric($value)) return $now;
+    $numeric = (float)$value;
+    if (!is_finite($numeric) || $numeric <= 0) return $now;
+    // Browser timestamps are milliseconds; legacy/server timestamps are seconds.
+    if ($numeric >= 100000000000.0) $numeric /= 1000.0;
+    $seconds = (int)floor($numeric);
+    // Reject implausible/future values, but preserve valid offline unlock times.
+    if ($seconds < 946684800 || $seconds > $now + 300) return $now;
+    return $seconds;
+}
+
+function apply_summary_delta(array &$summary, array $before, array $after): void {
+    foreach (ACHIEVEMENT_IDS as $id) {
+        $had = isset($before[$id]);
+        $has = isset($after[$id]);
+        if ($had === $has) continue;
+        $summary['counts'][$id] = max(0, (int)$summary['counts'][$id] + ($has ? 1 : -1));
+    }
+}
+
+function maybe_qualify(array &$player, array &$summary, int $now): bool {
+    if ($player['qualified']) return false;
+    if ((int)$player['activityCount'] < QUALIFY_MIN_ACTIVITY) return false;
+    if ($now - (int)$player['firstSeen'] < QUALIFY_MIN_AGE_SECONDS) return false;
+    $player['qualified'] = true;
+    $summary['totalPlayers'] = max(0, (int)$summary['totalPlayers'] + 1);
+    foreach (array_keys($player['unlocked']) as $id) $summary['counts'][$id] = max(0, (int)$summary['counts'][$id] + 1);
+    return true;
+}
+
+function public_summary(array $summary, ?array $player = null): array {
+    $total = max(0, (int)$summary['totalPlayers']);
+    $achievements = [];
+    foreach (ACHIEVEMENT_IDS as $id) {
+        $count = max(0, min($total, (int)($summary['counts'][$id] ?? 0)));
+        $achievements[$id] = [
+            'unlockedPlayers' => $count,
+            'percentage' => $total > 0 ? round($count * 100 / $total, 1) : 0.0,
+        ];
+    }
+    $out = ['ok' => true, 'totalPlayers' => $total, 'achievements' => $achievements, 'statisticsTrust' => 'client-reported'];
+    if ($player !== null) {
+        $out['qualified'] = (bool)($player['qualified'] ?? false);
+        $out['playerGeneration'] = max(0, (int)($player['generation'] ?? 0));
+        // Return the authenticated player's grow-only set. The client uploads
+        // its offline snapshot first, then merges this atomic union response.
+        $out['playerUnlocked'] = (object)(is_array($player['unlocked'] ?? null) ? $player['unlocked'] : []);
+        $out['playerProgress'] = normalize_progress_state($player['progressState'] ?? null);
+    }
+    return $out;
+}
+
+function enforce_rate_limit(string $root, string $scope, int $limit): void {
+    $now = time();
+    $hash = hash('sha256', $scope);
+    $path = $root . DIRECTORY_SEPARATOR . 'rate' . DIRECTORY_SEPARATOR . substr($hash, 0, 2) . DIRECTORY_SEPARATOR . $hash . '.json';
+    ensure_directory(dirname($path));
+    $lockPath = $path . '.lock';
+    with_lock($lockPath, LOCK_EX, function () use ($path, $now, $limit): void {
+        $state = read_json_file($path, ['window' => $now, 'count' => 0]);
+        $window = (int)($state['window'] ?? $now);
+        $count = (int)($state['count'] ?? 0);
+        if ($now - $window >= RATE_WINDOW_SECONDS) { $window = $now; $count = 0; }
+        $count++;
+        if ($count > $limit) respond(['ok' => false, 'error' => 'rate_limited', 'retryAfter' => max(1, RATE_WINDOW_SECONDS - ($now - $window))], 429);
+        atomic_write_json($path, ['window' => $window, 'count' => $count]);
+    });
+}
+
+function claim_identity_issue_slot(string $root, string $ip): void {
+    $now = time();
+    $hash = hash('sha256', 'identity:' . $ip);
+    $path = $root . DIRECTORY_SEPARATOR . 'identity-rate' . DIRECTORY_SEPARATOR . substr($hash, 0, 2) . DIRECTORY_SEPARATOR . $hash . '.json';
+    with_lock($path . '.lock', LOCK_EX, function () use ($path, $now): void {
+        $state = read_json_file($path, ['window' => $now, 'count' => 0]);
+        $window = max(1, (int)($state['window'] ?? $now));
+        $count = max(0, (int)($state['count'] ?? 0));
+        if ($now - $window >= IDENTITY_ISSUE_WINDOW_SECONDS) { $window = $now; $count = 0; }
+        if ($count >= IDENTITY_ISSUE_LIMIT_PER_IP) {
+            respond([
+                'ok' => false,
+                'error' => 'identity_creation_limited',
+                'retryAfter' => max(1, IDENTITY_ISSUE_WINDOW_SECONDS - ($now - $window)),
+            ], 429);
+        }
+        atomic_write_json($path, ['window' => $window, 'count' => $count + 1]);
+    });
+}
+
+function random_uuid_v4(): string {
+    $bytes = random_bytes(16);
+    $bytes[6] = chr((ord($bytes[6]) & 0x0f) | 0x40);
+    $bytes[8] = chr((ord($bytes[8]) & 0x3f) | 0x80);
+    $hex = bin2hex($bytes);
+    return substr($hex, 0, 8) . '-' . substr($hex, 8, 4) . '-' . substr($hex, 12, 4) . '-' . substr($hex, 16, 4) . '-' . substr($hex, 20, 12);
+}
+
+function session_signing_key(string $root): string {
+    $path = $root . DIRECTORY_SEPARATOR . 'session-key.json';
+    return with_lock($path . '.lock', LOCK_EX, function () use ($path): string {
+        $state = read_json_file($path, []);
+        $hex = strtolower((string)($state['key'] ?? ''));
+        if (preg_match('/^[0-9a-f]{64}$/', $hex) !== 1) {
+            $hex = bin2hex(random_bytes(32));
+            atomic_write_json($path, ['key' => $hex]);
+        }
+        $key = hex2bin($hex);
+        if (!is_string($key) || strlen($key) !== 32) throw new RuntimeException('storage_corrupt');
+        return $key;
+    });
+}
+
+function make_session_cookie(string $root, string $playerId, string $secret): string {
+    $payload = strtolower($playerId) . '.' . strtolower($secret);
+    return $payload . '.' . hash_hmac('sha256', $payload, session_signing_key($root));
+}
+
+function read_session_cookie(string $root): ?array {
+    $token = strtolower((string)($_COOKIE[SESSION_COOKIE_NAME] ?? ''));
+    $parts = explode('.', $token);
+    if (count($parts) !== 3) return null;
+    [$playerId, $secret, $mac] = $parts;
+    if (!valid_player_id($playerId) || !valid_player_secret($secret) || preg_match('/^[0-9a-f]{64}$/', $mac) !== 1) return null;
+    $payload = $playerId . '.' . $secret;
+    $expected = hash_hmac('sha256', $payload, session_signing_key($root));
+    return hash_equals($expected, $mac) ? ['playerId' => $playerId, 'playerSecret' => $secret] : null;
+}
+
+function set_session_cookie(string $root, string $playerId, string $secret): void {
+    $secure = (!empty($_SERVER['HTTPS']) && strtolower((string)$_SERVER['HTTPS']) !== 'off');
+    setcookie(SESSION_COOKIE_NAME, make_session_cookie($root, $playerId, $secret), [
+        'expires' => time() + SESSION_COOKIE_MAX_AGE,
+        'path' => '/',
+        'secure' => $secure,
+        'httponly' => true,
+        'samesite' => 'Strict',
+    ]);
+}
+
+function stored_owner_matches(string $root, string $playerId, string $secret): bool {
+    $path = player_path($root, $playerId);
+    if (!is_file($path)) return false;
+    try {
+        $player = normalize_player(read_json_file($path, []), $playerId);
+    } catch (RuntimeException) {
+        return false;
+    }
+    $stored = (string)($player['ownerHash'] ?? '');
+    return $stored !== '' && hash_equals($stored, hash('sha256', strtolower($secret)));
+}
+
+function resolve_session_credentials(string $root, string $submittedPlayerId, string $submittedSecret, string $legacyPlayerId): array {
+    if (valid_legacy_player_id($legacyPlayerId) && valid_player_secret($submittedSecret)) {
+        $migratedPlayerId = legacy_player_uuid($legacyPlayerId);
+        $path = player_path($root, $migratedPlayerId);
+        if (is_file($path)) {
+            $raw = read_json_file($path, []);
+            $claimHash = strtolower((string)($raw['legacyClaimHash'] ?? ''));
+            if ($claimHash !== '' && hash_equals($claimHash, hash('sha256', $legacyPlayerId))) {
+                $ownerHash = strtolower((string)($raw['ownerHash'] ?? ''));
+                $submittedOwnerHash = hash('sha256', strtolower($submittedSecret));
+                if ($ownerHash !== '' && !hash_equals($ownerHash, $submittedOwnerHash)) {
+                    // A valid durable identity or HttpOnly cookie must remain a
+                    // recovery path even when stale legacy-ID storage survived
+                    // but its generated secret did not. Otherwise the stale
+                    // legacy value permanently blocks an already-authenticated
+                    // browser before cookie recovery is considered.
+                    if (valid_player_id($submittedPlayerId) && valid_player_secret($submittedSecret)
+                        && stored_owner_matches($root, strtolower($submittedPlayerId), strtolower($submittedSecret))) {
+                        return [
+                            'playerId' => strtolower($submittedPlayerId),
+                            'playerSecret' => strtolower($submittedSecret),
+                            'created' => false,
+                        ];
+                    }
+                    $cookie = read_session_cookie($root);
+                    if ($cookie !== null && stored_owner_matches($root, $cookie['playerId'], $cookie['playerSecret'])) {
+                        return [
+                            'playerId' => $cookie['playerId'],
+                            'playerSecret' => $cookie['playerSecret'],
+                            'created' => false,
+                        ];
+                    }
+                    respond(['ok' => false, 'error' => 'legacy_player_already_claimed'], 403);
+                }
+                return [
+                    'playerId' => $migratedPlayerId,
+                    'playerSecret' => strtolower($submittedSecret),
+                    'created' => false,
+                    'legacyClaimId' => $legacyPlayerId,
+                ];
+            }
+        }
+    }
+    if (valid_player_id($submittedPlayerId) && valid_player_secret($submittedSecret)
+        && stored_owner_matches($root, strtolower($submittedPlayerId), strtolower($submittedSecret))) {
+        return ['playerId' => strtolower($submittedPlayerId), 'playerSecret' => strtolower($submittedSecret), 'created' => false];
+    }
+    $cookie = read_session_cookie($root);
+    if ($cookie !== null && stored_owner_matches($root, $cookie['playerId'], $cookie['playerSecret'])) {
+        return ['playerId' => $cookie['playerId'], 'playerSecret' => $cookie['playerSecret'], 'created' => false];
+    }
+    claim_identity_issue_slot($root, client_ip());
+    return ['playerId' => random_uuid_v4(), 'playerSecret' => bin2hex(random_bytes(32)), 'created' => true];
+}
+
+$method = strtoupper((string)($_SERVER['REQUEST_METHOD'] ?? 'GET'));
 if (!in_array($method, ['GET', 'POST'], true)) respond(['ok' => false, 'error' => 'method_not_allowed'], 405);
 
 $payload = [];
@@ -377,137 +1033,195 @@ if ($method === 'POST') {
     if ($declaredLength > MAX_REQUEST_BYTES) respond(['ok' => false, 'error' => 'request_too_large'], 413);
     $raw = file_get_contents('php://input', false, null, 0, MAX_REQUEST_BYTES + 1);
     if (!is_string($raw) || strlen($raw) > MAX_REQUEST_BYTES) respond(['ok' => false, 'error' => 'request_too_large'], 413);
-    try {
-        $decoded = json_decode($raw, true, 64, JSON_THROW_ON_ERROR);
-    } catch (JsonException) {
-        respond(['ok' => false, 'error' => 'invalid_json'], 400);
-    }
+    try { $decoded = json_decode($raw, true, 64, JSON_THROW_ON_ERROR); }
+    catch (JsonException) { respond(['ok' => false, 'error' => 'invalid_json'], 400); }
     if (!is_array($decoded)) respond(['ok' => false, 'error' => 'invalid_json'], 400);
     $payload = $decoded;
 }
 
-$action = $method === 'POST'
-    ? (string)($payload['action'] ?? '')
-    : (string)($_GET['action'] ?? 'summary');
-$playerId = $method === 'POST'
-    ? (string)($payload['playerId'] ?? '')
-    : (string)($_GET['playerId'] ?? '');
+$action = $method === 'POST' ? (string)($payload['action'] ?? '') : (string)($_GET['action'] ?? 'summary');
+if (!in_array($action, ['session', 'sync', 'reset', 'summary'], true)) respond(['ok' => false, 'error' => 'invalid_action'], 400);
+if ($method === 'GET' && $action !== 'summary') respond(['ok' => false, 'error' => 'method_not_allowed'], 405);
 
-if (!in_array($action, ['session', 'unlock', 'sync', 'reset', 'summary'], true)) {
-    respond(['ok' => false, 'error' => 'invalid_action'], 400);
-}
-if ($method === 'GET' && $action !== 'summary') {
-    respond(['ok' => false, 'error' => 'method_not_allowed'], 405);
-}
-if (!valid_player_id($playerId)) {
-    respond(['ok' => false, 'error' => 'invalid_player'], 400);
-}
-$playerId = strtolower($playerId);
-$syncUnlocks = [];
-$completionistEligible = null;
-if ($action === 'unlock') {
-    $achievementId = (string)($payload['achievementId'] ?? '');
-    if (!in_array($achievementId, ACHIEVEMENT_IDS, true)) {
-        respond(['ok' => false, 'error' => 'invalid_achievement'], 400);
-    }
-} elseif ($action === 'sync') {
-    $submittedUnlocks = $payload['unlocked'] ?? null;
-    if (!is_array($submittedUnlocks) || count($submittedUnlocks) > count(ACHIEVEMENT_IDS)) {
-        respond(['ok' => false, 'error' => 'invalid_unlocks'], 400);
-    }
-    if (array_key_exists('completionistEligible', $payload)) {
-        if (!is_bool($payload['completionistEligible'])) {
-            respond(['ok' => false, 'error' => 'invalid_completionist_state'], 400);
-        }
-        $completionistEligible = $payload['completionistEligible'];
-    }
-    foreach ($submittedUnlocks as $achievementId => $timestamp) {
-        if (!is_string($achievementId) || !in_array($achievementId, ACHIEVEMENT_IDS, true)) {
-            respond(['ok' => false, 'error' => 'invalid_achievement'], 400);
-        }
-        if (!is_int($timestamp) && !is_float($timestamp) && !is_string($timestamp)) {
-            respond(['ok' => false, 'error' => 'invalid_timestamp'], 400);
-        }
-        $numericTimestamp = filter_var($timestamp, FILTER_VALIDATE_FLOAT);
-        if ($numericTimestamp === false || !is_finite((float)$numericTimestamp) || $numericTimestamp <= 0) {
-            respond(['ok' => false, 'error' => 'invalid_timestamp'], 400);
-        }
-        $syncUnlocks[$achievementId] = (float)$numericTimestamp;
-    }
-    if ($completionistEligible === false) unset($syncUnlocks['true_tarinai_observer']);
-}
-
-$dataDir = __DIR__ . DIRECTORY_SEPARATOR . DATA_DIR_NAME;
-if (!is_dir($dataDir) && !mkdir($dataDir, 0775, true) && !is_dir($dataDir)) {
-    respond(['ok' => false, 'error' => 'storage_unavailable'], 503);
-}
-$dataPath = $dataDir . DIRECTORY_SEPARATOR . DATA_FILE_NAME;
-$lockPath = $dataDir . DIRECTORY_SEPARATOR . LOCK_FILE_NAME;
-$lockHandle = @fopen($lockPath, 'c');
-if ($lockHandle === false || !flock($lockHandle, LOCK_EX)) {
-    if (is_resource($lockHandle)) fclose($lockHandle);
-    respond(['ok' => false, 'error' => 'storage_locked'], 503);
-}
-
-$summary = null;
-$storageError = null;
 try {
-    $contents = is_file($dataPath) ? file_get_contents($dataPath) : '';
-    if ($contents === false) throw new RuntimeException('storage_unavailable');
-    [$state, $sourceFormat] = decode_stored_state($contents);
-    $now = time();
-    $mutatesPlayer = $action !== 'summary';
-
-    if ($mutatesPlayer) {
-        $player = isset($state['players'][$playerId]) && is_array($state['players'][$playerId])
-            ? $state['players'][$playerId]
-            : ['firstSeen' => $now];
-        $player['lastSeen'] = $now;
-        $submittedGameVersion = substr((string)($payload['gameVersion'] ?? ''), 0, 32);
-        if ($submittedGameVersion !== '' || !isset($player['gameVersion'])) $player['gameVersion'] = $submittedGameVersion;
-        $state['players'][$playerId] = $player;
-    }
-
-    if ($action === 'unlock') {
-        $achievementId = (string)$payload['achievementId'];
-        if (!isset($state['unlocks'][$achievementId]) || !is_array($state['unlocks'][$achievementId])) {
-            $state['unlocks'][$achievementId] = [];
-        }
-        if (!isset($state['unlocks'][$achievementId][$playerId])) {
-            $state['unlocks'][$achievementId][$playerId] = $now;
-        }
-    } elseif ($action === 'sync') {
-        if ($completionistEligible === false && isset($state['unlocks']['true_tarinai_observer'][$playerId])) {
-            unset($state['unlocks']['true_tarinai_observer'][$playerId]);
-        }
-        foreach ($syncUnlocks as $achievementId => $submittedTimestamp) {
-            if (!isset($state['unlocks'][$achievementId]) || !is_array($state['unlocks'][$achievementId])) {
-                $state['unlocks'][$achievementId] = [];
-            }
-            if (isset($state['unlocks'][$achievementId][$playerId])) continue;
-            $timestampSeconds = $submittedTimestamp >= 100000000000
-                ? (int)floor($submittedTimestamp / 1000)
-                : (int)floor($submittedTimestamp);
-            $state['unlocks'][$achievementId][$playerId] = max(1, min($now, $timestampSeconds));
-        }
-    } elseif ($action === 'reset') {
-        foreach ($state['unlocks'] as $achievementId => $records) {
-            if (is_array($records)) unset($state['unlocks'][$achievementId][$playerId]);
-        }
-    }
-
-    $encoded = encode_compact_state($state);
-    if (trim($contents) !== $encoded || $sourceFormat !== 'v3' || $mutatesPlayer) {
-        atomic_write_state($dataPath, $encoded);
-    }
-    $summary = build_summary($state);
+    $root = data_root();
+    protect_data_root($root);
+    $summaryPath = $root . DIRECTORY_SEPARATOR . 'summary.json';
+    $globalLock = $root . DIRECTORY_SEPARATOR . 'summary.lock';
+    with_lock($globalLock, LOCK_EX, fn() => migrate_legacy_compact_state_v4($root, $summaryPath));
 } catch (RuntimeException $error) {
-    $known = ['storage_corrupt', 'storage_unavailable', 'storage_write_failed', 'storage_encode_failed'];
-    $storageError = in_array($error->getMessage(), $known, true) ? $error->getMessage() : 'storage_unavailable';
-} finally {
-    flock($lockHandle, LOCK_UN);
-    fclose($lockHandle);
+    $known = [
+        'storage_corrupt', 'storage_unavailable', 'storage_write_failed', 'storage_encode_failed', 'storage_locked',
+        'legacy_state_unreadable', 'legacy_state_invalid', 'legacy_catalog_mismatch', 'legacy_backup_failed',
+        'legacy_player_collision', 'legacy_migration_verify_failed',
+    ];
+    $message = in_array($error->getMessage(), $known, true) ? $error->getMessage() : 'storage_unavailable';
+    respond(['ok' => false, 'error' => $message], 503);
+}
+if ($action === 'summary') {
+    enforce_rate_limit($root, 'ip:' . client_ip() . ':read', RATE_READ_LIMIT);
+} elseif ($action === 'session') {
+    enforce_rate_limit($root, 'ip:' . client_ip() . ':session', RATE_SESSION_IP_LIMIT);
+} else {
+    // Authenticated writes are primarily player-scoped. The high IP ceiling is
+    // only an abuse fuse and does not make a classroom share a 30-request pool.
+    enforce_rate_limit($root, 'ip:' . client_ip() . ':write-abuse', RATE_WRITE_IP_LIMIT);
+}
+if ($action === 'summary') {
+    try {
+        $result = with_lock($globalLock, LOCK_EX, fn() => public_summary(repair_summary_cache($root, $summaryPath)));
+        respond($result);
+    } catch (RuntimeException $error) { respond(['ok' => false, 'error' => $error->getMessage()], 503); }
 }
 
-if ($storageError !== null) respond(['ok' => false, 'error' => $storageError], 503);
-respond(is_array($summary) ? $summary : ['ok' => false, 'error' => 'storage_unavailable'], is_array($summary) ? 200 : 503);
+$submittedPlayerId = strtolower((string)($payload['playerId'] ?? ''));
+$submittedSecret = strtolower((string)($payload['playerSecret'] ?? ''));
+$submittedLegacyPlayerId = (string)($payload['legacyPlayerId'] ?? '');
+$sessionCredentials = null;
+if ($action === 'session') {
+    try { $sessionCredentials = resolve_session_credentials($root, $submittedPlayerId, $submittedSecret, $submittedLegacyPlayerId); }
+    catch (RuntimeException $error) { respond(['ok' => false, 'error' => $error->getMessage()], 503); }
+    $playerId = $sessionCredentials['playerId'];
+    $secret = $sessionCredentials['playerSecret'];
+} else {
+    $playerId = $submittedPlayerId;
+    $secret = $submittedSecret;
+    if (!valid_player_id($playerId)) respond(['ok' => false, 'error' => 'invalid_player'], 400);
+    if (!valid_player_secret($secret)) respond(['ok' => false, 'error' => 'invalid_owner'], 403);
+    if (!is_file(player_path($root, $playerId))) respond(['ok' => false, 'error' => 'unknown_player'], 403);
+}
+enforce_rate_limit($root, 'player:' . $playerId, RATE_PLAYER_WRITE_LIMIT);
+$clientGeneration = max(0, (int)($payload['generation'] ?? 0));
+$generationRecovery = (bool)($payload['generationRecovery'] ?? false);
+$submittedUnlocks = [];
+$submittedProgress = default_progress_state();
+
+if ($action === 'sync') {
+    if ((int)($payload['syncProtocol'] ?? 0) !== SYNC_PROTOCOL_VERSION) {
+        respond(['ok' => false, 'error' => 'sync_protocol_upgrade_required', 'requiredProtocol' => SYNC_PROTOCOL_VERSION], 426);
+    }
+    if ((string)($payload['mergeMode'] ?? '') !== 'grow-only-union-v5') {
+        respond(['ok' => false, 'error' => 'invalid_merge_mode'], 400);
+    }
+    $rawUnlocks = $payload['unlocked'] ?? null;
+    if (!is_array($rawUnlocks) || count($rawUnlocks) > count(ACHIEVEMENT_IDS)) respond(['ok' => false, 'error' => 'invalid_unlocks'], 400);
+    if ((bool)($payload['replace'] ?? false)) respond(['ok' => false, 'error' => 'destructive_sync_disabled'], 409);
+    $rawProgress = $payload['progressState'] ?? null;
+    if (!is_array($rawProgress)) respond(['ok' => false, 'error' => 'invalid_progress'], 400);
+    $submittedProgress = normalize_progress_state($rawProgress);
+    $receivedAt = time();
+    foreach ($rawUnlocks as $id => $timestamp) {
+        if (!is_string($id) || !in_array($id, ACHIEVEMENT_IDS, true)) respond(['ok' => false, 'error' => 'invalid_achievement'], 400);
+        if ($id === COMPLETIONIST_ID) continue; // completionist is always server-derived.
+        $submittedUnlocks[$id] = normalize_client_unlock_time($timestamp, $receivedAt);
+    }
+}
+if ($action === 'reset') {
+    if ((int)($payload['syncProtocol'] ?? 0) !== SYNC_PROTOCOL_VERSION) {
+        respond(['ok' => false, 'error' => 'sync_protocol_upgrade_required', 'requiredProtocol' => SYNC_PROTOCOL_VERSION], 426);
+    }
+    if ((string)($payload['confirmReset'] ?? '') !== 'RESET_ACHIEVEMENTS') respond(['ok' => false, 'error' => 'reset_confirmation_required'], 409);
+    if ((string)($payload['catalogRevision'] ?? '') !== CATALOG_REVISION) respond(['ok' => false, 'error' => 'catalog_mismatch'], 409);
+}
+
+try {
+    $result = with_lock($globalLock, LOCK_EX, function () use ($root, $summaryPath, $playerId, $secret, $payload, $action, $submittedUnlocks, $submittedProgress, $sessionCredentials, $clientGeneration, $generationRecovery): array {
+        $now = time();
+        $summary = default_summary();
+        $path = player_path($root, $playerId);
+        $exists = is_file($path);
+        if (!$exists && $action !== 'session') respond(['ok' => false, 'error' => 'unknown_player'], 403);
+        $ownerHash = hash('sha256', $secret);
+        $player = $exists ? normalize_player(read_json_file($path, []), $playerId) : default_player($playerId, $ownerHash, $now);
+        $legacyClaimId = (string)($sessionCredentials['legacyClaimId'] ?? '');
+        if ($action === 'session' && $legacyClaimId !== '') {
+            $expectedClaimHash = hash('sha256', $legacyClaimId);
+            if (!hash_equals((string)($player['legacyClaimHash'] ?? ''), $expectedClaimHash)) {
+                respond(['ok' => false, 'error' => 'legacy_claim_invalid'], 403);
+            }
+            $storedOwnerHash = (string)($player['ownerHash'] ?? '');
+            if ($storedOwnerHash !== '' && !hash_equals($storedOwnerHash, $ownerHash)) {
+                respond(['ok' => false, 'error' => 'legacy_player_already_claimed'], 403);
+            }
+            $player['ownerHash'] = $ownerHash;
+            if ((int)($player['legacyClaimedAt'] ?? 0) <= 0) $player['legacyClaimedAt'] = $now;
+        }
+        verify_owner($player, $secret);
+
+        $beforeQualified = (bool)$player['qualified'];
+        $beforeUnlocks = $player['unlocked'];
+        $serverGeneration = max(0, (int)($player['generation'] ?? 0));
+
+        if ($action === 'sync') {
+            if ($clientGeneration < $serverGeneration) {
+                $summary = repair_summary_cache($root, $summaryPath);
+                $error = public_summary($summary, $player);
+                $error['ok'] = false;
+                $error['error'] = 'stale_generation';
+                respond($error, 409);
+            }
+            if ($clientGeneration > $serverGeneration) {
+                if (!$generationRecovery) {
+                    $summary = repair_summary_cache($root, $summaryPath);
+                    $error = public_summary($summary, $player);
+                    $error['ok'] = false;
+                    $error['error'] = 'generation_ahead';
+                    respond($error, 409);
+                }
+                // A locally durable newer generation is authoritative after a
+                // server backup restore or a newly-issued replacement identity.
+                $player['generation'] = $clientGeneration;
+                $player['unlocked'] = [];
+                $player['progressState'] = default_progress_state();
+                $serverGeneration = $clientGeneration;
+            }
+        }
+
+        $player['lastSeen'] = $now;
+        $player['activityCount'] = max(0, (int)$player['activityCount']) + 1;
+        $version = substr((string)($payload['gameVersion'] ?? ''), 0, 32);
+        if ($version !== '') $player['gameVersion'] = $version;
+
+        if ($action === 'sync') {
+            $player['progressState'] = merge_progress_state($player['progressState'] ?? null, $submittedProgress);
+            foreach ($submittedUnlocks as $id => $submittedAt) {
+                if (!isset($player['unlocked'][$id])) $player['unlocked'][$id] = $submittedAt;
+                else $player['unlocked'][$id] = min((int)$player['unlocked'][$id], $submittedAt);
+            }
+            // Cumulative achievements are independently reconstructed from the
+            // merged progress CRDT, so 99 actions on one device plus 1 on
+            // another unlocks exactly once without trusting request ordering.
+            reconcile_progress_unlocks($player['unlocked'], $player['progressState'], $now);
+        } elseif ($action === 'reset') {
+            // The client generation is the target generation. Equal or older
+            // reset requests are already-processed retries and must be no-ops.
+            if ($clientGeneration > $serverGeneration) {
+                $player['generation'] = $clientGeneration;
+                $player['unlocked'] = [];
+                $player['progressState'] = default_progress_state();
+            }
+        }
+        reconcile_completionist($player['unlocked'], $now);
+
+        if ($beforeQualified) apply_summary_delta($summary, $beforeUnlocks, $player['unlocked']);
+        maybe_qualify($player, $summary, $now);
+
+        atomic_write_json($path, $player);
+        $summary = repair_summary_cache($root, $summaryPath);
+        $public = public_summary($summary, $player);
+        if ($action === 'session') {
+            $public['playerId'] = $playerId;
+            $public['playerSecret'] = $secret;
+            $public['serverIssued'] = (bool)($sessionCredentials['created'] ?? false);
+            $public['legacyClaimed'] = (string)($sessionCredentials['legacyClaimId'] ?? '') !== '';
+        }
+        return $public;
+    });
+    if ($action === 'session') set_session_cookie($root, $playerId, $secret);
+    respond($result);
+
+} catch (RuntimeException $error) {
+    $known = ['storage_corrupt', 'storage_unavailable', 'storage_write_failed', 'storage_encode_failed', 'storage_locked'];
+    $message = in_array($error->getMessage(), $known, true) ? $error->getMessage() : 'storage_unavailable';
+    respond(['ok' => false, 'error' => $message], 503);
+}
diff --git a/app_manifest.json b/app_manifest.json
index 48459a8..1f598cf 100644
--- a/app_manifest.json
+++ b/app_manifest.json
@@ -1,5 +1,5 @@
 {
-  "version": "39.16.98",
+  "version": "39.18.18",
   "css": [
     "css/base.css",
     "css/layout.css",
@@ -58,6 +58,7 @@
     "js/item_dynamic_duplicator_system.js",
     "js/item_dynamic_pin_system.js",
     "js/item_dynamic_zunchi_system.js",
+    "js/item_environment_hazard_system.js",
     "js/item_dynamic_system.js",
     "js/item_lifecycle_decay_system.js",
     "js/item_lifecycle_growth_system.js",
@@ -69,6 +70,7 @@
     "js/item_lifecycle_pipeline.js",
     "js/item_runtime.js",
     "js/structure_lifecycle.js",
+    "js/memorial_bell_system.js",
     "js/item_render_helpers.js",
     "js/item_render_runtime.js",
     "js/burn_motion_util.js",
@@ -148,6 +150,7 @@
     "js/text_catalog.js",
     "js/ui.js",
     "js/game_dialogs.js",
+    "js/achievement_catalog.js",
     "js/achievements.js",
     "js/ui_helpers.js",
     "js/ui_log.js",
diff --git a/assets/objects/mamekusaredake.png b/assets/objects/mamekusaredake.png
new file mode 100644
index 0000000..254f5b2
Binary files /dev/null and b/assets/objects/mamekusaredake.png differ
diff --git a/assets/sounds/achievement_unlock.mp3 b/assets/sounds/achievement_unlock.mp3
new file mode 100644
index 0000000..9d814a7
Binary files /dev/null and b/assets/sounds/achievement_unlock.mp3 differ
diff --git a/assets/sounds/acquired_stress_001.wav b/assets/sounds/acquired_stress_001.wav
new file mode 100644
index 0000000..81ca9c2
Binary files /dev/null and b/assets/sounds/acquired_stress_001.wav differ
diff --git a/assets/sounds/acquired_stress_002.wav b/assets/sounds/acquired_stress_002.wav
new file mode 100644
index 0000000..fea55d0
Binary files /dev/null and b/assets/sounds/acquired_stress_002.wav differ
diff --git a/assets/sounds/acquired_stress_003.wav b/assets/sounds/acquired_stress_003.wav
new file mode 100644
index 0000000..8f57321
Binary files /dev/null and b/assets/sounds/acquired_stress_003.wav differ
diff --git a/assets/sounds/acquired_stress_004.wav b/assets/sounds/acquired_stress_004.wav
new file mode 100644
index 0000000..110d484
Binary files /dev/null and b/assets/sounds/acquired_stress_004.wav differ
diff --git a/assets/sounds/acquired_stress_005.wav b/assets/sounds/acquired_stress_005.wav
new file mode 100644
index 0000000..eee7794
Binary files /dev/null and b/assets/sounds/acquired_stress_005.wav differ
diff --git a/assets/sounds/acquired_stress_006.wav b/assets/sounds/acquired_stress_006.wav
new file mode 100644
index 0000000..9311ed7
Binary files /dev/null and b/assets/sounds/acquired_stress_006.wav differ
diff --git a/assets/sounds/acquired_stress_007.wav b/assets/sounds/acquired_stress_007.wav
new file mode 100644
index 0000000..dd56594
Binary files /dev/null and b/assets/sounds/acquired_stress_007.wav differ
diff --git a/assets/sounds/acquired_stress_008.wav b/assets/sounds/acquired_stress_008.wav
new file mode 100644
index 0000000..9585451
Binary files /dev/null and b/assets/sounds/acquired_stress_008.wav differ
diff --git a/assets/sounds/acquired_stress_009.wav b/assets/sounds/acquired_stress_009.wav
new file mode 100644
index 0000000..f6c07dc
Binary files /dev/null and b/assets/sounds/acquired_stress_009.wav differ
diff --git a/assets/sounds/acquired_tarinai/001_縺壹ｓ縺繧ゅｓ・医ヮ繝ｼ繝槭Ν・雲繝代ヱ縺壹ｓ縺ｯ縺ｩ縺薙↑縺ｮ窶ｦ(1).wav b/assets/sounds/acquired_tarinai/001_縺壹ｓ縺繧ゅｓ・医ヮ繝ｼ繝槭Ν・雲繝代ヱ縺壹ｓ縺ｯ縺ｩ縺薙↑縺ｮ窶ｦ(1).wav
new file mode 100644
index 0000000..81ca9c2
Binary files /dev/null and b/assets/sounds/acquired_tarinai/001_縺壹ｓ縺繧ゅｓ・医ヮ繝ｼ繝槭Ν・雲繝代ヱ縺壹ｓ縺ｯ縺ｩ縺薙↑縺ｮ窶ｦ(1).wav differ
diff --git a/assets/sounds/acquired_tarinai/002_縺壹ｓ縺繧ゅｓ・医ヮ繝ｼ繝槭Ν・雲繝槭・縺壹ｓ縺ｯ縺ｩ縺薙↑縺ｮ窶ｦ(2).wav b/assets/sounds/acquired_tarinai/002_縺壹ｓ縺繧ゅｓ・医ヮ繝ｼ繝槭Ν・雲繝槭・縺壹ｓ縺ｯ縺ｩ縺薙↑縺ｮ窶ｦ(2).wav
new file mode 100644
index 0000000..fea55d0
Binary files /dev/null and b/assets/sounds/acquired_tarinai/002_縺壹ｓ縺繧ゅｓ・医ヮ繝ｼ繝槭Ν・雲繝槭・縺壹ｓ縺ｯ縺ｩ縺薙↑縺ｮ窶ｦ(2).wav differ
diff --git a/assets/sounds/acquired_tarinai/003_縺壹ｓ縺繧ゅｓ・医ヮ繝ｼ繝槭Ν・雲縺薙ｓ縺ｪ縺ｯ縺壹§繧・↑縺銀€ｦ(2).wav b/assets/sounds/acquired_tarinai/003_縺壹ｓ縺繧ゅｓ・医ヮ繝ｼ繝槭Ν・雲縺薙ｓ縺ｪ縺ｯ縺壹§繧・↑縺銀€ｦ(2).wav
new file mode 100644
index 0000000..8f57321
Binary files /dev/null and b/assets/sounds/acquired_tarinai/003_縺壹ｓ縺繧ゅｓ・医ヮ繝ｼ繝槭Ν・雲縺薙ｓ縺ｪ縺ｯ縺壹§繧・↑縺銀€ｦ(2).wav differ
diff --git a/assets/sounds/acquired_tarinai/004_縺壹ｓ縺繧ゅｓ・医ヮ繝ｼ繝槭Ν・雲縺ｩ縺・＠縺ｦ(2).wav b/assets/sounds/acquired_tarinai/004_縺壹ｓ縺繧ゅｓ・医ヮ繝ｼ繝槭Ν・雲縺ｩ縺・＠縺ｦ(2).wav
new file mode 100644
index 0000000..110d484
Binary files /dev/null and b/assets/sounds/acquired_tarinai/004_縺壹ｓ縺繧ゅｓ・医ヮ繝ｼ繝槭Ν・雲縺ｩ縺・＠縺ｦ(2).wav differ
diff --git a/assets/sounds/acquired_tarinai/005_縺壹ｓ縺繧ゅｓ・医ヮ繝ｼ繝槭Ν・雲縺翫∪縺医ｒ繧・ｋ縺輔↑縺・€ｦ(2).wav b/assets/sounds/acquired_tarinai/005_縺壹ｓ縺繧ゅｓ・医ヮ繝ｼ繝槭Ν・雲縺翫∪縺医ｒ繧・ｋ縺輔↑縺・€ｦ(2).wav
new file mode 100644
index 0000000..eee7794
Binary files /dev/null and b/assets/sounds/acquired_tarinai/005_縺壹ｓ縺繧ゅｓ・医ヮ繝ｼ繝槭Ν・雲縺翫∪縺医ｒ繧・ｋ縺輔↑縺・€ｦ(2).wav differ
diff --git a/assets/sounds/acquired_tarinai/006_縺壹ｓ縺繧ゅｓ・医ヮ繝ｼ繝槭Ν・雲縺ｮ繧阪▲縺ｦ繧・ｋ縺ｮ縺(2).wav b/assets/sounds/acquired_tarinai/006_縺壹ｓ縺繧ゅｓ・医ヮ繝ｼ繝槭Ν・雲縺ｮ繧阪▲縺ｦ繧・ｋ縺ｮ縺(2).wav
new file mode 100644
index 0000000..9311ed7
Binary files /dev/null and b/assets/sounds/acquired_tarinai/006_縺壹ｓ縺繧ゅｓ・医ヮ繝ｼ繝槭Ν・雲縺ｮ繧阪▲縺ｦ繧・ｋ縺ｮ縺(2).wav differ
diff --git a/assets/sounds/bicycle_bell.mp3 b/assets/sounds/bicycle_bell.mp3
new file mode 100644
index 0000000..6fef91a
Binary files /dev/null and b/assets/sounds/bicycle_bell.mp3 differ
diff --git a/assets/sounds/intimidate_alt_001.wav b/assets/sounds/intimidate_alt_001.wav
new file mode 100644
index 0000000..146764b
Binary files /dev/null and b/assets/sounds/intimidate_alt_001.wav differ
diff --git a/assets/sounds/ochibi_calm_001.wav b/assets/sounds/ochibi_calm_001.wav
new file mode 100644
index 0000000..6ec4cb2
Binary files /dev/null and b/assets/sounds/ochibi_calm_001.wav differ
diff --git a/assets/sounds/ochibi_calm_002.wav b/assets/sounds/ochibi_calm_002.wav
new file mode 100644
index 0000000..f0bb63f
Binary files /dev/null and b/assets/sounds/ochibi_calm_002.wav differ
diff --git a/assets/sounds/ochibi_calm_003.wav b/assets/sounds/ochibi_calm_003.wav
new file mode 100644
index 0000000..ec88928
Binary files /dev/null and b/assets/sounds/ochibi_calm_003.wav differ
diff --git a/assets/sounds/ochibi_calm_004.wav b/assets/sounds/ochibi_calm_004.wav
new file mode 100644
index 0000000..ee10326
Binary files /dev/null and b/assets/sounds/ochibi_calm_004.wav differ
diff --git a/assets/sounds/ochibi_calm_005.wav b/assets/sounds/ochibi_calm_005.wav
new file mode 100644
index 0000000..bd71d76
Binary files /dev/null and b/assets/sounds/ochibi_calm_005.wav differ
diff --git a/assets/sounds/ochibi_calm_006.wav b/assets/sounds/ochibi_calm_006.wav
new file mode 100644
index 0000000..1d5c55a
Binary files /dev/null and b/assets/sounds/ochibi_calm_006.wav differ
diff --git a/assets/sounds/ochibi_calm_007.wav b/assets/sounds/ochibi_calm_007.wav
new file mode 100644
index 0000000..8606b70
Binary files /dev/null and b/assets/sounds/ochibi_calm_007.wav differ
diff --git a/assets/sounds/ochibi_calm_008.wav b/assets/sounds/ochibi_calm_008.wav
new file mode 100644
index 0000000..624d717
Binary files /dev/null and b/assets/sounds/ochibi_calm_008.wav differ
diff --git a/assets/sounds/ochibi_calm_009.wav b/assets/sounds/ochibi_calm_009.wav
new file mode 100644
index 0000000..8fbb49c
Binary files /dev/null and b/assets/sounds/ochibi_calm_009.wav differ
diff --git a/assets/sounds/ochibi_damage_001.wav b/assets/sounds/ochibi_damage_001.wav
new file mode 100644
index 0000000..5a774bd
Binary files /dev/null and b/assets/sounds/ochibi_damage_001.wav differ
diff --git a/assets/sounds/ochibi_damage_002.wav b/assets/sounds/ochibi_damage_002.wav
new file mode 100644
index 0000000..5f8fb15
Binary files /dev/null and b/assets/sounds/ochibi_damage_002.wav differ
diff --git a/assets/sounds/ochibi_damage_003.wav b/assets/sounds/ochibi_damage_003.wav
new file mode 100644
index 0000000..8ff254b
Binary files /dev/null and b/assets/sounds/ochibi_damage_003.wav differ
diff --git a/assets/sounds/ochibi_dirty_001.wav b/assets/sounds/ochibi_dirty_001.wav
new file mode 100644
index 0000000..cdaf92b
Binary files /dev/null and b/assets/sounds/ochibi_dirty_001.wav differ
diff --git a/assets/sounds/ochibi_dirty_002.wav b/assets/sounds/ochibi_dirty_002.wav
new file mode 100644
index 0000000..dfa73a9
Binary files /dev/null and b/assets/sounds/ochibi_dirty_002.wav differ
diff --git a/assets/sounds/ochibi_dirty_003.wav b/assets/sounds/ochibi_dirty_003.wav
new file mode 100644
index 0000000..8470f4a
Binary files /dev/null and b/assets/sounds/ochibi_dirty_003.wav differ
diff --git a/assets/sounds/ochibi_dirty_004.wav b/assets/sounds/ochibi_dirty_004.wav
new file mode 100644
index 0000000..8d48ae6
Binary files /dev/null and b/assets/sounds/ochibi_dirty_004.wav differ
diff --git a/assets/sounds/ochibi_disease_001.wav b/assets/sounds/ochibi_disease_001.wav
new file mode 100644
index 0000000..f486513
Binary files /dev/null and b/assets/sounds/ochibi_disease_001.wav differ
diff --git a/assets/sounds/ochibi_electric_006.wav b/assets/sounds/ochibi_electric_006.wav
new file mode 100644
index 0000000..6706edc
Binary files /dev/null and b/assets/sounds/ochibi_electric_006.wav differ
diff --git a/assets/sounds/ochibi_fight_hit_004.wav b/assets/sounds/ochibi_fight_hit_004.wav
new file mode 100644
index 0000000..b4c99fa
Binary files /dev/null and b/assets/sounds/ochibi_fight_hit_004.wav differ
diff --git a/assets/sounds/ochibi_hot_007.wav b/assets/sounds/ochibi_hot_007.wav
new file mode 100644
index 0000000..9a334a0
Binary files /dev/null and b/assets/sounds/ochibi_hot_007.wav differ
diff --git a/assets/sounds/ochibi_panic_005.wav b/assets/sounds/ochibi_panic_005.wav
new file mode 100644
index 0000000..e8dbbf2
Binary files /dev/null and b/assets/sounds/ochibi_panic_005.wav differ
diff --git a/assets/sounds/ochibi_sleep_002.wav b/assets/sounds/ochibi_sleep_002.wav
new file mode 100644
index 0000000..24eba42
Binary files /dev/null and b/assets/sounds/ochibi_sleep_002.wav differ
diff --git a/assets/sounds/ochibi_sleep_003.wav b/assets/sounds/ochibi_sleep_003.wav
new file mode 100644
index 0000000..6ab4744
Binary files /dev/null and b/assets/sounds/ochibi_sleep_003.wav differ
diff --git a/assets/sounds/ochibi_stress_008.wav b/assets/sounds/ochibi_stress_008.wav
new file mode 100644
index 0000000..d0650a9
Binary files /dev/null and b/assets/sounds/ochibi_stress_008.wav differ
diff --git a/assets/sprites/tarinai_40_intimidate_alt.webp b/assets/sprites/tarinai_40_intimidate_alt.webp
new file mode 100644
index 0000000..07e2454
Binary files /dev/null and b/assets/sprites/tarinai_40_intimidate_alt.webp differ
diff --git a/assets/sprites/tarinai_acquired_overlay.png b/assets/sprites/tarinai_acquired_overlay.png
new file mode 100644
index 0000000..3afc640
Binary files /dev/null and b/assets/sprites/tarinai_acquired_overlay.png differ
diff --git a/assets/ui/pwa-icon-192.png b/assets/ui/pwa-icon-192.png
new file mode 100644
index 0000000..480d662
Binary files /dev/null and b/assets/ui/pwa-icon-192.png differ
diff --git a/assets/ui/pwa-icon-512.png b/assets/ui/pwa-icon-512.png
new file mode 100644
index 0000000..f84c2de
Binary files /dev/null and b/assets/ui/pwa-icon-512.png differ
diff --git a/assets/ui/tool_acquired_tarinai.webp b/assets/ui/tool_acquired_tarinai.webp
new file mode 100644
index 0000000..1b23823
Binary files /dev/null and b/assets/ui/tool_acquired_tarinai.webp differ
diff --git a/assets/ui/tool_mamekusaredake.webp b/assets/ui/tool_mamekusaredake.webp
new file mode 100644
index 0000000..6b63693
Binary files /dev/null and b/assets/ui/tool_mamekusaredake.webp differ
diff --git a/css/base.css b/css/base.css
index 91b9d49..03a8520 100644
--- a/css/base.css
+++ b/css/base.css
@@ -78,10 +78,19 @@ button {
   min-width: 0;
 }
 
+.room-links {
+  display: flex;
+  flex-direction: column;
+  align-items: stretch;
+  gap: 6px;
+  flex: 0 0 auto;
+}
+
 .room-link {
   text-decoration: none;
   white-space: nowrap;
   background: rgba(255,255,255,0.86);
+  text-align: center;
 }
 
 h1 {
@@ -91,6 +100,11 @@ h1 {
   white-space: nowrap;
 }
 
+
+.speed-select-native { display: none; }
+.speed-menu { position: relative; display: inline-block; }
+.speed-menu-btn { min-width: 92px; text-align: center; white-space: nowrap; }
+
 .top-actions {
   display: flex;
   gap: 6px;
@@ -381,6 +395,7 @@ h1 {
   word-break: normal;
   overflow-wrap: anywhere;
   text-shadow: 0 1px 0 rgba(255,255,255,0.62);
+  white-space: pre-line;
 }
 
 .tool.tool-has-canvas-icon { --tool-icon: none; grid-template-columns: 31px minmax(0,1fr); min-height: 47px; padding-top: 4px; }
diff --git a/css/components.css b/css/components.css
index a13e84e..75daf0a 100644
--- a/css/components.css
+++ b/css/components.css
@@ -27,6 +27,9 @@
   gap: 8px;
   flex-wrap: wrap;
   margin: 8px 0 4px;
+  position: relative;
+  z-index: 4;
+  isolation: isolate;
 }
 .favorite-toggle {
   border: 1px solid rgba(128, 102, 56, 0.32);
@@ -34,8 +37,15 @@
   background: rgba(255, 248, 221, 0.92);
   color: #5a4630;
   font-weight: 700;
-  padding: 5px 10px;
+  padding: 7px 12px;
   cursor: pointer;
+  position: relative;
+  z-index: 5;
+  display: block;
+  width: 100%;
+  box-sizing: border-box;
+  pointer-events: auto;
+  touch-action: manipulation;
 }
 .favorite-toggle.active {
   background: rgba(255, 229, 122, 0.95);
@@ -335,13 +345,20 @@
   border: 1px solid rgba(192, 138, 96, 0.24);
   background: rgba(255, 247, 239, 0.74);
 }
+.event-category-heading {
+  margin-bottom: 7px;
+  font-size: 11px;
+  font-weight: 700;
+  color: rgba(82, 66, 52, 0.88);
+}
 .push-master {
   display: flex;
   align-items: center;
   gap: 7px;
   font-size: 12px;
   font-weight: 700;
-  margin-bottom: 8px;
+  margin-top: 9px;
+  margin-bottom: 0;
 }
 .push-kind-grid {
   display: grid;
@@ -419,6 +436,13 @@
 .log-push-toast.log-push-weather::before { background: #7bbbdc; }
 .log-push-toast.log-push-grass::before { background: #8cc77a; }
 .log-push-toast.log-push-event::before { background: #8b82d6; }
+
+.log-push-toast.log-push-life::before { background: #82bd72; }
+.log-push-toast.log-push-danger::before { background: #df845d; }
+.log-push-toast.log-push-social::before { background: #b28bd0; }
+.log-push-toast.log-push-living::before { background: #d7ad58; }
+.log-push-toast.log-push-environment::before { background: #70aac8; }
+.log-push-toast.log-push-observe::before { background: #9b9184; }
 .log-push-toast.leaving {
   animation: logPushOut .18s ease both;
 }
@@ -667,6 +691,10 @@
   gap: 5px;
 }
 .top-menu-panel.hidden { display: none; }
+.speed-menu-panel { width: 116px; min-width: 116px; }
+.speed-menu-panel .top-menu-item { text-align: center; }
+.speed-menu-panel .top-menu-item.active,
+.speed-menu-panel .top-menu-item[aria-checked="true"] { background: rgba(224,242,201,.92); }
 .top-menu-item {
   width: 100%;
   min-height: 38px;
diff --git a/css/layout.css b/css/layout.css
index 18545dc..d0f4064 100644
--- a/css/layout.css
+++ b/css/layout.css
@@ -25,6 +25,7 @@
 .tool[data-tool="delete"] { --tool-icon-zoom: 1.42; }
 .tool[data-tool="area_delete"] { --tool-icon-zoom: 1; }
 .tool[data-tool="pinch"].tool-emoji-icon::before { font-size: 22px; }
+.tool[data-tool="bell"].tool-emoji-icon::before { font-size: 21px; z-index: 1; }
 .tool[data-tool="area_delete"].tool-emoji-icon::before {
   font-size: 31px;
   line-height: 1;
@@ -125,6 +126,7 @@
   box-shadow: 0 1px 4px rgba(42,36,29,0.16);
   pointer-events: auto;
   cursor: pointer;
+  z-index: 4;
 }
 .chart-tabs { display: grid; grid-template-columns: repeat(3, 1fr); gap: 5px; margin: 3px 0 8px; }
 .chart-tabs button { border: 1px solid var(--line); background: rgba(255,255,255,0.62); border-radius: 999px; padding: 5px 4px; font-size: 11px; cursor: pointer; }
@@ -295,9 +297,15 @@ meter {
 .log-grass { border-left-color: rgba(72, 148, 67, 0.68); }
 .log-weather { border-left-color: rgba(92, 142, 210, 0.62); }
 .log-relation { border-left-color: rgba(204, 126, 176, 0.62); }
-.log-observe { border-left-color: rgba(175, 146, 86, 0.62); }
 .log-event { border-left-color: rgba(132, 120, 210, 0.62); }
 
+.log-life { border-left-color: rgba(105, 166, 96, 0.68); }
+.log-danger { border-left-color: rgba(214, 104, 70, 0.72); }
+.log-social { border-left-color: rgba(184, 116, 184, 0.66); }
+.log-living { border-left-color: rgba(183, 151, 74, 0.68); }
+.log-environment { border-left-color: rgba(82, 142, 170, 0.66); }
+.log-observe { border-left-color: rgba(142, 132, 116, 0.62); }
+
 /* Clearer tool category grouping. */
 .tool-category[data-tool-category="operate"] { --tool-cat-a: rgba(224,239,255,0.82); --tool-cat-b: rgba(203,226,255,0.74); --tool-cat-line: rgba(82,128,190,0.26); }
 .tool-category[data-tool-category="food"] { --tool-cat-a: rgba(236,252,219,0.82); --tool-cat-b: rgba(214,244,194,0.74); --tool-cat-line: rgba(96,156,72,0.26); }
@@ -347,3 +355,7 @@ meter {
   border-color: rgba(38,132,190,0.56);
   box-shadow: inset 0 0 0 1px rgba(84,176,226,0.20), 0 8px 20px rgba(59,133,177,0.10);
 }
+
+.chart-range-tabs { display: grid; grid-template-columns: repeat(3, 1fr); gap: 5px; margin: -2px 0 7px; }
+.chart-range-tabs button { border: 1px solid var(--line); background: rgba(255,255,255,0.48); border-radius: 8px; padding: 4px 4px; font-size: 10px; cursor: pointer; color: var(--muted); }
+.chart-range-tabs button.active { background: rgba(239,255,222,0.92); border-color: rgba(103,178,44,0.42); color: var(--text); font-weight: 700; }
diff --git a/css/mobile.css b/css/mobile.css
index fa953da..9b35acf 100644
--- a/css/mobile.css
+++ b/css/mobile.css
@@ -429,3 +429,23 @@ body.touch-mobile-ui .tool-tip-popover.mobile-selection-tip {
 @media (max-width: 980px) {
   .top-actions { overflow-x: auto; overflow-y: hidden; }
 }
+
+/* Mobile toolbar: keep every primary action reachable without hidden horizontal overflow. */
+@media (max-width: 520px) {
+  .top-actions {
+    display: flex;
+    flex-wrap: wrap;
+    overflow: visible;
+    align-items: center;
+  }
+  .top-panel-search {
+    flex: 1 1 100%;
+    width: 100%;
+    min-width: 0;
+  }
+  .top-actions > .btn,
+  .top-actions > .top-menu,
+  .top-actions > .speed-menu {
+    flex: 0 1 auto;
+  }
+}
diff --git a/css/panel.css b/css/panel.css
index 766acea..762f2c2 100644
--- a/css/panel.css
+++ b/css/panel.css
@@ -119,6 +119,14 @@ body::before {
   pointer-events: none;
 }
 
+
+.family-death-time {
+  display: block;
+  margin-top: 1px;
+  font-size: 10px;
+  line-height: 1.15;
+  color: rgba(93, 72, 61, 0.76);
+}
 .family-genetic-stats {
   display: grid !important;
   grid-template-columns: repeat(2, minmax(0, 1fr));
@@ -260,8 +268,8 @@ body::before {
 .lineage-family-tree .tree-node {
   position: absolute;
   width: 150px;
-  height: 104px;
-  min-height: 104px;
+  height: 112px;
+  min-height: 112px;
   box-sizing: border-box;
   align-items: flex-start;
   background: linear-gradient(180deg, #fffdf8, #f8f1e5);
@@ -280,6 +288,29 @@ body::before {
 .lineage-family-tree .tree-node[data-family-tarinai-id]:hover {
   transform: none;
 }
+.lineage-family-tree.family-hover-active .tree-node.family-hover-dim {
+  opacity: 0.28;
+  filter: saturate(0.58);
+  transition: opacity .12s ease, filter .12s ease, box-shadow .12s ease, border-color .12s ease;
+}
+.lineage-family-tree.family-hover-active .tree-node.family-hover-focus,
+.lineage-family-tree.family-hover-active .tree-node.family-hover-parent,
+.lineage-family-tree.family-hover-active .tree-node.family-hover-child {
+  opacity: 1;
+  filter: none;
+}
+.lineage-family-tree.family-hover-active .tree-node.family-hover-focus {
+  border-color: rgba(124, 165, 66, 0.78);
+  box-shadow: 0 0 0 3px rgba(124, 165, 66, 0.16), 0 5px 13px rgba(64,48,32,0.10);
+}
+.lineage-family-tree.family-hover-active .tree-node.family-hover-parent {
+  border-color: rgba(80, 132, 198, 0.72);
+  box-shadow: 0 0 0 2px rgba(80, 132, 198, 0.14);
+}
+.lineage-family-tree.family-hover-active .tree-node.family-hover-child {
+  border-color: rgba(87, 170, 91, 0.72);
+  box-shadow: 0 0 0 2px rgba(87, 170, 91, 0.14);
+}
 .lineage-family-tree .tree-node .family-portrait {
   right: 4px;
   top: 4px;
@@ -319,7 +350,7 @@ body::before {
 /* Restored from the original ZIP: fixed colony graph/legend sizing. */
 .colony-card { overflow: visible; min-height: 0; flex: 0 0 auto; }
 .colony-stats {
-  grid-template-columns: repeat(2, 1fr);
+  grid-template-columns: 1fr;
   margin-bottom: 8px;
 }
 .colony-chart {
@@ -442,3 +473,12 @@ body::before {
   line-height: 9px !important;
   font-size: 6.8px !important;
 }
+
+.colony-chart { position: relative; }
+.colony-chart-tooltip { position: fixed; z-index: 10020; pointer-events: none; min-width: 112px; max-width: 210px; padding: 7px 8px; border-radius: 9px; border: 1px solid rgba(80,65,48,0.18); background: rgba(255,252,245,0.98); color: #4d443a; box-shadow: 0 4px 14px rgba(64,48,30,0.16); font-size: 10px; line-height: 1.45; transform: none; }
+.colony-chart-tooltip.hidden { display: none; }
+.colony-chart-tooltip strong { display: block; margin-bottom: 3px; font-size: 10.5px; }
+.colony-chart-tooltip-row { display: flex; justify-content: space-between; gap: 10px; white-space: nowrap; }
+.colony-chart-hover-point { position: absolute; z-index: 5; width: 8px; height: 8px; border: 2px solid #5d8ee6; border-radius: 50%; background: rgba(255,255,255,0.96); box-shadow: 0 0 0 2px rgba(255,255,255,0.7); pointer-events: none; transform: translate(-50%, -50%); }
+.colony-chart-hover-point.hidden { display: none; }
+
diff --git a/index.html b/index.html
index c00fce4..09f28dc 100644
--- a/index.html
+++ b/index.html
@@ -4,14 +4,16 @@
   <meta charset="utf-8" />
   <meta name="viewport" content="width=device-width, initial-scale=1" />
   <title>&#x305F;&#x308A;&#x306A;&#x3044;&#x89B3;&#x5BDF;</title>
-  <link rel="icon" type="image/png" href="assets/ui/favicon.png?v=39.16.98" />
-  <link rel="apple-touch-icon" href="assets/ui/apple-touch-icon.png?v=39.16.98" />
-  <link rel="shortcut icon" href="favicon.ico?v=39.16.98" />
-  <link rel="stylesheet" href="css/base.css?v=39.16.98" />
-  <link rel="stylesheet" href="css/layout.css?v=39.16.98" />
-  <link rel="stylesheet" href="css/panel.css?v=39.16.98" />
-  <link rel="stylesheet" href="css/components.css?v=39.16.98" />
-  <link rel="stylesheet" href="css/mobile.css?v=39.16.98" />
+  <link rel="icon" type="image/png" href="assets/ui/favicon.png?v=39.18.18" />
+  <link rel="apple-touch-icon" href="assets/ui/apple-touch-icon.png?v=39.18.18" />
+  <link rel="manifest" href="manifest.webmanifest?v=39.18.18" />
+  <meta name="theme-color" content="#244d3a" />
+  <link rel="shortcut icon" href="favicon.ico?v=39.18.18" />
+  <link rel="stylesheet" href="css/base.css?v=39.18.18" />
+  <link rel="stylesheet" href="css/layout.css?v=39.18.18" />
+  <link rel="stylesheet" href="css/panel.css?v=39.18.18" />
+  <link rel="stylesheet" href="css/components.css?v=39.18.18" />
+  <link rel="stylesheet" href="css/mobile.css?v=39.18.18" />
 </head>
 <body>
   <div id="loadingScreen" class="loading-screen" aria-live="polite">
@@ -27,7 +29,10 @@
   <div id="app">
     <header class="topbar">
       <div class="top-left">
-        <a class="btn room-link" href="https://2012r2.nishi.boats/~333/">333&#x306E;&#x90E8;&#x5C4B;&#x306B;&#x79FB;&#x52D5;</a>
+        <div class="room-links" style="display:flex;flex-direction:column;align-items:stretch;gap:6px;">
+          <a class="btn room-link" style="display:block;text-align:center;" href="https://2012r2.nishi.boats/~333/">333&#x306E;&#x90E8;&#x5C4B;&#x306B;&#x79FB;&#x52D5;</a>
+          <a class="btn room-link" style="display:block;text-align:center;" href="https://seesaawiki.jp/informalzunda/d/%a5%b2%a1%bc%a5%e0%3a%20%a4%bf%a4%ea%a4%ca%a4%a4%b4%d1%bb%a1">&#x5730;&#x4E0B;&#x7262;&#x306B;&#x623B;&#x308B;</a>
+        </div>
         <div class="brand">
           <h1>&#x305F;&#x308A;&#x306A;&#x3044;&#x89B3;&#x5BDF;</h1>
         </div>
@@ -40,17 +45,30 @@
           <button class="panel-search-next" type="button" disabled aria-label="&#x6B21;&#x306E;&#x8A72;&#x5F53;&#x4F4D;&#x7F6E;&#x3078;&#x79FB;&#x52D5;">&#x2193;</button>
         </div>
         <button id="pauseBtn" class="btn primary">&#x4E00;&#x6642;&#x505C;&#x6B62;</button>
-        <button id="speedBtn" class="btn">&#x901F;&#x5EA6; x1</button>
+        <div id="speedMenu" class="top-menu speed-menu">
+          <button id="speedMenuBtn" class="btn speed-menu-btn" type="button" aria-haspopup="true" aria-expanded="false">&#x901F;&#x5EA6; &#xD7;1</button>
+          <div id="speedMenuPanel" class="top-menu-panel speed-menu-panel hidden" role="menu" aria-label="&#x901F;&#x5EA6;">
+            <button class="top-menu-item" type="button" role="menuitemradio" data-speed-value="0.5">&#xD7;0.5</button>
+            <button class="top-menu-item" type="button" role="menuitemradio" data-speed-value="1">&#xD7;1</button>
+            <button class="top-menu-item" type="button" role="menuitemradio" data-speed-value="2">&#xD7;2</button>
+            <button class="top-menu-item" type="button" role="menuitemradio" data-speed-value="4">&#xD7;4</button>
+            <button class="top-menu-item" type="button" role="menuitemradio" data-speed-value="8">&#xD7;8</button>
+            <button class="top-menu-item" type="button" role="menuitemradio" data-speed-value="16">&#xD7;16</button>
+          </div>
+          <select id="speedSelect" class="speed-select-native" aria-hidden="true" tabindex="-1">
+            <option value="0.5">0.5</option><option value="1" selected>1</option><option value="2">2</option><option value="4">4</option><option value="8">8</option><option value="16">16</option>
+          </select>
+        </div>
         <button id="saveBtn" class="btn">&#x30BB;&#x30FC;&#x30D6;</button>
-        <button id="achievementsBtn" class="btn achievement-top-btn" type="button" aria-haspopup="dialog" aria-controls="achievementsDialog">&#x5B9F;&#x7E3E; <span id="achievementButtonCount">0/75</span></button>
+        <button id="ecologyBtn" class="btn ecology-top-btn" type="button">&#x305F;&#x308A;&#x306A;&#x3044;&#x306E;&#x751F;&#x614B;</button>
+        <button id="achievementsBtn" class="btn achievement-top-btn" type="button" aria-haspopup="dialog" aria-controls="achievementsDialog">&#x5B9F;&#x7E3E; <span id="achievementButtonCount">0/77</span></button>
         <button id="resetBtn" class="btn danger reset-top-btn">&#x30EA;&#x30BB;&#x30C3;&#x30C8;</button>
         <div id="topMenu" class="top-menu">
           <button id="topMenuBtn" class="btn top-menu-btn" type="button" aria-haspopup="true" aria-expanded="false" aria-label="&#x30E1;&#x30CB;&#x30E5;&#x30FC;">&#x2630;</button>
-          <div id="topMenuPanel" class="top-menu-panel hidden" role="menu" aria-label="&#x30E1;&#x30CB;&#x30E5;&#x30FC;">
-            <button id="ecologyBtn" class="top-menu-item" type="button" role="menuitem">&#x751F;&#x614B;</button>
+          <div id="topMenuPanel" class="top-menu-panel hidden" role="group" aria-label="&#x30E1;&#x30CB;&#x30E5;&#x30FC;">
             <div id="soundMenu" class="sound-menu top-menu-sound">
               <button id="soundBtn" class="top-menu-item sound-menu-btn" type="button" aria-haspopup="true" aria-expanded="false">&#x97F3; ON</button>
-              <div id="soundPanel" class="sound-panel hidden" role="menu" aria-label="&#x97F3;">
+              <div id="soundPanel" class="sound-panel hidden" role="group" aria-label="&#x97F3;">
                 <label class="sound-master"><input id="soundMasterToggle" type="checkbox" checked><span>&#x52B9;&#x679C;&#x97F3;</span></label>
                 <div class="sound-panel-divider"></div>
                 <label><input type="checkbox" data-sound-category="voice"><span>&#x305F;&#x308A;&#x306A;&#x3044;&#x306E;&#x58F0;</span></label>
@@ -60,7 +78,7 @@
             </div>
             <div id="visualSettingsMenu" class="sound-menu top-menu-sound top-menu-visual">
               <button id="visualSettingsBtn" class="top-menu-item sound-menu-btn" type="button" aria-haspopup="true" aria-expanded="false">&#x8868;&#x793A;&#x8A2D;&#x5B9A;</button>
-              <div id="visualSettingsPanel" class="sound-panel hidden" role="menu" aria-label="&#x8868;&#x793A;&#x8A2D;&#x5B9A;">
+              <div id="visualSettingsPanel" class="sound-panel hidden" role="group" aria-label="&#x8868;&#x793A;&#x8A2D;&#x5B9A;">
                 <label><input id="visualEffectsToggle" type="checkbox" data-visual-setting="effects" data-visual-on="high" data-visual-off="off"><span>&#x30A8;&#x30D5;&#x30A7;&#x30AF;&#x30C8;</span></label>
                 <label><input id="visualShadowsToggle" type="checkbox" data-visual-setting="shadows" data-visual-on="high" data-visual-off="off"><span>&#x5F71;</span></label>
                 <div class="sound-panel-divider"></div>
@@ -70,7 +88,7 @@
                 <label><input type="radio" name="visualDetails" data-visual-setting="details" data-visual-value="high"><span>&#x9AD8;</span></label>
               </div>
             </div>
-            <button id="creditsBtn" class="top-menu-item" type="button" role="menuitem">&#x30AF;&#x30EC;&#x30B8;&#x30C3;&#x30C8;</button>
+            <button id="creditsBtn" class="top-menu-item" type="button">&#x30AF;&#x30EC;&#x30B8;&#x30C3;&#x30C8;</button>
           </div>
         </div>
       </div>
@@ -134,7 +152,7 @@
                 <div class="colony-setting-section-head"><span>&#x6C17;&#x6E29;</span><strong id="temperatureValue">10&#x2103;</strong></div>
                 <div class="temperature-control" aria-label="&#x6C17;&#x6E29;&#x8ABF;&#x6574;">
                   <label class="temperature-auto"><input id="temperatureAutoToggle" type="checkbox" checked> &#x81EA;&#x52D5;</label>
-                  <input id="temperatureSlider" class="temperature-slider" type="range" min="-100" max="120" step="1" value="10">
+                  <input id="temperatureSlider" class="temperature-slider" type="range" aria-label="&#x6C17;&#x6E29;" min="-100" max="120" step="1" value="10">
                 </div>
               </section>
               <section class="colony-setting-section colony-limit-section">
@@ -150,6 +168,7 @@
             </div>
           </details>
           <div id="colonyChartTabs" class="chart-tabs"><button data-chart="population" class="active">&#x500B;&#x4F53;&#x6570;</button><button data-chart="life">&#x6B32;&#x6C42;</button><button data-chart="objects">&#x74B0;&#x5883;</button></div>
+          <div id="colonyChartRangeTabs" class="chart-range-tabs" aria-label="&#x7D71;&#x8A08;&#x306E;&#x8868;&#x793A;&#x671F;&#x9593;"><button data-chart-range="day">1&#x65E5;</button><button data-chart-range="season" class="active">&#x5B63;&#x7BC0;</button><button data-chart-range="year">&#x5E74;</button></div>
           <div id="colonyChartLegend" class="colony-chart-legend"></div>
           <div id="colonyChart" class="colony-chart" aria-label="&#x30B3;&#x30ED;&#x30CB;&#x30FC;&#x306E;&#x63A8;&#x79FB;&#x30B0;&#x30E9;&#x30D5;" role="img"></div>
           </div>
@@ -159,19 +178,17 @@
           <button class="panel-card-toggle" type="button" aria-expanded="true"><span class="panel-card-title">&#x30A4;&#x30D9;&#x30F3;&#x30C8;</span><span class="panel-card-state">&#x6298;&#x308A;&#x7573;&#x307F;</span></button>
           <div class="panel-card-body">
             <div id="log" class="log"></div>
-            <div class="log-push-controls" id="logPushControls" aria-label="&#x30D7;&#x30C3;&#x30B7;&#x30E5;&#x901A;&#x77E5;&#x8A2D;&#x5B9A;">
-              <label class="push-master"><input id="logPushEnabled" type="checkbox"> &#x30D7;&#x30C3;&#x30B7;&#x30E5;&#x901A;&#x77E5;</label>
+            <div class="log-push-controls" id="logPushControls" aria-label="&#x30A4;&#x30D9;&#x30F3;&#x30C8;&#x8868;&#x793A;&#x30FB;&#x30D7;&#x30C3;&#x30B7;&#x30E5;&#x901A;&#x77E5;&#x8A2D;&#x5B9A;">
+              <div class="event-category-heading">&#x8868;&#x793A;&#x30AB;&#x30C6;&#x30B4;&#x30EA;</div>
               <div class="push-kind-grid">
-                <label><input type="checkbox" data-push-kind="death" checked> &#x6B7B;&#x4EA1;</label>
-                <label><input type="checkbox" data-push-kind="accident" checked> &#x4E8B;&#x6545;</label>
-                <label><input type="checkbox" data-push-kind="birth" checked> &#x8A95;&#x751F;</label>
-                <label><input type="checkbox" data-push-kind="fight"> &#x55A7;&#x5629;</label>
-                <label><input type="checkbox" data-push-kind="food"> &#x98DF;&#x4E8B;</label>
-                <label><input type="checkbox" data-push-kind="weather"> &#x5929;&#x6C17;</label>
-                <label><input type="checkbox" data-push-kind="grass"> &#x8349;</label>
-                <label><input type="checkbox" data-push-kind="event"> &#x51FA;&#x6765;&#x4E8B;</label>
-                <label><input type="checkbox" data-push-kind="relation"> &#x95A2;&#x4FC2;</label>
+                <label><input type="checkbox" data-event-category="life" checked> &#x751F;&#x547D;</label>
+                <label><input type="checkbox" data-event-category="danger" checked> &#x5371;&#x967A;</label>
+                <label><input type="checkbox" data-event-category="social" checked> &#x4EA4;&#x6D41;</label>
+                <label><input type="checkbox" data-event-category="living" checked> &#x751F;&#x6D3B;</label>
+                <label><input type="checkbox" data-event-category="environment" checked> &#x74B0;&#x5883;</label>
+                <label><input type="checkbox" data-event-category="observe" checked> &#x89B3;&#x5BDF;</label>
               </div>
+              <label class="push-master"><input id="logPushEnabled" type="checkbox"> &#x30D7;&#x30C3;&#x30B7;&#x30E5;&#x901A;&#x77E5;</label>
             </div>
           </div>
         </section>
@@ -202,7 +219,7 @@
       <div class="achievement-dialog-head">
         <div>
           <div class="achievement-dialog-kicker">&#x305F;&#x308A;&#x306A;&#x3044;&#x89B3;&#x5BDF;</div>
-          <h2 id="achievementsDialogTitle">&#x5B9F;&#x7E3E; <span id="achievementDialogCount">0 / 75</span></h2>
+          <h2 id="achievementsDialogTitle">&#x5B9F;&#x7E3E; <span id="achievementDialogCount">0 / 77</span></h2>
         </div>
         <button id="achievementsCloseIconBtn" class="achievement-close-icon" type="button" aria-label="&#x5B9F;&#x7E3E;&#x3092;&#x9589;&#x3058;&#x308B;">&times;</button>
       </div>
@@ -293,173 +310,221 @@
   </div>
 
   <div id="logPushOverlay" class="log-push-overlay" aria-live="polite" aria-atomic="false"></div>
-  <script src="js/version.js?v=39.16.98" defer></script>
-  <script src="js/event_bus.js?v=39.16.98" defer></script>
-  <script src="js/domain_ids.js?v=39.16.98" defer></script>
-  <script src="js/registry_base.js?v=39.16.98" defer></script>
-  <script src="js/disease_registry.js?v=39.16.98" defer></script>
-  <script src="js/sound_pack.js?v=39.16.98" defer></script>
-  <script src="js/deterministic_helpers.js?v=39.16.98" defer></script>
-  <script src="js/item_tool_metadata.js?v=39.16.98" defer></script>
-  <script src="js/item_tool_definitions.js?v=39.16.98" defer></script>
-  <script src="js/item_visual_definitions.js?v=39.16.98" defer></script>
-  <script src="js/item_food_definitions.js?v=39.16.98" defer></script>
-  <script src="js/item_effect_definitions.js?v=39.16.98" defer></script>
-  <script src="js/item_registry.js?v=39.16.98" defer></script>
-  <script src="js/data.js?v=39.16.98" defer></script>
-  <script src="js/ground_types.js?v=39.16.98" defer></script>
-  <script src="js/input_mode_manager.js?v=39.16.98" defer></script>
-  <script src="js/math.js?v=39.16.98" defer></script>
-  <script src="js/geometry_helpers.js?v=39.16.98" defer></script>
-  <script src="js/collision_footprint_system.js?v=39.16.98" defer></script>
-  <script src="js/physics_helpers.js?v=39.16.98" defer></script>
-  <script src="js/placement_preview_system.js?v=39.16.98" defer></script>
-  <script src="js/pin_attachment_system.js?v=39.16.98" defer></script>
-  <script src="js/physics_shape_editor_system.js?v=39.16.98" defer></script>
-  <script src="js/mechanical_system.js?v=39.16.98" defer></script>
-  <script src="js/mechanical_shape_bridge.js?v=39.16.98" defer></script>
-  <script src="js/constraint_system.js?v=39.16.98" defer></script>
-  <script src="js/physics_world_system.js?v=39.16.98" defer></script>
-  <script src="js/physics_projection_system.js?v=39.16.98" defer></script>
-  <script src="js/circuit_board_system.js?v=39.16.98" defer></script>
-  <script src="js/signal_system.js?v=39.16.98" defer></script>
-  <script src="js/assets.js?v=39.16.98" defer></script>
-  <script src="js/audio.js?v=39.16.98" defer></script>
-  <script src="js/perf_profiler.js?v=39.16.98" defer></script>
-  <script src="js/display_helpers.js?v=39.16.98" defer></script>
-  <script src="js/render.js?v=39.16.98" defer></script>
-  <script src="js/sim_core.js?v=39.16.98" defer></script>
-  <script src="js/tarinai_seed_factory.js?v=39.16.98" defer></script>
-  <script src="js/structures.js?v=39.16.98" defer></script>
-  <script src="js/item_type_catalog.js?v=39.16.98" defer></script>
-  <script src="js/items.js?v=39.16.98" defer></script>
-  <script src="js/item_type_initializers.js?v=39.16.98" defer></script>
-  <script src="js/item_lifecycle_support.js?v=39.16.98" defer></script>
-  <script src="js/item_update_policy.js?v=39.16.98" defer></script>
-  <script src="js/fire_runtime_system.js?v=39.16.98" defer></script>
-  <script src="js/robot_cleaner_system.js?v=39.16.98" defer></script>
-  <script src="js/item_dynamic_tool_system.js?v=39.16.98" defer></script>
-  <script src="js/item_dynamic_ball_system.js?v=39.16.98" defer></script>
-  <script src="js/item_dynamic_duplicator_system.js?v=39.16.98" defer></script>
-  <script src="js/item_dynamic_pin_system.js?v=39.16.98" defer></script>
-  <script src="js/item_dynamic_zunchi_system.js?v=39.16.98" defer></script>
-  <script src="js/item_dynamic_system.js?v=39.16.98" defer></script>
-  <script src="js/item_lifecycle_decay_system.js?v=39.16.98" defer></script>
-  <script src="js/item_lifecycle_growth_system.js?v=39.16.98" defer></script>
-  <script src="js/item_lifecycle_step_frame.js?v=39.16.98" defer></script>
-  <script src="js/item_lifecycle_step_decay.js?v=39.16.98" defer></script>
-  <script src="js/item_lifecycle_step_dynamic.js?v=39.16.98" defer></script>
-  <script src="js/item_lifecycle_step_growth.js?v=39.16.98" defer></script>
-  <script src="js/update_step_pipeline_runner.js?v=39.16.98" defer></script>
-  <script src="js/item_lifecycle_pipeline.js?v=39.16.98" defer></script>
-  <script src="js/item_runtime.js?v=39.16.98" defer></script>
-  <script src="js/structure_lifecycle.js?v=39.16.98" defer></script>
-  <script src="js/item_render_helpers.js?v=39.16.98" defer></script>
-  <script src="js/item_render_runtime.js?v=39.16.98" defer></script>
-  <script src="js/burn_motion_util.js?v=39.16.98" defer></script>
-  <script src="js/ants.js?v=39.16.98" defer></script>
-  <script src="js/health.js?v=39.16.98" defer></script>
-  <script src="js/tarinai.js?v=39.16.98" defer></script>
-  <script src="js/tarinai_action_spec.js?v=39.16.98" defer></script>
-  <script src="js/tarinai_behavior_state.js?v=39.16.98" defer></script>
-  <script src="js/tarinai_identity_social.js?v=39.16.98" defer></script>
-  <script src="js/tarinai_action_state.js?v=39.16.98" defer></script>
-  <script src="js/tarinai_disease_nest.js?v=39.16.98" defer></script>
-  <script src="js/tarinai_item_effects.js?v=39.16.98" defer></script>
-  <script src="js/tarinai_needs_core.js?v=39.16.98" defer></script>
-  <script src="js/tarinai_behavior_text.js?v=39.16.98" defer></script>
-  <script src="js/tarinai_forced_behavior.js?v=39.16.98" defer></script>
-  <script src="js/tarinai_nest_sleep_system.js?v=39.16.98" defer></script>
-  <script src="js/tarinai_item_targeting.js?v=39.16.98" defer></script>
-  <script src="js/tarinai_consumable_behavior.js?v=39.16.98" defer></script>
-  <script src="js/tarinai_social_action_runtime.js?v=39.16.98" defer></script>
-  <script src="js/tarinai_building_behavior.js?v=39.16.98" defer></script>
-  <script src="js/seesaw_system.js?v=39.16.98" defer></script>
-  <script src="js/tarinai_action_definitions.js?v=39.16.98" defer></script>
-  <script src="js/tarinai_needs_items.js?v=39.16.98" defer></script>
-  <script src="js/tarinai_food_prototype_mixin.js?v=39.16.98" defer></script>
-  <script src="js/tarinai_direct_feeding_system.js?v=39.16.98" defer></script>
-  <script src="js/tarinai_need_planner_system.js?v=39.16.98" defer></script>
-  <script src="js/tarinai_item_interaction_context.js?v=39.16.98" defer></script>
-  <script src="js/tarinai_food_interaction_system.js?v=39.16.98" defer></script>
-  <script src="js/tarinai_contact_item_system.js?v=39.16.98" defer></script>
-  <script src="js/tarinai_item_interaction_system.js?v=39.16.98" defer></script>
-  <script src="js/tarinai_sunbath_system.js?v=39.16.98" defer></script>
-  <script src="js/tarinai_cursor_care_system.js?v=39.16.98" defer></script>
-  <script src="js/tarinai_local_environment_system.js?v=39.16.98" defer></script>
-  <script src="js/tarinai_social_move_life.js?v=39.16.98" defer></script>
-  <script src="js/tarinai_update_step_frame.js?v=39.16.98" defer></script>
-  <script src="js/tarinai_update_step_ai.js?v=39.16.98" defer></script>
-  <script src="js/tarinai_update_step_environment.js?v=39.16.98" defer></script>
-  <script src="js/tarinai_update_step_movement.js?v=39.16.98" defer></script>
-  <script src="js/tarinai_update_step_health.js?v=39.16.98" defer></script>
-  <script src="js/tarinai_update_pipeline.js?v=39.16.98" defer></script>
-  <script src="js/tarinai_runtime.js?v=39.16.98" defer></script>
-  <script src="js/tarinai_render.js?v=39.16.98" defer></script>
-  <script src="js/world.js?v=39.16.98" defer></script>
-  <script src="js/world_view.js?v=39.16.98" defer></script>
-  <script src="js/family_graph.js?v=39.16.98" defer></script>
-  <script src="js/world_reset_presets.js?v=39.16.98" defer></script>
-  <script src="js/world_family_social.js?v=39.16.98" defer></script>
-  <script src="js/impact_core_system.js?v=39.16.98" defer></script>
-  <script src="js/impact_response_system.js?v=39.16.98" defer></script>
-  <script src="js/collision_response_system.js?v=39.16.98" defer></script>
-  <script src="js/world_combat_effects.js?v=39.16.98" defer></script>
-  <script src="js/world_environment.js?v=39.16.98" defer></script>
-  <script src="js/world_temperature_system.js?v=39.16.98" defer></script>
-  <script src="js/world_pathfinding_system.js?v=39.16.98" defer></script>
-  <script src="js/world_grass_placement_system.js?v=39.16.98" defer></script>
-  <script src="js/world_spatial_budget.js?v=39.16.98" defer></script>
-  <script src="js/world_ants_system.js?v=39.16.98" defer></script>
-  <script src="js/weather_system.js?v=39.16.98" defer></script>
-  <script src="js/item_update_scheduler.js?v=39.16.98" defer></script>
-  <script src="js/simulation_runtime_helpers.js?v=39.16.98" defer></script>
-  <script src="js/tarinai_update_policy.js?v=39.16.98" defer></script>
-  <script src="js/simulation_environment_system.js?v=39.16.98" defer></script>
-  <script src="js/simulation_item_ant_system.js?v=39.16.98" defer></script>
-  <script src="js/simulation_effects_system.js?v=39.16.98" defer></script>
-  <script src="js/simulation_creature_system.js?v=39.16.98" defer></script>
-  <script src="js/simulation_maintenance_system.js?v=39.16.98" defer></script>
-  <script src="js/simulation_ambient_system.js?v=39.16.98" defer></script>
-  <script src="js/simulation_systems.js?v=39.16.98" defer></script>
-  <script src="js/system_order.js?v=39.16.98" defer></script>
-  <script src="js/simulation.js?v=39.16.98" defer></script>
-  <script src="js/colony_situation_system.js?v=39.16.98" defer></script>
-  <script src="js/world_update.js?v=39.16.98" defer></script>
-  <script src="js/world_tool_actions.js?v=39.16.98" defer></script>
-  <script src="js/world_placement_log.js?v=39.16.98" defer></script>
-  <script src="js/world_event_effects.js?v=39.16.98" defer></script>
-  <script src="js/command_dispatcher.js?v=39.16.98" defer></script>
-  <script src="js/text_catalog.js?v=39.16.98" defer></script>
-  <script src="js/ui.js?v=39.16.98" defer></script>
-  <script src="js/game_dialogs.js?v=39.16.98" defer></script>
-  <script src="js/achievements.js?v=39.16.98" defer></script>
-  <script src="js/ui_helpers.js?v=39.16.98" defer></script>
-  <script src="js/ui_log.js?v=39.16.98" defer></script>
-  <script src="js/ui_selected.js?v=39.16.98" defer></script>
-  <script src="js/save_schema.js?v=39.16.98" defer></script>
-  <script src="js/snapshot_system.js?v=39.16.98" defer></script>
-  <script src="js/restore_coordinator.js?v=39.16.98" defer></script>
-  <script src="js/history_system.js?v=39.16.98" defer></script>
-  <script src="js/save_codec.js?v=39.16.98" defer></script>
-  <script src="js/save_storage.js?v=39.16.98" defer></script>
-  <script src="js/save_system.js?v=39.16.98" defer></script>
-  <script src="js/ui_tooltips.js?v=39.16.98" defer></script>
-  <script src="js/ui_layout_dialogs.js?v=39.16.98" defer></script>
-  <script src="js/ui_ground.js?v=39.16.98" defer></script>
-  <script src="js/ui_tools.js?v=39.16.98" defer></script>
-  <script src="js/ui_input_shared.js?v=39.16.98" defer></script>
-  <script src="js/ui_pointer_action_system.js?v=39.16.98" defer></script>
-  <script src="js/ui_input_touch.js?v=39.16.98" defer></script>
-  <script src="js/ui_input_mouse.js?v=39.16.98" defer></script>
-  <script src="js/ui_bind.js?v=39.16.98" defer></script>
-  <script src="js/ui_charts.js?v=39.16.98" defer></script>
-  <script src="js/ui_family_data.js?v=39.16.98" defer></script>
-  <script src="js/ui_family_async.js?v=39.16.98" defer></script>
-  <script src="js/ui_family_layout.js?v=39.16.98" defer></script>
-  <script src="js/ui_family_paths.js?v=39.16.98" defer></script>
-  <script src="js/ui_family_render.js?v=39.16.98" defer></script>
-  <script src="js/main.js?v=39.16.98" defer></script>
-  <script src="js/debug_tools.js?v=39.16.98" defer></script>
+
+  <script>
+  (() => {
+    const replacements = [
+      ["端末報告ベース", "達成率"],
+      ["報告プレイヤー", "達成人数"],
+    ];
+    const replaceText = value => replacements.reduce((text, [from, to]) => text.replaceAll(from, to), String(value || ""));
+    const normalizeNode = node => {
+      if (!node) return;
+      if (node.nodeType === Node.TEXT_NODE) {
+        const next = replaceText(node.nodeValue);
+        if (next !== node.nodeValue) node.nodeValue = next;
+        return;
+      }
+      if (node.nodeType !== Node.ELEMENT_NODE) return;
+      if (node.hasAttribute("aria-label")) {
+        const current = node.getAttribute("aria-label");
+        const next = replaceText(current);
+        if (next !== current) node.setAttribute("aria-label", next);
+      }
+      const walker = document.createTreeWalker(node, NodeFilter.SHOW_TEXT);
+      while (walker.nextNode()) {
+        const textNode = walker.currentNode;
+        const next = replaceText(textNode.nodeValue);
+        if (next !== textNode.nodeValue) textNode.nodeValue = next;
+      }
+      node.querySelectorAll?.("[aria-label]").forEach(element => {
+        const current = element.getAttribute("aria-label");
+        const next = replaceText(current);
+        if (next !== current) element.setAttribute("aria-label", next);
+      });
+    };
+    const list = document.getElementById("achievementList");
+    if (!list) return;
+    normalizeNode(list);
+    new MutationObserver(records => {
+      for (const record of records) {
+        if (record.type === "characterData") normalizeNode(record.target);
+        for (const node of record.addedNodes || []) normalizeNode(node);
+      }
+    }).observe(list, { childList: true, subtree: true, characterData: true });
+  })();
+  </script>
+  <script src="js/version.js?v=39.18.18" defer></script>
+  <script src="js/event_bus.js?v=39.18.18" defer></script>
+  <script src="js/domain_ids.js?v=39.18.18" defer></script>
+  <script src="js/registry_base.js?v=39.18.18" defer></script>
+  <script src="js/disease_registry.js?v=39.18.18" defer></script>
+  <script src="js/sound_pack.js?v=39.18.18" defer></script>
+  <script src="js/deterministic_helpers.js?v=39.18.18" defer></script>
+  <script src="js/item_tool_metadata.js?v=39.18.18" defer></script>
+  <script src="js/item_tool_definitions.js?v=39.18.18" defer></script>
+  <script src="js/item_visual_definitions.js?v=39.18.18" defer></script>
+  <script src="js/item_food_definitions.js?v=39.18.18" defer></script>
+  <script src="js/item_effect_definitions.js?v=39.18.18" defer></script>
+  <script src="js/item_registry.js?v=39.18.18" defer></script>
+  <script src="js/data.js?v=39.18.18" defer></script>
+  <script src="js/ground_types.js?v=39.18.18" defer></script>
+  <script src="js/input_mode_manager.js?v=39.18.18" defer></script>
+  <script src="js/math.js?v=39.18.18" defer></script>
+  <script src="js/geometry_helpers.js?v=39.18.18" defer></script>
+  <script src="js/collision_footprint_system.js?v=39.18.18" defer></script>
+  <script src="js/physics_helpers.js?v=39.18.18" defer></script>
+  <script src="js/placement_preview_system.js?v=39.18.18" defer></script>
+  <script src="js/pin_attachment_system.js?v=39.18.18" defer></script>
+  <script src="js/physics_shape_editor_system.js?v=39.18.18" defer></script>
+  <script src="js/mechanical_system.js?v=39.18.18" defer></script>
+  <script src="js/mechanical_shape_bridge.js?v=39.18.18" defer></script>
+  <script src="js/constraint_system.js?v=39.18.18" defer></script>
+  <script src="js/physics_world_system.js?v=39.18.18" defer></script>
+  <script src="js/physics_projection_system.js?v=39.18.18" defer></script>
+  <script src="js/circuit_board_system.js?v=39.18.18" defer></script>
+  <script src="js/signal_system.js?v=39.18.18" defer></script>
+  <script src="js/assets.js?v=39.18.18" defer></script>
+  <script src="js/audio.js?v=39.18.18" defer></script>
+  <script src="js/perf_profiler.js?v=39.18.18" defer></script>
+  <script src="js/display_helpers.js?v=39.18.18" defer></script>
+  <script src="js/render.js?v=39.18.18" defer></script>
+  <script src="js/sim_core.js?v=39.18.18" defer></script>
+  <script src="js/tarinai_seed_factory.js?v=39.18.18" defer></script>
+  <script src="js/structures.js?v=39.18.18" defer></script>
+  <script src="js/item_type_catalog.js?v=39.18.18" defer></script>
+  <script src="js/items.js?v=39.18.18" defer></script>
+  <script src="js/item_type_initializers.js?v=39.18.18" defer></script>
+  <script src="js/item_lifecycle_support.js?v=39.18.18" defer></script>
+  <script src="js/item_update_policy.js?v=39.18.18" defer></script>
+  <script src="js/fire_runtime_system.js?v=39.18.18" defer></script>
+  <script src="js/robot_cleaner_system.js?v=39.18.18" defer></script>
+  <script src="js/item_dynamic_tool_system.js?v=39.18.18" defer></script>
+  <script src="js/item_dynamic_ball_system.js?v=39.18.18" defer></script>
+  <script src="js/item_dynamic_duplicator_system.js?v=39.18.18" defer></script>
+  <script src="js/item_dynamic_pin_system.js?v=39.18.18" defer></script>
+  <script src="js/item_dynamic_zunchi_system.js?v=39.18.18" defer></script>
+  <script src="js/item_environment_hazard_system.js?v=39.18.18" defer></script>
+  <script src="js/item_dynamic_system.js?v=39.18.18" defer></script>
+  <script src="js/item_lifecycle_decay_system.js?v=39.18.18" defer></script>
+  <script src="js/item_lifecycle_growth_system.js?v=39.18.18" defer></script>
+  <script src="js/item_lifecycle_step_frame.js?v=39.18.18" defer></script>
+  <script src="js/item_lifecycle_step_decay.js?v=39.18.18" defer></script>
+  <script src="js/item_lifecycle_step_dynamic.js?v=39.18.18" defer></script>
+  <script src="js/item_lifecycle_step_growth.js?v=39.18.18" defer></script>
+  <script src="js/update_step_pipeline_runner.js?v=39.18.18" defer></script>
+  <script src="js/item_lifecycle_pipeline.js?v=39.18.18" defer></script>
+  <script src="js/item_runtime.js?v=39.18.18" defer></script>
+  <script src="js/structure_lifecycle.js?v=39.18.18" defer></script>
+  <script src="js/memorial_bell_system.js?v=39.18.18" defer></script>
+  <script src="js/item_render_helpers.js?v=39.18.18" defer></script>
+  <script src="js/item_render_runtime.js?v=39.18.18" defer></script>
+  <script src="js/burn_motion_util.js?v=39.18.18" defer></script>
+  <script src="js/ants.js?v=39.18.18" defer></script>
+  <script src="js/health.js?v=39.18.18" defer></script>
+  <script src="js/tarinai.js?v=39.18.18" defer></script>
+  <script src="js/mamekusaredake_system.js?v=39.18.18" defer></script>
+  <script src="js/tarinai_action_spec.js?v=39.18.18" defer></script>
+  <script src="js/tarinai_behavior_state.js?v=39.18.18" defer></script>
+  <script src="js/tarinai_identity_social.js?v=39.18.18" defer></script>
+  <script src="js/tarinai_action_state.js?v=39.18.18" defer></script>
+  <script src="js/tarinai_disease_nest.js?v=39.18.18" defer></script>
+  <script src="js/tarinai_item_effects.js?v=39.18.18" defer></script>
+  <script src="js/tarinai_needs_core.js?v=39.18.18" defer></script>
+  <script src="js/tarinai_behavior_text.js?v=39.18.18" defer></script>
+  <script src="js/tarinai_forced_behavior.js?v=39.18.18" defer></script>
+  <script src="js/tarinai_nest_sleep_system.js?v=39.18.18" defer></script>
+  <script src="js/tarinai_item_targeting.js?v=39.18.18" defer></script>
+  <script src="js/tarinai_consumable_behavior.js?v=39.18.18" defer></script>
+  <script src="js/tarinai_social_action_runtime.js?v=39.18.18" defer></script>
+  <script src="js/tarinai_building_behavior.js?v=39.18.18" defer></script>
+  <script src="js/seesaw_system.js?v=39.18.18" defer></script>
+  <script src="js/tarinai_action_definitions.js?v=39.18.18" defer></script>
+  <script src="js/tarinai_needs_items.js?v=39.18.18" defer></script>
+  <script src="js/tarinai_food_prototype_mixin.js?v=39.18.18" defer></script>
+  <script src="js/tarinai_direct_feeding_system.js?v=39.18.18" defer></script>
+  <script src="js/tarinai_need_planner_system.js?v=39.18.18" defer></script>
+  <script src="js/tarinai_item_interaction_context.js?v=39.18.18" defer></script>
+  <script src="js/tarinai_food_interaction_system.js?v=39.18.18" defer></script>
+  <script src="js/tarinai_contact_item_system.js?v=39.18.18" defer></script>
+  <script src="js/tarinai_item_interaction_system.js?v=39.18.18" defer></script>
+  <script src="js/tarinai_sunbath_system.js?v=39.18.18" defer></script>
+  <script src="js/tarinai_cursor_care_system.js?v=39.18.18" defer></script>
+  <script src="js/tarinai_local_environment_system.js?v=39.18.18" defer></script>
+  <script src="js/tarinai_social_move_life.js?v=39.18.18" defer></script>
+  <script src="js/tarinai_update_step_frame.js?v=39.18.18" defer></script>
+  <script src="js/tarinai_update_step_ai.js?v=39.18.18" defer></script>
+  <script src="js/tarinai_update_step_environment.js?v=39.18.18" defer></script>
+  <script src="js/tarinai_update_step_movement.js?v=39.18.18" defer></script>
+  <script src="js/tarinai_update_step_health.js?v=39.18.18" defer></script>
+  <script src="js/tarinai_update_pipeline.js?v=39.18.18" defer></script>
+  <script src="js/tarinai_runtime.js?v=39.18.18" defer></script>
+  <script src="js/tarinai_render.js?v=39.18.18" defer></script>
+  <script src="js/world.js?v=39.18.18" defer></script>
+  <script src="js/world_view.js?v=39.18.18" defer></script>
+  <script src="js/family_graph.js?v=39.18.18" defer></script>
+  <script src="js/world_reset_presets.js?v=39.18.18" defer></script>
+  <script src="js/world_family_social.js?v=39.18.18" defer></script>
+  <script src="js/impact_core_system.js?v=39.18.18" defer></script>
+  <script src="js/impact_response_system.js?v=39.18.18" defer></script>
+  <script src="js/collision_response_system.js?v=39.18.18" defer></script>
+  <script src="js/world_combat_effects.js?v=39.18.18" defer></script>
+  <script src="js/world_environment.js?v=39.18.18" defer></script>
+  <script src="js/world_temperature_system.js?v=39.18.18" defer></script>
+  <script src="js/world_pathfinding_system.js?v=39.18.18" defer></script>
+  <script src="js/world_grass_placement_system.js?v=39.18.18" defer></script>
+  <script src="js/world_spatial_budget.js?v=39.18.18" defer></script>
+  <script src="js/world_ants_system.js?v=39.18.18" defer></script>
+  <script src="js/weather_system.js?v=39.18.18" defer></script>
+  <script src="js/item_update_scheduler.js?v=39.18.18" defer></script>
+  <script src="js/simulation_runtime_helpers.js?v=39.18.18" defer></script>
+  <script src="js/tarinai_update_policy.js?v=39.18.18" defer></script>
+  <script src="js/simulation_environment_system.js?v=39.18.18" defer></script>
+  <script src="js/simulation_item_ant_system.js?v=39.18.18" defer></script>
+  <script src="js/simulation_effects_system.js?v=39.18.18" defer></script>
+  <script src="js/simulation_creature_system.js?v=39.18.18" defer></script>
+  <script src="js/simulation_maintenance_system.js?v=39.18.18" defer></script>
+  <script src="js/simulation_ambient_system.js?v=39.18.18" defer></script>
+  <script src="js/simulation_systems.js?v=39.18.18" defer></script>
+  <script src="js/system_order.js?v=39.18.18" defer></script>
+  <script src="js/simulation.js?v=39.18.18" defer></script>
+  <script src="js/colony_situation_system.js?v=39.18.18" defer></script>
+  <script src="js/world_update.js?v=39.18.18" defer></script>
+  <script src="js/world_tool_actions.js?v=39.18.18" defer></script>
+  <script src="js/world_placement_log.js?v=39.18.18" defer></script>
+  <script src="js/world_event_effects.js?v=39.18.18" defer></script>
+  <script src="js/command_dispatcher.js?v=39.18.18" defer></script>
+  <script src="js/text_catalog.js?v=39.18.18" defer></script>
+  <script src="js/ui.js?v=39.18.18" defer></script>
+  <script src="js/game_dialogs.js?v=39.18.18" defer></script>
+  <script src="js/achievement_catalog.js?v=39.18.18" defer></script>
+  <script src="js/achievements.js?v=39.18.18" defer></script>
+  <script src="js/ui_helpers.js?v=39.18.18" defer></script>
+  <script src="js/ui_log.js?v=39.18.18" defer></script>
+  <script src="js/ui_selected.js?v=39.18.18" defer></script>
+  <script src="js/save_schema.js?v=39.18.18" defer></script>
+  <script src="js/snapshot_system.js?v=39.18.18" defer></script>
+  <script src="js/restore_coordinator.js?v=39.18.18" defer></script>
+  <script src="js/history_system.js?v=39.18.18" defer></script>
+  <script src="js/save_codec.js?v=39.18.18" defer></script>
+  <script src="js/save_storage.js?v=39.18.18" defer></script>
+  <script src="js/save_system.js?v=39.18.18" defer></script>
+  <script src="js/ui_tooltips.js?v=39.18.18" defer></script>
+  <script src="js/ui_layout_dialogs.js?v=39.18.18" defer></script>
+  <script src="js/ui_ground.js?v=39.18.18" defer></script>
+  <script src="js/ui_tools.js?v=39.18.18" defer></script>
+  <script src="js/ui_input_shared.js?v=39.18.18" defer></script>
+  <script src="js/ui_pointer_action_system.js?v=39.18.18" defer></script>
+  <script src="js/ui_input_touch.js?v=39.18.18" defer></script>
+  <script src="js/ui_input_mouse.js?v=39.18.18" defer></script>
+  <script src="js/ui_bind.js?v=39.18.18" defer></script>
+  <script src="js/ui_charts.js?v=39.18.18" defer></script>
+  <script src="js/ui_family_data.js?v=39.18.18" defer></script>
+  <script src="js/ui_family_async.js?v=39.18.18" defer></script>
+  <script src="js/ui_family_layout.js?v=39.18.18" defer></script>
+  <script src="js/ui_family_paths.js?v=39.18.18" defer></script>
+  <script src="js/ui_family_render.js?v=39.18.18" defer></script>
+  <script src="js/main.js?v=39.18.18" defer></script>
+  <script src="js/debug_tools.js?v=39.18.18" defer></script>
 </body>
 </html>
diff --git a/js/achievement_catalog.js b/js/achievement_catalog.js
new file mode 100644
index 0000000..875a9de
--- /dev/null
+++ b/js/achievement_catalog.js
@@ -0,0 +1,731 @@
+window.TARINAI_ACHIEVEMENT_CATALOG = {
+  "revision": "2026-07-25-achievement-cleanup-v1",
+  "completionistId": "true_tarinai_observer",
+  "categories": [
+    {
+      "id": "ecology",
+      "title": "生態"
+    },
+    {
+      "id": "population",
+      "title": "人口"
+    },
+    {
+      "id": "experiment",
+      "title": "実験"
+    },
+    {
+      "id": "construction",
+      "title": "建築"
+    },
+    {
+      "id": "operation",
+      "title": "操作"
+    },
+    {
+      "id": "other",
+      "title": "その他"
+    }
+  ],
+  "medicineLedgerTypes": [
+    "first_aid",
+    "sedative",
+    "sleep_drug",
+    "laxative",
+    "protein",
+    "niteropu",
+    "ammo",
+    "mystery_drug",
+    "mercury",
+    "giant_drug",
+    "dwarf_drug"
+  ],
+  "linkProgressTypes": [
+    "rope",
+    "rod",
+    "spring"
+  ],
+  "additiveProgressCaps": {
+    "placementCount": 100,
+    "antKills": 100,
+    "birthCount": 3333,
+    "quickDeleteCount": 30,
+    "undoCount": 20,
+    "redoCount": 20,
+    "directFeedCount": 33,
+    "firstAidHeals": 50,
+    "fightMochiFightCount": 666,
+    "shotCount": 333,
+    "loveMochiBirthCount": 721,
+    "statsButtonPressCount": 30,
+    "totalDeathCount": 10000,
+    "manualTarinaiAddedCount": 100,
+    "robotCleanCount": 200
+  },
+  "definitions": [
+    {
+      "id": "first_birth",
+      "title": "はじめての繁殖",
+      "description": "たりないの繁殖を1回成功させる。",
+      "category": "population",
+      "showLockedDescription": true,
+      "progress": {
+        "type": "counter",
+        "key": "birthCount",
+        "target": 1
+      }
+    },
+    {
+      "id": "natural_zunchi_slave",
+      "title": "ずんちどれい",
+      "description": "ずんちどれいが出現する。",
+      "category": "ecology",
+      "showLockedDescription": true
+    },
+    {
+      "id": "ochibi_natural_slave",
+      "title": "たりないより「たりない」",
+      "description": "おちびが鎖無しでずんちどれいになる。",
+      "category": "ecology",
+      "showLockedDescription": true
+    },
+    {
+      "id": "natural_tarinai_king",
+      "title": "たりない王",
+      "description": "たりない王が出現する。",
+      "category": "ecology",
+      "showLockedDescription": true
+    },
+    {
+      "id": "self_zunchi_death",
+      "title": "あぁ＾～ たまらねぇぜ",
+      "description": "おしり鋲を抜いた時、自分のずんちで自爆する。",
+      "category": "experiment",
+      "showLockedDescription": true
+    },
+    {
+      "id": "zunchi_collision_death",
+      "title": "くちゃいのだ！",
+      "description": "ずんちとの衝突で死亡する個体が出現する。",
+      "category": "experiment",
+      "showLockedDescription": true
+    },
+    {
+      "id": "natural_zunchi_slave_5_generations",
+      "title": "末代までの恥",
+      "description": "5代連続でずんちどれい（鎖なし）",
+      "category": "population",
+      "showLockedDescription": true
+    },
+    {
+      "id": "natural_tarinai_king_3_generations",
+      "title": "華麗なる王族",
+      "description": "3代連続でたりない王（王冠なし）",
+      "category": "population",
+      "showLockedDescription": true
+    },
+    {
+      "id": "death_50_in_10_seconds",
+      "title": "6番目の大量絶滅",
+      "description": "10秒以内に50体のたりないが死亡する。",
+      "category": "experiment",
+      "showLockedDescription": true
+    },
+    {
+      "id": "birth_50_in_60_seconds",
+      "title": "ベビーブーム",
+      "description": "1分以内に30体のたりないが誕生する。",
+      "category": "population",
+      "showLockedDescription": true
+    },
+    {
+      "id": "great_mother_1000_births",
+      "title": "母なる大地",
+      "description": "たりないを繁殖で累計3333体誕生させる。",
+      "category": "population",
+      "showLockedDescription": true,
+      "progress": {
+        "type": "counter",
+        "key": "birthCount",
+        "target": 3333,
+        "display": "percent",
+        "unit": "体"
+      }
+    },
+    {
+      "id": "lifespan_completed",
+      "title": "天寿",
+      "description": "たりない1体が天寿を全うする。",
+      "category": "ecology",
+      "showLockedDescription": true
+    },
+    {
+      "id": "soccer_ball_death",
+      "title": "豆野、殺ッカーやろうぜ！",
+      "description": "サッカーボールとの衝突で、たりない1体が死亡する。",
+      "category": "experiment",
+      "showLockedDescription": false
+    },
+    {
+      "id": "fight_pair_danger_kill",
+      "title": "喧嘩両成敗",
+      "description": "喧嘩中のたりないを、両方とも危険カテゴリのアイテムで倒す。",
+      "category": "experiment",
+      "showLockedDescription": false
+    },
+    {
+      "id": "all_non_sleep_diseased_25",
+      "title": "緊急事態宣言",
+      "description": "25体以上が存命し、フィールド上の全員がねむり病以外の病気にかかる。",
+      "category": "ecology",
+      "showLockedDescription": true
+    },
+    {
+      "id": "colony_happy",
+      "title": "管理された楽園",
+      "description": "コロニー状態をしばらく「幸福」にする。",
+      "category": "ecology",
+      "showLockedDescription": true
+    },
+    {
+      "id": "direct_feed_33",
+      "title": "餌やりじいさん",
+      "description": "手から直接33回餌を与える。",
+      "category": "ecology",
+      "showLockedDescription": false,
+      "progress": {
+        "type": "counter",
+        "key": "directFeedCount",
+        "target": 33
+      }
+    },
+    {
+      "id": "ignite_during_birth_ritual",
+      "title": "燃え上がる恋",
+      "description": "たりないがヘコヘコ中に着火する。",
+      "category": "experiment",
+      "showLockedDescription": false
+    },
+    {
+      "id": "laxative_starvation",
+      "title": "内臓全部出た",
+      "description": "下剤の効果中に餓死する。",
+      "category": "experiment",
+      "showLockedDescription": true
+    },
+    {
+      "id": "idle_observer_5_minutes",
+      "title": "監視カメラ",
+      "description": "3ゲーム日、操作せず画面を見るだけ",
+      "category": "operation",
+      "showLockedDescription": false
+    },
+    {
+      "id": "placed_objects_100",
+      "title": "物でいっぱい",
+      "description": "配置物を累計100個置く。",
+      "category": "construction",
+      "showLockedDescription": false,
+      "progress": {
+        "type": "counter",
+        "key": "placementCount",
+        "target": 100
+      }
+    },
+    {
+      "id": "mechanized_industry",
+      "title": "機械化産業",
+      "description": "検知器の信号で接続先を作動させ、ロープ・棒・ばねをそれぞれ1本以上設置する。",
+      "category": "construction",
+      "showLockedDescription": false,
+      "progress": {
+        "type": "mechanized"
+      }
+    },
+    {
+      "id": "safe_colony_25_5_minutes",
+      "title": "安全第一",
+      "description": "25体以上いる状態をゲーム内5分間維持し、その間寿命以外で死亡者を出さない。",
+      "category": "ecology",
+      "showLockedDescription": true
+    },
+    {
+      "id": "ants_alive_25",
+      "title": "アリの惑星",
+      "description": "生存しているアリが25体に到達する。",
+      "category": "ecology",
+      "showLockedDescription": true
+    },
+    {
+      "id": "ants_killed_100",
+      "title": "害虫駆除",
+      "description": "アリを累計100体倒す。",
+      "category": "experiment",
+      "showLockedDescription": false,
+      "progress": {
+        "type": "counter",
+        "key": "antKills",
+        "target": 100
+      }
+    },
+    {
+      "id": "secret_collection_9_slots",
+      "title": "秘密のコレクション",
+      "description": "セーブスロット9つをすべて埋める。",
+      "category": "operation",
+      "showLockedDescription": false
+    },
+    {
+      "id": "pause_spam_4_in_1_second",
+      "title": "何やってるの？",
+      "description": "何もない部分を1秒間に4回連打する。",
+      "category": "operation",
+      "showLockedDescription": false
+    },
+    {
+      "id": "continuous_play_1_hour",
+      "title": "めっちゃたりない観察",
+      "description": "1時間連続プレイする。",
+      "category": "other",
+      "showLockedDescription": true
+    },
+    {
+      "id": "below_absolute_zero_item",
+      "title": "物理法則を下側に超越",
+      "description": "温度計算されるアイテムを1つ絶対零度を下回る温度にする。",
+      "category": "experiment",
+      "showLockedDescription": false
+    },
+    {
+      "id": "undo_mass_revival",
+      "title": "見なかったことにしよう",
+      "description": "一度のUndoで10体以上の死亡をなかったことにする。",
+      "category": "operation",
+      "showLockedDescription": false
+    },
+    {
+      "id": "robot_cleaner_100",
+      "title": "清掃業者",
+      "description": "ロボ掃除機にずんち・死骸・汚れを累計200個処理させる。",
+      "category": "construction",
+      "showLockedDescription": true,
+      "progress": {
+        "type": "counter",
+        "key": "robotCleanCount",
+        "target": 200,
+        "display": "count",
+        "unit": "個"
+      }
+    },
+    {
+      "id": "held_30_seconds",
+      "title": "空中生活",
+      "description": "同じたりないを30秒間つまみ続ける。",
+      "category": "operation",
+      "showLockedDescription": false
+    },
+    {
+      "id": "minimalist_happy",
+      "title": "ミニマリスト",
+      "description": "プレイ開始6日目以降、配置物を10個以下に抑えてコロニー状態を「幸福」にする。",
+      "category": "construction",
+      "showLockedDescription": false
+    },
+    {
+      "id": "overprotective",
+      "title": "過保護",
+      "description": "同じたりないに手から10回餌を与え、3回以上薬で治療する。",
+      "category": "ecology",
+      "showLockedDescription": true
+    },
+    {
+      "id": "self_sufficient",
+      "title": "自給自足",
+      "description": "複製機がない状態で、20体以上を直接給餌せず10分間維持する。",
+      "category": "ecology",
+      "showLockedDescription": false
+    },
+    {
+      "id": "unplanned_city_30",
+      "title": "無計画都市",
+      "description": "配置後30秒以内に削除する操作を累計30回行う。",
+      "category": "construction",
+      "showLockedDescription": false,
+      "progress": {
+        "type": "counter",
+        "key": "quickDeleteCount",
+        "target": 30
+      }
+    },
+    {
+      "id": "sauna_cold_plunge",
+      "title": "サウナ水風呂",
+      "description": "暑すぎる状態になったたりないを、15秒以内に寒すぎる状態にする。",
+      "category": "experiment",
+      "showLockedDescription": false
+    },
+    {
+      "id": "rain_shelter_all",
+      "title": "雨宿り完了",
+      "description": "雨天時、20体以上の全員をパラソル・巣箱・土管で雨宿りさせる。",
+      "category": "ecology",
+      "showLockedDescription": true
+    },
+    {
+      "id": "medicine_ledger_all",
+      "title": "おくすり手帳全埋め",
+      "description": "全種類の薬を少なくとも1回使用する。",
+      "category": "ecology",
+      "showLockedDescription": false,
+      "progress": {
+        "type": "set",
+        "key": "medicineTypes",
+        "required": "medicineLedgerTypes"
+      }
+    },
+    {
+      "id": "mercury_lifespan",
+      "title": "不老不死まであと一歩",
+      "description": "水銀を使用したたりないが天寿を全うする。",
+      "category": "experiment",
+      "showLockedDescription": true
+    },
+    {
+      "id": "enemy_enemy_friend",
+      "title": "敵の敵は味方",
+      "description": "たりない30体以上を無傷で保ちながら、危険アイテムでアリを10体倒す。",
+      "category": "ecology",
+      "showLockedDescription": true
+    },
+    {
+      "id": "revolution",
+      "title": "革命",
+      "description": "ずんちどれいが、たりない王を喧嘩で死亡させる。",
+      "category": "experiment",
+      "showLockedDescription": true
+    },
+    {
+      "id": "fuel_to_fire",
+      "title": "火に油",
+      "description": "けんか餅を与えたたりないが30秒以内に喧嘩を始める。",
+      "category": "experiment",
+      "showLockedDescription": false
+    },
+    {
+      "id": "undo_20",
+      "title": "やっぱなし",
+      "description": "Undoを累計20回成功させる。",
+      "category": "operation",
+      "showLockedDescription": false,
+      "progress": {
+        "type": "counter",
+        "key": "undoCount",
+        "target": 20
+      }
+    },
+    {
+      "id": "redo_20",
+      "title": "やっぱあり",
+      "description": "Redoを累計20回成功させる。",
+      "category": "operation",
+      "showLockedDescription": false,
+      "progress": {
+        "type": "counter",
+        "key": "redoCount",
+        "target": 20
+      }
+    },
+    {
+      "id": "eternal_history_generation_10",
+      "title": "悠久の歴史",
+      "description": "世代が10に到達する。",
+      "category": "population",
+      "showLockedDescription": true
+    },
+    {
+      "id": "king_full_satisfaction",
+      "title": "五体満足",
+      "description": "たりない王1個体にプロテインと巨大薬の効果を同時に付与する。",
+      "category": "ecology",
+      "showLockedDescription": false
+    },
+    {
+      "id": "slave_zero_satisfaction",
+      "title": "零体満足",
+      "description": "ずんちどれい1個体にンイテロプと矮小薬の効果を同時に付与する。",
+      "category": "ecology",
+      "showLockedDescription": false
+    },
+    {
+      "id": "town_doctor_50",
+      "title": "町のお医者さん",
+      "description": "救急薬を累計50回使用し、体力を回復させる。",
+      "category": "ecology",
+      "showLockedDescription": true,
+      "progress": {
+        "type": "counter",
+        "key": "firstAidHeals",
+        "target": 50,
+        "display": "count",
+        "unit": "回"
+      }
+    },
+    {
+      "id": "poke_plushie_fling",
+      "title": "割とふわふわ",
+      "description": "ぬいぐるみを「つつく」で弾き飛ばす。",
+      "category": "operation",
+      "showLockedDescription": false
+    },
+    {
+      "id": "chaos_seeker_666_fights",
+      "title": "混沌ヲ希求スル者",
+      "description": "けんか餅の影響下で喧嘩を累計666回発生させる。",
+      "category": "experiment",
+      "showLockedDescription": true,
+      "progress": {
+        "type": "counter",
+        "key": "fightMochiFightCount",
+        "target": 666,
+        "display": "percent",
+        "unit": "回"
+      }
+    },
+    {
+      "id": "clean_freak_robot_only",
+      "title": "潔癖症",
+      "description": "ロボット掃除機の設定全項目にチェックを入れて稼働させ、フィールド上にロボット掃除機以外を存在させない。",
+      "category": "construction",
+      "showLockedDescription": false
+    },
+    {
+      "id": "true_tarinai_observer",
+      "title": "真・たりない観察",
+      "description": "これ以外の全ての実績を達成する。",
+      "category": "other",
+      "showLockedDescription": false
+    },
+    {
+      "id": "sniper_333_shots",
+      "title": "狙撃手",
+      "description": "累計333発撃つ。",
+      "category": "operation",
+      "showLockedDescription": false,
+      "progress": {
+        "type": "counter",
+        "key": "shotCount",
+        "target": 333
+      }
+    },
+    {
+      "id": "megalopolis",
+      "title": "メガロポリス",
+      "description": "複製機を10個以上、干草寝床・巣箱・土管を合計15個以上設置し、たりないを100体以上生存させる。",
+      "category": "construction",
+      "showLockedDescription": true
+    },
+    {
+      "id": "fertility_seeker_721_love_births",
+      "title": "豊穣ヲ希求スル者",
+      "description": "へこ餅の影響下で繁殖を721回成功させる。",
+      "category": "population",
+      "showLockedDescription": true,
+      "progress": {
+        "type": "counter",
+        "key": "loveMochiBirthCount",
+        "target": 721,
+        "display": "percent",
+        "unit": "回"
+      }
+    },
+    {
+      "id": "low_fps_single_digit",
+      "title": "スペックがたりない",
+      "description": "fpsを1桁にする。",
+      "category": "other",
+      "showLockedDescription": true
+    },
+    {
+      "id": "continuous_play_24_hours",
+      "title": "寝ろ",
+      "description": "24時間連続でプレイする。",
+      "category": "other",
+      "showLockedDescription": true
+    },
+    {
+      "id": "sandbox_five_toilets",
+      "title": "砂場",
+      "description": "トイレの砂をフィールドに5個設置する。",
+      "category": "construction",
+      "showLockedDescription": false
+    },
+    {
+      "id": "park_ground_changed",
+      "title": "そこ公共空間だよ？",
+      "description": "公園の地面を勝手に変更する。",
+      "category": "construction",
+      "showLockedDescription": false
+    },
+    {
+      "id": "ground_change_4_in_1_second",
+      "title": "破格の工事費用",
+      "description": "地面を変えすぎて破産する。",
+      "category": "construction",
+      "showLockedDescription": false
+    },
+    {
+      "id": "ant_nest_without_tarinai",
+      "title": "アリ観察",
+      "description": "アリの巣があるが、たりないがいない。",
+      "category": "ecology",
+      "showLockedDescription": false
+    },
+    {
+      "id": "sticky_bomb_15_passes",
+      "title": "命のバトン",
+      "description": "粘着ボムを爆発までに15回以上パスする。",
+      "category": "experiment",
+      "showLockedDescription": false
+    },
+    {
+      "id": "daily_play_7_days",
+      "title": "毎日たりない観察",
+      "description": "7日連続でプレイする。",
+      "category": "other",
+      "showLockedDescription": true,
+      "progress": {
+        "type": "value",
+        "key": "dailyPlayStreak",
+        "target": 7,
+        "display": "percent",
+        "unit": "日"
+      }
+    },
+    {
+      "id": "wire_shock_7_tarinai",
+      "title": "抵抗器じゃない",
+      "description": "電流が流れている1本の電線で7体のたりないを感電させる。",
+      "category": "experiment",
+      "showLockedDescription": false
+    },
+    {
+      "id": "information_industry",
+      "title": "情報化産業",
+      "description": "基盤同士を電線類でつなぎ、信号を流す。",
+      "category": "construction",
+      "showLockedDescription": false
+    },
+    {
+      "id": "strength_in_numbers",
+      "title": "数こそ力",
+      "description": "生存しているたりないが100体に到達する。",
+      "category": "population",
+      "showLockedDescription": false
+    },
+    {
+      "id": "elite_few",
+      "title": "少数精鋭",
+      "description": "たりないが25体以下の状態を5日間維持する。",
+      "category": "population",
+      "showLockedDescription": true
+    },
+    {
+      "id": "zunchi_overflow",
+      "title": "踩屎感",
+      "description": "たりないが20体以上いる状態で、ずんちの数がたりないの数を上回る。",
+      "category": "ecology",
+      "showLockedDescription": false
+    },
+    {
+      "id": "comfortable_beds",
+      "title": "快適な寝床",
+      "description": "生存している全てのたりないに行き渡る数の寝床を用意する。",
+      "category": "ecology",
+      "showLockedDescription": false
+    },
+    {
+      "id": "stone_pillow",
+      "title": "石に枕す",
+      "description": "たりないが30体以上いる状態で、寝床充足率を0%にする。",
+      "category": "ecology",
+      "showLockedDescription": false
+    },
+    {
+      "id": "across_seasons",
+      "title": "季節を越えて",
+      "description": "春夏秋冬の四季を一巡する。",
+      "category": "other",
+      "showLockedDescription": false
+    },
+    {
+      "id": "favorite_one",
+      "title": "推し",
+      "description": "ある個体をお気に入りに登録する。",
+      "category": "ecology",
+      "showLockedDescription": false
+    },
+    {
+      "id": "statistician",
+      "title": "統計学者",
+      "description": "統計の個体数・欲求・環境・グラフ表示切替ボタンを累計30回押す。",
+      "category": "operation",
+      "showLockedDescription": false,
+      "progress": {
+        "type": "counter",
+        "key": "statsButtonPressCount",
+        "target": 30,
+        "display": "count",
+        "unit": "回"
+      }
+    },
+    {
+      "id": "well_informed",
+      "title": "情報通",
+      "description": "プッシュ通知をONにする。",
+      "category": "operation",
+      "showLockedDescription": false
+    },
+    {
+      "id": "lively_making",
+      "title": "賑わいづくり",
+      "description": "「たりないを追加」で100体追加する。",
+      "category": "population",
+      "showLockedDescription": true,
+      "progress": {
+        "type": "counter",
+        "key": "manualTarinaiAddedCount",
+        "target": 100,
+        "display": "count",
+        "unit": "体"
+      }
+    },
+    {
+      "id": "memento_mori",
+      "title": "多数の死は統計上の数字でしかない",
+      "description": "たりないが合計10000体死亡する。",
+      "category": "population",
+      "showLockedDescription": true,
+      "progress": {
+        "type": "counter",
+        "key": "totalDeathCount",
+        "target": 10000,
+        "display": "percent",
+        "unit": "体"
+      }
+    },
+    {
+      "id": "mad_scientist",
+      "title": "マッドサイエンティスト",
+      "description": "異なる10匹のたりないに怪しい薬を投与する。",
+      "category": "experiment",
+      "showLockedDescription": false,
+      "progress": {
+        "type": "unique",
+        "key": "mysteryDrugTarinaiIds",
+        "target": 10,
+        "display": "count",
+        "unit": "匹"
+      }
+    }
+  ]
+};
diff --git a/js/achievements.js b/js/achievements.js
index c98a1e8..31bff77 100644
--- a/js/achievements.js
+++ b/js/achievements.js
@@ -1,209 +1,87 @@
 "use strict";
 
 (function initAchievementSystem(global) {
-  const STORAGE_KEY = "tarinai_achievements_v2";
+  // v7 uses a fresh namespace so tabs left open on older builds cannot write
+  // stale full-state envelopes into the current persistence layer.
+  const STORAGE_KEY = "tarinai_achievements_v7";
+  const STORAGE_BACKUP_KEY = "tarinai_achievements_backup_v7";
+  const STORAGE_SESSION_KEY = "tarinai_achievements_session_v7";
+  const PREVIOUS_STORAGE_KEY = "tarinai_achievements_v6";
+  const PREVIOUS_STORAGE_BACKUP_KEY = "tarinai_achievements_backup_v6";
+  const PREVIOUS_STORAGE_SESSION_KEY = "tarinai_achievements_session_v6";
+  const OLDER_STORAGE_KEY = "tarinai_achievements_v5";
+  const OLDER_STORAGE_BACKUP_KEY = "tarinai_achievements_backup_v5";
+  const OLDER_STORAGE_SESSION_KEY = "tarinai_achievements_session_v5";
+  const LEGACY_STORAGE_KEY = "tarinai_achievements_v4";
+  const LEGACY_STORAGE_BACKUP_KEY = "tarinai_achievements_backup_v4";
+  const LEGACY_STORAGE_SESSION_KEY = "tarinai_achievements_session_v4";
+  const ANCIENT_STORAGE_KEY = "tarinai_achievements_v2";
+  const ANCIENT_STORAGE_BACKUP_KEY = "tarinai_achievements_backup_v3";
+  const ANCIENT_STORAGE_SESSION_KEY = "tarinai_achievements_session_v3";
+  const PERSISTENCE_FORMAT = "tarinai-achievements-envelope-v1";
+  const PERSISTENCE_DB_NAME = "tarinai_achievements_durable_v5";
+  const PREVIOUS_PERSISTENCE_DB_NAME = "tarinai_achievements_durable_v4";
+  const OLDER_PERSISTENCE_DB_NAME = "tarinai_achievements_durable_v3";
+  const LEGACY_PERSISTENCE_DB_NAME = "tarinai_achievements_durable_v2";
+  const ANCIENT_PERSISTENCE_DB_NAME = "tarinai_achievements_durable_v1";
+  const PERSISTENCE_DB_STORE = "records";
+  const PERSISTENCE_DB_KEY = "achievement-state";
+  const PERSISTENCE_CHANNEL_NAME = "tarinai-achievements-persistence-v5";
+  const PREHYDRATION_JOURNAL_PREFIX = "tarinai_achievements_pre_hydration_v7_";
+  const PREHYDRATION_JOURNAL_FORMAT = "tarinai-achievements-pre-hydration-v1";
+  const PREHYDRATION_JOURNAL_DB_PREFIX = "pre-hydration-journal:";
   const PLAYER_KEY = "tarinai_achievement_player_v1";
+  const PLAYER_SECRET_KEY = "tarinai_achievement_player_secret_v1";
+  const LEGACY_PLAYER_KEY = "tarinai_achievement_legacy_player_v4";
   const API_URL = String(global.TARINAI_ACHIEVEMENT_API || "achievement_api.php");
-  const GAME_VERSION = String(global.TARINAI_VERSION || "39.16.77");
+  const GAME_VERSION = String(global.TARINAI_VERSION || "39.18.18");
   const DEBUG_MODE = ["1", "true"].includes(new URLSearchParams(global.location?.search || "").get("debug"));
-  const PLAYER_ID_PATTERN = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
+  const PLAYER_ID_PATTERN = /^[0-9a-f]{8}-[0-9a-f]{4}-4[0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/i;
+  const LEGACY_PLAYER_ID_PATTERN = /^[A-Za-z0-9_-]{22}$/;
+  const PLAYER_SECRET_PATTERN = /^[0-9a-f]{64}$/i;
   const ABSOLUTE_ZERO_C = -273.15;
   const CONTINUOUS_PLAY_TARGET_MS = 60 * 60 * 1000;
   const CONTINUOUS_PLAY_24H_TARGET_MS = 24 * 60 * 60 * 1000;
   const HELD_TARGET_MS = 30 * 1000;
-  const COMPLETIONIST_ID = "true_tarinai_observer";
+  const ACHIEVEMENT_CATALOG = global.TARINAI_ACHIEVEMENT_CATALOG;
+  if (!ACHIEVEMENT_CATALOG || !Array.isArray(ACHIEVEMENT_CATALOG.definitions) || !Array.isArray(ACHIEVEMENT_CATALOG.categories)) {
+    throw new Error("achievement catalog unavailable");
+  }
+  const COMPLETIONIST_ID = String(ACHIEVEMENT_CATALOG.completionistId || "true_tarinai_observer");
+  const ACHIEVEMENT_CATALOG_REVISION = String(ACHIEVEMENT_CATALOG.revision || "unknown");
   const GENERATION_TARGET = 10;
-  const CHAOS_FIGHT_TARGET = 666;
-  const SNIPER_SHOT_TARGET = 333;
-  const FERTILITY_BIRTH_TARGET = 721;
-  const DAILY_PLAY_TARGET = 7;
-  const WIRE_SHOCK_TARGET = 7;
   const DAY_MS = 24 * 60 * 60 * 1000;
-  const ROBOT_CLEAN_TARGET = 200;
-  const ROBOT_ALL_TARGET_MASK = 0x3f;
   const SYNC_DEBOUNCE_MS = 450;
   const FULL_SYNC_INTERVAL_MS = 5 * 60 * 1000;
-  const SPELL_STATE_VERSION = 8;
-  const MEDICINE_LEDGER_TYPES = Object.freeze(["first_aid", "sedative", "sleep_drug", "laxative", "protein", "niteropu", "ammo", "mystery_drug", "mercury", "giant_drug", "dwarf_drug"]);
-  const DIRECT_TREATMENT_TYPES = new Set(["first_aid", "sedative", "sleep_drug", "laxative", "protein", "niteropu", "ammo", "mystery_drug", "mercury", "giant_drug", "dwarf_drug"]);
+  const SYNC_PROTOCOL_VERSION = 5;
+  const SPELL_STATE_VERSION = 11; // v11 stores additive counters only in the canonical ledger.
+  const MEDICINE_LEDGER_TYPES = Object.freeze([...(ACHIEVEMENT_CATALOG.medicineLedgerTypes || [])]);
+  const LINK_PROGRESS_TYPES = Object.freeze([...(ACHIEVEMENT_CATALOG.linkProgressTypes || [])]);
+  const ADDITIVE_PROGRESS_CAPS = Object.freeze({ ...(ACHIEVEMENT_CATALOG.additiveProgressCaps || {}) });
+  const ADDITIVE_PROGRESS_KEYS = Object.freeze(Object.keys(ADDITIVE_PROGRESS_CAPS));
+  const CHAOS_FIGHT_TARGET = ADDITIVE_PROGRESS_CAPS.fightMochiFightCount;
+  const SNIPER_SHOT_TARGET = ADDITIVE_PROGRESS_CAPS.shotCount;
+  const FERTILITY_BIRTH_TARGET = ADDITIVE_PROGRESS_CAPS.loveMochiBirthCount;
+  const DAILY_PLAY_TARGET = 7;
+  const WIRE_SHOCK_TARGET = 7;
+  const ROBOT_CLEAN_TARGET = ADDITIVE_PROGRESS_CAPS.robotCleanCount;
+  const ROBOT_ALL_TARGET_MASK = 0x7f;
   const OBSERVER_GAME_DAYS = 3;
   const STRENGTH_IN_NUMBERS_TARGET = 100;
   const ELITE_FEW_MAX_POPULATION = 25;
   const ELITE_FEW_TARGET_DAYS = 5;
-  const STATISTICIAN_TARGET = 30;
-  const LIVELY_MAKING_TARGET = 100;
-  const MEMENTO_MORI_TARGET = 10000;
+  const STATISTICIAN_TARGET = ADDITIVE_PROGRESS_CAPS.statsButtonPressCount;
+  const LIVELY_MAKING_TARGET = ADDITIVE_PROGRESS_CAPS.manualTarinaiAddedCount;
+  const MEMENTO_MORI_TARGET = ADDITIVE_PROGRESS_CAPS.totalDeathCount;
+  const MAD_SCIENTIST_TARGET = Number(ACHIEVEMENT_CATALOG.definitions.find(def => def.id === "mad_scientist")?.progress?.target || 10);
   const FULL_SEASON_CYCLE_DAYS = 20;
-  const PRE_UNLOCK_DESCRIPTION_IDS = new Set([
-    "natural_zunchi_slave",
-    "natural_tarinai_king",
-    "revolution",
-    "laxative_starvation",
-    "natural_zunchi_slave_5_generations",
-    "natural_tarinai_king_3_generations",
-    "first_birth",
-    "lifespan_completed",
-    "birth_50_in_60_seconds",
-    "death_50_in_10_seconds",
-    "all_non_sleep_diseased_25",
-    "colony_happy",
-    "safe_colony_25_5_minutes",
-    "ants_alive_25",
-    "great_mother_1000_births",
-    "continuous_play_1_hour",
-    "low_fps_single_digit",
-    "continuous_play_24_hours",
-    "robot_cleaner_100",
-    "mercury_lifespan",
-    "enemy_enemy_friend",
-    "eternal_history_generation_10",
-    "town_doctor_50",
-    "chaos_seeker_666_fights",
-    "fertility_seeker_721_love_births",
-    "daily_play_7_days",
-    "elite_few",
-    "lively_making",
-    "memento_mori",
-  ]);
-  const ACHIEVEMENT_CATEGORIES = Object.freeze([
-    Object.freeze({
-      id: "ecology",
-      title: "\u751f\u614b",
-      ids: Object.freeze([
-        "natural_zunchi_slave", "natural_tarinai_king", "lifespan_completed",
-        "all_non_sleep_diseased_25", "colony_happy", "direct_feed_33",
-        "safe_colony_25_5_minutes", "ants_alive_25", "overprotective",
-        "self_sufficient", "rain_shelter_all", "medicine_ledger_all",
-        "enemy_enemy_friend", "king_full_satisfaction", "slave_zero_satisfaction",
-        "town_doctor_50", "ant_nest_without_tarinai", "zunchi_overflow",
-        "comfortable_beds", "stone_pillow", "favorite_one",
-      ]),
-    }),
-    Object.freeze({
-      id: "population",
-      title: "\u7e41\u6b96\u30fb\u4eba\u53e3",
-      ids: Object.freeze([
-        "first_birth", "natural_zunchi_slave_5_generations", "natural_tarinai_king_3_generations",
-        "birth_50_in_60_seconds", "great_mother_1000_births", "eternal_history_generation_10",
-        "fertility_seeker_721_love_births", "strength_in_numbers", "elite_few",
-        "lively_making", "memento_mori",
-      ]),
-    }),
-    Object.freeze({
-      id: "experiment",
-      title: "\u5b9f\u9a13",
-      ids: Object.freeze([
-        "self_zunchi_death", "death_50_in_10_seconds", "soccer_ball_death",
-        "fight_pair_danger_kill", "ignite_during_birth_ritual", "laxative_starvation",
-        "ants_killed_100", "below_absolute_zero_item", "sauna_cold_plunge",
-        "mercury_lifespan", "revolution", "fuel_to_fire",
-        "chaos_seeker_666_fights", "sticky_bomb_15_passes", "wire_shock_7_tarinai",
-      ]),
-    }),
-    Object.freeze({
-      id: "construction",
-      title: "\u5efa\u7bc9",
-      ids: Object.freeze([
-        "placed_objects_100", "mechanized_industry", "information_industry", "robot_cleaner_100",
-        "minimalist_happy", "unplanned_city_30", "clean_freak_robot_only", "megalopolis",
-        "sandbox_five_toilets", "park_ground_changed", "ground_change_4_in_1_second",
-      ]),
-    }),
-    Object.freeze({
-      id: "operation",
-      title: "\u64cd\u4f5c",
-      ids: Object.freeze([
-        "idle_observer_5_minutes", "secret_collection_9_slots", "pause_spam_4_in_1_second",
-        "undo_mass_revival", "held_30_seconds", "undo_20", "redo_20",
-        "poke_plushie_fling", "sniper_333_shots", "statistician", "well_informed",
-      ]),
-    }),
-    Object.freeze({
-      id: "other",
-      title: "\u305d\u306e\u4ed6",
-      ids: Object.freeze([
-        "low_fps_single_digit", "daily_play_7_days", "continuous_play_24_hours",
-        "continuous_play_1_hour", "across_seasons", "true_tarinai_observer",
-      ]),
-    }),
-  ]);
-  const DEFINITIONS = Object.freeze([
-    Object.freeze({ id: "first_birth", title: "\u306f\u3058\u3081\u3066\u306e\u7e41\u6b96", description: "\u305f\u308a\u306a\u3044\u306e\u7e41\u6b96\u30921\u56de\u6210\u529f\u3055\u305b\u308b\u3002" }),
-    Object.freeze({ id: "natural_zunchi_slave", title: "\u305a\u3093\u3061\u3069\u308c\u3044", description: "\u305a\u3093\u3061\u3069\u308c\u3044\u304c\u51fa\u73fe\u3059\u308b\u3002" }),
-    Object.freeze({ id: "natural_tarinai_king", title: "\u305f\u308a\u306a\u3044\u738b", description: "\u305f\u308a\u306a\u3044\u738b\u304c\u51fa\u73fe\u3059\u308b\u3002" }),
-    Object.freeze({ id: "self_zunchi_death", title: "\u3042\u3041\uff3e\uff5e \u305f\u307e\u3089\u306d\u3047\u305c", description: "\u304a\u3057\u308a\u92f2\u3092\u629c\u3044\u305f\u6642\u3001\u81ea\u5206\u306e\u305a\u3093\u3061\u3067\u81ea\u7206\u3059\u308b\u3002" }),
-    Object.freeze({ id: "natural_zunchi_slave_5_generations", title: "\u672b\u4ee3\u307e\u3067\u306e\u6065", description: "5\u4ee3\u9023\u7d9a\u3067\u305a\u3093\u3061\u3069\u308c\u3044\uff08\u9396\u306a\u3057\uff09" }),
-    Object.freeze({ id: "natural_tarinai_king_3_generations", title: "\u83ef\u9e97\u306a\u308b\u738b\u65cf", description: "3\u4ee3\u9023\u7d9a\u3067\u305f\u308a\u306a\u3044\u738b\uff08\u738b\u51a0\u306a\u3057\uff09" }),
-    Object.freeze({ id: "death_50_in_10_seconds", title: "6\u756a\u76ee\u306e\u5927\u91cf\u7d76\u6ec5", description: "10\u79d2\u4ee5\u5185\u306b50\u4f53\u306e\u305f\u308a\u306a\u3044\u304c\u6b7b\u4ea1\u3059\u308b\u3002" }),
-    Object.freeze({ id: "birth_50_in_60_seconds", title: "\u30d9\u30d3\u30fc\u30d6\u30fc\u30e0", description: "1\u5206\u4ee5\u5185\u306b30\u4f53\u306e\u305f\u308a\u306a\u3044\u304c\u8a95\u751f\u3059\u308b\u3002" }),
-    Object.freeze({ id: "great_mother_1000_births", title: "\u5927\u3044\u306a\u308b\u6bcd", description: "\u305f\u308a\u306a\u3044\u3092\u7e41\u6b96\u3067\u7d2f\u8a083333\u4f53\u8a95\u751f\u3055\u305b\u308b\u3002" }),
-    Object.freeze({ id: "lifespan_completed", title: "\u5929\u5bff", description: "\u305f\u308a\u306a\u30441\u4f53\u304c\u5929\u5bff\u3092\u5168\u3046\u3059\u308b\u3002" }),
-    Object.freeze({ id: "soccer_ball_death", title: "\u8c46\u91ce\u3001\u6bba\u30c3\u30ab\u30fc\u3084\u308d\u3046\u305c\uff01", description: "\u30b5\u30c3\u30ab\u30fc\u30dc\u30fc\u30eb\u3068\u306e\u885d\u7a81\u3067\u3001\u305f\u308a\u306a\u30441\u4f53\u304c\u6b7b\u4ea1\u3059\u308b\u3002" }),
-    Object.freeze({ id: "fight_pair_danger_kill", title: "\u55a7\u5629\u4e21\u6210\u6557", description: "\u55a7\u5629\u4e2d\u306e\u305f\u308a\u306a\u3044\u3092\u3001\u4e21\u65b9\u3068\u3082\u5371\u967a\u30ab\u30c6\u30b4\u30ea\u306e\u30a2\u30a4\u30c6\u30e0\u3067\u5012\u3059\u3002" }),
-    Object.freeze({ id: "all_non_sleep_diseased_25", title: "\u7dca\u6025\u4e8b\u614b\u5ba3\u8a00", description: "25\u4f53\u4ee5\u4e0a\u304c\u5b58\u547d\u3057\u3001\u30d5\u30a3\u30fc\u30eb\u30c9\u4e0a\u306e\u5168\u54e1\u304c\u306d\u3080\u308a\u75c5\u4ee5\u5916\u306e\u75c5\u6c17\u306b\u304b\u304b\u308b\u3002" }),
-    Object.freeze({ id: "colony_happy", title: "\u7ba1\u7406\u3055\u308c\u305f\u697d\u5712", description: "\u30b3\u30ed\u30cb\u30fc\u72b6\u614b\u3092\u3057\u3070\u3089\u304f\u300c\u5e78\u798f\u300d\u306b\u3059\u308b\u3002" }),
-    Object.freeze({ id: "direct_feed_33", title: "\u990c\u3084\u308a\u3058\u3044\u3055\u3093", description: "\u624b\u304b\u3089\u76f4\u63a533\u56de\u990c\u3092\u4e0e\u3048\u308b\u3002" }),
-    Object.freeze({ id: "ignite_during_birth_ritual", title: "\u71c3\u3048\u4e0a\u304c\u308b\u604b", description: "\u305f\u308a\u306a\u3044\u304c\u30d8\u30b3\u30d8\u30b3\u4e2d\u306b\u7740\u706b\u3059\u308b\u3002" }),
-    Object.freeze({ id: "laxative_starvation", title: "\u5185\u81d3\u5168\u90e8\u51fa\u305f", description: "\u4e0b\u5264\u306e\u52b9\u679c\u4e2d\u306b\u9913\u6b7b\u3059\u308b\u3002" }),
-    Object.freeze({ id: "idle_observer_5_minutes", title: "\u76e3\u8996\u30ab\u30e1\u30e9", description: "3\u30b2\u30fc\u30e0\u65e5\u3001\u64cd\u4f5c\u305b\u305a\u753b\u9762\u3092\u898b\u308b\u3060\u3051" }),
-    Object.freeze({ id: "placed_objects_100", title: "\u7269\u3067\u3044\u3063\u3071\u3044", description: "\u914d\u7f6e\u7269\u3092\u7d2f\u8a08100\u500b\u7f6e\u304f\u3002" }),
-    Object.freeze({ id: "mechanized_industry", title: "\u6a5f\u68b0\u5316\u7523\u696d", description: "\u691c\u77e5\u5668\u306e\u4fe1\u53f7\u3067\u63a5\u7d9a\u5148\u3092\u4f5c\u52d5\u3055\u305b\u3001\u30ed\u30fc\u30d7\u30fb\u68d2\u30fb\u3070\u306d\u3092\u305d\u308c\u305e\u308c1\u672c\u4ee5\u4e0a\u8a2d\u7f6e\u3059\u308b\u3002" }),
-    Object.freeze({ id: "safe_colony_25_5_minutes", title: "\u5b89\u5168\u7b2c\u4e00", description: "25\u4f53\u4ee5\u4e0a\u3044\u308b\u72b6\u614b\u3092\u30b2\u30fc\u30e0\u51855\u5206\u9593\u7dad\u6301\u3057\u3001\u305d\u306e\u9593\u5bff\u547d\u4ee5\u5916\u3067\u6b7b\u4ea1\u8005\u3092\u51fa\u3055\u306a\u3044\u3002" }),
-    Object.freeze({ id: "ants_alive_25", title: "\u30a2\u30ea\u306e\u60d1\u661f", description: "\u751f\u5b58\u3057\u3066\u3044\u308b\u30a2\u30ea\u304c25\u4f53\u306b\u5230\u9054\u3059\u308b\u3002" }),
-    Object.freeze({ id: "ants_killed_100", title: "\u5bb3\u866b\u99c6\u9664", description: "\u30a2\u30ea\u3092\u7d2f\u8a08100\u4f53\u5012\u3059\u3002" }),
-    Object.freeze({ id: "secret_collection_9_slots", title: "\u79d8\u5bc6\u306e\u30b3\u30ec\u30af\u30b7\u30e7\u30f3", description: "\u30bb\u30fc\u30d6\u30b9\u30ed\u30c3\u30c89\u3064\u3092\u3059\u3079\u3066\u57cb\u3081\u308b\u3002" }),
-    Object.freeze({ id: "pause_spam_4_in_1_second", title: "\u4f55\u3084\u3063\u3066\u308b\u306e\uff1f", description: "\u4f55\u3082\u306a\u3044\u90e8\u5206\u30921\u79d2\u9593\u306b4\u56de\u9023\u6253\u3059\u308b\u3002" }),
-    Object.freeze({ id: "continuous_play_1_hour", title: "\u3081\u3063\u3061\u3083\u305f\u308a\u306a\u3044\u89b3\u5bdf", description: "1\u6642\u9593\u9023\u7d9a\u30d7\u30ec\u30a4\u3059\u308b\u3002" }),
-    Object.freeze({ id: "below_absolute_zero_item", title: "\u7269\u7406\u6cd5\u5247\u3092\u4e0b\u5074\u306b\u8d85\u8d8a", description: "\u6e29\u5ea6\u8a08\u7b97\u3055\u308c\u308b\u30a2\u30a4\u30c6\u30e0\u30921\u3064\u7d76\u5bfe\u96f6\u5ea6\u3092\u4e0b\u56de\u308b\u6e29\u5ea6\u306b\u3059\u308b\u3002" }),
-    Object.freeze({ id: "undo_mass_revival", title: "\u898b\u306a\u304b\u3063\u305f\u3053\u3068\u306b\u3057\u3088\u3046", description: "\u4e00\u5ea6\u306eUndo\u306710\u4f53\u4ee5\u4e0a\u306e\u6b7b\u4ea1\u3092\u306a\u304b\u3063\u305f\u3053\u3068\u306b\u3059\u308b\u3002" }),
-    Object.freeze({ id: "robot_cleaner_100", title: "\u6e05\u6383\u696d\u8005", description: "\u30ed\u30dc\u6383\u9664\u6a5f\u306b\u305a\u3093\u3061\u30fb\u6b7b\u9ab8\u30fb\u6c5a\u308c\u3092\u7d2f\u8a08200\u500b\u51e6\u7406\u3055\u305b\u308b\u3002" }),
-    Object.freeze({ id: "held_30_seconds", title: "\u7a7a\u4e2d\u751f\u6d3b", description: "\u540c\u3058\u305f\u308a\u306a\u3044\u309230\u79d2\u9593\u3064\u307e\u307f\u7d9a\u3051\u308b\u3002" }),
-    Object.freeze({ id: "minimalist_happy", title: "\u30df\u30cb\u30de\u30ea\u30b9\u30c8", description: "\u30d7\u30ec\u30a4\u958b\u59cb6\u65e5\u76ee\u4ee5\u964d\u3001\u914d\u7f6e\u7269\u309210\u500b\u4ee5\u4e0b\u306b\u6291\u3048\u3066\u30b3\u30ed\u30cb\u30fc\u72b6\u614b\u3092\u300c\u5e78\u798f\u300d\u306b\u3059\u308b\u3002" }),
-    Object.freeze({ id: "overprotective", title: "\u904e\u4fdd\u8b77", description: "\u540c\u3058\u305f\u308a\u306a\u3044\u306b\u624b\u304b\u308910\u56de\u990c\u3092\u4e0e\u3048\u30013\u56de\u4ee5\u4e0a\u85ac\u3067\u6cbb\u7642\u3059\u308b\u3002" }),
-    Object.freeze({ id: "self_sufficient", title: "\u81ea\u7d66\u81ea\u8db3", description: "\u8907\u88fd\u6a5f\u304c\u306a\u3044\u72b6\u614b\u3067\u300120\u4f53\u4ee5\u4e0a\u3092\u76f4\u63a5\u7d66\u990c\u305b\u305a10\u5206\u9593\u7dad\u6301\u3059\u308b\u3002" }),
-    Object.freeze({ id: "unplanned_city_30", title: "\u7121\u8a08\u753b\u90fd\u5e02", description: "\u914d\u7f6e\u5f8c30\u79d2\u4ee5\u5185\u306b\u524a\u9664\u3059\u308b\u64cd\u4f5c\u3092\u7d2f\u8a0830\u56de\u884c\u3046\u3002" }),
-    Object.freeze({ id: "sauna_cold_plunge", title: "\u30b5\u30a6\u30ca\u6c34\u98a8\u5442", description: "\u6691\u3059\u304e\u308b\u72b6\u614b\u306b\u306a\u3063\u305f\u305f\u308a\u306a\u3044\u3092\u300115\u79d2\u4ee5\u5185\u306b\u5bd2\u3059\u304e\u308b\u72b6\u614b\u306b\u3059\u308b\u3002" }),
-    Object.freeze({ id: "rain_shelter_all", title: "\u96e8\u5bbf\u308a\u5b8c\u4e86", description: "\u96e8\u5929\u6642\u300120\u4f53\u4ee5\u4e0a\u306e\u5168\u54e1\u3092\u30d1\u30e9\u30bd\u30eb\u30fb\u5de3\u7bb1\u30fb\u571f\u7ba1\u3067\u96e8\u5bbf\u308a\u3055\u305b\u308b\u3002" }),
-    Object.freeze({ id: "medicine_ledger_all", title: "\u304a\u304f\u3059\u308a\u624b\u5e33\u5168\u57cb\u3081", description: "\u5168\u7a2e\u985e\u306e\u85ac\u3092\u5c11\u306a\u304f\u3068\u30821\u56de\u4f7f\u7528\u3059\u308b\u3002" }),
-    Object.freeze({ id: "mercury_lifespan", title: "\u4e0d\u8001\u4e0d\u6b7b\u307e\u3067\u3042\u3068\u4e00\u6b69", description: "\u6c34\u9280\u3092\u4f7f\u7528\u3057\u305f\u305f\u308a\u306a\u3044\u304c\u5929\u5bff\u3092\u5168\u3046\u3059\u308b\u3002" }),
-    Object.freeze({ id: "enemy_enemy_friend", title: "\u6575\u306e\u6575\u306f\u5473\u65b9", description: "\u305f\u308a\u306a\u304430\u4f53\u4ee5\u4e0a\u3092\u7121\u50b7\u3067\u4fdd\u3061\u306a\u304c\u3089\u3001\u5371\u967a\u30a2\u30a4\u30c6\u30e0\u3067\u30a2\u30ea\u309210\u4f53\u5012\u3059\u3002" }),
-    Object.freeze({ id: "revolution", title: "\u9769\u547d", description: "\u305a\u3093\u3061\u3069\u308c\u3044\u304c\u3001\u305f\u308a\u306a\u3044\u738b\u3092\u55a7\u5629\u3067\u6b7b\u4ea1\u3055\u305b\u308b\u3002" }),
-    Object.freeze({ id: "fuel_to_fire", title: "\u706b\u306b\u6cb9", description: "\u3051\u3093\u304b\u9905\u3092\u4e0e\u3048\u305f\u305f\u308a\u306a\u3044\u304c30\u79d2\u4ee5\u5185\u306b\u55a7\u5629\u3092\u59cb\u3081\u308b\u3002" }),
-    Object.freeze({ id: "undo_20", title: "\u3084\u3063\u3071\u306a\u3057", description: "Undo\u3092\u7d2f\u8a0820\u56de\u6210\u529f\u3055\u305b\u308b\u3002" }),
-    Object.freeze({ id: "redo_20", title: "\u3084\u3063\u3071\u3042\u308a", description: "Redo\u3092\u7d2f\u8a0820\u56de\u6210\u529f\u3055\u305b\u308b\u3002" }),
-    Object.freeze({ id: "eternal_history_generation_10", title: "\u60a0\u4e45\u306e\u6b74\u53f2", description: "\u4e16\u4ee3\u304c10\u306b\u5230\u9054\u3059\u308b\u3002" }),
-    Object.freeze({ id: "king_full_satisfaction", title: "\u4e94\u4f53\u6e80\u8db3", description: "\u305f\u308a\u306a\u3044\u738b1\u500b\u4f53\u306b\u30d7\u30ed\u30c6\u30a4\u30f3\u3068\u5de8\u5927\u85ac\u306e\u52b9\u679c\u3092\u540c\u6642\u306b\u4ed8\u4e0e\u3059\u308b\u3002" }),
-    Object.freeze({ id: "slave_zero_satisfaction", title: "\u96f6\u4f53\u6e80\u8db3", description: "\u305a\u3093\u3061\u3069\u308c\u30441\u500b\u4f53\u306b\u30f3\u30a4\u30c6\u30ed\u30d7\u3068\u77ee\u5c0f\u85ac\u306e\u52b9\u679c\u3092\u540c\u6642\u306b\u4ed8\u4e0e\u3059\u308b\u3002" }),
-    Object.freeze({ id: "town_doctor_50", title: "\u753a\u306e\u304a\u533b\u8005\u3055\u3093", description: "\u6551\u6025\u85ac\u3092\u7d2f\u8a0850\u56de\u4f7f\u7528\u3057\u3001\u4f53\u529b\u3092\u56de\u5fa9\u3055\u305b\u308b\u3002" }),
-    Object.freeze({ id: "poke_plushie_fling", title: "\u5272\u3068\u3075\u308f\u3075\u308f", description: "\u306c\u3044\u3050\u308b\u307f\u3092\u300c\u3064\u3064\u304f\u300d\u3067\u5f3e\u304d\u98db\u3070\u3059\u3002" }),
-    Object.freeze({ id: "chaos_seeker_666_fights", title: "\u6df7\u6c8c\u30f2\u5e0c\u6c42\u30b9\u30eb\u8005", description: "\u3051\u3093\u304b\u9905\u306e\u5f71\u97ff\u4e0b\u3067\u55a7\u5629\u3092\u7d2f\u8a08666\u56de\u767a\u751f\u3055\u305b\u308b\u3002" }),
-    Object.freeze({ id: "clean_freak_robot_only", title: "\u6f54\u7656\u75c7", description: "\u30ed\u30dc\u30c3\u30c8\u6383\u9664\u6a5f\u306e\u8a2d\u5b9a\u5168\u9805\u76ee\u306b\u30c1\u30a7\u30c3\u30af\u3092\u5165\u308c\u3066\u7a3c\u50cd\u3055\u305b\u3001\u30d5\u30a3\u30fc\u30eb\u30c9\u4e0a\u306b\u30ed\u30dc\u30c3\u30c8\u6383\u9664\u6a5f\u4ee5\u5916\u3092\u5b58\u5728\u3055\u305b\u306a\u3044\u3002" }),
-    Object.freeze({ id: "true_tarinai_observer", title: "\u771f\u30fb\u305f\u308a\u306a\u3044\u89b3\u5bdf", description: "\u3053\u308c\u4ee5\u5916\u306e\u5168\u3066\u306e\u5b9f\u7e3e\u3092\u9054\u6210\u3059\u308b\u3002" }),
-    Object.freeze({ id: "sniper_333_shots", title: "\u72d9\u6483\u624b", description: "\u7d2f\u8a08333\u767a\u6483\u3064\u3002" }),
-    Object.freeze({ id: "megalopolis", title: "\u30e1\u30ac\u30ed\u30dd\u30ea\u30b9", description: "\u8907\u88fd\u6a5f\u309210\u500b\u4ee5\u4e0a\u3001\u5e72\u8349\u5bdd\u5e8a\u30fb\u5de3\u7bb1\u30fb\u571f\u7ba1\u3092\u5408\u8a0815\u500b\u4ee5\u4e0a\u8a2d\u7f6e\u3057\u3001\u305f\u308a\u306a\u3044\u3092100\u4f53\u4ee5\u4e0a\u751f\u5b58\u3055\u305b\u308b\u3002" }),
-    Object.freeze({ id: "fertility_seeker_721_love_births", title: "\u8c4a\u7a63\u30f2\u5e0c\u6c42\u30b9\u30eb\u8005", description: "\u3078\u3053\u9905\u306e\u5f71\u97ff\u4e0b\u3067\u7e41\u6b96\u3092721\u56de\u6210\u529f\u3055\u305b\u308b\u3002" }),
-    Object.freeze({ id: "low_fps_single_digit", title: "\u30b9\u30da\u30c3\u30af\u304c\u305f\u308a\u306a\u3044", description: "fps\u30921\u6841\u306b\u3059\u308b\u3002" }),
-    Object.freeze({ id: "continuous_play_24_hours", title: "\u5bdd\u308d", description: "24\u6642\u9593\u9023\u7d9a\u3067\u30d7\u30ec\u30a4\u3059\u308b\u3002" }),
-    Object.freeze({ id: "sandbox_five_toilets", title: "\u7802\u5834", description: "\u30c8\u30a4\u30ec\u306e\u7802\u3092\u30d5\u30a3\u30fc\u30eb\u30c9\u306b5\u500b\u8a2d\u7f6e\u3059\u308b\u3002" }),
-    Object.freeze({ id: "park_ground_changed", title: "\u305d\u3053\u516c\u5171\u7a7a\u9593\u3060\u3088\uff1f", description: "\u516c\u5712\u306e\u5730\u9762\u3092\u52dd\u624b\u306b\u5909\u66f4\u3059\u308b\u3002" }),
-    Object.freeze({ id: "ground_change_4_in_1_second", title: "\u7834\u683c\u306e\u5de5\u4e8b\u8cbb\u7528", description: "\u5730\u9762\u3092\u5909\u3048\u3059\u304e\u3066\u7834\u7523\u3059\u308b\u3002" }),
-    Object.freeze({ id: "ant_nest_without_tarinai", title: "\u30a2\u30ea\u89b3\u5bdf", description: "\u30a2\u30ea\u306e\u5de3\u304c\u3042\u308b\u304c\u3001\u305f\u308a\u306a\u3044\u304c\u3044\u306a\u3044\u3002" }),
-    Object.freeze({ id: "sticky_bomb_15_passes", title: "\u547d\u306e\u30d0\u30c8\u30f3", description: "\u7c98\u7740\u30dc\u30e0\u3092\u7206\u767a\u307e\u3067\u306b15\u56de\u4ee5\u4e0a\u30d1\u30b9\u3059\u308b\u3002" }),
-    Object.freeze({ id: "daily_play_7_days", title: "\u6bce\u65e5\u305f\u308a\u306a\u3044\u89b3\u5bdf", description: "7\u65e5\u9023\u7d9a\u3067\u30d7\u30ec\u30a4\u3059\u308b\u3002" }),
-    Object.freeze({ id: "wire_shock_7_tarinai", title: "\u62b5\u6297\u5668\u3058\u3083\u306a\u3044", description: "\u96fb\u6d41\u304c\u6d41\u308c\u3066\u3044\u308b1\u672c\u306e\u96fb\u7dda\u30677\u4f53\u306e\u305f\u308a\u306a\u3044\u3092\u611f\u96fb\u3055\u305b\u308b\u3002" }),
-    Object.freeze({ id: "information_industry", title: "\u60c5\u5831\u5316\u7523\u696d", description: "\u57fa\u76e4\u540c\u58eb\u3092\u96fb\u7dda\u985e\u3067\u3064\u306a\u304e\u3001\u4fe1\u53f7\u3092\u6d41\u3059\u3002" }),
-    Object.freeze({ id: "strength_in_numbers", title: "\u6570\u3053\u305d\u529b", description: "\u751f\u5b58\u3057\u3066\u3044\u308b\u305f\u308a\u306a\u3044\u304c100\u4f53\u306b\u5230\u9054\u3059\u308b\u3002" }),
-    Object.freeze({ id: "elite_few", title: "\u5c11\u6570\u7cbe\u92ed", description: "\u305f\u308a\u306a\u3044\u304c25\u4f53\u4ee5\u4e0b\u306e\u72b6\u614b\u30925\u65e5\u9593\u7dad\u6301\u3059\u308b\u3002" }),
-    Object.freeze({ id: "zunchi_overflow", title: "\u8e29\u5c4e\u611f", description: "\u305f\u308a\u306a\u3044\u304c20\u4f53\u4ee5\u4e0a\u3044\u308b\u72b6\u614b\u3067\u3001\u305a\u3093\u3061\u306e\u6570\u304c\u305f\u308a\u306a\u3044\u306e\u6570\u3092\u4e0a\u56de\u308b\u3002" }),
-    Object.freeze({ id: "comfortable_beds", title: "\u5feb\u9069\u306a\u5bdd\u5e8a", description: "\u751f\u5b58\u3057\u3066\u3044\u308b\u5168\u3066\u306e\u305f\u308a\u306a\u3044\u306b\u884c\u304d\u6e21\u308b\u6570\u306e\u5bdd\u5e8a\u3092\u7528\u610f\u3059\u308b\u3002" }),
-    Object.freeze({ id: "stone_pillow", title: "\u77f3\u306b\u6795\u3059", description: "\u305f\u308a\u306a\u3044\u304c30\u4f53\u4ee5\u4e0a\u3044\u308b\u72b6\u614b\u3067\u3001\u5bdd\u5e8a\u5145\u8db3\u7387\u30920%\u306b\u3059\u308b\u3002" }),
-    Object.freeze({ id: "across_seasons", title: "\u5b63\u7bc0\u3092\u8d8a\u3048\u3066", description: "\u6625\u590f\u79cb\u51ac\u306e\u56db\u5b63\u3092\u4e00\u5de1\u3059\u308b\u3002" }),
-    Object.freeze({ id: "favorite_one", title: "\u63a8\u3057", description: "\u3042\u308b\u500b\u4f53\u3092\u304a\u6c17\u306b\u5165\u308a\u306b\u767b\u9332\u3059\u308b\u3002" }),
-    Object.freeze({ id: "statistician", title: "\u7d71\u8a08\u5b66\u8005", description: "\u7d71\u8a08\u306e\u500b\u4f53\u6570\u30fb\u6b32\u6c42\u30fb\u74b0\u5883\u30fb\u30b0\u30e9\u30d5\u8868\u793a\u5207\u66ff\u30dc\u30bf\u30f3\u3092\u7d2f\u8a0830\u56de\u62bc\u3059\u3002" }),
-    Object.freeze({ id: "well_informed", title: "\u60c5\u5831\u901a", description: "\u30d7\u30c3\u30b7\u30e5\u901a\u77e5\u3092ON\u306b\u3059\u308b\u3002" }),
-    Object.freeze({ id: "lively_making", title: "\u8cd1\u308f\u3044\u3065\u304f\u308a", description: "\u300c\u305f\u308a\u306a\u3044\u3092\u8ffd\u52a0\u300d\u3067100\u4f53\u8ffd\u52a0\u3059\u308b\u3002" }),
-    Object.freeze({ id: "memento_mori", title: "\u30e1\u30e1\u30f3\u30c8\u30fb\u30e2\u30ea", description: "\u305f\u308a\u306a\u3044\u304c\u5408\u8a0810000\u4f53\u6b7b\u4ea1\u3059\u308b\u3002" }),
-  ]);
+  const DEFINITIONS = Object.freeze(ACHIEVEMENT_CATALOG.definitions.map(definition => Object.freeze({ ...definition })));
+  const PRE_UNLOCK_DESCRIPTION_IDS = new Set(DEFINITIONS.filter(definition => definition.showLockedDescription).map(definition => definition.id));
+  const ACHIEVEMENT_CATEGORIES = Object.freeze(ACHIEVEMENT_CATALOG.categories.map(category => Object.freeze({
+    id: String(category.id || ""),
+    title: String(category.title || ""),
+    ids: Object.freeze(DEFINITIONS.filter(definition => definition.category === category.id).map(definition => definition.id)),
+  })));
   const definitionById = new Map(DEFINITIONS.map(def => [def.id, def]));
   const CATEGORY_DEFINITIONS = new Map(ACHIEVEMENT_CATEGORIES.map(category => [
     category.id,
@@ -228,8 +106,25 @@
     pauseButton: document.getElementById("pauseBtn"),
   };
 
-  let state = loadState();
-  let shared = { connected: false, loading: false, totalPlayers: 0, achievements: {} };
+  function createPersistenceActorId() {
+    if (global.crypto?.randomUUID) return global.crypto.randomUUID();
+    return `tab-${Date.now().toString(36)}-${Math.random().toString(36).slice(2)}-${Math.random().toString(36).slice(2)}`;
+  }
+
+  const persistenceActorId = createPersistenceActorId();
+  let persistenceGeneration = 0;
+  let persistenceRevision = 0;
+  let persistenceHydrated = false;
+  let persistenceDirty = false;
+  let durableWriteQueue = Promise.resolve();
+  let persistenceReadyPromise = Promise.resolve();
+  let persistenceChannel = null;
+  const initialPersistence = loadStateRecord();
+  const initialPersistenceBaseline = normalizeState(initialPersistence.state);
+  let state = initialPersistence.state;
+  persistenceGeneration = initialPersistence.generation;
+  persistenceRevision = initialPersistence.revision;
+  let shared = { connected: false, loading: false, totalPlayers: 0, achievements: {}, statisticsTrust: "client-reported" };
   let requestSerial = 0;
   let runtimeByWorld = new WeakMap();
   let dangerFightDeathsByWorld = new WeakMap();
@@ -239,82 +134,734 @@
   let toastActive = false;
   let emptyClickTimes = [];
   let groundChangeTimes = [];
-  let continuousPlayStartedAt = Date.now();
-  let continuousPlayLastHeartbeatAt = continuousPlayStartedAt;
+  let continuousPlayAccumulatedMs = 0;
+  let continuousPlayLastHeartbeatAt = Date.now();
+  let continuousPlayActive = !document.hidden;
   let lastListSignature = "";
   let scheduledSyncTimer = 0;
   let scheduledProgressSaveTimer = 0;
+  let progressMutationRevision = 0;
+  let progressSyncedRevision = 0;
 
-  function blankState() {
-    return { unlocked: {}, pending: [], resetPending: false, debugUnlocked: [], progress: { placementCount: 0, linkTypes: [], signalActivated: false, antKills: 0, birthCount: 0, quickDeleteCount: 0, undoCount: 0, redoCount: 0, medicineTypes: [], firstAidHeals: 0, fightMochiFightCount: 0, shotCount: 0, loveMochiBirthCount: 0, dailyPlayStreak: 0, dailyPlayLastDay: 0, statsButtonPressCount: 0, totalDeathCount: 0, manualTarinaiAddedCount: 0 } };
+  function blankProgressLedger() {
+    return {
+      base: Object.fromEntries(ADDITIVE_PROGRESS_KEYS.map(key => [key, 0])),
+      shards: Object.fromEntries(ADDITIVE_PROGRESS_KEYS.map(key => [key, {}])),
+    };
   }
 
-  function loadState() {
+  function blankState() {
+    return {
+      unlocked: {},
+      pending: [],
+      resetPending: false,
+      debugUnlocked: [],
+      serverIdentity: null,
+      progress: { linkTypes: [], signalActivated: false, medicineTypes: [], dailyPlayStreak: 0, dailyPlayLastDay: 0, mysteryDrugTarinaiIds: [] },
+      _progressLedger: blankProgressLedger(),
+    };
+  }
+
+  function ledgerCounterValue(ledgerInput, key) {
+    if (!Object.prototype.hasOwnProperty.call(ADDITIVE_PROGRESS_CAPS, key)) return 0;
+    const cap = ADDITIVE_PROGRESS_CAPS[key];
+    const ledger = ledgerInput && typeof ledgerInput === "object" ? ledgerInput : {};
+    const base = Math.min(cap, Math.max(0, Math.floor(Number(ledger.base?.[key] || 0) || 0)));
+    const shards = ledger.shards?.[key] && typeof ledger.shards[key] === "object" ? ledger.shards[key] : {};
+    return Math.min(cap, base + Object.values(shards).reduce((sum, value) => sum + Math.max(0, Math.floor(Number(value || 0) || 0)), 0));
+  }
+
+  function sanitizeProgressLedger(parsed, legacyProgress = {}) {
+    const source = parsed?._progressLedger && typeof parsed._progressLedger === "object" ? parsed._progressLedger : {};
+    const baseSource = source.base && typeof source.base === "object" ? source.base : {};
+    const shardsSource = source.shards && typeof source.shards === "object" ? source.shards : {};
+    const ledger = blankProgressLedger();
+    for (const key of ADDITIVE_PROGRESS_KEYS) {
+      const cap = ADDITIVE_PROGRESS_CAPS[key];
+      let base = Math.min(cap, Math.max(0, Math.floor(Number(baseSource[key] || 0) || 0)));
+      const shards = {};
+      const rawShards = shardsSource[key] && typeof shardsSource[key] === "object" ? shardsSource[key] : {};
+      for (const [actorId, rawValue] of Object.entries(rawShards)) {
+        const id = String(actorId || "").slice(0, 160);
+        const value = Math.min(cap, Math.max(0, Math.floor(Number(rawValue || 0) || 0)));
+        if (id && value > 0) shards[id] = value;
+      }
+      let total = Math.min(cap, base + Object.values(shards).reduce((sum, value) => sum + value, 0));
+      const legacyFloor = Math.min(cap, Math.max(0, Math.floor(Number(legacyProgress[key] || 0) || 0)));
+      if (legacyFloor > total) {
+        base = Math.min(cap, base + (legacyFloor - total));
+        total = legacyFloor;
+      }
+      if (total >= cap) {
+        base = cap;
+        for (const actorId of Object.keys(shards)) delete shards[actorId];
+      }
+      ledger.base[key] = base;
+      ledger.shards[key] = shards;
+    }
+    return ledger;
+  }
+
+  function normalizeServerIdentity(value) {
+    if (!value || typeof value !== "object") return null;
+    const id = String(value.playerId || "").toLowerCase();
+    const secret = String(value.playerSecret || "").toLowerCase();
+    if (!PLAYER_ID_PATTERN.test(id) || !PLAYER_SECRET_PATTERN.test(secret)) return null;
+    return { playerId: id, playerSecret: secret };
+  }
+
+  function normalizeState(parsed) {
+    if (!parsed || typeof parsed !== "object") return blankState();
+    const unlockedSource = parsed.unlocked && typeof parsed.unlocked === "object" ? parsed.unlocked : {};
+    const unlocked = {};
+    for (const [id, timestamp] of Object.entries(unlockedSource)) {
+      if (definitionById.has(id) && Number(timestamp) > 0) unlocked[id] = Number(timestamp);
+    }
+    const debugUnlockedSource = Array.isArray(parsed.debugUnlocked) ? parsed.debugUnlocked : [];
+    const debugUnlocked = [...new Set(debugUnlockedSource.filter(id => definitionById.has(id)))];
+    if (!DEBUG_MODE) {
+      for (const id of debugUnlocked) delete unlocked[id];
+    }
+    // v6 and older persisted a redundant synced list. It is read once only to
+    // avoid re-queuing already acknowledged legacy unlocks, then discarded.
+    const legacySynced = new Set((Array.isArray(parsed.synced) ? parsed.synced : []).filter(id => definitionById.has(id)));
+    const pendingSource = Array.isArray(parsed.pending) ? parsed.pending : [];
+    const pending = pendingSource.filter(id => definitionById.has(id) && unlocked[id] && !debugUnlocked.includes(id) && !legacySynced.has(id));
+    const progressSource = parsed.progress && typeof parsed.progress === "object" ? parsed.progress : {};
+    const progress = {
+      linkTypes: [...new Set((Array.isArray(progressSource.linkTypes) ? progressSource.linkTypes : []).filter(type => LINK_PROGRESS_TYPES.includes(type)))],
+      signalActivated: Boolean(progressSource.signalActivated),
+      medicineTypes: [...new Set((Array.isArray(progressSource.medicineTypes) ? progressSource.medicineTypes : []).filter(type => MEDICINE_LEDGER_TYPES.includes(type)))],
+      dailyPlayStreak: Math.min(DAILY_PLAY_TARGET, Math.max(0, Math.floor(Number(progressSource.dailyPlayStreak || 0) || 0))),
+      dailyPlayLastDay: Math.max(0, Math.floor(Number(progressSource.dailyPlayLastDay || 0) || 0)),
+      mysteryDrugTarinaiIds: [...new Set((Array.isArray(progressSource.mysteryDrugTarinaiIds) ? progressSource.mysteryDrugTarinaiIds : []).map(id => String(id || "")).filter(Boolean))].slice(0, MAD_SCIENTIST_TARGET),
+    };
+    const progressLedger = sanitizeProgressLedger(parsed, progressSource);
+    const missingCompletionRequirement = DEFINITIONS.some(definition => definition.id !== COMPLETIONIST_ID && !unlocked[definition.id]);
+    if (unlocked[COMPLETIONIST_ID] && missingCompletionRequirement) {
+      delete unlocked[COMPLETIONIST_ID];
+      const pendingIndex = pending.indexOf(COMPLETIONIST_ID);
+      if (pendingIndex >= 0) pending.splice(pendingIndex, 1);
+    }
+    return { unlocked, pending: [...new Set(pending)], resetPending: Boolean(parsed.resetPending), debugUnlocked: DEBUG_MODE ? debugUnlocked : [], serverIdentity: normalizeServerIdentity(parsed.serverIdentity), progress, _progressLedger: progressLedger };
+  }
+
+  function decodePersistenceEnvelope(raw) {
     try {
-      const parsed = JSON.parse(global.localStorage?.getItem(STORAGE_KEY) || "null");
-      if (!parsed || typeof parsed !== "object") return blankState();
-      const unlockedSource = parsed.unlocked && typeof parsed.unlocked === "object" ? parsed.unlocked : {};
-      const unlocked = {};
-      for (const [id, timestamp] of Object.entries(unlockedSource)) {
-        if (definitionById.has(id) && Number(timestamp) > 0) unlocked[id] = Number(timestamp);
+      const parsed = typeof raw === "string" ? JSON.parse(raw) : raw;
+      if (!parsed || typeof parsed !== "object") return null;
+      if (parsed.format === PERSISTENCE_FORMAT && parsed.state && typeof parsed.state === "object") {
+        return {
+          generation: Math.max(0, Math.floor(Number(parsed.generation || 0) || 0)),
+          revision: Math.max(0, Math.floor(Number(parsed.revision || 0) || 0)),
+          updatedAt: Math.max(0, Number(parsed.updatedAt || 0) || 0),
+          migrationComplete: Boolean(parsed.migrationComplete),
+          state: normalizeState(parsed.state),
+        };
       }
-      const legacyMechanizedAt = Math.max(
-        Number(unlockedSource.signal_automation_first || 0) || 0,
-        Number(unlockedSource.link_craftsman || 0) || 0
-      );
-      if (!unlocked.mechanized_industry
-        && Number(unlockedSource.signal_automation_first || 0) > 0
-        && Number(unlockedSource.link_craftsman || 0) > 0) {
-        unlocked.mechanized_industry = legacyMechanizedAt || Date.now();
-      }
-      const debugUnlockedSource = Array.isArray(parsed.debugUnlocked) ? parsed.debugUnlocked : [];
-      const debugUnlocked = [...new Set(debugUnlockedSource.filter(id => definitionById.has(id)))];
-      if (!DEBUG_MODE) {
-        for (const id of debugUnlocked) delete unlocked[id];
-      }
-      const pendingSource = Array.isArray(parsed.pending) ? parsed.pending : [];
-      const pending = pendingSource.filter(id => definitionById.has(id) && !debugUnlocked.includes(id));
-      if (unlocked.mechanized_industry && !pending.includes("mechanized_industry")
-        && (pendingSource.includes("signal_automation_first") || pendingSource.includes("link_craftsman"))) {
-        pending.push("mechanized_industry");
-      }
-      const progressSource = parsed.progress && typeof parsed.progress === "object" ? parsed.progress : {};
-      const legacyLinkTypes = Number(unlockedSource.link_craftsman || 0) > 0 ? ["rope", "rod", "spring"] : [];
-      const progress = {
-        placementCount: Math.max(0, Math.floor(Number(progressSource.placementCount || 0) || 0)),
-        linkTypes: [...new Set([...(Array.isArray(progressSource.linkTypes) ? progressSource.linkTypes : []), ...legacyLinkTypes].filter(type => ["rope", "rod", "spring"].includes(type)))],
-        signalActivated: Boolean(progressSource.signalActivated || unlockedSource.signal_automation_first),
-        antKills: Math.max(0, Math.floor(Number(progressSource.antKills || 0) || 0)),
-        birthCount: Math.max(0, Math.floor(Number(progressSource.birthCount || 0) || 0)),
-        quickDeleteCount: Math.max(0, Math.floor(Number(progressSource.quickDeleteCount || 0) || 0)),
-        undoCount: Math.max(0, Math.floor(Number(progressSource.undoCount || 0) || 0)),
-        redoCount: Math.max(0, Math.floor(Number(progressSource.redoCount || 0) || 0)),
-        medicineTypes: [...new Set((Array.isArray(progressSource.medicineTypes) ? progressSource.medicineTypes : []).filter(type => MEDICINE_LEDGER_TYPES.includes(type)))],
-        firstAidHeals: Math.max(0, Math.floor(Number(progressSource.firstAidHeals || 0) || 0)),
-        fightMochiFightCount: Math.max(0, Math.floor(Number(progressSource.fightMochiFightCount || 0) || 0)),
-        shotCount: Math.max(0, Math.floor(Number(progressSource.shotCount || 0) || 0)),
-        loveMochiBirthCount: Math.max(0, Math.floor(Number(progressSource.loveMochiBirthCount || 0) || 0)),
-        dailyPlayStreak: Math.min(DAILY_PLAY_TARGET, Math.max(0, Math.floor(Number(progressSource.dailyPlayStreak || 0) || 0))),
-        dailyPlayLastDay: Math.max(0, Math.floor(Number(progressSource.dailyPlayLastDay || 0) || 0)),
-        statsButtonPressCount: Math.min(STATISTICIAN_TARGET, Math.max(0, Math.floor(Number(progressSource.statsButtonPressCount || 0) || 0))),
-        totalDeathCount: Math.min(MEMENTO_MORI_TARGET, Math.max(0, Math.floor(Number(progressSource.totalDeathCount || 0) || 0))),
-        manualTarinaiAddedCount: Math.min(LIVELY_MAKING_TARGET, Math.max(0, Math.floor(Number(progressSource.manualTarinaiAddedCount || 0) || 0))),
-      };
-      const missingCompletionRequirement = DEFINITIONS.some(definition => definition.id !== COMPLETIONIST_ID && !unlocked[definition.id]);
-      if (unlocked[COMPLETIONIST_ID] && missingCompletionRequirement) {
-        delete unlocked[COMPLETIONIST_ID];
-        const pendingIndex = pending.indexOf(COMPLETIONIST_ID);
-        if (pendingIndex >= 0) pending.splice(pendingIndex, 1);
-      }
-      return { unlocked, pending: [...new Set(pending)], resetPending: Boolean(parsed.resetPending), debugUnlocked: DEBUG_MODE ? debugUnlocked : [], progress };
+      return { generation: 0, revision: 0, updatedAt: 0, migrationComplete: false, state: normalizeState(parsed) };
     } catch (_) {
-      return blankState();
+      return null;
     }
   }
 
+  function mergeStateData(targetInput, sourceInput) {
+    const target = normalizeState(targetInput);
+    const source = normalizeState(sourceInput);
+    for (const [id, timestamp] of Object.entries(source.unlocked)) {
+      const current = Number(target.unlocked[id] || 0) || 0;
+      target.unlocked[id] = current > 0 ? Math.min(current, timestamp) : timestamp;
+    }
+    target.pending = [...new Set([...target.pending, ...source.pending])]
+      .filter(id => definitionById.has(id) && target.unlocked[id] && !target.debugUnlocked.includes(id));
+    if (DEBUG_MODE) target.debugUnlocked = [...new Set([...target.debugUnlocked, ...source.debugUnlocked])];
+    if (!target.serverIdentity && source.serverIdentity) target.serverIdentity = { ...source.serverIdentity };
+    for (const key of ADDITIVE_PROGRESS_KEYS) {
+      target._progressLedger.base[key] = Math.max(
+        Number(target._progressLedger.base[key] || 0) || 0,
+        Number(source._progressLedger.base[key] || 0) || 0,
+      );
+      const targetShards = target._progressLedger.shards[key] || (target._progressLedger.shards[key] = {});
+      const sourceShards = source._progressLedger.shards[key] || {};
+      for (const [actorId, value] of Object.entries(sourceShards)) {
+        targetShards[actorId] = Math.max(Number(targetShards[actorId] || 0) || 0, Number(value || 0) || 0);
+      }
+    }
+    // Daily streak and its last-day marker are one logical record. Merging the
+    // two numbers independently can pair an old high streak with a new date.
+    const targetDay = Number(target.progress.dailyPlayLastDay || 0) || 0;
+    const sourceDay = Number(source.progress.dailyPlayLastDay || 0) || 0;
+    if (sourceDay > targetDay) {
+      target.progress.dailyPlayLastDay = sourceDay;
+      target.progress.dailyPlayStreak = Number(source.progress.dailyPlayStreak || 0) || 0;
+    } else if (sourceDay === targetDay) {
+      target.progress.dailyPlayStreak = Math.max(Number(target.progress.dailyPlayStreak || 0) || 0, Number(source.progress.dailyPlayStreak || 0) || 0);
+    }
+    target.progress.signalActivated = Boolean(target.progress.signalActivated || source.progress.signalActivated);
+    target.progress.linkTypes = [...new Set([...(target.progress.linkTypes || []), ...(source.progress.linkTypes || [])])];
+    target.progress.medicineTypes = [...new Set([...(target.progress.medicineTypes || []), ...(source.progress.medicineTypes || [])])];
+    target.progress.mysteryDrugTarinaiIds = [...new Set([...(target.progress.mysteryDrugTarinaiIds || []), ...(source.progress.mysteryDrugTarinaiIds || [])])].slice(0, MAD_SCIENTIST_TARGET);
+    return normalizeState(target);
+  }
+
+  function growOnlyStateDelta(baseInput, currentInput) {
+    const base = normalizeState(baseInput);
+    const current = normalizeState(currentInput);
+    const delta = blankState();
+    for (const [id, timestamp] of Object.entries(current.unlocked)) {
+      const previous = Number(base.unlocked[id] || 0) || 0;
+      if (!previous || timestamp < previous) delta.unlocked[id] = timestamp;
+    }
+    delta.pending = current.pending.filter(id => delta.unlocked[id]);
+    if (DEBUG_MODE) delta.debugUnlocked = current.debugUnlocked.filter(id => !base.debugUnlocked.includes(id));
+    if (current.serverIdentity && (!base.serverIdentity || current.serverIdentity.playerId !== base.serverIdentity.playerId || current.serverIdentity.playerSecret !== base.serverIdentity.playerSecret)) {
+      delta.serverIdentity = { ...current.serverIdentity };
+    }
+    for (const key of ADDITIVE_PROGRESS_KEYS) {
+      const currentBase = Number(current._progressLedger.base[key] || 0) || 0;
+      const baselineBase = Number(base._progressLedger.base[key] || 0) || 0;
+      if (currentBase > baselineBase) delta._progressLedger.base[key] = currentBase;
+      const currentShards = current._progressLedger.shards[key] || {};
+      const baselineShards = base._progressLedger.shards[key] || {};
+      const deltaShards = delta._progressLedger.shards[key]
+        || (delta._progressLedger.shards[key] = {});
+      for (const [actorId, value] of Object.entries(currentShards)) {
+        if ((Number(value) || 0) > (Number(baselineShards[actorId]) || 0)) {
+          deltaShards[actorId] = Number(value) || 0;
+        }
+      }
+    }
+    const currentDay = Number(current.progress.dailyPlayLastDay || 0) || 0;
+    const baseDay = Number(base.progress.dailyPlayLastDay || 0) || 0;
+    const currentStreak = Number(current.progress.dailyPlayStreak || 0) || 0;
+    const baseStreak = Number(base.progress.dailyPlayStreak || 0) || 0;
+    if (currentDay !== baseDay) {
+      delta.progress.dailyPlayLastDay = currentDay;
+      delta.progress.dailyPlayStreak = currentStreak;
+    } else if (currentStreak > baseStreak) {
+      delta.progress.dailyPlayStreak = currentStreak;
+    }
+    delta.progress.signalActivated = Boolean(current.progress.signalActivated && !base.progress.signalActivated);
+    delta.progress.linkTypes = current.progress.linkTypes.filter(value => !base.progress.linkTypes.includes(value));
+    delta.progress.medicineTypes = current.progress.medicineTypes.filter(value => !base.progress.medicineTypes.includes(value));
+    delta.progress.mysteryDrugTarinaiIds = current.progress.mysteryDrugTarinaiIds.filter(value => !base.progress.mysteryDrugTarinaiIds.includes(value));
+    return normalizeState(delta);
+  }
+
+  function readStorageCandidate(storage, key) {
+    try { return decodePersistenceEnvelope(storage?.getItem?.(key) || null); }
+    catch (_) { return null; }
+  }
+
+  function webStorageCandidates() {
+    return [
+      readStorageCandidate(global.localStorage, STORAGE_KEY),
+      readStorageCandidate(global.localStorage, STORAGE_BACKUP_KEY),
+      readStorageCandidate(global.sessionStorage, STORAGE_SESSION_KEY),
+    ].filter(Boolean);
+  }
+
+  function legacyWebStorageCandidates() {
+    return [
+      readStorageCandidate(global.localStorage, PREVIOUS_STORAGE_KEY),
+      readStorageCandidate(global.localStorage, PREVIOUS_STORAGE_BACKUP_KEY),
+      readStorageCandidate(global.sessionStorage, PREVIOUS_STORAGE_SESSION_KEY),
+      readStorageCandidate(global.localStorage, OLDER_STORAGE_KEY),
+      readStorageCandidate(global.localStorage, OLDER_STORAGE_BACKUP_KEY),
+      readStorageCandidate(global.sessionStorage, OLDER_STORAGE_SESSION_KEY),
+      readStorageCandidate(global.localStorage, LEGACY_STORAGE_KEY),
+      readStorageCandidate(global.localStorage, LEGACY_STORAGE_BACKUP_KEY),
+      readStorageCandidate(global.sessionStorage, LEGACY_STORAGE_SESSION_KEY),
+      readStorageCandidate(global.localStorage, ANCIENT_STORAGE_KEY),
+      readStorageCandidate(global.localStorage, ANCIENT_STORAGE_BACKUP_KEY),
+      readStorageCandidate(global.sessionStorage, ANCIENT_STORAGE_SESSION_KEY),
+    ].filter(Boolean);
+  }
+
+  function decodePreHydrationJournal(raw) {
+    try {
+      const parsed = typeof raw === "string" ? JSON.parse(raw) : raw;
+      if (!parsed || parsed.format !== PREHYDRATION_JOURNAL_FORMAT || !parsed.delta || typeof parsed.delta !== "object") return null;
+      return {
+        format: PREHYDRATION_JOURNAL_FORMAT,
+        actorId: String(parsed.actorId || "").slice(0, 160),
+        baseGeneration: Math.max(0, Math.floor(Number(parsed.baseGeneration || 0) || 0)),
+        updatedAt: Math.max(0, Number(parsed.updatedAt || 0) || 0),
+        delta: normalizeState(parsed.delta),
+      };
+    } catch (_) {
+      return null;
+    }
+  }
+
+  function storageJournalCandidates(storage) {
+    const journals = [];
+    try {
+      const length = Math.max(0, Number(storage?.length || 0) || 0);
+      for (let index = 0; index < length; index += 1) {
+        const key = String(storage?.key?.(index) || "");
+        if (!key.startsWith(PREHYDRATION_JOURNAL_PREFIX)) continue;
+        const journal = decodePreHydrationJournal(storage?.getItem?.(key));
+        if (journal) journals.push(journal);
+      }
+    } catch (_) {}
+    return journals;
+  }
+
+  function webStorageJournals() {
+    return [...storageJournalCandidates(global.localStorage), ...storageJournalCandidates(global.sessionStorage)];
+  }
+
+  function currentPreHydrationJournal() {
+    return {
+      format: PREHYDRATION_JOURNAL_FORMAT,
+      actorId: persistenceActorId,
+      baseGeneration: persistenceGeneration,
+      updatedAt: Date.now(),
+      delta: growOnlyStateDelta(initialPersistenceBaseline, state),
+    };
+  }
+
+  function writePreHydrationJournalToWebStorage(journalInput) {
+    const journal = decodePreHydrationJournal(journalInput);
+    if (!journal) return false;
+    let serialized = "";
+    try { serialized = JSON.stringify(journal); } catch (_) { return false; }
+    const key = `${PREHYDRATION_JOURNAL_PREFIX}${persistenceActorId}`;
+    let stored = false;
+    try { global.localStorage?.setItem?.(key, serialized); stored = true; } catch (_) {}
+    try { global.sessionStorage?.setItem?.(key, serialized); stored = true; } catch (_) {}
+    return stored;
+  }
+
+  function removeWebStorageJournals(maxGeneration = persistenceGeneration) {
+    for (const storage of [global.localStorage, global.sessionStorage]) {
+      try {
+        const keys = [];
+        const length = Math.max(0, Number(storage?.length || 0) || 0);
+        for (let index = 0; index < length; index += 1) {
+          const key = String(storage?.key?.(index) || "");
+          if (key.startsWith(PREHYDRATION_JOURNAL_PREFIX)) keys.push(key);
+        }
+        for (const key of keys) {
+          const journal = decodePreHydrationJournal(storage?.getItem?.(key));
+          if (!journal || journal.baseGeneration <= maxGeneration) storage?.removeItem?.(key);
+        }
+      } catch (_) {}
+    }
+  }
+
+  function persistenceStateSignature(generation, stateInput) {
+    try { return `${Math.max(0, Number(generation) || 0)}:${JSON.stringify(normalizeState(stateInput))}`; }
+    catch (_) { return `${Math.max(0, Number(generation) || 0)}:`; }
+  }
+
+  function normalizePersistenceCandidate(candidate) {
+    if (candidate && typeof candidate === "object" && candidate.state && typeof candidate.state === "object" && Number.isFinite(Number(candidate.generation))) {
+      return {
+        generation: Math.max(0, Math.floor(Number(candidate.generation || 0) || 0)),
+        revision: Math.max(0, Math.floor(Number(candidate.revision || 0) || 0)),
+        updatedAt: Math.max(0, Number(candidate.updatedAt || 0) || 0),
+        migrationComplete: Boolean(candidate.migrationComplete),
+        state: normalizeState(candidate.state),
+      };
+    }
+    return decodePersistenceEnvelope(candidate);
+  }
+
+  function mergePersistenceEnvelopes(candidatesInput, options = {}) {
+    const candidates = (Array.isArray(candidatesInput) ? candidatesInput : [])
+      .map(candidate => normalizePersistenceCandidate(candidate))
+      .filter(Boolean);
+    if (!candidates.length) {
+      return {
+        format: PERSISTENCE_FORMAT,
+        generation: 0,
+        revision: options.incrementRevision ? 1 : 0,
+        updatedAt: Date.now(),
+        migrationComplete: false,
+        state: blankState(),
+      };
+    }
+    const generation = Math.max(...candidates.map(candidate => candidate.generation));
+    const active = candidates
+      .filter(candidate => candidate.generation === generation)
+      .sort((a, b) => (a.revision - b.revision) || (a.updatedAt - b.updatedAt));
+    let merged = blankState();
+    for (const candidate of active) merged = mergeStateData(merged, candidate.state);
+    const latest = active[active.length - 1];
+    merged.resetPending = Boolean(latest?.state?.resetPending);
+    const latestIdentity = [...active].reverse().map(candidate => normalizeServerIdentity(candidate.state?.serverIdentity)).find(Boolean);
+    if (latestIdentity) merged.serverIdentity = { ...latestIdentity };
+    const maxRevision = Math.max(0, ...active.map(candidate => candidate.revision));
+    return {
+      format: PERSISTENCE_FORMAT,
+      generation,
+      revision: maxRevision + (options.incrementRevision ? 1 : 0),
+      updatedAt: Date.now(),
+      migrationComplete: active.some(candidate => candidate.migrationComplete),
+      state: normalizeState(merged),
+    };
+  }
+
+  function loadStateRecord() {
+    const currentCandidates = webStorageCandidates();
+    const currentGeneration = currentCandidates.length
+      ? Math.max(...currentCandidates.map(candidate => candidate.generation))
+      : 0;
+    // v6 is written only by this build. Import older namespaces once, before a
+    // completed v6 envelope exists. This still repairs the v39.17.7 failure
+    // where an empty v5 envelope hid v4/v2 data, without reading old namespaces
+    // forever and allowing an old open tab to contaminate current storage.
+    const migrationComplete = currentCandidates.some(candidate => candidate.migrationComplete);
+    const legacyCandidates = currentGeneration === 0 && !migrationComplete ? legacyWebStorageCandidates() : [];
+    const candidates = [...currentCandidates, ...legacyCandidates];
+    const source = currentCandidates.length && legacyCandidates.length
+      ? "mixed"
+      : (currentCandidates.length ? "current" : (legacyCandidates.length ? "legacy" : "empty"));
+    const merged = mergePersistenceEnvelopes(candidates);
+    return {
+      generation: merged.generation,
+      revision: merged.revision,
+      updatedAt: merged.updatedAt,
+      migrationComplete: merged.migrationComplete,
+      state: merged.state,
+      source,
+    };
+  }
+
+  function persistenceEnvelope() {
+    return {
+      format: PERSISTENCE_FORMAT,
+      generation: persistenceGeneration,
+      revision: persistenceRevision,
+      updatedAt: Date.now(),
+      migrationComplete: true,
+      state: normalizeState(state),
+    };
+  }
+
+  function adoptPersistenceEnvelope(envelopeInput) {
+    const envelope = normalizePersistenceCandidate(envelopeInput);
+    if (!envelope || envelope.generation < persistenceGeneration) return false;
+    const before = persistenceStateSignature(persistenceGeneration, state);
+    if (envelope.generation > persistenceGeneration) {
+      persistenceGeneration = envelope.generation;
+      persistenceRevision = envelope.revision;
+      state = normalizeState(envelope.state);
+    } else {
+      state = mergeStateData(state, envelope.state);
+      if (envelope.revision >= persistenceRevision) {
+        state.resetPending = Boolean(envelope.state.resetPending);
+        const newerIdentity = normalizeServerIdentity(envelope.state.serverIdentity);
+        if (newerIdentity) state.serverIdentity = { ...newerIdentity };
+      }
+      persistenceRevision = Math.max(persistenceRevision, envelope.revision);
+    }
+    return before !== persistenceStateSignature(persistenceGeneration, state);
+  }
+
+  function writeEnvelopeToWebStorage(envelopeInput) {
+    const envelope = normalizePersistenceCandidate(envelopeInput);
+    if (!envelope) return false;
+    let serialized = "";
+    try {
+      serialized = JSON.stringify({
+        format: PERSISTENCE_FORMAT,
+        generation: envelope.generation,
+        revision: envelope.revision,
+        updatedAt: envelope.updatedAt || Date.now(),
+        migrationComplete: Boolean(envelope.migrationComplete),
+        state: normalizeState(envelope.state),
+      });
+    } catch (_) {
+      return false;
+    }
+    let stored = false;
+    try { global.localStorage?.setItem?.(STORAGE_BACKUP_KEY, serialized); stored = true; } catch (_) {}
+    try { global.localStorage?.setItem?.(STORAGE_KEY, serialized); stored = true; } catch (_) {}
+    try { global.sessionStorage?.setItem?.(STORAGE_SESSION_KEY, serialized); stored = true; } catch (_) {}
+    return stored;
+  }
+
+  function broadcastPersistenceEnvelope(envelopeInput) {
+    const envelope = normalizePersistenceCandidate(envelopeInput);
+    if (!envelope) return;
+    try { persistenceChannel?.postMessage?.(envelope); } catch (_) {}
+  }
+
+  function openPersistenceDatabase(databaseName = PERSISTENCE_DB_NAME) {
+    return new Promise((resolve, reject) => {
+      if (!global.indexedDB?.open) return reject(new Error("indexeddb unavailable"));
+      let request;
+      try { request = global.indexedDB.open(databaseName, 1); }
+      catch (error) { reject(error); return; }
+      request.onupgradeneeded = () => {
+        const db = request.result;
+        if (!db.objectStoreNames.contains(PERSISTENCE_DB_STORE)) db.createObjectStore(PERSISTENCE_DB_STORE);
+      };
+      request.onsuccess = () => resolve(request.result);
+      request.onerror = () => reject(request.error || new Error("indexeddb open failed"));
+      request.onblocked = () => reject(new Error("indexeddb blocked"));
+    });
+  }
+
+  async function readDurableEnvelope(databaseName = PERSISTENCE_DB_NAME) {
+    let db = null;
+    try {
+      db = await openPersistenceDatabase(databaseName);
+      return await new Promise((resolve, reject) => {
+        const tx = db.transaction(PERSISTENCE_DB_STORE, "readonly");
+        const request = tx.objectStore(PERSISTENCE_DB_STORE).get(PERSISTENCE_DB_KEY);
+        request.onsuccess = () => resolve(decodePersistenceEnvelope(request.result));
+        request.onerror = () => reject(request.error || new Error("indexeddb read failed"));
+        tx.onabort = () => reject(tx.error || new Error("indexeddb read aborted"));
+      });
+    } catch (_) {
+      return null;
+    } finally {
+      try { db?.close?.(); } catch (_) {}
+    }
+  }
+
+  async function readDurableJournals() {
+    let db = null;
+    try {
+      db = await openPersistenceDatabase();
+      return await new Promise((resolve, reject) => {
+        const journals = [];
+        const tx = db.transaction(PERSISTENCE_DB_STORE, "readonly");
+        const store = tx.objectStore(PERSISTENCE_DB_STORE);
+        const request = store.openCursor();
+        request.onsuccess = () => {
+          const cursor = request.result;
+          if (!cursor) return;
+          if (String(cursor.key || "").startsWith(PREHYDRATION_JOURNAL_DB_PREFIX)) {
+            const journal = decodePreHydrationJournal(cursor.value);
+            if (journal) journals.push(journal);
+          }
+          cursor.continue();
+        };
+        request.onerror = () => reject(request.error || new Error("indexeddb journal read failed"));
+        tx.oncomplete = () => resolve(journals);
+        tx.onerror = () => reject(tx.error || new Error("indexeddb journal transaction failed"));
+        tx.onabort = () => reject(tx.error || new Error("indexeddb journal read aborted"));
+      });
+    } catch (_) {
+      return [];
+    } finally {
+      try { db?.close?.(); } catch (_) {}
+    }
+  }
+
+  async function writeDurableJournal(journalInput) {
+    const journal = decodePreHydrationJournal(journalInput);
+    if (!journal) return false;
+    let db = null;
+    try {
+      db = await openPersistenceDatabase();
+      return await new Promise((resolve, reject) => {
+        const tx = db.transaction(PERSISTENCE_DB_STORE, "readwrite");
+        tx.objectStore(PERSISTENCE_DB_STORE).put(journal, `${PREHYDRATION_JOURNAL_DB_PREFIX}${journal.actorId || persistenceActorId}`);
+        tx.oncomplete = () => resolve(true);
+        tx.onerror = () => reject(tx.error || new Error("indexeddb journal write failed"));
+        tx.onabort = () => reject(tx.error || new Error("indexeddb journal write aborted"));
+      });
+    } catch (_) {
+      return false;
+    } finally {
+      try { db?.close?.(); } catch (_) {}
+    }
+  }
+
+  async function removeDurableJournals(maxGeneration = persistenceGeneration) {
+    let db = null;
+    try {
+      db = await openPersistenceDatabase();
+      await new Promise((resolve, reject) => {
+        const tx = db.transaction(PERSISTENCE_DB_STORE, "readwrite");
+        const store = tx.objectStore(PERSISTENCE_DB_STORE);
+        const request = store.openCursor();
+        request.onsuccess = () => {
+          const cursor = request.result;
+          if (!cursor) return;
+          if (String(cursor.key || "").startsWith(PREHYDRATION_JOURNAL_DB_PREFIX)) {
+            const journal = decodePreHydrationJournal(cursor.value);
+            if (!journal || journal.baseGeneration <= maxGeneration) cursor.delete();
+          }
+          cursor.continue();
+        };
+        request.onerror = () => reject(request.error || new Error("indexeddb journal cleanup failed"));
+        tx.oncomplete = () => resolve(true);
+        tx.onerror = () => reject(tx.error || new Error("indexeddb journal cleanup transaction failed"));
+        tx.onabort = () => reject(tx.error || new Error("indexeddb journal cleanup aborted"));
+      });
+    } catch (_) {
+      return false;
+    } finally {
+      try { db?.close?.(); } catch (_) {}
+    }
+    return true;
+  }
+
+  async function writeDurableEnvelope(envelopeInput) {
+    const incoming = normalizePersistenceCandidate(envelopeInput);
+    if (!incoming) return null;
+    let db = null;
+    try {
+      db = await openPersistenceDatabase();
+      return await new Promise((resolve, reject) => {
+        const tx = db.transaction(PERSISTENCE_DB_STORE, "readwrite");
+        const store = tx.objectStore(PERSISTENCE_DB_STORE);
+        const request = store.get(PERSISTENCE_DB_KEY);
+        let committed = incoming;
+        request.onsuccess = () => {
+          const existing = normalizePersistenceCandidate(request.result);
+          if (existing?.generation > incoming.generation) {
+            committed = existing;
+          } else if (existing?.generation === incoming.generation) {
+            committed = mergePersistenceEnvelopes([existing, incoming], { incrementRevision: true });
+          }
+          if (existing?.generation > incoming.generation) return;
+          try { store.put(committed, PERSISTENCE_DB_KEY); }
+          catch (error) { reject(error); }
+        };
+        request.onerror = () => reject(request.error || new Error("indexeddb read before write failed"));
+        tx.oncomplete = () => resolve(committed);
+        tx.onerror = () => reject(tx.error || new Error("indexeddb write failed"));
+        tx.onabort = () => reject(tx.error || new Error("indexeddb write aborted"));
+      });
+    } catch (_) {
+      return null;
+    } finally {
+      try { db?.close?.(); } catch (_) {}
+    }
+  }
+
+  function handleExternalPersistenceEnvelope(envelopeInput, options = {}) {
+    const envelope = normalizePersistenceCandidate(envelopeInput);
+    if (!envelope) return false;
+    const changed = adoptPersistenceEnvelope(envelope);
+    if (!changed) return false;
+    const merged = mergePersistenceEnvelopes([persistenceEnvelope(), envelope], { incrementRevision: true });
+    adoptPersistenceEnvelope(merged);
+    writeEnvelopeToWebStorage(merged);
+    if (options.broadcast !== false) broadcastPersistenceEnvelope(merged);
+    durableWriteQueue = durableWriteQueue.then(
+      () => writeDurableEnvelope(merged),
+      () => writeDurableEnvelope(merged),
+    ).then(committed => {
+      if (!committed) return null;
+      const durableChanged = adoptPersistenceEnvelope(committed);
+      writeEnvelopeToWebStorage(committed);
+      if (durableChanged) {
+        broadcastPersistenceEnvelope(committed);
+        render({ forceList: true });
+      }
+      return committed;
+    });
+    render({ forceList: true });
+    return true;
+  }
+
+  function setupPersistenceCrossTabSync() {
+    try {
+      if (typeof global.BroadcastChannel === "function") {
+        persistenceChannel = new global.BroadcastChannel(PERSISTENCE_CHANNEL_NAME);
+        persistenceChannel.addEventListener?.("message", event => {
+          handleExternalPersistenceEnvelope(event?.data, { broadcast: true });
+        });
+      }
+    } catch (_) {
+      persistenceChannel = null;
+    }
+    global.addEventListener?.("storage", event => {
+      if (![STORAGE_KEY, STORAGE_BACKUP_KEY].includes(String(event?.key || ""))) return;
+      handleExternalPersistenceEnvelope(event?.newValue, { broadcast: true });
+    });
+  }
+
+  function persistStateNow() {
+    persistenceDirty = false;
+    const current = persistenceEnvelope();
+    const envelope = mergePersistenceEnvelopes([current, ...webStorageCandidates()], { incrementRevision: true });
+    adoptPersistenceEnvelope(envelope);
+    const stored = writeEnvelopeToWebStorage(envelope);
+    broadcastPersistenceEnvelope(envelope);
+    durableWriteQueue = durableWriteQueue.then(
+      () => writeDurableEnvelope(envelope),
+      () => writeDurableEnvelope(envelope),
+    ).then(committed => {
+      if (!committed) return null;
+      const changed = adoptPersistenceEnvelope(committed);
+      writeEnvelopeToWebStorage(committed);
+      if (changed) {
+        broadcastPersistenceEnvelope(committed);
+        render({ forceList: true });
+      }
+      return committed;
+    });
+    return stored;
+  }
+
   function saveState() {
-    try { global.localStorage?.setItem(STORAGE_KEY, JSON.stringify(state)); }
-    catch (_) {}
+    persistenceDirty = true;
+    if (!persistenceHydrated) {
+      const journal = currentPreHydrationJournal();
+      const stored = writePreHydrationJournalToWebStorage(journal);
+      durableWriteQueue = durableWriteQueue.then(
+        () => writeDurableJournal(journal),
+        () => writeDurableJournal(journal),
+      );
+      return stored;
+    }
+    return persistStateNow();
+  }
+
+  async function hydrateDurableState() {
+    try {
+      const persistRequest = global.navigator?.storage?.persist?.();
+      persistRequest?.catch?.(() => false);
+    } catch (_) {}
+
+    const [currentDurable, previousDurable, olderDurable, legacyDurable, ancientDurable, durableJournals] = await Promise.all([
+      readDurableEnvelope(PERSISTENCE_DB_NAME),
+      readDurableEnvelope(PREVIOUS_PERSISTENCE_DB_NAME),
+      readDurableEnvelope(OLDER_PERSISTENCE_DB_NAME),
+      readDurableEnvelope(LEGACY_PERSISTENCE_DB_NAME),
+      readDurableEnvelope(ANCIENT_PERSISTENCE_DB_NAME),
+      readDurableJournals(),
+    ]);
+    const currentCandidates = [...webStorageCandidates(), currentDurable].filter(Boolean);
+    const currentGeneration = currentCandidates.length
+      ? Math.max(...currentCandidates.map(candidate => candidate.generation))
+      : 0;
+    const migrationComplete = currentCandidates.some(candidate => candidate.migrationComplete);
+    const legacyCandidates = currentGeneration === 0 && !migrationComplete
+      ? [...legacyWebStorageCandidates(), previousDurable, olderDurable, legacyDurable, ancientDurable].filter(Boolean)
+      : [];
+    const baseEnvelope = mergePersistenceEnvelopes([...currentCandidates, ...legacyCandidates]);
+    const preHydrationDelta = growOnlyStateDelta(initialPersistenceBaseline, state);
+    const journals = [...webStorageJournals(), ...durableJournals]
+      .filter(journal => journal.baseGeneration === baseEnvelope.generation);
+
+    let mergedState = baseEnvelope.state;
+    if (initialPersistence.generation === baseEnvelope.generation) {
+      mergedState = mergeStateData(mergedState, preHydrationDelta);
+    }
+    for (const journal of journals) mergedState = mergeStateData(mergedState, journal.delta);
+
+    persistenceGeneration = baseEnvelope.generation;
+    persistenceRevision = baseEnvelope.revision;
+    state = normalizeState(mergedState);
+    state.resetPending = Boolean(baseEnvelope.state.resetPending);
+    persistenceHydrated = true;
+    persistStateNow();
+    await durableWriteQueue.catch(() => null);
+    removeWebStorageJournals(persistenceGeneration);
+    await removeDurableJournals(persistenceGeneration);
+    render({ forceList: true });
+    return true;
   }
 
   function scheduleProgressSave(delay = 350) {
@@ -325,6 +872,11 @@
     }, Math.max(0, Number(delay) || 0));
   }
 
+  function markProgressMutation() {
+    progressMutationRevision += 1;
+    if (!DEBUG_MODE && global.location?.protocol !== "file:") schedulePendingSync();
+  }
+
   function createPlayerId() {
     if (global.crypto?.randomUUID) return global.crypto.randomUUID();
     const hex = "xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx";
@@ -334,19 +886,104 @@
     });
   }
 
-  function playerId() {
+  function createPlayerSecret() {
+    const bytes = new Uint8Array(32);
+    if (global.crypto?.getRandomValues) global.crypto.getRandomValues(bytes);
+    else for (let i = 0; i < bytes.length; i++) bytes[i] = Math.floor(Math.random() * 256);
+    return [...bytes].map(value => value.toString(16).padStart(2, "0")).join("");
+  }
+
+  function storageServerIdentity(storage) {
     try {
-      const stored = String(global.localStorage?.getItem(PLAYER_KEY) || "");
-      if (PLAYER_ID_PATTERN.test(stored)) return stored;
-      const next = createPlayerId();
-      global.localStorage?.setItem(PLAYER_KEY, next);
-      return next;
+      return normalizeServerIdentity({
+        playerId: storage?.getItem?.(PLAYER_KEY),
+        playerSecret: storage?.getItem?.(PLAYER_SECRET_KEY),
+      });
     } catch (_) {
-      if (!playerId.memory) playerId.memory = createPlayerId();
-      return playerId.memory;
+      return null;
     }
   }
 
+  function legacyPlayerId() {
+    const candidates = [];
+    for (const storage of [global.localStorage, global.sessionStorage]) {
+      try {
+        candidates.push(storage?.getItem?.(LEGACY_PLAYER_KEY));
+        candidates.push(storage?.getItem?.(PLAYER_KEY));
+      } catch (_) {}
+    }
+    candidates.push(legacyPlayerId.memory);
+    const legacyId = candidates.map(value => String(value || "")).find(value => LEGACY_PLAYER_ID_PATTERN.test(value)) || "";
+    if (!legacyId) return "";
+    legacyPlayerId.memory = legacyId;
+    for (const storage of [global.localStorage, global.sessionStorage]) {
+      try { storage?.setItem?.(LEGACY_PLAYER_KEY, legacyId); } catch (_) {}
+    }
+    return legacyId;
+  }
+
+  function clearLegacyPlayerId() {
+    legacyPlayerId.memory = "";
+    for (const storage of [global.localStorage, global.sessionStorage]) {
+      try { storage?.removeItem?.(LEGACY_PLAYER_KEY); } catch (_) {}
+    }
+  }
+
+  function currentServerIdentity() {
+    return storageServerIdentity(global.localStorage)
+      || storageServerIdentity(global.sessionStorage)
+      || normalizeServerIdentity(state?.serverIdentity)
+      || normalizeServerIdentity(currentServerIdentity.memory);
+  }
+
+  function persistServerIdentity(identityInput, options = {}) {
+    const identity = normalizeServerIdentity(identityInput);
+    if (!identity) return false;
+    currentServerIdentity.memory = identity;
+    for (const storage of [global.localStorage, global.sessionStorage]) {
+      try {
+        storage?.setItem?.(PLAYER_KEY, identity.playerId);
+        storage?.setItem?.(PLAYER_SECRET_KEY, identity.playerSecret);
+      } catch (_) {}
+    }
+    const before = normalizeServerIdentity(state?.serverIdentity);
+    const changed = !before || before.playerId !== identity.playerId || before.playerSecret !== identity.playerSecret;
+    if (state && typeof state === "object") state.serverIdentity = { ...identity };
+    if (changed && options.save !== false) saveState();
+    return true;
+  }
+
+  function ensureServerIdentity() {
+    // Capture the legacy bearer ID before the current UUID overwrites the old
+    // localStorage slot. It is retained until the server confirms the claim.
+    legacyPlayerId();
+    const existing = currentServerIdentity();
+    if (existing) {
+      persistServerIdentity(existing, { save: false });
+      return existing;
+    }
+    const created = { playerId: createPlayerId(), playerSecret: createPlayerSecret() };
+    persistServerIdentity(created);
+    return created;
+  }
+
+  function playerId() {
+    return ensureServerIdentity().playerId;
+  }
+
+  function playerSecret() {
+    return ensureServerIdentity().playerSecret;
+  }
+
+  function storeServerCredentials(data) {
+    const stored = persistServerIdentity({
+      playerId: String(data?.playerId || "").toLowerCase(),
+      playerSecret: String(data?.playerSecret || "").toLowerCase(),
+    });
+    if (stored && data?.legacyClaimed === true) clearLegacyPlayerId();
+    return stored;
+  }
+
   function unlockedCount() {
     return DEFINITIONS.reduce((sum, def) => sum + (state.unlocked[def.id] ? 1 : 0), 0);
   }
@@ -384,14 +1021,17 @@
   }
 
   function sharedAchievementText(id) {
-    return `\u5168\u4f53\u9054\u6210\u7387 ${percentageText(id)}\uff08\u9054\u6210\u8005 ${achieverCountText(id)}\uff09`;
+    return `達成率 ${percentageText(id)}（達成人数 ${achieverCountText(id)}）`;
   }
 
   function continuousPlayElapsedMs(now = Date.now()) {
     if (state.unlocked.continuous_play_24_hours) return CONTINUOUS_PLAY_24H_TARGET_MS;
     const timestamp = Number(now);
-    if (!continuousPlayStartedAt || !Number.isFinite(timestamp)) return 0;
-    return Math.max(0, timestamp - continuousPlayStartedAt);
+    if (!Number.isFinite(timestamp)) return Math.max(0, continuousPlayAccumulatedMs);
+    const activeSegment = continuousPlayActive && !document.hidden && timestamp >= continuousPlayLastHeartbeatAt
+      ? timestamp - continuousPlayLastHeartbeatAt
+      : 0;
+    return Math.max(0, continuousPlayAccumulatedMs + activeSegment);
   }
 
   function formatElapsed(ms = 0) {
@@ -402,29 +1042,18 @@
   }
 
   function localProgressText(id) {
-    if (id === "great_mother_1000_births") {
-      const target = 3333;
-      const count = state.unlocked[id] ? target : Math.min(target, Math.max(0, Math.floor(Number(state.progress?.birthCount || 0) || 0)));
-      return `\u73fe\u5728\u306e\u9054\u6210\u7387 ${(count / target * 100).toFixed(1)}%\uff08${count} / ${target}\u4f53\uff09`;
-    }
-    if (id === "town_doctor_50") {
-      const target = 50;
-      const count = state.unlocked[id] ? target : Math.min(target, Math.max(0, Math.floor(Number(state.progress?.firstAidHeals || 0) || 0)));
-      return `\u73fe\u5728 ${count} / ${target}\u56de`;
-    }
-    if (id === "chaos_seeker_666_fights") {
-      const target = CHAOS_FIGHT_TARGET;
-      const count = state.unlocked[id] ? target : Math.min(target, Math.max(0, Math.floor(Number(state.progress?.fightMochiFightCount || 0) || 0)));
-      return `\u73fe\u5728\u306e\u9054\u6210\u7387 ${(count / target * 100).toFixed(1)}%\uff08${count} / ${target}\u56de\uff09`;
-    }
-    if (id === "fertility_seeker_721_love_births") {
-      const target = FERTILITY_BIRTH_TARGET;
-      const count = state.unlocked[id] ? target : Math.min(target, Math.max(0, Math.floor(Number(state.progress?.loveMochiBirthCount || 0) || 0)));
-      return `\u73fe\u5728\u306e\u9054\u6210\u7387 ${(count / target * 100).toFixed(1)}%\uff08${count} / ${target}\u56de\uff09`;
-    }
-    if (id === "daily_play_7_days") {
-      const count = state.unlocked[id] ? DAILY_PLAY_TARGET : Math.min(DAILY_PLAY_TARGET, Math.max(0, Math.floor(Number(state.progress?.dailyPlayStreak || 0) || 0)));
-      return `\u73fe\u5728\u306e\u9054\u6210\u7387 ${(count / DAILY_PLAY_TARGET * 100).toFixed(1)}%\uff08${count} / ${DAILY_PLAY_TARGET}\u65e5\uff09`;
+    const definition = definitionById.get(String(id || ""));
+    const spec = definition?.progress || null;
+    if (spec?.display) {
+      const target = Math.max(1, Math.floor(Number(spec.target || 0) || 0));
+      let count = 0;
+      if (spec.type === "counter") count = progressCounter(spec.key);
+      else if (spec.type === "value") count = Math.max(0, Math.floor(Number(ensureProgress()[spec.key] || 0) || 0));
+      else if (spec.type === "unique") count = ensureProgress()[spec.key]?.length || 0;
+      count = state.unlocked[id] ? target : Math.min(target, count);
+      const unit = String(spec.unit || "");
+      if (spec.display === "percent") return `現在の達成率 ${(count / target * 100).toFixed(1)}%（${count} / ${target}${unit}）`;
+      return `現在 ${count} / ${target}${unit}`;
     }
     if (id === "elite_few") {
       const world = global.world || null;
@@ -435,32 +1064,20 @@
         ? Math.min(ELITE_FEW_TARGET_DAYS, (now - startedAt) / dayLength)
         : 0;
       const aliveCount = (world?.tarinai || []).reduce((count, tarinai) => count + (tarinai && !tarinai.dead ? 1 : 0), 0);
-      return `\u73fe\u5728 ${elapsedDays.toFixed(1)} / ${ELITE_FEW_TARGET_DAYS}\u65e5\uff08\u500b\u4f53\u6570 ${aliveCount} / ${ELITE_FEW_MAX_POPULATION}\u4ee5\u4e0b\uff09`;
-    }
-    if (id === "statistician") {
-      const count = state.unlocked[id] ? STATISTICIAN_TARGET : Math.min(STATISTICIAN_TARGET, Math.max(0, Math.floor(Number(state.progress?.statsButtonPressCount || 0) || 0)));
-      return `\u73fe\u5728 ${count} / ${STATISTICIAN_TARGET}\u56de`;
-    }
-    if (id === "lively_making") {
-      const count = state.unlocked[id] ? LIVELY_MAKING_TARGET : Math.min(LIVELY_MAKING_TARGET, Math.max(0, Math.floor(Number(state.progress?.manualTarinaiAddedCount || 0) || 0)));
-      return `\u73fe\u5728 ${count} / ${LIVELY_MAKING_TARGET}\u4f53`;
-    }
-    if (id === "memento_mori") {
-      const count = state.unlocked[id] ? MEMENTO_MORI_TARGET : Math.min(MEMENTO_MORI_TARGET, Math.max(0, Math.floor(Number(state.progress?.totalDeathCount || 0) || 0)));
-      return `\u73fe\u5728\u306e\u9054\u6210\u7387 ${(count / MEMENTO_MORI_TARGET * 100).toFixed(1)}%\uff08${count} / ${MEMENTO_MORI_TARGET}\u4f53\uff09`;
+      return `現在 ${elapsedDays.toFixed(1)} / ${ELITE_FEW_TARGET_DAYS}日（個体数 ${aliveCount} / ${ELITE_FEW_MAX_POPULATION}以下）`;
     }
     if (id === "continuous_play_1_hour") {
       const elapsed = Math.min(CONTINUOUS_PLAY_TARGET_MS, continuousPlayElapsedMs());
-      return `\u73fe\u5728\u306e\u9054\u6210\u7387 ${(elapsed / CONTINUOUS_PLAY_TARGET_MS * 100).toFixed(1)}%\uff08${formatElapsed(elapsed)} / 60:00\uff09`;
+      return `現在の達成率 ${(elapsed / CONTINUOUS_PLAY_TARGET_MS * 100).toFixed(1)}%（${formatElapsed(elapsed)} / 60:00）`;
     }
     if (id === "continuous_play_24_hours") {
       const elapsed = Math.min(CONTINUOUS_PLAY_24H_TARGET_MS, continuousPlayElapsedMs());
-      return `\u73fe\u5728\u306e\u9054\u6210\u7387 ${(elapsed / CONTINUOUS_PLAY_24H_TARGET_MS * 100).toFixed(1)}%\uff08${formatElapsed(elapsed)} / 1440:00\uff09`;
+      return `現在の達成率 ${(elapsed / CONTINUOUS_PLAY_24H_TARGET_MS * 100).toFixed(1)}%（${formatElapsed(elapsed)} / 1440:00）`;
     }
     if (id === "enemy_enemy_friend") {
       const world = global.world || null;
       const count = state.unlocked[id] ? 10 : Math.min(10, Math.max(0, Math.floor(Number(world?.achievementEnemyAntKills || 0) || 0)));
-      return `\u73fe\u5728\u306e\u9054\u6210\u7387 ${(count * 10).toFixed(1)}%\uff08${count} / 10\u4f53\uff09`;
+      return `現在の達成率 ${(count * 10).toFixed(1)}%（${count} / 10体）`;
     }
     return "";
   }
@@ -475,18 +1092,21 @@
       ? DEFINITIONS.map(definition => `${percentageValue(definition.id).toFixed(1)}:${achieverCountValue(definition.id) ?? "-"}`).join(",")
       : shared.loading ? "loading" : "offline";
     const local = [
-      Math.min(3333, Math.max(0, Number(state.progress?.birthCount || 0) || 0)),
+      progressCounter("birthCount"),
       Math.floor(continuousPlayElapsedMs() / 1000),
       Math.max(0, Math.floor(Number(global.__tarinaiFps || 0) || 0)),
       Math.min(10, Math.max(0, Number(global.world?.achievementEnemyAntKills || 0) || 0)),
-      Math.min(50, Math.max(0, Number(state.progress?.firstAidHeals || 0) || 0)),
-      Math.min(CHAOS_FIGHT_TARGET, Math.max(0, Number(state.progress?.fightMochiFightCount || 0) || 0)),
-      Math.min(FERTILITY_BIRTH_TARGET, Math.max(0, Number(state.progress?.loveMochiBirthCount || 0) || 0)),
+      progressCounter("firstAidHeals"),
+      progressCounter("fightMochiFightCount"),
+      progressCounter("loveMochiBirthCount"),
       Math.min(DAILY_PLAY_TARGET, Math.max(0, Number(state.progress?.dailyPlayStreak || 0) || 0)),
       Math.max(0, Number(state.progress?.dailyPlayLastDay || 0) || 0),
-      Math.min(STATISTICIAN_TARGET, Math.max(0, Number(state.progress?.statsButtonPressCount || 0) || 0)),
-      Math.min(MEMENTO_MORI_TARGET, Math.max(0, Number(state.progress?.totalDeathCount || 0) || 0)),
-      Math.min(LIVELY_MAKING_TARGET, Math.max(0, Number(state.progress?.manualTarinaiAddedCount || 0) || 0)),
+      progressCounter("statsButtonPressCount"),
+      progressCounter("totalDeathCount"),
+      progressCounter("manualTarinaiAddedCount"),
+      progressCounter("directFeedCount"),
+      progressCounter("robotCleanCount"),
+      Math.min(MAD_SCIENTIST_TARGET, state.progress?.mysteryDrugTarinaiIds?.length || 0),
       Math.floor(Math.max(0, (Number(global.world?.time || 0) || 0) - Math.max(0, Number(global.world?.achievementEliteFewStartAt || 0) || 0)) / Math.max(1, Number(global.world?.config?.dayLength ?? global.CONFIG?.dayLength ?? 120) || 120) * 10),
     ].join(":");
     return `${unlocks}|${rates}|${local}`;
@@ -573,7 +1193,7 @@
     dom.button?.classList.toggle("complete", count === DEFINITIONS.length);
     if (dom.sharedStatus) {
       if (shared.loading) dom.sharedStatus.textContent = "\u5171\u6709\u9054\u6210\u7387\u3092\u78ba\u8a8d\u4e2d\u2026";
-      else if (shared.connected) dom.sharedStatus.textContent = `\u5171\u6709\u96c6\u8a08: ${shared.totalPlayers}\u4eba\u306e\u30d7\u30ec\u30a4\u30e4\u30fc`;
+      else if (shared.connected) dom.sharedStatus.textContent = `共有集計（端末報告値）: ${shared.totalPlayers}人のプレイヤー`;
       else dom.sharedStatus.textContent = "\u5171\u6709\u9054\u6210\u7387: \u672a\u63a5\u7d9a\uff08\u30ed\u30fc\u30ab\u30eb\u5b9f\u7e3e\u306f\u5229\u7528\u53ef\u80fd\uff09";
     }
     if (!dom.list || dom.dialog?.classList.contains("hidden")) return;
@@ -656,6 +1276,7 @@
   function runNextUnlockToast() {
     if (toastActive || !toastQueue.length) return;
     const definition = toastQueue.shift();
+    global.TarinaiAudio?.achievementUnlock?.();
     if (!dom.toast || !dom.toastTitle) {
       global.showToast?.(`\u5b9f\u7e3e\u89e3\u9664: ${definition.title} \u2014 ${definition.description || ""}`);
       global.setTimeout(runNextUnlockToast, 80);
@@ -691,15 +1312,22 @@
       const options = payload ? {
         method: "POST",
         headers: { "Content-Type": "application/json" },
-        body: JSON.stringify(payload),
+        body: JSON.stringify({ ...payload, playerSecret: playerSecret() }),
         signal: controller?.signal,
         cache: "no-store",
       } : { signal: controller?.signal, cache: "no-store" };
-      const url = payload ? API_URL : `${API_URL}?action=summary&playerId=${encodeURIComponent(playerId())}`;
+      const url = payload ? API_URL : `${API_URL}?action=summary`;
       const response = await fetch(url, options);
-      if (!response.ok) throw new Error(`api ${response.status}`);
-      const data = await response.json();
-      if (!data?.ok) throw new Error("api rejected");
+      let data = null;
+      try { data = await response.json(); } catch (_) {}
+      if (!response.ok || !data?.ok) {
+        const error = new Error(`api ${response.status || 0}`);
+        error.status = Number(response.status || 0) || 0;
+        error.code = String(data?.error || "api_rejected");
+        error.data = data;
+        throw error;
+      }
+      storeServerCredentials(data);
       return data;
     } finally {
       global.clearTimeout(timeout);
@@ -712,6 +1340,7 @@
       loading: false,
       totalPlayers: Math.max(0, Number(data?.totalPlayers || 0) || 0),
       achievements: data?.achievements && typeof data.achievements === "object" ? data.achievements : {},
+      statisticsTrust: String(data?.statisticsTrust || "client-reported"),
     };
     render();
   }
@@ -721,11 +1350,7 @@
     shared.loading = true;
     render();
     try {
-      const data = await request(options.session ? {
-        action: "session",
-        playerId: playerId(),
-        gameVersion: GAME_VERSION,
-      } : null);
+      const data = options.session ? await establishSession() : await request(null);
       if (serial === requestSerial) applyShared(data);
       return true;
     } catch (_) {
@@ -746,35 +1371,209 @@
     return unlocked;
   }
 
+  function localProgressSnapshot() {
+    const normalized = normalizeState(state);
+    return {
+      progress: JSON.parse(JSON.stringify(normalized.progress)),
+      ledger: JSON.parse(JSON.stringify(normalized._progressLedger)),
+    };
+  }
+
+  function completionistTimestamp() {
+    let latest = 0;
+    for (const definition of DEFINITIONS) {
+      if (definition.id === COMPLETIONIST_ID) continue;
+      const timestamp = Number(state.unlocked[definition.id] || 0) || 0;
+      if (!timestamp) return 0;
+      latest = Math.max(latest, timestamp);
+    }
+    return latest;
+  }
+
+  function mergeServerUnlocks(data) {
+    const serverGenerationRaw = Number(data?.playerGeneration);
+    const hasServerGeneration = Number.isFinite(serverGenerationRaw) && serverGenerationRaw >= 0;
+    const serverGeneration = hasServerGeneration ? Math.floor(serverGenerationRaw) : persistenceGeneration;
+    if (serverGeneration < persistenceGeneration) return false;
+
+    let changed = false;
+    if (serverGeneration > persistenceGeneration) {
+      // A reset committed by another tab/device wins over every older local tab.
+      const identity = currentServerIdentity();
+      persistenceGeneration = serverGeneration;
+      persistenceRevision = 0;
+      state = blankState();
+      if (identity) state.serverIdentity = { ...identity };
+      progressMutationRevision = 0;
+      progressSyncedRevision = 0;
+      changed = true;
+    }
+
+    const serverProgress = data?.playerProgress;
+    if (serverProgress && typeof serverProgress === "object" && !Array.isArray(serverProgress)) {
+      const beforeProgress = JSON.stringify({ progress: state.progress, ledger: state._progressLedger });
+      const incoming = blankState();
+      incoming.progress = serverProgress.progress && typeof serverProgress.progress === "object" ? serverProgress.progress : {};
+      incoming._progressLedger = serverProgress.ledger && typeof serverProgress.ledger === "object" ? serverProgress.ledger : {};
+      state = mergeStateData(state, incoming);
+      const afterProgress = JSON.stringify({ progress: state.progress, ledger: state._progressLedger });
+      if (beforeProgress !== afterProgress) changed = true;
+    }
+
+    const source = data?.playerUnlocked;
+    if (source && typeof source === "object" && !Array.isArray(source)) {
+      const serverIds = [];
+      for (const [id, serverTimestamp] of Object.entries(source)) {
+        if (!definitionById.has(id) || state.debugUnlocked?.includes?.(id)) continue;
+        const seconds = Number(serverTimestamp);
+        const serverTime = Number.isFinite(seconds) && seconds > 0 ? Math.max(1, Math.floor(seconds * 1000)) : Date.now();
+        const localTime = Number(state.unlocked[id] || 0) || 0;
+        const sameSecond = localTime > 0 && Math.floor(localTime / 1000) === Math.floor(serverTime / 1000);
+        const mergedTime = localTime > 0 ? (sameSecond ? localTime : Math.min(localTime, serverTime)) : serverTime;
+        if (localTime !== mergedTime) {
+          state.unlocked[id] = mergedTime;
+          changed = true;
+        }
+        serverIds.push(id);
+      }
+      const confirmedSet = new Set(serverIds);
+      const beforePending = state.pending.length;
+      state.pending = state.pending.filter(id => !confirmedSet.has(id));
+      if (state.pending.length !== beforePending) changed = true;
+    }
+
+    const completionTime = completionistTimestamp();
+    if (completionTime > 0) {
+      const current = Number(state.unlocked[COMPLETIONIST_ID] || 0) || 0;
+      const merged = current > 0 ? Math.max(current, completionTime) : completionTime;
+      if (current !== merged) {
+        state.unlocked[COMPLETIONIST_ID] = merged;
+        changed = true;
+      }
+    }
+    if (changed) {
+      saveState();
+      render();
+    }
+    return changed;
+  }
+
+  async function establishSession(options = {}) {
+    const legacyId = legacyPlayerId();
+    const payload = {
+      action: "session",
+      playerId: playerId(),
+      gameVersion: GAME_VERSION,
+      generation: persistenceGeneration,
+    };
+    if (legacyId) payload.legacyPlayerId = legacyId;
+    const data = await request(payload);
+    if (options.merge !== false) mergeServerUnlocks(data);
+    return data;
+  }
+
   async function performSyncPending(options = {}) {
     let latest = null;
+    const writeWithIdentityRecovery = async (payload, recoveryOptions = {}) => {
+      try {
+        const data = await request(payload);
+        mergeServerUnlocks(data);
+        return data;
+      } catch (error) {
+        const status = Number(error?.status || 0);
+        const code = String(error?.code || "");
+        if (status === 409 && code === "stale_generation") {
+          // A reset from another device is authoritative. Merge it, but never
+          // replay this request's older-generation unlock/progress snapshot.
+          error.recoveredData = await establishSession({ merge: true });
+          throw error;
+        }
+        if (status === 409 && code === "generation_ahead") {
+          // Compatibility recovery for servers that require an explicit full
+          // generation promotion after a backup restore or identity recreation.
+          const data = await request({
+            action: "sync",
+            playerId: playerId(),
+            gameVersion: GAME_VERSION,
+            generation: persistenceGeneration,
+            generationRecovery: true,
+            syncProtocol: SYNC_PROTOCOL_VERSION,
+            mergeMode: "grow-only-union-v5",
+            unlocked: localUnlockSnapshot(),
+            progressState: localProgressSnapshot(),
+          });
+          mergeServerUnlocks(data);
+          return data;
+        }
+        const recoverableIdentity = status === 403 && ["unknown_player", "invalid_owner"].includes(code);
+        if (!recoverableIdentity) throw error;
+        const sessionData = await establishSession({ merge: true });
+        if (recoveryOptions.sessionOnly) return sessionData;
+        if (payload.action === "reset" && !state.resetPending) return sessionData;
+        const retryPayload = payload.action === "sync" ? {
+          action: "sync",
+          playerId: playerId(),
+          gameVersion: GAME_VERSION,
+          generation: persistenceGeneration,
+          generationRecovery: true,
+          syncProtocol: SYNC_PROTOCOL_VERSION,
+          mergeMode: "grow-only-union-v5",
+          unlocked: localUnlockSnapshot(),
+          progressState: localProgressSnapshot(),
+        } : {
+          ...payload,
+          playerId: playerId(),
+          generation: persistenceGeneration,
+          generationRecovery: true,
+          syncProtocol: SYNC_PROTOCOL_VERSION,
+        };
+        const data = await request(retryPayload);
+        mergeServerUnlocks(data);
+        return data;
+      }
+    };
     try {
       if (state.resetPending) {
-        latest = await request({
+        latest = await writeWithIdentityRecovery({
           action: "reset",
           playerId: playerId(),
           gameVersion: GAME_VERSION,
-        });
+          confirmReset: "RESET_ACHIEVEMENTS",
+          catalogRevision: ACHIEVEMENT_CATALOG_REVISION,
+          generation: persistenceGeneration,
+          syncProtocol: SYNC_PROTOCOL_VERSION,
+        }, { mergeSession: false });
         state.resetPending = false;
         saveState();
       }
 
+      // Unlocks and progress are uploaded as one generation-scoped CRDT
+      // snapshot. The server unions actor shards, set-like progress and the
+      // earliest unlock timestamps, then returns the atomic merged state.
       const snapshot = localUnlockSnapshot();
+      const progressSnapshot = localProgressSnapshot();
+      const progressRevisionAtStart = progressMutationRevision;
       const pendingIds = [...new Set(state.pending.filter(id => definitionById.has(id) && snapshot[id]))];
       const unlocked = options.full
         ? snapshot
         : Object.fromEntries(pendingIds.map(id => [id, snapshot[id]]));
       const syncedIds = Object.keys(unlocked);
-      if (syncedIds.length || options.full) {
-        latest = await request({
+      const hasProgressChanges = progressRevisionAtStart > progressSyncedRevision;
+      if (options.full || syncedIds.length || hasProgressChanges) {
+        latest = await writeWithIdentityRecovery({
           action: "sync",
           playerId: playerId(),
           gameVersion: GAME_VERSION,
           unlocked,
-          ...(options.full ? { completionistEligible: allOtherAchievementsUnlocked() } : {}),
-        });
-        const syncedSet = new Set(syncedIds);
-        state.pending = state.pending.filter(id => !syncedSet.has(id));
+          progressState: progressSnapshot,
+          mergeMode: "grow-only-union-v5",
+          syncProtocol: SYNC_PROTOCOL_VERSION,
+          generation: persistenceGeneration,
+          generationRecovery: true,
+        }, { mergeSession: false });
+        const confirmedSet = new Set(syncedIds);
+        state.pending = state.pending.filter(id => !confirmedSet.has(id));
+        progressSyncedRevision = Math.max(progressSyncedRevision, progressRevisionAtStart);
         saveState();
       } else if (!latest) {
         return refreshShared({ session: true });
@@ -782,7 +1581,11 @@
 
       if (latest) applyShared(latest);
       return true;
-    } catch (_) {
+    } catch (error) {
+      if (error?.recoveredData) {
+        applyShared(error.recoveredData);
+        return true;
+      }
       shared = { ...shared, connected: false, loading: false };
       render();
       return false;
@@ -791,7 +1594,10 @@
 
   function syncPending(options = {}) {
     const normalized = { full: Boolean(options.full) };
-    const run = () => performSyncPending(normalized);
+    const run = async () => {
+      await persistenceReadyPromise;
+      return performSyncPending(normalized);
+    };
     syncQueue = syncQueue.then(run, run);
     return syncQueue;
   }
@@ -857,30 +1663,13 @@
     return tracker;
   }
 
-  function generationRunLength(values = []) {
-    const sorted = [...new Set((values || [])
-      .map(value => Math.max(1, Math.floor(Number(value) || 0)))
-      .filter(Number.isFinite))].sort((a, b) => a - b);
-    let best = 0;
-    let run = 0;
-    let previous = null;
-    for (const generation of sorted) {
-      run = previous !== null && generation === previous + 1 ? run + 1 : 1;
-      best = Math.max(best, run);
-      previous = generation;
-    }
-    return best;
-  }
-
-  function recordNaturalGeneration(world, tarinai, property, required) {
+  function recordNaturalGeneration(world, tarinai, depthKey, required) {
     if (!world || !tarinai) return 0;
-    const depthKey = property === "achievementNaturalSlaveGenerations"
-      ? "_achievementNaturalSlaveLineageDepth"
-      : "_achievementNaturalKingLineageDepth";
     const parentIds = Array.isArray(tarinai.parents) ? tarinai.parents.filter(Boolean) : [];
     let parentDepth = 0;
     for (const parentId of parentIds) {
-      const parent = (world.tarinai || []).find(candidate => candidate && String(candidate.id || "") === String(parentId));
+      const parent = (world.tarinai || []).find(candidate => candidate
+        && String(candidate.familyKey || candidate.id || "") === String(parentId));
       parentDepth = Math.max(parentDepth, Math.max(0, Math.floor(Number(parent?.[depthKey] || 0) || 0)));
     }
     tarinai[depthKey] = Math.max(1, parentDepth + 1);
@@ -901,29 +1690,57 @@
   function ensureProgress() {
     if (!state.progress || typeof state.progress !== "object") state.progress = blankState().progress;
     if (!Array.isArray(state.progress.linkTypes)) state.progress.linkTypes = [];
-    state.progress.placementCount = Math.max(0, Math.floor(Number(state.progress.placementCount || 0) || 0));
+    state.progress.linkTypes = [...new Set(state.progress.linkTypes.filter(type => LINK_PROGRESS_TYPES.includes(type)))];
     state.progress.signalActivated = Boolean(state.progress.signalActivated);
-    state.progress.antKills = Math.max(0, Math.floor(Number(state.progress.antKills || 0) || 0));
-    state.progress.birthCount = Math.max(0, Math.floor(Number(state.progress.birthCount || 0) || 0));
-    state.progress.quickDeleteCount = Math.max(0, Math.floor(Number(state.progress.quickDeleteCount || 0) || 0));
-    state.progress.undoCount = Math.max(0, Math.floor(Number(state.progress.undoCount || 0) || 0));
-    state.progress.redoCount = Math.max(0, Math.floor(Number(state.progress.redoCount || 0) || 0));
     if (!Array.isArray(state.progress.medicineTypes)) state.progress.medicineTypes = [];
     state.progress.medicineTypes = [...new Set(state.progress.medicineTypes.filter(type => MEDICINE_LEDGER_TYPES.includes(type)))];
-    state.progress.firstAidHeals = Math.max(0, Math.floor(Number(state.progress.firstAidHeals || 0) || 0));
-    state.progress.fightMochiFightCount = Math.max(0, Math.floor(Number(state.progress.fightMochiFightCount || 0) || 0));
-    state.progress.shotCount = Math.max(0, Math.floor(Number(state.progress.shotCount || 0) || 0));
-    state.progress.loveMochiBirthCount = Math.max(0, Math.floor(Number(state.progress.loveMochiBirthCount || 0) || 0));
     state.progress.dailyPlayStreak = Math.min(DAILY_PLAY_TARGET, Math.max(0, Math.floor(Number(state.progress.dailyPlayStreak || 0) || 0)));
     state.progress.dailyPlayLastDay = Math.max(0, Math.floor(Number(state.progress.dailyPlayLastDay || 0) || 0));
-    state.progress.statsButtonPressCount = Math.min(STATISTICIAN_TARGET, Math.max(0, Math.floor(Number(state.progress.statsButtonPressCount || 0) || 0)));
-    state.progress.totalDeathCount = Math.min(MEMENTO_MORI_TARGET, Math.max(0, Math.floor(Number(state.progress.totalDeathCount || 0) || 0)));
-    state.progress.manualTarinaiAddedCount = Math.min(LIVELY_MAKING_TARGET, Math.max(0, Math.floor(Number(state.progress.manualTarinaiAddedCount || 0) || 0)));
+    if (!Array.isArray(state.progress.mysteryDrugTarinaiIds)) state.progress.mysteryDrugTarinaiIds = [];
+    state.progress.mysteryDrugTarinaiIds = [...new Set(state.progress.mysteryDrugTarinaiIds.map(id => String(id || "")).filter(Boolean))].slice(0, MAD_SCIENTIST_TARGET);
     return state.progress;
   }
 
-  function hexByte(value = 0) {
-    return Math.max(0, Math.min(255, Number(value) || 0)).toString(16).padStart(2, "0");
+  function ensureProgressLedger() {
+    state._progressLedger = sanitizeProgressLedger(state, state.progress || {});
+    return state._progressLedger;
+  }
+
+  function progressCounter(key) {
+    return ledgerCounterValue(ensureProgressLedger(), key);
+  }
+
+  function raiseProgressCounter(key, minimumValue = 0) {
+    if (!Object.prototype.hasOwnProperty.call(ADDITIVE_PROGRESS_CAPS, key)) return 0;
+    const cap = ADDITIVE_PROGRESS_CAPS[key];
+    const ledger = ensureProgressLedger();
+    const current = ledgerCounterValue(ledger, key);
+    const target = Math.min(cap, Math.max(0, Math.floor(Number(minimumValue || 0) || 0)));
+    if (target <= current) return current;
+    ledger.base[key] = Math.min(cap, Math.max(0, Math.floor(Number(ledger.base[key] || 0) || 0)) + (target - current));
+    if (target >= cap) {
+      ledger.base[key] = cap;
+      ledger.shards[key] = {};
+    }
+    markProgressMutation();
+    return target;
+  }
+
+  function incrementProgressCounter(key, amount = 1) {
+    if (!Object.prototype.hasOwnProperty.call(ADDITIVE_PROGRESS_CAPS, key)) return 0;
+    const ledger = ensureProgressLedger();
+    const cap = ADDITIVE_PROGRESS_CAPS[key];
+    const current = ledgerCounterValue(ledger, key);
+    const increment = Math.min(Math.max(0, Math.floor(Number(amount || 0) || 0)), Math.max(0, cap - current));
+    if (increment <= 0) return current;
+    const shards = ledger.shards[key] || (ledger.shards[key] = {});
+    shards[persistenceActorId] = Math.max(0, Math.floor(Number(shards[persistenceActorId] || 0) || 0)) + increment;
+    if (current + increment >= cap) {
+      ledger.base[key] = cap;
+      ledger.shards[key] = {};
+    }
+    markProgressMutation();
+    return current + increment;
   }
 
   function unlockedIndexesFromMaskWords(lowWord = 0, highWord = 0, extraWord = 0) {
@@ -973,31 +1790,35 @@
       baseTimestamp,
       deltas,
       [
-        state.unlocked.placed_objects_100 ? 0 : Math.min(100, progress.placementCount),
+        state.unlocked.placed_objects_100 ? 0 : Math.min(100, progressCounter("placementCount")),
         state.unlocked.mechanized_industry ? 0 : linkFlags,
-        state.unlocked.ants_killed_100 ? 0 : Math.min(100, progress.antKills),
-        state.unlocked.great_mother_1000_births ? 0 : Math.min(3333, progress.birthCount),
-        state.unlocked.unplanned_city_30 ? 0 : Math.min(30, progress.quickDeleteCount),
-        state.unlocked.undo_20 ? 0 : Math.min(20, progress.undoCount),
-        state.unlocked.redo_20 ? 0 : Math.min(20, progress.redoCount),
+        state.unlocked.ants_killed_100 ? 0 : Math.min(100, progressCounter("antKills")),
+        state.unlocked.great_mother_1000_births ? 0 : Math.min(3333, progressCounter("birthCount")),
+        state.unlocked.unplanned_city_30 ? 0 : Math.min(30, progressCounter("quickDeleteCount")),
+        state.unlocked.undo_20 ? 0 : Math.min(20, progressCounter("undoCount")),
+        state.unlocked.redo_20 ? 0 : Math.min(20, progressCounter("redoCount")),
         state.unlocked.medicine_ledger_all ? 0 : medicineMask,
-        state.unlocked.town_doctor_50 ? 0 : Math.min(50, progress.firstAidHeals),
-        state.unlocked.chaos_seeker_666_fights ? 0 : Math.min(CHAOS_FIGHT_TARGET, progress.fightMochiFightCount),
-        state.unlocked.sniper_333_shots ? 0 : Math.min(SNIPER_SHOT_TARGET, progress.shotCount),
-        state.unlocked.fertility_seeker_721_love_births ? 0 : Math.min(FERTILITY_BIRTH_TARGET, progress.loveMochiBirthCount),
+        state.unlocked.town_doctor_50 ? 0 : Math.min(50, progressCounter("firstAidHeals")),
+        state.unlocked.chaos_seeker_666_fights ? 0 : Math.min(CHAOS_FIGHT_TARGET, progressCounter("fightMochiFightCount")),
+        state.unlocked.sniper_333_shots ? 0 : Math.min(SNIPER_SHOT_TARGET, progressCounter("shotCount")),
+        state.unlocked.fertility_seeker_721_love_births ? 0 : Math.min(FERTILITY_BIRTH_TARGET, progressCounter("loveMochiBirthCount")),
         state.unlocked.daily_play_7_days ? 0 : Math.min(DAILY_PLAY_TARGET, progress.dailyPlayStreak),
         state.unlocked.daily_play_7_days ? 0 : Math.min(131071, progress.dailyPlayLastDay),
-        state.unlocked.statistician ? 0 : Math.min(STATISTICIAN_TARGET, progress.statsButtonPressCount),
-        state.unlocked.memento_mori ? 0 : Math.min(MEMENTO_MORI_TARGET, progress.totalDeathCount),
-        state.unlocked.lively_making ? 0 : Math.min(LIVELY_MAKING_TARGET, progress.manualTarinaiAddedCount),
+        state.unlocked.statistician ? 0 : Math.min(STATISTICIAN_TARGET, progressCounter("statsButtonPressCount")),
+        state.unlocked.memento_mori ? 0 : Math.min(MEMENTO_MORI_TARGET, progressCounter("totalDeathCount")),
+        state.unlocked.lively_making ? 0 : Math.min(LIVELY_MAKING_TARGET, progressCounter("manualTarinaiAddedCount")),
+        state.unlocked.mad_scientist ? 0 : Math.min(MAD_SCIENTIST_TARGET, progress.mysteryDrugTarinaiIds.length),
+        state.unlocked.direct_feed_33 ? 0 : Math.min(33, progressCounter("directFeedCount")),
+        state.unlocked.robot_cleaner_100 ? 0 : Math.min(ROBOT_CLEAN_TARGET, progressCounter("robotCleanCount")),
       ],
+      state.unlocked.mad_scientist ? [] : progress.mysteryDrugTarinaiIds.slice(0, MAD_SCIENTIST_TARGET),
     ];
   }
 
   function parseSpellState(payload = null) {
     if (!Array.isArray(payload)) return null;
     const version = Number(payload[0]);
-    if (version !== SPELL_STATE_VERSION) return null;
+    if (![9, 10, SPELL_STATE_VERSION].includes(version)) return null;
     const lowWord = Number(payload[1]);
     const highWord = Number(payload[2]);
     const extraWord = Number(payload[3]);
@@ -1012,6 +1833,10 @@
       baseTimestamp: Math.max(0, Math.floor(Number(payload[4] || 0) || 0)),
       deltas: Array.isArray(payload[5]) ? payload[5] : [],
       packed: Array.isArray(payload[6]) ? payload[6] : [],
+      mysteryDrugIds: version >= 10 && Array.isArray(payload[7])
+        ? [...new Set(payload[7].map(id => String(id || "")).filter(Boolean))].slice(0, MAD_SCIENTIST_TARGET)
+        : [],
+      version,
       timestampUnitMs: 60000,
     };
   }
@@ -1019,7 +1844,7 @@
   function importSpellState(payload = null) {
     const parsed = parseSpellState(payload);
     if (!parsed) return { included: false, unlockedAdded: 0, progressChanged: false };
-    const { unlockedIndexes, baseTimestamp, deltas, packed, timestampUnitMs } = parsed;
+    const { unlockedIndexes, baseTimestamp, deltas, packed, mysteryDrugIds, version, timestampUnitMs } = parsed;
     if (deltas.length !== unlockedIndexes.length) throw new Error("invalid achievement spell timestamps");
     const importedUnlocks = [];
     let importedCompletionistAt = 0;
@@ -1051,8 +1876,8 @@
     }
 
     const progress = ensureProgress();
-    const previousProgress = JSON.stringify(progress);
-    progress.placementCount = Math.max(progress.placementCount, Math.min(100, Math.max(0, Math.floor(Number(packed[0] || 0) || 0))));
+    const previousProgress = JSON.stringify({ progress, ledger: ensureProgressLedger() });
+    raiseProgressCounter("placementCount", packed[0]);
     const linkFlags = Math.max(0, Math.floor(Number(packed[1] || 0) || 0));
     const importedLinks = [];
     if (linkFlags & 1) importedLinks.push("rope");
@@ -1060,18 +1885,18 @@
     if (linkFlags & 4) importedLinks.push("spring");
     progress.linkTypes = [...new Set([...(progress.linkTypes || []), ...importedLinks])];
     progress.signalActivated = Boolean(progress.signalActivated || (linkFlags & 8));
-    progress.antKills = Math.max(progress.antKills, Math.min(100, Math.max(0, Math.floor(Number(packed[2] || 0) || 0))));
-    progress.birthCount = Math.max(progress.birthCount, Math.min(3333, Math.max(0, Math.floor(Number(packed[3] || 0) || 0))));
-    progress.quickDeleteCount = Math.max(progress.quickDeleteCount, Math.min(30, Math.max(0, Math.floor(Number(packed[4] || 0) || 0))));
-    progress.undoCount = Math.max(progress.undoCount, Math.min(20, Math.max(0, Math.floor(Number(packed[5] || 0) || 0))));
-    progress.redoCount = Math.max(progress.redoCount, Math.min(20, Math.max(0, Math.floor(Number(packed[6] || 0) || 0))));
+    raiseProgressCounter("antKills", packed[2]);
+    raiseProgressCounter("birthCount", packed[3]);
+    raiseProgressCounter("quickDeleteCount", packed[4]);
+    raiseProgressCounter("undoCount", packed[5]);
+    raiseProgressCounter("redoCount", packed[6]);
     const medicineMask = Math.max(0, Math.floor(Number(packed[7] || 0) || 0));
     const importedMedicines = MEDICINE_LEDGER_TYPES.filter((_type, index) => medicineMask & (1 << index));
     progress.medicineTypes = [...new Set([...(progress.medicineTypes || []), ...importedMedicines])];
-    progress.firstAidHeals = Math.max(progress.firstAidHeals, Math.min(50, Math.max(0, Math.floor(Number(packed[8] || 0) || 0))));
-    progress.fightMochiFightCount = Math.max(progress.fightMochiFightCount, Math.min(CHAOS_FIGHT_TARGET, Math.max(0, Math.floor(Number(packed[9] || 0) || 0))));
-    progress.shotCount = Math.max(progress.shotCount, Math.min(SNIPER_SHOT_TARGET, Math.max(0, Math.floor(Number(packed[10] || 0) || 0))));
-    progress.loveMochiBirthCount = Math.max(progress.loveMochiBirthCount, Math.min(FERTILITY_BIRTH_TARGET, Math.max(0, Math.floor(Number(packed[11] || 0) || 0))));
+    raiseProgressCounter("firstAidHeals", packed[8]);
+    raiseProgressCounter("fightMochiFightCount", packed[9]);
+    raiseProgressCounter("shotCount", packed[10]);
+    raiseProgressCounter("loveMochiBirthCount", packed[11]);
     const importedDailyStreak = Math.min(DAILY_PLAY_TARGET, Math.max(0, Math.floor(Number(packed[12] || 0) || 0)));
     const importedDailyLastDay = Math.min(131071, Math.max(0, Math.floor(Number(packed[13] || 0) || 0)));
     if (importedDailyLastDay > progress.dailyPlayLastDay) {
@@ -1080,10 +1905,16 @@
     } else if (importedDailyLastDay === progress.dailyPlayLastDay) {
       progress.dailyPlayStreak = Math.max(progress.dailyPlayStreak, importedDailyStreak);
     }
-    progress.statsButtonPressCount = Math.max(progress.statsButtonPressCount, Math.min(STATISTICIAN_TARGET, Math.max(0, Math.floor(Number(packed[14] || 0) || 0))));
-    progress.totalDeathCount = Math.max(progress.totalDeathCount, Math.min(MEMENTO_MORI_TARGET, Math.max(0, Math.floor(Number(packed[15] || 0) || 0))));
-    progress.manualTarinaiAddedCount = Math.max(progress.manualTarinaiAddedCount, Math.min(LIVELY_MAKING_TARGET, Math.max(0, Math.floor(Number(packed[16] || 0) || 0))));
-    const progressChanged = previousProgress !== JSON.stringify(progress);
+    raiseProgressCounter("statsButtonPressCount", packed[14]);
+    raiseProgressCounter("totalDeathCount", packed[15]);
+    raiseProgressCounter("manualTarinaiAddedCount", packed[16]);
+    if (version >= 10 && mysteryDrugIds.length) {
+      progress.mysteryDrugTarinaiIds = [...new Set([...(progress.mysteryDrugTarinaiIds || []), ...mysteryDrugIds])].slice(0, MAD_SCIENTIST_TARGET);
+    }
+    raiseProgressCounter("directFeedCount", packed[18]);
+    raiseProgressCounter("robotCleanCount", packed[19]);
+    const progressChanged = previousProgress !== JSON.stringify({ progress, ledger: ensureProgressLedger() });
+    if (progressChanged) markProgressMutation();
     changed = changed || progressChanged;
 
     if (!state.unlocked[COMPLETIONIST_ID] && allOtherAchievementsUnlocked()) {
@@ -1110,18 +1941,19 @@
     recordIntervention({ ...detail, world });
     const item = detail.item || null;
     if (item) {
+      if (!item._achievementPlayerPlaced || item._achievementPlayerPlacedCounted === false) world.achievementPlayerPlacedActiveCount = Math.max(0, Number(world.achievementPlayerPlacedActiveCount || 0) || 0) + 1;
       item._achievementPlayerPlaced = true;
+      item._achievementPlayerPlacedCounted = true;
       item._achievementPlacedAt = Math.max(0, Number(world.time || 0) || 0);
     }
     let changed = evaluateCleanFreak(world, detail);
     changed = evaluateMegalopolis(world, detail) || changed;
     changed = evaluateSandbox(world, detail) || changed;
     if (!state.unlocked.placed_objects_100) {
-      const progress = ensureProgress();
-      progress.placementCount = Math.min(100, progress.placementCount + 1);
+      const count = incrementProgressCounter("placementCount");
       saveState();
       renderIfDialogOpen();
-      if (progress.placementCount >= 100) changed = unlock("placed_objects_100", { ...detail, world, count: progress.placementCount }) || changed;
+      if (count >= ADDITIVE_PROGRESS_CAPS.placementCount) changed = unlock("placed_objects_100", { ...detail, world, count }) || changed;
     }
     return changed;
   }
@@ -1137,15 +1969,14 @@
     const placedAtRaw = item._achievementPlacedAt;
     const placedAt = placedAtRaw == null ? NaN : Number(placedAtRaw);
     if (!Number.isFinite(placedAt) || now < placedAt || now - placedAt > 30.0001) return changed;
-    const progress = ensureProgress();
     if (!state.unlocked.unplanned_city_30) {
       const operationKey = detail.operationId == null ? "" : String(detail.operationId);
       if (operationKey && world._achievementLastQuickDeleteOperation === operationKey) return changed;
       if (operationKey) world._achievementLastQuickDeleteOperation = operationKey;
-      progress.quickDeleteCount = Math.min(30, progress.quickDeleteCount + 1);
+      const count = incrementProgressCounter("quickDeleteCount");
       saveState();
       renderIfDialogOpen();
-      if (progress.quickDeleteCount >= 30) changed = unlock("unplanned_city_30", { ...detail, world, count: progress.quickDeleteCount }) || changed;
+      if (count >= ADDITIVE_PROGRESS_CAPS.quickDeleteCount) changed = unlock("unplanned_city_30", { ...detail, world, count }) || changed;
     }
     return changed;
   }
@@ -1155,24 +1986,39 @@
     if (action !== "undo" && action !== "redo") return false;
     const world = detailWorld(detail);
     if (world) recordIntervention({ ...detail, world, tool: action });
-    const progress = ensureProgress();
     const key = action === "undo" ? "undoCount" : "redoCount";
     const achievementId = action === "undo" ? "undo_20" : "redo_20";
-    progress[key] = Math.min(20, progress[key] + 1);
+    const count = incrementProgressCounter(key);
     saveState();
     renderIfDialogOpen();
     let changed = false;
     if (action === "undo" && Math.max(0, Number(detail.deadRestored || 0) || 0) >= 10) {
       changed = unlock("undo_mass_revival", { ...detail, count: Math.max(0, Number(detail.deadRestored || 0) || 0) }) || changed;
     }
-    if (progress[key] >= 20) changed = unlock(achievementId, { ...detail, count: progress[key] }) || changed;
+    if (count >= ADDITIVE_PROGRESS_CAPS[key]) changed = unlock(achievementId, { ...detail, count }) || changed;
     return changed;
   }
 
+  function mechanizedIndustryHasAllLinks(world = global.world) {
+    if (!world) return false;
+    return ["rope", "rod", "spring"].every(required => {
+      const bucket = world.itemsOfType?.(required);
+      if (Array.isArray(bucket)) return bucket.some(item => item && !item.dead);
+      return (world.items || []).some(item => item && !item.dead && item.type === required);
+    });
+  }
+
   function evaluateMechanizedIndustry(detail = {}) {
-    const progress = ensureProgress();
-    const hasAllLinks = ["rope", "rod", "spring"].every(required => progress.linkTypes.includes(required));
-    if (progress.signalActivated && hasAllLinks) return unlock("mechanized_industry", detail);
+    if (state.unlocked.mechanized_industry) return false;
+    const world = detailWorld(detail);
+    const source = detail.source || null;
+    const detectorDriven = Boolean(detail.detectorDriven)
+      || source?.type === "pressure_switch"
+      || (Array.isArray(detail.detectorSources) && detail.detectorSources.some(candidate => candidate?.type === "pressure_switch"));
+    const connectedTarget = Boolean(detail.connected) && detail.target && !detail.target.dead;
+    if (world && detectorDriven && connectedTarget && mechanizedIndustryHasAllLinks(world)) {
+      return unlock("mechanized_industry", { ...detail, world });
+    }
     return false;
   }
 
@@ -1180,23 +2026,10 @@
     const linkType = String(type || detail.type || detail.item?.type || "");
     const placementLinkTypes = ["rope", "rod", "spring", "wire", "insulated_wire"];
     if (!placementLinkTypes.includes(linkType)) return false;
-    recordPlayerPlacement(detail);
-    if (state.unlocked.mechanized_industry || !["rope", "rod", "spring"].includes(linkType)) return false;
-    const progress = ensureProgress();
-    progress.linkTypes = [...new Set([...(progress.linkTypes || []), linkType])];
-    saveState();
-    renderIfDialogOpen();
-    return evaluateMechanizedIndustry({ ...detail, type: linkType });
+    return recordPlayerPlacement(detail);
   }
 
   function recordSignalActivation(detail = {}) {
-    if (state.unlocked.mechanized_industry) return false;
-    const progress = ensureProgress();
-    if (!progress.signalActivated) {
-      progress.signalActivated = true;
-      saveState();
-      renderIfDialogOpen();
-    }
     return evaluateMechanizedIndustry(detail);
   }
 
@@ -1209,7 +2042,7 @@
 
   function evaluateAntNestWithoutTarinai(worldRef = global.world, detail = {}) {
     if (!worldRef || state.unlocked.ant_nest_without_tarinai) return false;
-    const hasNest = (worldRef.items || []).some(item => item && !item.dead && item.type === "ant_nest");
+    const hasNest = playstyleItemCount(worldRef, "ant_nest") > 0;
     if (!hasNest) return false;
     const aliveTarinai = (worldRef.tarinai || []).some(tarinai => tarinai && !tarinai.dead);
     if (aliveTarinai) return false;
@@ -1253,13 +2086,12 @@
 
   function recordAntKilled(detail = {}) {
     let changed = false;
-    const progress = ensureProgress();
     const playerCaused = Boolean(detail.playerCaused || detail.ant?._achievementLastDamageSource?.danger);
     if (!state.unlocked.ants_killed_100 && playerCaused) {
-      progress.antKills = Math.min(100, progress.antKills + 1);
+      const count = incrementProgressCounter("antKills");
       saveState();
       renderIfDialogOpen();
-      if (progress.antKills >= 100) changed = unlock("ants_killed_100", detail) || changed;
+      if (count >= ADDITIVE_PROGRESS_CAPS.antKills) changed = unlock("ants_killed_100", { ...detail, count }) || changed;
     }
     const world = detailWorld(detail);
     const ant = detail.ant || null;
@@ -1291,11 +2123,12 @@
     const world = detail.world || tarinai.world || global.world || null;
     const now = Math.max(0, Number(world?.time || 0) || 0);
     const dangerSource = dangerItemSource(source);
-    // This achievement tracks collateral damage caused by danger-category tools,
-    // not ordinary combat, hunger, disease, or ant attacks.
-    if (world && dangerSource) {
-      world.achievementLastTarinaiDamageAt = now;
-      world.achievementEnemyAntKills = 0;
+    // "Unharmed" means no actual damage from any cause while the streak is active.
+    if (world) {
+      if (Math.max(0, Math.floor(Number(world.achievementEnemyAntKills || 0) || 0)) > 0) {
+        world.achievementEnemyAntKills = 0;
+        renderIfDialogOpen();
+      }
     }
     tarinai._achievementLastDamageSource = dangerSource ? {
       danger: true,
@@ -1338,32 +2171,38 @@
     const now = Math.max(0, Number(world.time || 0) || 0);
     const source = tarinai._achievementLastDamageSource || null;
     const lethalDanger = Boolean(detail.fromDamage || detail.achievementDangerKill);
+    const session = tarinai._achievementFightSession || null;
     if (!lethalDanger || !source?.danger || Math.abs(now - Number(source.at || 0)) > 0.05) return false;
+    if (!session?.id || !session.opponentId || Number(tarinai.fightTimer || 0) <= 0.04) return false;
     const tracker = fightPairTracker(world);
     if (!tracker) return false;
+    const maxGap = 6;
     for (const [key, pending] of [...tracker.entries()]) {
-      if (!pending) {
+      if (!pending || now - Number(pending.at || 0) > maxGap) {
         tracker.delete(key);
         continue;
       }
-      if (pending.firstId !== tarinai.id && pending.otherId === tarinai.id) {
+      if (pending.sessionId === session.id
+        && pending.firstId !== tarinai.id
+        && pending.otherId === tarinai.id
+        && session.opponentId === pending.firstId) {
         tracker.delete(key);
-        return unlock("fight_pair_danger_kill", { ...detail, pairKey: key, first: pending, secondSource: source });
+        return unlock("fight_pair_danger_kill", { ...detail, pairKey: key, fightSessionId: session.id, first: pending, secondSource: source });
       }
     }
-    const targets = [...new Set([...(Array.isArray(tarinai.fightTargetIds) ? tarinai.fightTargetIds : []), tarinai.fightTargetId].filter(Boolean))];
-    for (const targetId of targets) {
-      const opponent = (world.tarinai || []).find(candidate => candidate && candidate.id === targetId) || null;
-      if (!opponent || opponent === tarinai) continue;
-      const activePair = Boolean(world.isAlreadyFightingPair?.(tarinai, opponent))
-        || Boolean((tarinai.fightTimer || 0) > 0.04 && (opponent.fightTimer || 0) > 0.04);
-      if (!activePair) continue;
-      const key = world.fightPairKey?.(tarinai, opponent)
-        || [String(tarinai.id || ""), String(opponent.id || "")].sort().join(":");
-      if (!key) continue;
-      tracker.set(key, { firstId: tarinai.id, otherId: opponent.id, at: now, source });
-      return false;
-    }
+    const opponent = (world.tarinai || []).find(candidate => candidate && candidate.id === session.opponentId) || null;
+    if (!opponent || opponent === tarinai || opponent.dead) return false;
+    const opponentSession = opponent._achievementFightSession || null;
+    if (opponentSession?.id !== session.id || opponentSession.opponentId !== tarinai.id) return false;
+    const key = String(session.pairKey || world.fightPairKey?.(tarinai, opponent) || "");
+    if (!key) return false;
+    tracker.set(key, {
+      firstId: tarinai.id,
+      otherId: opponent.id,
+      at: now,
+      source,
+      sessionId: session.id,
+    });
     return false;
   }
 
@@ -1422,7 +2261,7 @@
 
   function evaluateSandbox(world = global.world, detail = {}) {
     if (!world || state.unlocked.sandbox_five_toilets) return false;
-    const count = (world.items || []).reduce((sum, item) => sum + (item && !item.dead && item.type === "toilet" ? 1 : 0), 0);
+    const count = playstyleItemCount(world, "toilet");
     if (count < 5) return false;
     return unlock("sandbox_five_toilets", { ...detail, world, count });
   }
@@ -1451,6 +2290,7 @@
       ? Math.min(DAILY_PLAY_TARGET, progress.dailyPlayStreak + 1)
       : 1;
     progress.dailyPlayLastDay = today;
+    markProgressMutation();
     saveState();
     renderIfDialogOpen();
     if (progress.dailyPlayStreak >= DAILY_PLAY_TARGET) {
@@ -1467,9 +2307,7 @@
       elapsedMs = Math.max(0, explicitElapsed);
     } else {
       const timestamp = Number.isFinite(Number(detail.now)) ? Number(detail.now) : Date.now();
-      if (!continuousPlayStartedAt || timestamp < continuousPlayStartedAt) continuousPlayStartedAt = timestamp;
-      continuousPlayLastHeartbeatAt = timestamp;
-      elapsedMs = Math.max(0, timestamp - continuousPlayStartedAt);
+      elapsedMs = continuousPlayElapsedMs(timestamp);
     }
     let changed = false;
     if (!state.unlocked.continuous_play_1_hour && elapsedMs >= CONTINUOUS_PLAY_TARGET_MS) {
@@ -1483,23 +2321,43 @@
 
   function recordBelowAbsoluteZeroItem(worldRef = global.world, detail = {}) {
     if (state.unlocked.below_absolute_zero_item || !worldRef) return false;
-    for (const item of worldRef.items || []) {
-      if (!item || item.dead) continue;
+    worldRef.ensureItemBuckets?.("achievement-absolute-zero");
+    const testItem = (item) => {
+      if (!item || item.dead) return false;
       const temperature = Number(worldRef.temperatureAt?.(item.x, item.y, null));
-      if (!Number.isFinite(temperature) || temperature >= ABSOLUTE_ZERO_C) continue;
+      if (!Number.isFinite(temperature) || temperature >= ABSOLUTE_ZERO_C) return false;
       return unlock("below_absolute_zero_item", { ...detail, world: worldRef, item, temperature });
+    };
+    // Evaluate the actual temperature field for every live item. This avoids
+    // coupling the achievement to a hard-coded list of present-day heat sources.
+    for (const item of worldRef.items || []) {
+      if (testItem(item)) return true;
+    }
+    for (const residue of worldRef.residues || []) {
+      if (testItem(residue)) return true;
     }
     return false;
   }
 
+  function importWorldAchievementProgress(detail = {}) {
+    const imported = Math.min(ROBOT_CLEAN_TARGET, Math.max(0, Math.floor(Number(detail.robotCleanCount || 0) || 0)));
+    const current = progressCounter("robotCleanCount");
+    if (imported <= current) return false;
+    raiseProgressCounter("robotCleanCount", imported);
+    saveState();
+    renderIfDialogOpen();
+    return true;
+  }
+
   function recordRobotClean(detail = {}) {
     if (state.unlocked.robot_cleaner_100) return false;
     const world = detailWorld(detail);
     const type = String(detail.type || detail.target?.type || "");
     if (!world || !["zunchi", "ant_corpse", "trace", "splat"].includes(type)) return false;
-    world.achievementRobotCleanCount = Math.min(ROBOT_CLEAN_TARGET, Math.max(0, Math.floor(Number(world.achievementRobotCleanCount || 0) || 0)) + 1);
+    const count = incrementProgressCounter("robotCleanCount");
+    if (count >= ROBOT_CLEAN_TARGET) return unlock("robot_cleaner_100", { ...detail, world, count });
+    saveState();
     renderIfDialogOpen();
-    if (world.achievementRobotCleanCount >= ROBOT_CLEAN_TARGET) return unlock("robot_cleaner_100", { ...detail, world, count: world.achievementRobotCleanCount });
     return false;
   }
 
@@ -1510,10 +2368,13 @@
 
   function evaluateCleanFreak(world = global.world, detail = {}) {
     if (!world || state.unlocked.clean_freak_robot_only) return false;
-    const liveItems = (world.items || []).filter(item => item && !item.dead);
-    if (!liveItems.length || liveItems.some(item => item.type !== "robot_cleaner")) return false;
+    const activeObjects = Math.max(0, Number(world.activeObjectCount?.() ?? (world.items || []).reduce((count, item) => count + (item && !item.dead ? 1 : 0), 0)) || 0);
+    const robotCount = Math.max(0, Number(world.itemCounts?.robot_cleaner || 0) || 0);
+    if (!activeObjects || robotCount !== activeObjects) return false;
+    const liveItems = world.itemsOfType?.("robot_cleaner") || [];
     if ((world.tarinai || []).some(tarinai => tarinai && !tarinai.dead)) return false;
     if ((world.ants || []).some(ant => ant && !ant.dead)) return false;
+    if ((world.residues || []).some(residue => residue && !residue.dead && Math.max(0, Number(residue.amount ?? 1) || 0) > 0)) return false;
     const qualifies = liveItems.some(robot => {
       const mask = Number(global.TarinaiItemDynamicToolSystem?.robotCleanerMask?.(robot) ?? robot.robotCleanerMask ?? 0) | 0;
       return (mask & ROBOT_ALL_TARGET_MASK) === ROBOT_ALL_TARGET_MASK
@@ -1546,11 +2407,10 @@
     if (state.unlocked.town_doctor_50) return false;
     const recovered = Number(detail.recovered ?? detail.amount ?? 0);
     if (!Number.isFinite(recovered) || recovered <= 0.0001) return false;
-    const progress = ensureProgress();
-    progress.firstAidHeals = Math.min(50, progress.firstAidHeals + 1);
+    const count = incrementProgressCounter("firstAidHeals");
     saveState();
     renderIfDialogOpen();
-    if (progress.firstAidHeals >= 50) return unlock("town_doctor_50", { ...detail, count: progress.firstAidHeals, recovered });
+    if (count >= ADDITIVE_PROGRESS_CAPS.firstAidHeals) return unlock("town_doctor_50", { ...detail, count, recovered });
     return false;
   }
 
@@ -1564,16 +2424,28 @@
     const world = detailWorld(detail);
     let changed = false;
     if (type === "fight_mochi" && tarinai && world) {
-      const serial = Math.max(1, Math.floor(Number(world.achievementFightMochiSerial || 0) || 0) + 1);
-      world.achievementFightMochiSerial = serial;
       tarinai._achievementFightMochiAt = Math.max(0, Number(world.time || 0) || 0);
-      tarinai._achievementFightMochiSerial = serial;
       tarinai._achievementFightMochiWorld = world;
     }
+    if (type === "mystery_drug" && tarinai && !state.unlocked.mad_scientist) {
+      const progress = ensureProgress();
+      const identity = String(tarinai.familyKey || tarinai.id || "");
+      if (identity && !progress.mysteryDrugTarinaiIds.includes(identity)) {
+        progress.mysteryDrugTarinaiIds = [...progress.mysteryDrugTarinaiIds, identity].slice(0, MAD_SCIENTIST_TARGET);
+        markProgressMutation();
+        if (progress.mysteryDrugTarinaiIds.length >= MAD_SCIENTIST_TARGET) {
+          changed = unlock("mad_scientist", { ...detail, world, tarinai, count: progress.mysteryDrugTarinaiIds.length }) || changed;
+        } else {
+          saveState();
+          renderIfDialogOpen();
+        }
+      }
+    }
     if (MEDICINE_LEDGER_TYPES.includes(type) && !state.unlocked.medicine_ledger_all) {
       const progress = ensureProgress();
       if (!progress.medicineTypes.includes(type)) {
         progress.medicineTypes = [...progress.medicineTypes, type];
+        markProgressMutation();
         saveState();
         renderIfDialogOpen();
       }
@@ -1596,7 +2468,6 @@
     if (foodGift) {
       tarinai._achievementDirectFeedCount = Math.max(0, Math.floor(Number(tarinai._achievementDirectFeedCount || 0) || 0)) + 1;
       world.achievementSelfSufficientStartAt = -1;
-      world.achievementLastDirectFeedAt = Math.max(0, Number(world.time || 0) || 0);
     }
     if (treatment) tarinai._achievementDirectTreatmentCount = Math.max(0, Math.floor(Number(tarinai._achievementDirectTreatmentCount || 0) || 0)) + 1;
     recordConsumableUse({ ...detail, world, tarinai, type });
@@ -1614,24 +2485,32 @@
       (Number(tarinai.fightMochiTimer || 0) > 0.04) || Boolean(tarinai.hasFightMochiEffect?.())
     ));
     if (!state.unlocked.chaos_seeker_666_fights && fightMochiInfluenced) {
-      const progress = ensureProgress();
-      progress.fightMochiFightCount = Math.min(CHAOS_FIGHT_TARGET, progress.fightMochiFightCount + 1);
-      if (progress.fightMochiFightCount >= CHAOS_FIGHT_TARGET) {
-        changed = unlock("chaos_seeker_666_fights", { ...detail, world, count: progress.fightMochiFightCount, fightMochiInfluenced: true }) || changed;
+      const count = incrementProgressCounter("fightMochiFightCount");
+      if (count >= CHAOS_FIGHT_TARGET) {
+        changed = unlock("chaos_seeker_666_fights", { ...detail, world, count, fightMochiInfluenced: true }) || changed;
       } else {
         saveState();
         renderIfDialogOpen();
       }
     }
     const now = Math.max(0, Number(world.time || 0) || 0);
+    const pairA = detail.a || null;
+    const pairB = detail.b || null;
+    if (pairA && pairB && pairA !== pairB) {
+      world.achievementFightSessionSerial = Math.max(0, Math.floor(Number(world.achievementFightSessionSerial || 0) || 0)) + 1;
+      const pairKey = world.fightPairKey?.(pairA, pairB)
+        || [String(pairA.id || ""), String(pairB.id || "")].sort().join(":");
+      const sessionId = `${pairKey}@${world.achievementFightSessionSerial}`;
+      pairA._achievementFightSession = { id: sessionId, pairKey, opponentId: pairB.id, startedAt: now };
+      pairB._achievementFightSession = { id: sessionId, pairKey, opponentId: pairA.id, startedAt: now };
+    }
     const candidates = [detail.a, detail.b].filter(Boolean);
     for (const tarinai of candidates) {
       const givenAtRaw = tarinai._achievementFightMochiAt;
       const givenAt = givenAtRaw == null ? NaN : Number(givenAtRaw);
-      const serial = Math.floor(Number(tarinai._achievementFightMochiSerial || 0) || 0);
-      const validCurrentSessionMochi = serial > 0 && tarinai._achievementFightMochiWorld === world;
+      const validCurrentSessionMochi = tarinai._achievementFightMochiWorld === world;
       if (validCurrentSessionMochi && Number.isFinite(givenAt) && now >= givenAt && now - givenAt <= 30.0001) {
-        changed = unlock("fuel_to_fire", { ...detail, world, tarinai, elapsed: now - givenAt, serial }) || changed;
+        changed = unlock("fuel_to_fire", { ...detail, world, tarinai, elapsed: now - givenAt }) || changed;
         break;
       }
     }
@@ -1640,9 +2519,8 @@
 
   function recordShotFired(detail = {}) {
     if (state.unlocked.sniper_333_shots) return false;
-    const progress = ensureProgress();
-    progress.shotCount = Math.min(SNIPER_SHOT_TARGET, progress.shotCount + 1);
-    if (progress.shotCount >= SNIPER_SHOT_TARGET) return unlock("sniper_333_shots", { ...detail, count: progress.shotCount });
+    const count = incrementProgressCounter("shotCount");
+    if (count >= SNIPER_SHOT_TARGET) return unlock("sniper_333_shots", { ...detail, count });
     saveState();
     renderIfDialogOpen();
     return false;
@@ -1650,10 +2528,9 @@
 
   function recordLoveMochiBirth(detail = {}) {
     if (state.unlocked.fertility_seeker_721_love_births || !detail.loveMochiInfluenced) return false;
-    const progress = ensureProgress();
-    progress.loveMochiBirthCount = Math.min(FERTILITY_BIRTH_TARGET, progress.loveMochiBirthCount + 1);
-    if (progress.loveMochiBirthCount >= FERTILITY_BIRTH_TARGET) {
-      return unlock("fertility_seeker_721_love_births", { ...detail, count: progress.loveMochiBirthCount });
+    const count = incrementProgressCounter("loveMochiBirthCount");
+    if (count >= FERTILITY_BIRTH_TARGET) {
+      return unlock("fertility_seeker_721_love_births", { ...detail, count });
     }
     saveState();
     renderIfDialogOpen();
@@ -1676,34 +2553,28 @@
     if (!world) return false;
     runtimeByWorld.delete(world);
     dangerFightDeathsByWorld.delete(world);
-    world.achievementDirectFeedCount = 0;
-    world.achievementRobotCleanCount = 0;
     world.achievementEnemyAntKills = 0;
-    world.achievementLastTarinaiDamageAt = -Infinity;
     world.achievementSelfSufficientStartAt = -1;
-    world.achievementLastDirectFeedAt = -Infinity;
     world.achievementNoDeathStartAt = -1;
     world.achievementHappyStartAt = -1;
-    world.achievementFightMochiSerial = 0;
     world.achievementEliteFewStartAt = -1;
     for (const tarinai of world.tarinai || []) {
       if (!tarinai) continue;
       tarinai._achievementFightMochiAt = null;
-      tarinai._achievementFightMochiSerial = 0;
       tarinai._achievementFightMochiWorld = null;
       tarinai._achievementDirectFeedCount = 0;
       tarinai._achievementDirectTreatmentCount = 0;
       tarinai._achievementSaunaHotAt = null;
       tarinai._achievementSaunaWasHot = false;
       tarinai._achievementHeldStartedAt = null;
+      tarinai._achievementFightSession = null;
     }
     for (const item of world.items || []) {
       if (!item) continue;
       if (item.type === "sticky_bomb") item.stickyBombPassCount = 0;
       item._achievementPlacedAt = null;
     }
-    world.achievementNaturalSlaveGenerations = [];
-    world.achievementNaturalKingGenerations = [];
+    // Mystery-drug targets are a lifetime achievement and intentionally survive world resets.
     return true;
   }
 
@@ -1740,12 +2611,11 @@
     if (child?.isZunchiSlave) recordNaturalStatus("slave", { ...detail, world, tarinai: child, bornWithStatus: true });
     if (child?.isTarinaiChampion) recordNaturalStatus("king", { ...detail, world, tarinai: child, bornWithStatus: true });
     evaluateMegalopolis(world, detail);
-    const progress = ensureProgress();
     if (!state.unlocked.great_mother_1000_births) {
-      progress.birthCount = Math.min(3333, progress.birthCount + 1);
+      const count = incrementProgressCounter("birthCount");
       saveState();
       renderIfDialogOpen();
-      if (progress.birthCount >= 3333) unlock("great_mother_1000_births", { ...detail, count: progress.birthCount });
+      if (count >= ADDITIVE_PROGRESS_CAPS.birthCount) unlock("great_mother_1000_births", { ...detail, count });
     }
     if (state.unlocked.birth_50_in_60_seconds) return;
     const now = Number(world?.time || 0) || 0;
@@ -1759,9 +2629,8 @@
   function recordDeath(detail = {}) {
     recordFightPairDangerDeath(detail);
     if (!state.unlocked.memento_mori) {
-      const progress = ensureProgress();
-      progress.totalDeathCount = Math.min(MEMENTO_MORI_TARGET, progress.totalDeathCount + 1);
-      if (progress.totalDeathCount >= MEMENTO_MORI_TARGET) unlock("memento_mori", { ...detail, count: progress.totalDeathCount });
+      const count = incrementProgressCounter("totalDeathCount");
+      if (count >= MEMENTO_MORI_TARGET) unlock("memento_mori", { ...detail, count });
       else { scheduleProgressSave(); renderIfDialogOpen(); }
     }
     const reason = String(detail.reason || detail.tarinai?.deathReason || "");
@@ -1802,7 +2671,8 @@
     const world = detail.world || tarinai?.world || null;
     if (kind === "slave") {
       unlock("natural_zunchi_slave", detail);
-      if (recordNaturalGeneration(world, tarinai, "achievementNaturalSlaveGenerations", 5)) {
+      if (tarinai?.isAcquiredTarinai) unlock("ochibi_natural_slave", detail);
+      if (recordNaturalGeneration(world, tarinai, "_achievementNaturalSlaveLineageDepth", 5)) {
         unlock("natural_zunchi_slave_5_generations", detail);
       }
       evaluateStatusEffectAchievements(tarinai, detail);
@@ -1810,7 +2680,7 @@
     }
     if (kind === "king") {
       unlock("natural_tarinai_king", detail);
-      if (recordNaturalGeneration(world, tarinai, "achievementNaturalKingGenerations", 3)) {
+      if (recordNaturalGeneration(world, tarinai, "_achievementNaturalKingLineageDepth", 3)) {
         unlock("natural_tarinai_king_3_generations", detail);
       }
       evaluateStatusEffectAchievements(tarinai, detail);
@@ -1822,9 +2692,10 @@
     if (!world) return false;
     recordDirectCare({ ...detail, world, foodGift: true });
     if (state.unlocked.direct_feed_33) return false;
-    world.achievementDirectFeedCount = Math.min(33, Math.max(0, Math.floor(Number(world.achievementDirectFeedCount || 0) || 0)) + 1);
+    const count = incrementProgressCounter("directFeedCount");
+    saveState();
     renderIfDialogOpen();
-    if (world.achievementDirectFeedCount >= 33) return unlock("direct_feed_33", { ...detail, world, count: world.achievementDirectFeedCount });
+    if (count >= ADDITIVE_PROGRESS_CAPS.directFeedCount) return unlock("direct_feed_33", { ...detail, world, count });
     return false;
   }
 
@@ -1841,10 +2712,9 @@
 
   function recordStatsButtonPress(detail = {}) {
     if (state.unlocked.statistician) return false;
-    const progress = ensureProgress();
-    progress.statsButtonPressCount = Math.min(STATISTICIAN_TARGET, progress.statsButtonPressCount + 1);
-    if (progress.statsButtonPressCount >= STATISTICIAN_TARGET) {
-      return unlock("statistician", { ...detail, count: progress.statsButtonPressCount });
+    const count = incrementProgressCounter("statsButtonPressCount");
+    if (count >= STATISTICIAN_TARGET) {
+      return unlock("statistician", { ...detail, count });
     }
     saveState();
     renderIfDialogOpen();
@@ -1857,11 +2727,13 @@
   }
 
   function recordManualTarinaiAdded(detail = {}) {
+    // Adding a Tarinai is a direct player intervention and must invalidate
+    // the no-operation window used by the surveillance-camera achievement.
+    recordIntervention({ ...detail, tool: detail.tool || "new-tarinai" });
     if (state.unlocked.lively_making) return false;
-    const progress = ensureProgress();
-    progress.manualTarinaiAddedCount = Math.min(LIVELY_MAKING_TARGET, progress.manualTarinaiAddedCount + 1);
-    if (progress.manualTarinaiAddedCount >= LIVELY_MAKING_TARGET) {
-      return unlock("lively_making", { ...detail, count: progress.manualTarinaiAddedCount });
+    const count = incrementProgressCounter("manualTarinaiAddedCount");
+    if (count >= LIVELY_MAKING_TARGET) {
+      return unlock("lively_making", { ...detail, count });
     }
     saveState();
     renderIfDialogOpen();
@@ -1976,7 +2848,7 @@
     const moodId = String(mood?.id || worldRef.colonyMood?.id || "");
     const day = Math.max(1, Math.floor(Number(worldRef.day || 1) || 1));
     if (alive.length > 0 && moodId === "happy" && day >= 6 && !state.unlocked.minimalist_happy) {
-      const placedAlive = (worldRef.items || []).reduce((count, item) => count + (item && !item.dead && item._achievementPlayerPlaced ? 1 : 0), 0);
+      const placedAlive = Math.max(0, Number(worldRef.achievementPlayerPlacedActiveCount || 0) || 0);
       if (placedAlive <= 10) unlock("minimalist_happy", { world: worldRef, mood: mood || worldRef.colonyMood, placedAlive });
     }
     if (!state.unlocked.colony_happy) {
@@ -1994,7 +2866,7 @@
     }
 
     if (!state.unlocked.self_sufficient) {
-      if (alive.length >= 20 && !(worldRef.items || []).some(item => item && !item.dead && item.type === "duplicator")) {
+      if (alive.length >= 20 && playstyleItemCount(worldRef, "duplicator") === 0) {
         let selfStart = Number(worldRef.achievementSelfSufficientStartAt);
         if (!Number.isFinite(selfStart) || selfStart < 0 || selfStart > now) {
           selfStart = now;
@@ -2074,6 +2946,7 @@
   }
 
   async function resetAchievements() {
+    await persistenceReadyPromise;
     const confirmed = await global.TarinaiGameDialogs?.confirm?.({
       title: "\u5b9f\u7e3e\u306e\u30ea\u30bb\u30c3\u30c8",
       message: "\u3059\u3079\u3066\u306e\u5b9f\u7e3e\u89e3\u9664\u72b6\u614b\u3068\u3001\u5171\u6709\u96c6\u8a08\u4e0a\u306e\u81ea\u5206\u306e\u89e3\u9664\u8a18\u9332\u3092\u524a\u9664\u3057\u307e\u3059\u3002",
@@ -2082,8 +2955,14 @@
       danger: true,
     });
     if (!confirmed) return false;
+    const identity = currentServerIdentity();
+    persistenceGeneration += 1;
+    persistenceRevision = 0;
     state = blankState();
+    if (identity) state.serverIdentity = { ...identity };
     state.resetPending = true;
+    progressMutationRevision = 0;
+    progressSyncedRevision = 0;
     runtimeByWorld = new WeakMap();
     dangerFightDeathsByWorld = new WeakMap();
     wireShockTrackers = new WeakMap();
@@ -2091,8 +2970,9 @@
     toastActive = false;
     emptyClickTimes = [];
     groundChangeTimes = [];
-    continuousPlayStartedAt = Date.now();
-    continuousPlayLastHeartbeatAt = continuousPlayStartedAt;
+    continuousPlayAccumulatedMs = 0;
+    continuousPlayLastHeartbeatAt = Date.now();
+    continuousPlayActive = !document.hidden;
     if (global.world) {
       resetWorldProgress(global.world);
       global.world.achievementLastInterventionAt = Math.max(0, Number(global.world.time || 0) || 0);
@@ -2128,19 +3008,36 @@
   }
 
   function openDialog() {
-    dom.dialog?.classList.remove("hidden");
+    if (global.TarinaiManagedDialogs?.open) global.TarinaiManagedDialogs.open(dom.dialog, dom.button);
+    else {
+      dom.dialog?.classList.remove("hidden");
+      dom.dialog?.setAttribute("aria-hidden", "false");
+    }
     render({ forceList: true });
-    dom.closeIconButton?.focus?.();
+    if (!global.TarinaiManagedDialogs?.open) dom.closeIconButton?.focus?.();
     void syncPending({ full: true });
   }
 
   function closeDialog() {
-    dom.dialog?.classList.add("hidden");
-    dom.button?.focus?.();
+    if (global.TarinaiManagedDialogs?.close) global.TarinaiManagedDialogs.close(dom.dialog);
+    else {
+      dom.dialog?.classList.add("hidden");
+      dom.dialog?.setAttribute("aria-hidden", "true");
+      dom.button?.focus?.();
+    }
   }
 
   document.addEventListener("visibilitychange", () => {
-    if (!document.hidden) continuousPlayLastHeartbeatAt = Date.now();
+    const now = Date.now();
+    if (document.hidden) {
+      if (continuousPlayActive && now >= continuousPlayLastHeartbeatAt) {
+        continuousPlayAccumulatedMs += now - continuousPlayLastHeartbeatAt;
+      }
+      continuousPlayActive = false;
+    } else {
+      continuousPlayLastHeartbeatAt = now;
+      continuousPlayActive = true;
+    }
   });
   if (typeof global.setInterval === "function") {
     global.setInterval(() => {
@@ -2153,7 +3050,7 @@
   }
 
   dom.button?.addEventListener("click", () => {
-    global.audio?.uiClick?.();
+    global.TarinaiAudio?.uiClick?.();
     openDialog();
   });
   dom.closeButton?.addEventListener("click", closeDialog);
@@ -2165,19 +3062,15 @@
   dom.dialog?.addEventListener("click", event => {
     if (event.target === dom.dialog) closeDialog();
   });
-  document.addEventListener("keydown", event => {
-    if (event.key === "Escape" && !dom.dialog?.classList.contains("hidden")) closeDialog();
+  dom.dialog?.addEventListener("tarinai:dialog-close-request", closeDialog);
+  global.addEventListener?.("pagehide", () => {
+    saveState();
+  });
+  document.addEventListener("visibilitychange", () => {
+    if (document.hidden) saveState();
   });
-  global.addEventListener?.("pagehide", saveState);
 
   const api = Object.freeze({
-    definitions: DEFINITIONS,
-    categories: ACHIEVEMENT_CATEGORIES,
-    unlock,
-    open: openDialog,
-    close: closeDialog,
-    refresh() { return syncPending({ full: true }); },
-    reset: resetAchievements,
     isUnlocked(id) { return Boolean(state.unlocked[String(id || "")]); },
     recordBirth,
     recordDeath,
@@ -2188,19 +3081,17 @@
     recordConsumableUse,
     recordFirstAidRecovery,
     recordPlushiePokeFling,
-    evaluateStatusEffectAchievements,
     recordIgnition,
     recordIntervention,
     recordPlayerPlacement,
     recordPlayerDeletion,
     recordHistoryAction,
     recordRobotClean,
+    importWorldAchievementProgress,
     evaluateCleanFreak,
     recordFightStarted,
     recordShotFired,
     recordLoveMochiBirth,
-    evaluateMegalopolis,
-    recordHeldTarinai,
     recordFavoriteTarinai,
     recordStatsButtonPress,
     recordPushNotificationsEnabled,
@@ -2209,7 +3100,6 @@
     recordLinkPlaced,
     recordSignalActivation,
     recordAntPopulation,
-    evaluateAntNestWithoutTarinai,
     recordAntKilled,
     recordStickyBombPass,
     recordCircuitBoardSignalTransfer,
@@ -2218,25 +3108,50 @@
     recordSaveSlotsFilled,
     recordEmptyClick,
     recordGroundChange,
-    evaluateSandbox,
-    recordLowFps,
-    recordContinuousPlay,
-    recordDailyPlay,
-    recordBelowAbsoluteZeroItem,
     recordDamageSource,
     recordAntDamageSource,
-    debugUnlockAll: unlockAllAchievementsForDebug,
     exportSpellState,
     importSpellState,
     evaluateWorld,
     evaluateEvent,
     recordSelfZunchiDeath(detail = {}) { return unlock("self_zunchi_death", detail); },
+    recordZunchiCollisionDeath(detail = {}) { return unlock("zunchi_collision_death", detail); },
     recordSoccerBallDeath(detail = {}) { return unlock("soccer_ball_death", detail); },
   });
   global.TarinaiAchievements = api;
-  recordDailyPlay({ source: "load" });
-  if (!state.unlocked[COMPLETIONIST_ID] && allOtherAchievementsUnlocked()) unlock(COMPLETIONIST_ID, { source: "load" });
-  render();
-  global.setTimeout(() => recordSaveSlotsFilled(), 0);
-  global.setTimeout(() => void syncPending({ full: true }), 700);
+  if (global.__TARINAI_TEST__) {
+    global.TarinaiAchievementTestHooks = Object.freeze({
+      state() { return normalizeState(state); },
+      growOnlyStateDelta,
+      mergeStateData,
+      blankState,
+      normalizeState,
+      progressCounter,
+      localProgressSnapshot,
+      recordFightPairDangerDeath,
+      recordNaturalGeneration,
+      definitions: DEFINITIONS,
+      categories: ACHIEVEMENT_CATEGORIES,
+      definition(id) { return definitionById.get(String(id || "")) || null; },
+      refresh() { return syncPending({ full: true }); },
+      reset: resetAchievements,
+      open: openDialog,
+      render(options = {}) { return render(options); },
+    });
+  }
+  setupPersistenceCrossTabSync();
+  if (dom.buttonCount) dom.buttonCount.textContent = "…";
+  if (dom.dialogCount) dom.dialogCount.textContent = `… / ${DEFINITIONS.length}`;
+  persistenceReadyPromise = hydrateDurableState().catch(() => {
+    persistenceHydrated = true;
+    persistStateNow();
+    return true;
+  }).then(() => {
+    recordDailyPlay({ source: "load" });
+    if (!state.unlocked[COMPLETIONIST_ID] && allOtherAchievementsUnlocked()) unlock(COMPLETIONIST_ID, { source: "load" });
+    render();
+    global.setTimeout(() => recordSaveSlotsFilled(), 0);
+    global.setTimeout(() => void syncPending({ full: true }), 700);
+    return true;
+  });
 })(window);
diff --git a/js/ants.js b/js/ants.js
index f615baf..9fcd59d 100644
--- a/js/ants.js
+++ b/js/ants.js
@@ -100,7 +100,7 @@ class AntActor {
     this.targetRef = null;
     this.burnWanderAngle = rand(0, Math.PI * 2);
     this.hpBarTimer = Math.max(this.hpBarTimer || 0, 1.0);
-    this.world?.effects?.push(new Effect("ring", this.x, this.y, { size: Math.max(10, this.r * 2.8), life: 0.18, color: "rgba(255,110,36,0.56)" }));
+    this.world?.queueEffect?.("ring", this.x, this.y, { size: Math.max(10, this.r * 2.8), life: 0.18, color: "rgba(255,110,36,0.56)" });
     return true;
   }
 
@@ -108,7 +108,7 @@ class AntActor {
     if (!this.burning && !(this.burnTimer > 0)) return false;
     this.burning = false;
     this.burnTimer = 0;
-    this.world?.effects?.push(new Effect("ring", this.x, this.y, { size: Math.max(9, this.r * 2.2), life: 0.16, color: "rgba(108,192,236,0.58)" }));
+    this.world?.queueEffect?.("ring", this.x, this.y, { size: Math.max(9, this.r * 2.2), life: 0.16, color: "rgba(108,192,236,0.58)" });
     return true;
   }
 
@@ -158,7 +158,7 @@ class AntActor {
       if (distXY(this.x, this.y, it.x, it.y) <= contactRadius + Math.max(it.r || 16, 12)) globalThis.TarinaiItemDynamicToolSystem?.igniteGrassByFire?.(it, this, this.world, dt);
     }
     if (deterministicChance(this.world, "ant-fire-effect", dt * 2.0, this)) {
-      this.world?.effects?.push(new Effect("flame", this.x, this.y - this.r, { vx: rand(-2, 2), vy: rand(-14, -6), size: Math.max(4, this.r * 1.0), life: 0.22, color: "rgba(236,46,24,0.72)" }));
+      this.world?.queueEffect?.("flame", this.x, this.y - this.r, { vx: rand(-2, 2), vy: rand(-14, -6), size: Math.max(4, this.r * 1.0), life: 0.22, color: "rgba(236,46,24,0.72)" });
     }
     if (this.burnTimer <= 0.01) this.extinguishFire("timeout");
     return true;
@@ -300,6 +300,7 @@ class AntActor {
   updateSearch(dt, home) {
     const target = this.chooseTarget(52);
     if (target) {
+      const alreadyCaptured = Boolean((target.antDraggedTimer || 0) > 0 && target.antDraggedBy);
       this.state = "drag";
       this.targetId = target.id;
       this.targetToken = target.liveToken || 0;
@@ -310,6 +311,7 @@ class AntActor {
       target.fearTimer = Math.max(target.fearTimer || 0, 0.55);
       target.thought = "\u30a2\u30ea\u306b\u904b\u3070\u308c\u3066\u3044\u308b";
       target.recordChangeCause?.("\u30a2\u30ea\u306b\u904b\u3070\u308c\u305f", "\u72b6\u614b");
+      if (!alreadyCaptured) this.world?.log?.(`${target.name}\u304c\u30a2\u30ea\u306b\u6355\u307e\u3063\u305f\u3002`, "event", { participants: [target] });
       audio.antDrag?.();
       this.world.drawListDirty = true;
       return;
@@ -416,10 +418,6 @@ class AntActor {
     globalThis.TarinaiAchievements?.recordAntDamageSource?.(this, target, { world: this.world, reason: "tarinai_struggle" });
     this.hp -= dt * struggle;
 
-    if ((this.world.time || 0) - (this.carryLogAt || -999) > 8 && Math.random() < dt * 0.04) {
-      this.carryLogAt = this.world.time || 0;
-      this.world.log(`${target.name}\u304c\u30a2\u30ea\u306b\u5f15\u3063\u5f35\u3089\u308c\u3066\u3044\u308b\u3002`, "event", { participants: [target] });
-    }
     if (this.hp <= 0) this.dieAsCorpse(home);
   }
 
@@ -431,7 +429,7 @@ class AntActor {
     const corpse = new Item("ant_corpse", this.x, this.y);
     corpse.amount = 24;
     this.world.addItem?.(corpse, "ant-corpse");
-    this.world.effects?.push(new Effect("zunchi_miasma", this.x, this.y - 4, { size: 10, life: 0.44, color: "rgba(82,61,42,0.28)" }));
+    this.world.queueEffect?.("zunchi_miasma", this.x, this.y - 4, { size: 10, life: 0.44, color: "rgba(82,61,42,0.28)" });
     if (home) syncAntNestCount(this.world, home);
     this.world.ensureItemBuckets?.("ant-corpse");
     this.world.drawListDirty = true;
diff --git a/js/assets.js b/js/assets.js
index ebf8742..a7799bb 100644
--- a/js/assets.js
+++ b/js/assets.js
@@ -16,6 +16,8 @@ const DECOR_ASSETS = [
   { id: "oshibyo", path: "assets/objects/oshibyo.webp" },
   { id: "oshibyo_stuck", path: "assets/objects/oshibyo_stuck.webp" },
   { id: "plushie_bear", path: "assets/objects/plushie_bear.png" },
+  { id: "acquired_tarinai_overlay", path: "assets/sprites/tarinai_acquired_overlay.png" },
+  { id: "mamekusaredake", path: "assets/objects/mamekusaredake.png" },
 ];
 
 const ALPHA_BOUNDS = {
@@ -45,6 +47,7 @@ const ALPHA_BOUNDS = {
   stress_dizzy: { x: 16, y: 21, w: 480, h: 433, imageW: 512, imageH: 468 },
   stress_sweat: { x: 16, y: 26, w: 480, h: 428, imageW: 512, imageH: 468 },
   intimidate: { x: 98, y: 16, w: 316, h: 438, imageW: 512, imageH: 468 },
+  intimidate_alt: { x: 45, y: 48, w: 422, h: 379, imageW: 512, imageH: 468 },
   zunchi_slave: { x: 17, y: 22, w: 478, h: 431, imageW: 512, imageH: 468 },
   hungry_70: { x: 0, y: 0, w: 430, h: 366, imageW: 430, imageH: 366 },
   zunchi_slave_alt: { x: 42, y: 22, w: 425, h: 426, imageW: 512, imageH: 468 },
@@ -77,8 +80,8 @@ let imageLoadTimeoutsTotal = 0;
 const SUNBATH_IMAGE_IDS = new Set(SPRITES
   .map(asset => asset?.id || "")
   .filter(id => String(id).startsWith("sunbath")));
-const INITIAL_IMAGE_IDS = new Set(["smile", "hungry_70", "hot_1", "hot_2", "hot_3", "cold_1", "cold_2", "cold_3", "zunchi_slave", "zunchi_slave_alt", "zunchi", "zunchi_02", "genkotsu", "pushpin", "pushpin_stuck", "oshibyo", "oshibyo_stuck", ...SUNBATH_IMAGE_IDS]);
-const EARLY_IMAGE_IDS = new Set(["smile", "angry", "teary", "jito", "drool", "cry", "sleep", "pokan", "normal_smirk", "normal_tongue", "normal_happy", "hot_1", "hot_2", "hot_3", "cold_1", "cold_2", "cold_3", "weak", "hurt", "hurt2", "fear", "flee", "flee_fear2", "fear_blue", "fear_cry", "sleep2", "stress_dizzy", "stress_sweat", "intimidate", "birth_ritual", "zunchi_slave", "zunchi_slave_alt", "hungry_70", "zunchi", "zunchi_02", "genkotsu", "pushpin", "pushpin_stuck", "oshibyo", "oshibyo_stuck", ...SUNBATH_IMAGE_IDS]);
+const INITIAL_IMAGE_IDS = new Set(["smile", "sleep", "hungry_70", "hot_1", "hot_2", "hot_3", "cold_1", "cold_2", "cold_3", "zunchi_slave", "zunchi_slave_alt", "zunchi", "zunchi_02", "genkotsu", "pushpin", "pushpin_stuck", "oshibyo", "oshibyo_stuck", ...SUNBATH_IMAGE_IDS]);
+const EARLY_IMAGE_IDS = new Set(["smile", "angry", "teary", "jito", "drool", "cry", "sleep", "pokan", "normal_smirk", "normal_tongue", "normal_happy", "hot_1", "hot_2", "hot_3", "cold_1", "cold_2", "cold_3", "weak", "hurt", "hurt2", "fear", "flee", "flee_fear2", "fear_blue", "fear_cry", "sleep2", "stress_dizzy", "stress_sweat", "intimidate", "intimidate_alt", "birth_ritual", "zunchi_slave", "zunchi_slave_alt", "hungry_70", "zunchi", "zunchi_02", "genkotsu", "pushpin", "pushpin_stuck", "oshibyo", "oshibyo_stuck", ...SUNBATH_IMAGE_IDS]);
 
 function trimCanvasCache(cache, limit = 128) {
   while (cache.size > limit) {
diff --git a/js/audio.js b/js/audio.js
index 1620371..32e55c4 100644
--- a/js/audio.js
+++ b/js/audio.js
@@ -297,6 +297,7 @@ const audio = {
   explode() { if (!this.playSample("sfx_firecracker_explode", 0.30, "ops")) this.play("sfx_firecracker_explode", { category: "ops", minGap: 0.30 }); },
   phase() { this.play("sfx_phase", { category: "notify", minGap: 1.0 }); },
   notify() { this.play("sfx_notify", { category: "notify", minGap: 0.12 }); },
+  achievementUnlock() { this.ensure(); this.play("sfx_achievement_unlock", { category: "notify", minGap: 0.35 }); },
   uiClick() { this.play("sfx_ui_click", { category: "ops", minGap: 0.035 }); },
   uiFold() { this.play("sfx_ui_fold", { category: "ops", minGap: 0.08 }); },
   place(type = "") {
@@ -313,6 +314,7 @@ const audio = {
   waterHose() { this.play("sfx_water_hose", { category: "ops", minGap: 0.20 }); },
   shoot() { this.play("sfx_shoot", { category: "ops", minGap: 0.045 }); },
   boltAction() { this.play("sfx_bolt_action", { category: "ops", minGap: 0.10 }); },
+  bell() { if (!this.playSample("sfx_bell", 0.16, "ops")) this.play("sfx_bell", { category: "ops", minGap: 0.16 }); },
   ballHit() { this.play("sfx_ball_hit", { category: "ops", minGap: 0.08 }); },
   stoneImpact() { this.play("sfx_stone_impact", { category: "ops", minGap: 0.18 }); },
   genkotsuImpact() { this.play("sfx_genkotsu_impact", { category: "ops", minGap: 0.20 }); setTimeout(() => this.play("sfx_ground_rumble", { category: "ops", minGap: 0.20 }), 80); },
diff --git a/js/circuit_board_system.js b/js/circuit_board_system.js
index 38cdc4e..2131fb2 100644
--- a/js/circuit_board_system.js
+++ b/js/circuit_board_system.js
@@ -395,13 +395,23 @@
     result.boardId = board.id || "";
     result.direction = port.direction;
     result.signalActive = port.direction === "output" ? Boolean(board._circuitOutputState?.[port.id]) : Boolean(board._circuitInputState?.[port.id]);
+    result._signalDetectorSources = port.direction === "output"
+      ? [...(board._circuitOutputDetectorSources?.[port.id] || [])]
+      : [...(board._circuitInputDetectorSources?.[port.id] || [])];
     return result;
   }
 
-  function evaluate(board, inputValues = null) {
+  function evaluate(board, inputValues = null, inputProvenance = null) {
     const config = ensureConfig(board);
     const inputs = Object.create(null);
-    for (const port of config.inputs) inputs[port.id] = Boolean(inputValues ? inputValues[port.id] : board?._circuitInputState?.[port.id]);
+    const inputDetectorSources = Object.create(null);
+    for (const port of config.inputs) {
+      inputs[port.id] = Boolean(inputValues ? inputValues[port.id] : board?._circuitInputState?.[port.id]);
+      const rawSources = inputProvenance ? inputProvenance[port.id] : board?._circuitInputDetectorSources?.[port.id];
+      inputDetectorSources[port.id] = inputs[port.id]
+        ? [...new Set(Array.isArray(rawSources) ? rawSources.filter(Boolean) : [])]
+        : [];
+    }
 
     const parent = new Map();
     const rank = new Map();
@@ -511,18 +521,74 @@
       return Boolean(value);
     }
 
+    const netDetectorSources = new Map();
+    const nodeDetectorSources = Object.create(null);
+    const visitingSourceNodes = new Set();
+    const visitingSourceNets = new Set();
+    const unionSources = (...lists) => [...new Set(lists.flatMap(list => Array.isArray(list) ? list : []))];
+
+    function driverDetectorSources(token) {
+      if (token.startsWith("i:")) {
+        const id = token.slice(2);
+        return inputs[id] ? inputDetectorSources[id] || [] : [];
+      }
+      const match = /^n:([^:]+):o$/.exec(token);
+      return match ? nodeSourceValue(match[1]) : [];
+    }
+
+    function netSourceValue(token) {
+      const root = find(token);
+      if (netDetectorSources.has(root)) return netDetectorSources.get(root);
+      if (visitingSourceNets.has(root)) return [];
+      visitingSourceNets.add(root);
+      let sources = [];
+      for (const member of members.get(root) || [token]) {
+        if ((member.startsWith("i:") || /^n:[^:]+:o$/.test(member)) && driverValue(member)) {
+          sources = unionSources(sources, driverDetectorSources(member));
+        }
+      }
+      visitingSourceNets.delete(root);
+      netDetectorSources.set(root, sources);
+      return sources;
+    }
+
+    function nodeSourceValue(id) {
+      if (Object.prototype.hasOwnProperty.call(nodeDetectorSources, id)) return nodeDetectorSources[id];
+      if (visitingSourceNodes.has(id) || !nodeValue(id)) return [];
+      const node = nodeMap.get(id);
+      if (!node || unstableNodes.has(id) || node.type === "on" || node.type === "not") {
+        nodeDetectorSources[id] = [];
+        return [];
+      }
+      visitingSourceNodes.add(id);
+      let sources = netSourceValue(`n:${id}:a`);
+      if (node.type === "and") sources = unionSources(sources, netSourceValue(`n:${id}:b`));
+      visitingSourceNodes.delete(id);
+      nodeDetectorSources[id] = sources;
+      return sources;
+    }
+
     const outputs = Object.create(null);
-    for (const port of config.outputs) outputs[port.id] = netValue(`o:${port.id}`);
+    const outputDetectorSources = Object.create(null);
+    for (const port of config.outputs) {
+      outputs[port.id] = netValue(`o:${port.id}`);
+      outputDetectorSources[port.id] = outputs[port.id] ? netSourceValue(`o:${port.id}`) : [];
+    }
     if (board) {
       board._circuitInputState = inputs;
+      board._circuitInputDetectorSources = inputDetectorSources;
       board._circuitNodeState = nodeValues;
       board._circuitOutputState = outputs;
+      board._circuitOutputDetectorSources = outputDetectorSources;
       for (const port of config.outputs) {
         const term = terminal(board, `o:${port.id}`);
-        if (term) term.signalActive = Boolean(outputs[port.id]);
+        if (term) {
+          term.signalActive = Boolean(outputs[port.id]);
+          term._signalDetectorSources = [...(outputDetectorSources[port.id] || [])];
+        }
       }
     }
-    return { inputs, nodes: nodeValues, outputs };
+    return { inputs, nodes: nodeValues, outputs, inputDetectorSources, outputDetectorSources };
   }
 
   function nearestPin(config, x, y, maxDistance = 17) {
@@ -565,8 +631,6 @@
     return null;
   }
 
-  const distanceToSegment = (px, py, ax, ay, bx, by) => global.TarinaiGeometry.pointSegmentDistance(px, py, ax, ay, bx, by);
-
   function wirePath(config, wire) {
     const a = endpointPosition(config, wire.a);
     const b = endpointPosition(config, wire.b);
@@ -579,7 +643,7 @@
     for (let i = config.wires.length - 1; i >= 0; i -= 1) {
       const path = wirePath(config, config.wires[i]);
       if (path.length < 2) continue;
-      const d = distanceToSegment(x, y, path[0].x, path[0].y, path[1].x, path[1].y);
+      const d = global.TarinaiGeometry.pointSegmentDistance(x, y, path[0].x, path[0].y, path[1].x, path[1].y);
       if (d <= bestD) { bestD = d; best = { wire: config.wires[i], index: i, distance: d }; }
     }
     return best;
@@ -608,7 +672,7 @@
   }
 
   function pointOnSegment(point, a, b) {
-    return distanceToSegment(point.x, point.y, a.x, a.y, b.x, b.y) < 0.6
+    return global.TarinaiGeometry.pointSegmentDistance(point.x, point.y, a.x, a.y, b.x, b.y) < 0.6
       && point.x >= Math.min(a.x, b.x) - 0.6 && point.x <= Math.max(a.x, b.x) + 0.6
       && point.y >= Math.min(a.y, b.y) - 0.6 && point.y <= Math.max(a.y, b.y) + 0.6;
   }
@@ -700,7 +764,11 @@
     dialog = document.createElement("div");
     dialog.id = "circuitBoardEditor";
     dialog.className = "rotator-editor circuit-grid-editor hidden";
-    dialog.innerHTML = `<div class="rotator-editor-panel circuit-grid-panel" role="dialog" aria-modal="true" aria-labelledby="circuitBoardTitle">
+    dialog.setAttribute("role", "dialog");
+    dialog.setAttribute("aria-modal", "true");
+    dialog.setAttribute("aria-labelledby", "circuitBoardTitle");
+    dialog.setAttribute("aria-hidden", "true");
+    dialog.innerHTML = `<div class="rotator-editor-panel circuit-grid-panel">
       <div class="rotator-editor-titlebar"><h2 id="circuitBoardTitle">\u57fa\u76e4</h2><button class="rotator-editor-close" type="button" data-action="close" aria-label="\u9589\u3058\u308b">\u00d7</button></div>
       <div class="circuit-port-count-controls">
         <label>\u6a2a\u5e45 <button type="button" data-grid-delta="cols:-1">\u2212</button><input id="circuitGridCols" type="number" min="${MIN_COLS}" max="${MAX_COLS}" step="1"><button type="button" data-grid-delta="cols:1">\uff0b</button></label>
@@ -1091,20 +1159,27 @@
     dialog.querySelector("[data-action=clear]").onclick = () => { snapshot(); draft.nodes = []; draft.wires = []; draw(); };
     dialog.querySelector("[data-action=reset]").onclick = () => { snapshot(); draft = defaultConfig(); syncControls(); resizeCanvas(); draw(); };
     const close = () => {
-      dialog.classList.add("hidden");
+      if (global.TarinaiManagedDialogs?.close) global.TarinaiManagedDialogs.close(dialog);
+      else { dialog.classList.add("hidden"); dialog.setAttribute("aria-hidden", "true"); }
       document.removeEventListener("keydown", handleEditorKeydown, true);
       canvas.onpointerdown = null; canvas.onpointermove = null; canvas.onpointerup = null; canvas.onpointercancel = null; canvas.onpointerleave = null; canvas.oncontextmenu = null;
     };
     dialog.querySelector("[data-action=close]").onclick = close;
     dialog.querySelector("[data-action=cancel]").onclick = close;
+    if (dialog._tarinaiCloseRequestHandler) dialog.removeEventListener("tarinai:dialog-close-request", dialog._tarinaiCloseRequestHandler);
+    dialog._tarinaiCloseRequestHandler = close;
+    dialog.addEventListener("tarinai:dialog-close-request", close);
     dialog.querySelector("[data-action=save]").onclick = () => {
       applySerializedConfig(board, draft); evaluate(board); remapAttachedWireEndpoints(board, worldRef);
-      if (worldRef) { worldRef.drawListDirty = true; worldRef.markSpatialDirty?.("circuit-board-edited"); worldRef.log?.("\u57fa\u76e4\u306e\u56de\u8def\u3092\u7d44\u307f\u66ff\u3048\u305f\u3002", "observe"); }
+      if (worldRef) { worldRef.drawListDirty = true; worldRef.markSpatialDirty?.("circuit-board-edited"); }
       global.showToast?.("\u57fa\u76e4\u306e\u56de\u8def\u3092\u53cd\u6620\u3057\u307e\u3057\u305f\u3002");
       global.render?.(); close();
     };
     dialog.onclick = event => { if (event.target === dialog) close(); };
-    syncControls(); resizeCanvas(); setTool("wire"); dialog.classList.remove("hidden"); draw();
+    syncControls(); resizeCanvas(); setTool("wire");
+    if (global.TarinaiManagedDialogs?.open) global.TarinaiManagedDialogs.open(dialog, document.activeElement);
+    else { dialog.classList.remove("hidden"); dialog.setAttribute("aria-hidden", "false"); }
+    draw();
     return true;
   }
 
diff --git a/js/collision_footprint_system.js b/js/collision_footprint_system.js
index 6bf87c4..e6010e7 100644
--- a/js/collision_footprint_system.js
+++ b/js/collision_footprint_system.js
@@ -52,7 +52,7 @@
 
   function isSoftPlacementIgnoredType(type = "") {
     const key = String(type || "");
-    return key === "zunchi" || key === "grass_bed" || key === "grass" || key === "water";
+    return key === "zunchi" || key === "grass_bed" || key === "grass" || key === "water" || key === "grave";
   }
 
   function placementRectsFor(worldRef, item) {
diff --git a/js/colony_situation_system.js b/js/colony_situation_system.js
index 038aefd..545f6d5 100644
--- a/js/colony_situation_system.js
+++ b/js/colony_situation_system.js
@@ -55,11 +55,18 @@
     const crisisCollapseSignal = m.weakRatio >= 0.70 && m.criticalRatio >= 0.60;
     add("devastation", 120, m.n <= 10 && devastationSignal);
     add("crisis", 110, !m.populationIncreasing && ((crisisMortalitySignal && crisisSystemicStress) || crisisCollapseSignal));
-    add("confusion", 100, (m.recentShock && (m.panicRatio >= 0.10 || m.safetyRatio >= 0.18)) || m.panicRatio >= 0.25);
+    const confusionPanicThreshold = Math.max(4, Math.ceil(m.n * 0.32));
+    const confusionShockPanicThreshold = Math.max(3, Math.ceil(m.n * 0.18));
+    const confusionShockSafetyThreshold = Math.max(5, Math.ceil(m.n * 0.30));
+    const confusionSignal = m.panicCount >= confusionPanicThreshold
+      || (m.recentShock && m.panicCount >= confusionShockPanicThreshold && m.safetyHighCount >= confusionShockSafetyThreshold);
+    const breedingThreshold = Math.max(4, Math.ceil(m.n * 0.18));
+    const breedingSignal = m.breedingCount >= breedingThreshold && m.breedingRatio >= 0.18;
+    add("confusion", 100, confusionSignal);
     add("fearful", 90, (m.avgSafety >= 50 && m.safetyRatio >= 0.28) || (m.recentShock && m.safetyRatio >= 0.18));
     add("disease_spread", 82, m.diseaseRatio >= 0.25 || (m.diseasedCount >= 3 && m.diseaseRatio >= 0.16));
     add("weakened", 74, !m.populationIncreasing && ((m.avgEnergy < 54 && m.weakRatio >= 0.18) || m.avgHunger > 82 || m.weakRatio >= 0.34));
-    add("breeding", 66, m.breedingRatio >= 0.10 || m.breedingCount >= 2 || m.now - (worldRef?.lastBirthAt || -999) <= 45);
+    add("breeding", 66, breedingSignal);
     add("happy", 46, m.avgStress < 28 && m.panicRatio < 0.08 && m.diseaseRatio < 0.12 && m.weakRatio < 0.18);
     add("isolated", 28, m.n <= 1);
     if (!candidates.length) return "relaxed";
diff --git a/js/command_dispatcher.js b/js/command_dispatcher.js
index 8e26e9f..fd296cd 100644
--- a/js/command_dispatcher.js
+++ b/js/command_dispatcher.js
@@ -102,7 +102,6 @@
 
   function normalizeToolPickMode(mode = "free") {
     const value = String(mode || "free").toLowerCase();
-    if (value === "grid") return "grid40"; // compatibility with v39.16.34
     return DEFAULT_PICK_MODE_ORDER.includes(value) ? value : "free";
   }
 
@@ -139,6 +138,15 @@
     return ok({ speed: worldRef.speed });
   }
 
+  function setSpeed(worldRef, speed, allowed = [0.5, 1, 2, 4, 8, 16]) {
+    if (!worldRef) return fail("missing_world");
+    const value = Number(speed);
+    const list = Array.isArray(allowed) ? allowed.map(Number).filter(Number.isFinite) : [0.5, 1, 2, 4, 8, 16];
+    if (!Number.isFinite(value) || !list.includes(value)) return fail("invalid_speed", { speed });
+    worldRef.speed = value;
+    return ok({ speed: worldRef.speed });
+  }
+
   function primaryPointer(worldRef, x, y) {
     if (!worldRef) return fail("missing_world");
     const px = Number(x);
@@ -171,6 +179,8 @@
         return togglePaused(worldRef);
       case "simulation.speed.cycle":
         return cycleSpeed(worldRef, command.speeds);
+      case "simulation.speed.set":
+        return setSpeed(worldRef, command.speed, command.allowed);
       case "pointer.primary":
         return primaryPointer(worldRef, command.x, command.y);
       case "history.undo": {
diff --git a/js/data.js b/js/data.js
index d270a43..66110f5 100644
--- a/js/data.js
+++ b/js/data.js
@@ -26,6 +26,7 @@ const SPRITES = [
   { id: "stress_dizzy", label: "\u9ad8\u30b9\u30c8\u30ec\u30b9\u305f\u308a\u306a\u3044\u30fb\u3050\u308b\u3050\u308b", path: "assets/sprites/tarinai_24_stress_dizzy.webp", actionOnly: true },
   { id: "stress_sweat", label: "\u9ad8\u30b9\u30c8\u30ec\u30b9\u305f\u308a\u306a\u3044\u30fb\u6c57", path: "assets/sprites/tarinai_25_stress_sweat.webp", actionOnly: true },
   { id: "intimidate", label: "\u5a01\u5687\u305f\u308a\u306a\u3044", path: "assets/sprites/tarinai_26_intimidate.webp", actionOnly: true },
+  { id: "intimidate_alt", label: "威嚇たりない 2", path: "assets/sprites/tarinai_40_intimidate_alt.webp", actionOnly: true },
   { id: "birth_ritual", label: "\u3078\u3053\u3078\u3053\u305f\u308a\u306a\u3044", path: "assets/sprites/tarinai_27_birth_ritual.webp", actionOnly: true },
   { id: "zunchi_slave", label: "\u305a\u3093\u3061\u3069\u308c\u3044", path: "assets/sprites/tarinai_28_zunchi_slave.webp", displayOnly: true },
   { id: "hungry_70", label: "\u7a7a\u817970\u4ee5\u4e0a\u305f\u308a\u306a\u3044", path: "assets/sprites/tarinai_29_hungry_70.webp", displayOnly: true },
@@ -51,7 +52,7 @@ const CONFIG = {
   hungerPerMinute: 36.0,
   lonelinessPerMinute: 7.6,
   energyPerMinute: 8.2,
-  reproductionCooldown: 18,
+  reproductionCooldown: 39,
   dayLength: 120,
   standardTemperature: 15,
   summerTemperatureBoost: 0,
diff --git a/js/deterministic_helpers.js b/js/deterministic_helpers.js
index d280a6e..8405fc9 100644
--- a/js/deterministic_helpers.js
+++ b/js/deterministic_helpers.js
@@ -68,7 +68,6 @@
     birthHash32,
     isEffectCauseText,
   });
-  global.isTarinaiEffectCauseText = global.isTarinaiEffectCauseText || isEffectCauseText;
 })(typeof window !== "undefined" ? window : globalThis);
 
 // Keep the historical bare high-level helper names available to legacy scripts while the
diff --git a/js/disease_registry.js b/js/disease_registry.js
index 5bd4e69..8b08892 100644
--- a/js/disease_registry.js
+++ b/js/disease_registry.js
@@ -22,6 +22,12 @@
       id: "disease_fight",
       flag: "fightDisease",
       mysteryEligible: true,
+    },
+    disease_mamekusaredake: {
+      id: "disease_mamekusaredake",
+      flag: "mamekusaredakeDisease",
+      baseInfectionChance: 0.025,
+      mysteryEligible: false,
     }
   };
 
diff --git a/js/domain_ids.js b/js/domain_ids.js
index 97faff2..dc15f2f 100644
--- a/js/domain_ids.js
+++ b/js/domain_ids.js
@@ -10,12 +10,12 @@
   const WEATHER_IDS = Object.freeze(["sunny", "cloudy", "light_rain"]);
   const MOOD_IDS = Object.freeze(["relaxed", "devastation", "crisis", "confusion", "fearful", "disease_spread", "weakened", "breeding", "happy", "overcrowded", "isolated"]);
 
-  const STATE_IDS = Object.freeze(["idle", "sleep"]);
+  const STATE_IDS = Object.freeze(["idle", "sleep", "eat", "fight", "panic", "sunbath", "birth_ritual", "build", "social", "flee", "wander", "defeated"]);
   const POWER_MODE_IDS = Object.freeze(["", "protein", "niteropu"]);
   const SIZE_MODE_IDS = Object.freeze(["", "giant_drug", "dwarf_drug"]);
   const LIFE_MODE_IDS = Object.freeze(["", "mercury"]);
   const PIN_STATE_IDS = Object.freeze(["loose", "lodged", "falling", "stuck"]);
-  const STAGE_IDS = Object.freeze(["fresh", "aging", "old", "dry"]);
+  const STAGE_IDS = Object.freeze(["fresh", "aging", "old", "dry", "decomposing", "fertile_soil"]);
 
   function indexMap(list) {
     return Object.freeze(Object.fromEntries(list.map((id, index) => [id, index])));
diff --git a/js/fire_runtime_system.js b/js/fire_runtime_system.js
index f6f0daf..a286aea 100644
--- a/js/fire_runtime_system.js
+++ b/js/fire_runtime_system.js
@@ -81,7 +81,7 @@ function updateFirecracker(item, dt, worldRef) {
   function consumeWaterForFire(worldRef, water, amount = 8) {
     if (!water) return false;
     water.amount = Math.max(0, Number(water.amount || 0) - amount);
-    worldRef?.effects?.push(new Effect("ring", water.x, water.y, { size: Math.max(10, (water.r || 10) * 1.4), life: 0.18, color: "rgba(108,192,236,0.58)" }));
+    worldRef?.queueEffect?.("ring", water.x, water.y, { size: Math.max(10, (water.r || 10) * 1.4), life: 0.18, color: "rgba(108,192,236,0.58)" });
     worldRef?.markItemBucketsDirty?.("fire-water");
     worldRef?.markSpatialDirty?.("fire-water");
     return true;
@@ -160,7 +160,7 @@ function updateFirecracker(item, dt, worldRef) {
       box.flameWaterCooldown = 0;
       box.nestFireEffectCooldown = 0;
       worldRef?.log?.("\u5de3\u7bb1\u306b\u706b\u304c\u71c3\u3048\u79fb\u3063\u305f\u3002", "danger");
-      worldRef?.effects?.push(new Effect("ring", box.x, box.y, { size: nestBoxFireRadius(box) * 1.35, life: 0.30, color: "rgba(255,122,48,0.56)" }));
+      worldRef?.queueEffect?.("ring", box.x, box.y, { size: nestBoxFireRadius(box) * 1.35, life: 0.30, color: "rgba(255,122,48,0.56)" });
     }
     worldRef?.markTerrainDirtyAt?.(box.x, box.y, nestBoxFireRadius(box) + 18, "nest-box-fire");
     worldRef?.markItemBucketsDirty?.("nest-box-fire");
@@ -179,7 +179,7 @@ function updateFirecracker(item, dt, worldRef) {
     box.nestFireWetUntil = reason === "water" ? ((Number(worldRef?.time || box.world?.time || 0) || 0) + NEST_BOX_FIRE_WET_REIGNITE_DELAY) : 0;
     box.flameWaterCooldown = 0;
     box.nestFireEffectCooldown = 0;
-    worldRef?.effects?.push(new Effect("ring", box.x, box.y, { size: nestBoxFireRadius(box) * 1.22, life: 0.24, color: "rgba(108,192,236,0.62)" }));
+    worldRef?.queueEffect?.("ring", box.x, box.y, { size: nestBoxFireRadius(box) * 1.22, life: 0.24, color: "rgba(108,192,236,0.62)" });
     worldRef?.markTerrainDirtyAt?.(box.x, box.y, nestBoxFireRadius(box) + 18, "nest-box-fire-extinguished");
     worldRef?.markItemBucketsDirty?.("nest-box-fire-extinguished");
     worldRef?.markSpatialDirty?.("nest-box-fire-extinguished");
@@ -207,7 +207,7 @@ function updateFirecracker(item, dt, worldRef) {
     }
     if (count) {
       worldRef.log?.(`\u708e\u4e0a\u3057\u305f\u5de3\u7bb1\u304b\u3089${count}\u5339\u306e\u305f\u308a\u306a\u3044\u304c\u8ffd\u3044\u51fa\u3055\u308c\u305f\u3002`, "danger", { participants: occupants });
-      worldRef.effects?.push(new Effect("ring", box.x, box.y, { size: nestBoxFireRadius(box) * 1.55, life: 0.32, color: "rgba(255,92,38,0.58)" }));
+      worldRef.queueEffect?.("ring", box.x, box.y, { size: nestBoxFireRadius(box) * 1.55, life: 0.32, color: "rgba(255,92,38,0.58)" });
       worldRef.markSpatialDirty?.(reason);
       worldRef.drawListDirty = true;
     }
@@ -231,7 +231,7 @@ function updateFirecracker(item, dt, worldRef) {
       box.dead = true;
     }
     worldRef?.log?.("\u5de3\u7bb1\u304c\u713c\u5931\u3057\u305f\u3002", "danger");
-    worldRef?.effects?.push(new Effect("ring", box.x, box.y, { size: nestBoxFireRadius(box) * 1.45, life: 0.34, color: "rgba(90,54,38,0.58)" }));
+    worldRef?.queueEffect?.("ring", box.x, box.y, { size: nestBoxFireRadius(box) * 1.45, life: 0.34, color: "rgba(90,54,38,0.58)" });
     worldRef?.markTerrainDirtyAt?.(box.x, box.y, nestBoxFireRadius(box) + 18, "nest-box-burnout");
     worldRef?.markItemBucketsDirty?.("nest-box-burnout");
     worldRef?.markSpatialDirty?.("nest-box-burnout");
@@ -290,7 +290,7 @@ function updateFirecracker(item, dt, worldRef) {
     fire.flameLife = Math.max(0, Number(fire.flameLife || 0) - 0.85);
     grass.health = clamp((grass.health ?? 1) - 0.035, 0, 1);
     if ((fire.amount || 0) <= 24 || (fire.flameLife || 0) <= 0.35) fire.amount = 0;
-    worldRef?.effects?.push(new Effect("ring", fire.x, fire.y, { size: Math.max(18, (fire.r || 14) * 1.8), life: 0.18, color: "rgba(118,188,94,0.46)" }));
+    worldRef?.queueEffect?.("ring", fire.x, fire.y, { size: Math.max(18, (fire.r || 14) * 1.8), life: 0.18, color: "rgba(118,188,94,0.46)" });
     worldRef?.markTerrainDirtyAt?.(grass.x, grass.y, Math.max(grass.r || 17, 28), "grass-extinguish-fire");
     worldRef?.markItemBucketsDirty?.("grass-extinguish-fire");
     worldRef?.markSpatialDirty?.("grass-extinguish-fire");
@@ -590,7 +590,7 @@ function updateFirecracker(item, dt, worldRef) {
       }
       pushFireEffect(worldRef, item.x + Math.cos(a) * Math.min(d, 28), item.y + Math.sin(a) * Math.min(d, 28), 14, item);
     }
-    worldRef.effects?.push(new Effect("ring", item.x, item.y, { size: Math.max(42, (item.r || 15) * (2.4 + sizeScale * 0.65)), life: 0.30 + sizeScale * 0.045, color: "rgba(255,126,54,0.58)" }));
+    worldRef.queueEffect?.("ring", item.x, item.y, { size: Math.max(42, (item.r || 15) * (2.4 + sizeScale * 0.65)), life: 0.30 + sizeScale * 0.045, color: "rgba(255,126,54,0.58)" });
     item.amount = 0;
     worldRef.markItemBucketsDirty?.("flame-firecracker");
     worldRef.markSpatialDirty?.("flame-firecracker");
diff --git a/js/game_dialogs.js b/js/game_dialogs.js
index 8f67b20..8d4d3b4 100644
--- a/js/game_dialogs.js
+++ b/js/game_dialogs.js
@@ -29,10 +29,7 @@
       if (event.target === dialog || event.target.closest("[data-game-dialog-cancel]")) settle(false);
       else if (event.target.closest("[data-game-dialog-confirm]")) settle(true);
     });
-    document.addEventListener("keydown", event => {
-      if (!active || dialog.classList.contains("hidden")) return;
-      if (event.key === "Escape") { event.preventDefault(); event.stopImmediatePropagation?.(); settle(false); }
-    }, true);
+    dialog.addEventListener("tarinai:dialog-close-request", () => { if (active) settle(false); });
     return dialog;
   }
 
@@ -52,7 +49,8 @@
       confirmButton.classList.toggle("primary", !active.options.danger);
     }
     if (cancelButton) cancelButton.textContent = active.options.cancelText || "\u30ad\u30e3\u30f3\u30bb\u30eb";
-    dialog.classList.remove("hidden");
+    if (global.TarinaiManagedDialogs?.open) global.TarinaiManagedDialogs.open(dialog, active.restoreFocus);
+    else { dialog.classList.remove("hidden"); dialog.setAttribute("aria-hidden", "false"); }
     global.setTimeout(() => confirmButton?.focus?.(), 0);
   }
 
@@ -60,8 +58,9 @@
     if (!active) return;
     const current = active;
     active = null;
-    document.getElementById("gameConfirmDialog")?.classList.add("hidden");
-    current.restoreFocus?.focus?.();
+    const dialog = document.getElementById("gameConfirmDialog");
+    if (global.TarinaiManagedDialogs?.close) global.TarinaiManagedDialogs.close(dialog);
+    else { dialog?.classList.add("hidden"); dialog?.setAttribute("aria-hidden", "true"); current.restoreFocus?.focus?.(); }
     current.resolve(Boolean(accepted));
     global.setTimeout(pump, 0);
   }
diff --git a/js/health.js b/js/health.js
index e9868e9..e6d31d8 100644
--- a/js/health.js
+++ b/js/health.js
@@ -34,6 +34,8 @@ const HEALTH = (() => {
     heatstroke: "\u71B1\u4E2D\u75C7",
     cleaning: "\u6383\u9664",
     electrocution: "\u611f\u96fb",
+    trap: "\u7f60\u306b\u6355\u307e\u3063\u305f",
+    poisonGas: "\u6bd2\u30ac\u30b9",
   });
   const DISEASE_RE = /([^\u3001\u3002\s]+\u75c5)/;
 
@@ -41,6 +43,8 @@ const HEALTH = (() => {
     const text = String(reason || "");
     if (!text) return "";
     if (/\u6383\u9664|\u30ed\u30dc\u6383\u9664\u6a5f|robot.?cleaner|cleaned/.test(text)) return CAUSES.cleaning;
+    if (/\u7f60\u306b\u6355\u307e\u3063\u305f|bear.?trap|trapped/i.test(text)) return CAUSES.trap;
+    if (/\u6bd2\u30ac\u30b9|poison.?gas/i.test(text)) return CAUSES.poisonGas;
     if (/\u611f\u96fb|\u901a\u96fb\u4e2d\u306e\u96fb\u7dda|electrocution|electric.?shock|shocked/i.test(text)) return CAUSES.electrocution;
     if (text.includes(WEAKENED_SUFFIX)) return text.replace(/\u3067\u8870\u5f31.*$/, "");
     if (/\u51CD\u7D50|\u4F4E\u6E29|\u5BD2\u3055|cold|freeze|freezing/i.test(text)) return CAUSES.freeze;
@@ -176,10 +180,16 @@ const HEALTH = (() => {
 
 
   const MAJOR_DAMAGE_REACTIONS = Object.freeze([
-    { id: "voice_major_damage_01", text: "\u3042\u3042\u3042\u3042\uff01" },
-    { id: "voice_major_damage_02", text: "\u3048\u3048\u3048\u3048\uff01" },
-    { id: "voice_major_damage_03", text: "\u306f\u3046\u3046\u3046\uff01" },
-    { id: "voice_major_damage_04", text: "\u306f\u3046\u306f\u3046\uff01" },
+    { id: "voice_major_damage_01", text: "ああああ！" },
+    { id: "voice_major_damage_02", text: "ええええ！" },
+    { id: "voice_major_damage_03", text: "はううう！" },
+    { id: "voice_major_damage_04", text: "はうはう！" },
+  ]);
+
+  const OCHIBI_MAJOR_DAMAGE_REACTIONS = Object.freeze([
+    { id: "voice_ochibi_damage_001", text: "いちゃい！" },
+    { id: "voice_ochibi_damage_002", text: "ごふっ" },
+    { id: "voice_ochibi_damage_003", text: "ああああああああ" },
   ]);
 
   function spawnSilentDamageBubble(t, text = "!", color = "rgba(142,58,58,0.86)") {
@@ -196,14 +206,14 @@ const HEALTH = (() => {
     if (typeof Effect === "undefined") return false;
     if ((world.effectCounts?.bubble || 0) >= (CONFIG?.bubbleLimit || 80)) return false;
     const r = Math.max(16, t.radius || 22);
-    world.effects?.push(new Effect("bubble", t.x, t.y - r * 1.38, {
+    world.queueEffect?.("bubble", t.x, t.y - r * 1.38, {
       vx: (Math.random() - 0.5) * 2.4,
       vy: -4.8 - Math.random() * 2.8,
       life: 2.4 + Math.random() * 0.6,
       size: 9,
       text,
       color,
-    }));
+    });
     world.effectCounts.bubble = (world.effectCounts.bubble || 0) + 1;
     t.nextBubbleAt = Math.max(t.nextBubbleAt || 0, (world.time || 0) + 1.55);
     t._damageBubblePriorityUntil = Math.max(Number(t._damageBubblePriorityUntil || 0), (world.time || 0) + 1.55);
@@ -238,7 +248,7 @@ const HEALTH = (() => {
     t.lastMajorDamageAt = now;
     if (now < Number(t.nextMajorDamageVoiceAt || -999)) return false;
     t.nextMajorDamageVoiceAt = now + 1.0;
-    const list = MAJOR_DAMAGE_REACTIONS;
+    const list = t.isAcquiredTarinai ? OCHIBI_MAJOR_DAMAGE_REACTIONS : MAJOR_DAMAGE_REACTIONS;
     const reaction = list[Math.floor(Math.random() * list.length)] || list[0];
     audio.play?.(reaction.id, { category: "voice", minGap: 0.85 });
     spawnSilentDamageBubble(t, reaction.text, "rgba(146,58,58,0.88)");
diff --git a/js/history_system.js b/js/history_system.js
index 6620c0d..626a3fd 100644
--- a/js/history_system.js
+++ b/js/history_system.js
@@ -2,8 +2,8 @@
 
 // User-facing undo/redo for direct editing actions.
 (function (global) {
-  const MAX_HISTORY = 48;
-  const MAX_HISTORY_BYTES = 16 * 1024 * 1024;
+  const MAX_HISTORY = 32;
+  const MAX_HISTORY_BYTES = 8 * 1024 * 1024;
 
   function ensure(worldRef) {
     if (!worldRef) return null;
diff --git a/js/impact_response_system.js b/js/impact_response_system.js
index 5ac7c0a..c821619 100644
--- a/js/impact_response_system.js
+++ b/js/impact_response_system.js
@@ -78,10 +78,18 @@
         ball.spinVelocity = clamp((ball.spinVelocity || 0) + (nx >= 0 ? 1 : -1) * (10 + p * 12), -48, 48);
         ball.lastPokedAt = worldRef.time || 0;
         ballHit += 1;
-        worldRef.effects?.push(new Effect("ring", ball.x, ball.y, { size: Math.max(18, (ball.r || 18) * 1.1), life: 0.20, color: "rgba(255,255,255,0.52)" }));
+        worldRef.queueEffect?.("ring", ball.x, ball.y, { size: Math.max(18, (ball.r || 18) * 1.1), life: 0.20, color: "rgba(255,255,255,0.52)" });
       }
       if (ballHit > 0) worldRef.markSpatialDirty?.("genkotsu-ball-impact");
     }
+    for (const grave of worldRef.itemsOfType?.("grave") || (worldRef.items || []).filter(item => item && item.type === "grave")) {
+      if (!grave || grave.dead) continue;
+      const d = Math.max(1, distXY(grave.x, grave.y, it.x, it.y));
+      const p = clamp(1 - d / (radius + (grave.r || 18)), 0, 1);
+      if (p <= 0) continue;
+      const force = push * (0.35 + p * 1.15);
+      global.TarinaiMemorialBellSystem?.applyExternalForce?.(worldRef, grave, force, it, "drop-impact");
+    }
     const antHit = damage > 0 ? worldRef.damageAntsInRadius(it.x, it.y, radius + 54, p => damage * (0.35 + p * 0.65), reason, {
       push: p => push * (0.62 + p * 1.25),
       source: it,
diff --git a/js/item_dynamic_ball_system.js b/js/item_dynamic_ball_system.js
index 2b71cde..baddd74 100644
--- a/js/item_dynamic_ball_system.js
+++ b/js/item_dynamic_ball_system.js
@@ -30,7 +30,8 @@
       resolveObstacleCollisions(item, dt, worldRef);
       item.x = clamp(item.x, p, worldRef.w - p);
       item.y = clamp(item.y, p, worldRef.h - p);
-      const groundFriction = Math.pow(0.72, dt);
+      const oilMul = global.TarinaiItemEnvironmentHazardSystem?.groundFrictionMultiplier?.(worldRef, item.x, item.y) ?? 1;
+      const groundFriction = Math.pow(1 - (1 - 0.72) * oilMul, dt);
       item.vx *= groundFriction;
       item.vy *= groundFriction;
     }
@@ -138,7 +139,7 @@
     item.spinVelocity *= Math.pow(0.24, Math.max(0.016, dt || 0.016));
     if ((item.lastHaySlowLogAt || -999) + 3.5 < (worldRef.time || 0) && Math.hypot(item.vx || 0, item.vy || 0) > 120) {
       item.lastHaySlowLogAt = worldRef.time || 0;
-      worldRef.effects?.push(new Effect("ring", item.x, item.y, { size: Math.max(14, item.r * 0.95), life: 0.20, color: "rgba(214,184,96,0.42)" }));
+      worldRef.queueEffect?.("ring", item.x, item.y, { size: Math.max(14, item.r * 0.95), life: 0.20, color: "rgba(214,184,96,0.42)" });
     }
   }
 
@@ -216,8 +217,8 @@
     const now = worldRef?.time || 0;
     if ((item.lastObstacleBounceAt || -999) + 0.08 > now) return;
     item.lastObstacleBounceAt = now;
-    const color = item.type === "balloon" ? "rgba(248,122,166,0.36)" : ((obstacle?.type === "bounce_fence" || obstacle?.type === "bounce_fence_v") ? "rgba(82,153,230,0.46)" : (obstacle?.type === "stone" ? "rgba(165,165,150,0.45)" : "rgba(160,116,64,0.42)"));
-    worldRef?.effects?.push(new Effect("ring", item.x, item.y, { size: Math.max(13, (item.r || 18) * 0.82), life: 0.18, color }));
+    const color = item.type === "balloon" ? "rgba(248,122,166,0.36)" : ((obstacle?.type === "bounce_fence" || obstacle?.type === "bounce_fence_v") ? "rgba(235,104,165,0.50)" : (obstacle?.type === "stone" ? "rgba(165,165,150,0.45)" : "rgba(160,116,64,0.42)"));
+    worldRef?.queueEffect?.("ring", item.x, item.y, { size: Math.max(13, (item.r || 18) * 0.82), life: 0.18, color });
   }
 
   function normalizeAngleLocal(angle = 0, fallback = 0) {
@@ -342,7 +343,7 @@
       const phase = Math.sin(item.fanPulse || 0);
       const px = item.x + ax * (42 + 24 * phase);
       const py = item.y + ay * (42 + 24 * phase);
-      worldRef?.effects?.push(new Effect("ring", px, py, { size: 12 + 7 * Math.abs(phase), life: 0.18, color: "rgba(174,214,236,0.26)" }));
+      worldRef?.queueEffect?.("ring", px, py, { size: 12 + 7 * Math.abs(phase), life: 0.18, color: "rgba(174,214,236,0.26)" });
     }
     return true;
   }
@@ -372,13 +373,13 @@
       // A fan should carry embers forward instead of merely dimming the source flame.
       // The source loses a little fuel, while the downwind flame handles normal fire contacts.
       fire.amount = Math.max(4, (fire.amount || 0) - (2.2 + falloff * 3.8));
-      worldRef.effects?.push(new Effect("flame", fire.x + ax * Math.max(12, fire.r || 14), fire.y + ay * Math.max(12, fire.r || 14), {
+      worldRef.queueEffect?.("flame", fire.x + ax * Math.max(12, fire.r || 14), fire.y + ay * Math.max(12, fire.r || 14), {
         size: Math.max(7, (fire.r || 14) * 0.72),
         life: 0.22,
         color: "rgba(255,126,54,0.58)",
         vx: ax * (80 + falloff * 120),
         vy: ay * (80 + falloff * 120),
-      }));
+      });
       worldRef.markItemBucketsDirty?.("fan-fire-spread");
       worldRef.markSpatialDirty?.("fan-fire-spread");
       worldRef.drawListDirty = true;
@@ -429,7 +430,7 @@
       t.lastFanSurpriseAt = worldRef?.time || 0;
       t.surpriseTimer = Math.max(t.surpriseTimer || 0, 0.12);
       if (typeof t.spawnBubble === "function") t.spawnBubble("~", { life: 0.55 });
-      worldRef?.effects?.push(new Effect("ring", t.x + ax * radius * 0.4, t.y + ay * radius * 0.2, { size: Math.max(12, radius * 0.72), life: 0.16, color: "rgba(174,214,236,0.28)" }));
+      worldRef?.queueEffect?.("ring", t.x + ax * radius * 0.4, t.y + ay * radius * 0.2, { size: Math.max(12, radius * 0.72), life: 0.16, color: "rgba(174,214,236,0.28)" });
     }
   }
 
@@ -522,13 +523,13 @@
       if (!addedDrop) continue;
       spawned += 1;
       if (i < 8) {
-        worldRef.effects?.push(new Effect("fight", drop.x, drop.y, {
+        worldRef.queueEffect?.("fight", drop.x, drop.y, {
           size: deterministicRange(worldRef || balloon, "water-balloon-drop-spark-size", 3.5, 7.0, balloon, i),
           life: deterministicRange(worldRef || balloon, "water-balloon-drop-spark-life", 0.24, 0.42, balloon, i),
           color: "rgba(96,196,244,0.66)",
           vx: drop.vx * 0.42,
           vy: drop.vy * 0.42,
-        }));
+        });
       }
     }
     if (spawned) {
@@ -566,7 +567,7 @@
     }
     if (worldRef && ((item.lastSplashTrailAt || -999) + 0.12 < (worldRef.time || 0)) && Math.hypot(item.vx || 0, item.vy || 0) > 72) {
       item.lastSplashTrailAt = worldRef.time || 0;
-      worldRef.effects?.push(new Effect("fight", item.x, item.y, { size: Math.max(2.8, r * 0.55), life: 0.18, color: "rgba(112,206,248,0.36)", vx: -(item.vx || 0) * 0.05, vy: -(item.vy || 0) * 0.05 }));
+      worldRef.queueEffect?.("fight", item.x, item.y, { size: Math.max(2.8, r * 0.55), life: 0.18, color: "rgba(112,206,248,0.36)", vx: -(item.vx || 0) * 0.05, vy: -(item.vy || 0) * 0.05 });
     }
     worldRef?.markSpatialDirty?.("water-drop-motion");
     worldRef?.markTerrainDirtyAt?.(item.x, item.y, Math.max(28, r * 3.2), "water-drop-motion");
@@ -624,11 +625,11 @@
     // through amount/hp instead of assigning to .dead directly.
     balloon.amount = 0;
     balloon.hp = 0;
-    worldRef?.effects?.push(new Effect("ring", balloon.x, balloon.y, { size: Math.max(32, (balloon.r || 20) * 1.9), life: 0.28, color: "rgba(76,178,236,0.62)" }));
+    worldRef?.queueEffect?.("ring", balloon.x, balloon.y, { size: Math.max(32, (balloon.r || 20) * 1.9), life: 0.28, color: "rgba(76,178,236,0.62)" });
     for (let i = 0; i < 9; i++) {
       const a = deterministicAngle(worldRef || balloon, "water-balloon-pop-piece", balloon, i);
       const s = deterministicRange(worldRef || balloon, "water-balloon-pop-speed", 24, 96, balloon, i);
-      worldRef?.effects?.push(new Effect("fight", balloon.x, balloon.y, { size: deterministicRange(worldRef || balloon, "water-balloon-pop-size", 4, 10, balloon, i), life: 0.28, color: "rgba(95,204,246,0.72)", vx: Math.cos(a) * s, vy: Math.sin(a) * s }));
+      worldRef?.queueEffect?.("fight", balloon.x, balloon.y, { size: deterministicRange(worldRef || balloon, "water-balloon-pop-size", 4, 10, balloon, i), life: 0.28, color: "rgba(95,204,246,0.72)", vx: Math.cos(a) * s, vy: Math.sin(a) * s });
     }
     spawnWaterFromBalloon(balloon, worldRef);
     const sourceLabel = cause?.type === "fire" || cause?.type === "flame_firecracker" ? "\u706b"
diff --git a/js/item_dynamic_pin_system.js b/js/item_dynamic_pin_system.js
index c4612d8..bb62c03 100644
--- a/js/item_dynamic_pin_system.js
+++ b/js/item_dynamic_pin_system.js
@@ -63,7 +63,7 @@
     if (!ball.stuckPinIds.includes(item.id)) ball.stuckPinIds.push(item.id);
     ball.stuckPinId = ball.stuckPinIds[0] || item.id;
     updateBallLodged(item, 0, worldRef);
-    worldRef?.effects?.push(new Effect("ring", item.x, item.y, { size: Math.max(12, (item.r || 8) * 1.4), life: 0.16, color: item.type === "oshibyo" ? "rgba(73,119,205,0.42)" : "rgba(214,72,72,0.42)" }));
+    worldRef?.queueEffect?.("ring", item.x, item.y, { size: Math.max(12, (item.r || 8) * 1.4), life: 0.16, color: item.type === "oshibyo" ? "rgba(73,119,205,0.42)" : "rgba(214,72,72,0.42)" });
     return true;
   }
 
@@ -212,7 +212,7 @@
     if (isOshibyo) {
       t.thought = "\u304a\u3057\u308a\u92f2\u304c\u523a\u3055\u3063\u3066\u305a\u3093\u3061\u304c\u51fa\u306a\u304f\u306a\u3063\u305f";
       worldRef.log?.(`${t.name}\u306b\u304a\u3057\u308a\u92f2\u304c\u523a\u3055\u3063\u305f\u3002`, "accident", { participants: [t] });
-      worldRef.effects?.push(new Effect("ring", t.x, t.y + (t.radius || 16) * 0.34, { size: Math.max(14, (t.radius || 16) * 0.58), life: 0.18, color: "rgba(73,119,205,0.36)" }));
+      worldRef.queueEffect?.("ring", t.x, t.y + (t.radius || 16) * 0.34, { size: Math.max(14, (t.radius || 16) * 0.58), life: 0.18, color: "rgba(73,119,205,0.36)" });
       return true;
     }
     if (t.enterPanic) {
@@ -229,7 +229,7 @@
       item.pinLogAt = worldRef.time || 0;
       worldRef.log?.(`${t.name}\u306b\u753b\u92f2\u304c\u523a\u3055\u3063\u305f\u3002`, "accident", { participants: [t] });
     }
-    worldRef.effects?.push(new Effect("ring", t.x, t.y - (t.radius || 16) * 0.12, { size: Math.max(18, (t.radius || 16) * 0.90), life: 0.22, color: "rgba(214,72,72,0.50)" }));
+    worldRef.queueEffect?.("ring", t.x, t.y - (t.radius || 16) * 0.12, { size: Math.max(18, (t.radius || 16) * 0.90), life: 0.22, color: "rgba(214,72,72,0.50)" });
     return true;
   }
 
@@ -342,7 +342,7 @@
       item.vx = clamp(baseVx * 0.45 + nx * 18, -90, 90);
       item.vy = clamp(baseVy * 0.45 + Math.max(12, ny * 18), -60, 110);
       item.spinVelocity = clamp((item.spinVelocity || 0) * 0.35 + (Math.sign(nx) || 1) * 0.9, -2.2, 2.2);
-      worldRef?.effects?.push(new Effect("ring", item.x, item.y, { size: Math.max(14, (item.r || 16) * 0.92), life: 0.16, color: "rgba(214,112,112,0.40)" }));
+      worldRef?.queueEffect?.("ring", item.x, item.y, { size: Math.max(14, (item.r || 16) * 0.92), life: 0.16, color: "rgba(214,112,112,0.40)" });
       if (reason === "fall" && t) worldRef?.log?.(`${t.name}\u306E\u753B\u92F2\u304C\u629C\u3051\u843D\u3061\u305F\u3002`, "observe", { participants: [t] });
     }
     if (wasOshibyo && storedZunchi > 0 && worldRef?.spawnBurstZunchi) {
diff --git a/js/item_dynamic_system.js b/js/item_dynamic_system.js
index 3b8eb7e..df42975 100644
--- a/js/item_dynamic_system.js
+++ b/js/item_dynamic_system.js
@@ -7,6 +7,14 @@
   function update(item, dt, worldRef) {
     if (!item || item.dead) return false;
     switch (item.type) {
+      case "oil":
+      case "bear_trap":
+      case "leakage_device":
+      case "poison_gas_can":
+      case "poison_gas":
+      case "mamekusaredake":
+      case "mame_spore":
+        return global.TarinaiItemEnvironmentHazardSystem.update(item, dt, worldRef) !== false;
       case "firecracker":
       case "flame_firecracker":
       case "sticky_bomb":
diff --git a/js/item_dynamic_zunchi_system.js b/js/item_dynamic_zunchi_system.js
index aa26681..b754207 100644
--- a/js/item_dynamic_zunchi_system.js
+++ b/js/item_dynamic_zunchi_system.js
@@ -93,6 +93,9 @@
           && item.achievementBurstNeverStopped !== false
         );
         worldRef.applyImpactDamage?.(t, damage, "\u885d\u7a81", { source: item }) || t.damage?.(damage, "\u885d\u7a81");
+        if (t.dead) {
+          globalThis.TarinaiAchievements?.recordZunchiCollisionDeath?.({ world: worldRef, tarinai: t, zunchi: item, speed });
+        }
         if (t.dead && eligibleSelfZunchiDeath) {
           globalThis.TarinaiAchievements?.recordSelfZunchiDeath?.({ world: worldRef, tarinai: t, zunchi: item, speed });
         }
@@ -108,7 +111,7 @@
         if (t.addStress) t.addStress(7, { threshold: 8, duration: 3.2 });
       }
       worldRef.spawnFallEffect?.(t.x, t.y + (t.radius || 20) * 0.45, 0.65);
-      worldRef.effects?.push(new Effect("zunchi_miasma", item.x, item.y - 4, { size: 14, life: 0.38, color: "rgba(77,92,42,0.36)" }));
+      worldRef.queueEffect?.("zunchi_miasma", item.x, item.y - 4, { size: 14, life: 0.38, color: "rgba(77,92,42,0.36)" });
       item.vx *= -0.18;
       item.vy *= -0.18;
       break;
@@ -139,7 +142,7 @@
       item.burning = false;
       item.burnTimer = 0;
       item.amount = 0;
-      worldRef?.effects?.push(new Effect("zunchi_miasma", item.x, item.y - 4, { size: Math.max(13, (item.r || 15) * 1.25), life: 0.42, color: "rgba(64,44,34,0.44)" }));
+      worldRef?.queueEffect?.("zunchi_miasma", item.x, item.y - 4, { size: Math.max(13, (item.r || 15) * 1.25), life: 0.42, color: "rgba(64,44,34,0.44)" });
     }
     worldRef?.markTerrainDirtyAt?.(item.x, item.y, Math.max(item.r || 15, 28), "zunchi-burning");
     worldRef?.markItemBucketsDirty?.("zunchi-burning");
@@ -183,7 +186,7 @@
     }
     if ((item.amount || 0) <= 0.5) {
       item.amount = 0;
-      worldRef?.effects?.push(new Effect("zunchi_miasma", item.x, item.y - 4, { size: Math.max(12, (item.r || 15) * 1.15), life: 0.34, color: "rgba(64,44,34,0.34)" }));
+      worldRef?.queueEffect?.("zunchi_miasma", item.x, item.y - 4, { size: Math.max(12, (item.r || 15) * 1.15), life: 0.34, color: "rgba(64,44,34,0.34)" });
       worldRef?.markTerrainDirtyAt?.(item.x, item.y, Math.max(item.r || 15, 28), "zunchi-decay-out");
       worldRef?.markItemBucketsDirty?.("zunchi-decay-out");
       worldRef?.markSpatialDirty?.("zunchi-decay-out");
diff --git a/js/item_environment_hazard_system.js b/js/item_environment_hazard_system.js
new file mode 100644
index 0000000..7a49723
--- /dev/null
+++ b/js/item_environment_hazard_system.js
@@ -0,0 +1,384 @@
+"use strict";
+(function(global){
+  const LOOSE_DYNAMIC_TYPES = new Set([
+    "ball","balloon","zunchi","pushpin","oshibyo","genkotsu",
+    "firecracker","flame_firecracker","sticky_bomb","water"
+  ]);
+
+  function nearby(world,x,y,r){ return world?.nearbyItems?.(x,y,r,true) || world?.items || []; }
+  function oilAt(world,x,y){
+    for(const o of (world?.itemsOfType?.("oil")||[])) {
+      if(o&&!o.dead&&distXY(x,y,o.x,o.y)<=Math.max(12,o.r||58)) return o;
+    }
+    return null;
+  }
+  function groundFrictionMultiplier(world,x,y){ return oilAt(world,x,y)?0:1; }
+
+  function spawnOilFire(item,world,initial=false){
+    if(!item||!world)return null;
+    const r=Math.max(24,item.r||58);
+    const angle=initial ? global.deterministicAngle?.(world,"oil-ignite-fire",item,item.oilBurnTimer||0) ?? 0 : Math.random()*Math.PI*2;
+    const distance=initial ? 0 : Math.random()*r*.58;
+    return global.TarinaiFireRuntimeSystem?.spawnFireAt?.(
+      world,
+      item.x+Math.cos(angle)*distance,
+      item.y+Math.sin(angle)*distance*.58,
+      {radius:initial?20:12+Math.random()*5,amount:initial?72:30+Math.random()*24,life:initial?4.4:2.8+Math.random()*2.0,source:item,mergeRadius:initial?48:42}
+    ) || null;
+  }
+
+  function igniteOil(item,world){
+    if(!item||item.dead||item.type!=="oil"||item.oilBurning)return false;
+    item.oilBurning=true;
+    item.oilBurnTimer=0;
+    item.nextOilFireAt=Number(world?.time||0);
+    spawnOilFire(item,world,true);
+    if(world){ world.drawListDirty=true; world.markSpatialDirty?.("oil-ignited"); }
+    return true;
+  }
+  function igniteOilNear(world,x,y,r=120){
+    let n=0;
+    for(const o of (world?.itemsOfType?.("oil")||[])){
+      if(o&&!o.dead&&distXY(x,y,o.x,o.y)<=r+Math.max(12,o.r||58)) n+=igniteOil(o,world)?1:0;
+    }
+    return n;
+  }
+
+  function igniteFromBurningOilContact(item,world){
+    if(!item||!world||!item.oilBurning)return 0;
+    const radius=Math.max(24,Number(item.r||58));
+    let ignited=0;
+    const tarinai=world.nearbyTarinai?.(item.x,item.y,radius+48,true)||world.tarinai||[];
+    for(const t of tarinai){
+      if(!t||t.dead||t.insideNestBoxId||world.isTarinaiHiddenInNestBox?.(t))continue;
+      if(distXY(item.x,item.y,t.x,t.y)>radius+Math.max(12,Number(t.radius||18))*.72)continue;
+      const wasBurning=Boolean(t.burning||(t.burnTimer||0)>.02);
+      if(typeof t.igniteFire==="function")t.igniteFire(item,false);
+      if(!wasBurning&&Boolean(t.burning||(t.burnTimer||0)>.02))ignited++;
+    }
+    const ants=world.nearbyAnts?.(item.x,item.y,radius+24,true)||world.ants||[];
+    for(const ant of ants){
+      if(!ant||ant.dead||distXY(item.x,item.y,ant.x,ant.y)>radius+Math.max(4,Number(ant.r||5)))continue;
+      const wasBurning=Boolean(ant.burning||(ant.burnTimer||0)>.02);
+      global.TarinaiFireRuntimeSystem?.igniteAntByFire?.(ant,item,world);
+      if(!wasBurning&&Boolean(ant.burning||(ant.burnTimer||0)>.02))ignited++;
+    }
+    return ignited;
+  }
+  function updateOil(item,dt,world){
+    if(!item.oilBurning){
+      for(const f of (world?.itemsOfType?.("fire")||[])){
+        if(f&&!f.dead&&distXY(item.x,item.y,f.x,f.y)<=Math.max(item.r||58,24)+Math.max(f.r||14,10)){
+          igniteOil(item,world); break;
+        }
+      }
+      return true;
+    }
+    const now=Number(world?.time||0);
+    igniteFromBurningOilContact(item,world);
+    item.oilBurnTimer=(item.oilBurnTimer||0)+dt;
+    item.amount=Math.max(0,(item.amount||100)-dt*5.2);
+    if(now>=Number(item.nextOilFireAt||0)){
+      item.nextOilFireAt=now+0.36+Math.random()*0.34;
+      spawnOilFire(item,world,false);
+    }
+    if(item.amount<=0){
+      item.amount=0;
+      world?.markItemBucketsDirty?.("oil-burnout");
+      world?.markSpatialDirty?.("oil-burnout");
+      world && (world.drawListDirty=true);
+    }
+    return true;
+  }
+
+  function isTrappableDynamic(it,world){
+    if(!it||it.dead||it.type==="bear_trap"||it.type==="poison_gas"||it.type==="fire") return false;
+    if(it.isStructure) return false;
+    if(["rope","rod","spring","wire","insulated_wire","rotator","reciprocator","poison_block"].includes(it.type)) return false;
+    if(LOOSE_DYNAMIC_TYPES.has(it.type)) return true;
+    if((it.dropTimer||0)>0 || Math.hypot(it.vx||0,it.vy||0)>0.2) return true;
+    return Boolean(world?.spatial?.isDynamicItem?.(it) && !it.isStructure);
+  }
+
+  function trapTarget(item,world){
+    const ref=item?.trapTargetRef;
+    if(ref&&!ref.dead&&(!item.trapTargetId||ref.id===item.trapTargetId)) return ref;
+    if(!item?.trapTargetId) return null;
+    const found=world?.itemById?.(item.trapTargetId)
+      || (world?.items||[]).find(it=>it&&!it.dead&&it.id===item.trapTargetId)
+      || (world?.tarinai||[]).find(t=>t&&!t.dead&&t.id===item.trapTargetId)
+      || null;
+    item.trapTargetRef=found;
+    return found;
+  }
+
+  function hasTrapDamageStat(target){
+    if(!target||target.dead)return false;
+    if(Number.isFinite(Number(target.hp))||Number.isFinite(Number(target.health)))return true;
+    if(Number.isFinite(Number(target.maxHp))||Number.isFinite(Number(target.maxHealth)))return true;
+    if(typeof target.damage==="function"&&Number.isFinite(Number(target.energy)))return true;
+    return false;
+  }
+
+  function damageHeld(target,world,trap){
+    if(!target||target.dead||!hasTrapDamageStat(target))return false;
+    if(typeof target.damage==="function"){
+      try {
+        target.damage(2,"\u7f60\u306b\u6355\u307e\u3063\u305f",{source:trap});
+      } catch (_) {
+        target.damage(2,"\u7f60\u306b\u6355\u307e\u3063\u305f",{source:trap});
+      }
+      if (target.world && Number.isFinite(Number(target.radius))) target.hurtTimer=Math.max(Number(target.hurtTimer||0),.62);
+      return true;
+    }
+    if(Number.isFinite(Number(target.hp))){
+      target.hp=Math.max(0,Number(target.hp)-2);
+      target.hpBarTimer=Math.max(Number(target.hpBarTimer||0),.8);
+      if(target.hp<=0) global.TarinaiStructureLifecycle?.deleteItem?.(world,target,{reason:"bear-trap",breaker:trap});
+      return true;
+    }
+    if(Number.isFinite(Number(target.health))){
+      target.health=Math.max(0,Number(target.health)-2);
+      return true;
+    }
+    return false;
+  }
+
+  function holdTrapTarget(trap,target,world){
+    if(!trap||!target||target.dead)return false;
+    const now=Number(world?.time||0);
+    target._bearTrapHoldUntil=Math.max(Number(target._bearTrapHoldUntil||0),Number(trap.trapUntil||now));
+    target._bearTrapOwnerId=trap.id;
+    target._bearTrapHoldX=trap.x;
+    target._bearTrapHoldY=trap.y;
+    target.x=trap.x;
+    target.y=trap.y;
+    target.prevX=trap.x;
+    target.prevY=trap.y;
+    target.vx=0; target.vy=0; target.impulseVx=0; target.impulseVy=0; target.spinVelocity=0;
+    const body=global.TarinaiPhysicsBodySystem?.isBodyType?.(target) ? global.TarinaiPhysicsBodySystem.ensureBody?.(target,world,{syncFromLegacy:true}) : null;
+    if(body?.pose){ body.pose.x=trap.x; body.pose.y=trap.y; }
+    if(body?.velocity){ body.velocity.x=0; body.velocity.y=0; body.velocity.linear=0; body.velocity.angular=0; }
+    target._physicsExternalPoseDirty=true;
+    return true;
+  }
+
+  function triggerBearTrap(item,target,world){
+    if(!item||!target||target.dead)return false;
+    const now=Number(world?.time||0);
+    item.trapTargetId=target.id||"";
+    item.trapTargetRef=target;
+    item.trapTriggeredAt=now;
+    item.trapDamageableTarget=hasTrapDamageStat(target);
+    item.trapHoldDuration=item.trapDamageableTarget?10:5;
+    item.trapUntil=now+item.trapHoldDuration;
+    item.nextTrapDamageAt=now+.5;
+    item.trapClosed=true;
+    holdTrapTarget(item,target,world);
+    world?.queueEffect?.("ring",item.x,item.y,{size:Math.max(34,(item.r||34)*1.2),life:.22,color:"rgba(190,204,214,0.58)"});
+    if(world){ world.drawListDirty=true; world.markSpatialDirty?.("bear-trap-trigger"); }
+    return true;
+  }
+
+  function updateBearTrap(item,dt,world){
+    const now=Number(world?.time||0);
+    if(item.trapClosed || item.trapUntil>0){
+      const target=trapTarget(item,world);
+      if(now>=Number(item.trapUntil||0)){
+        if(target){
+          target._bearTrapHoldUntil=0;
+          target._bearTrapOwnerId="";
+          target._bearTrapHoldX=undefined;
+          target._bearTrapHoldY=undefined;
+        }
+        item.trapTargetRef=null;
+        item.trapTargetId="";
+        const removed=global.TarinaiStructureLifecycle?.deleteItem?.(world,item,{reason:"bear-trap-expired"});
+        if(!removed)item.amount=0;
+        world?.markItemBucketsDirty?.("bear-trap-expired");
+        world?.markSpatialDirty?.("bear-trap-expired");
+        return true;
+      }
+      if(target){
+        holdTrapTarget(item,target,world);
+        if(item.trapDamageableTarget&&now>=Number(item.nextTrapDamageAt||0)){
+          item.nextTrapDamageAt=now+.5;
+          damageHeld(target,world,item);
+        }
+      }
+      return true;
+    }
+    const captureRadius=Math.max(46,(item.r||34)*1.45);
+    let best=null,bestD=Infinity;
+    for(const it of nearby(world,item.x,item.y,captureRadius)){
+      if(it===item||!isTrappableDynamic(it,world))continue;
+      if(Number(it._bearTrapHoldUntil||0)>now)continue;
+      const d=distXY(item.x,item.y,it.x,it.y);
+      const rr=Math.max(12,(item.r||34)*.72)+Math.max(7,(it.r||12)*.62);
+      if(d<=rr&&d<bestD){ best=it;bestD=d; }
+    }
+    for(const t of (world?.nearbyTarinai?.(item.x,item.y,captureRadius+36,true)||world?.tarinai||[])){
+      if(!t||t.dead||Number(t._bearTrapHoldUntil||0)>now)continue;
+      const d=distXY(item.x,item.y,t.x,t.y);
+      const rr=Math.max(12,(item.r||34)*.72)+Math.max(10,(t.radius||18)*.62);
+      if(d<=rr&&d<bestD){ best=t;bestD=d; }
+    }
+    if(best) triggerBearTrap(item,best,world);
+    return true;
+  }
+
+  function enforceTrapHolds(world){
+    const now=Number(world?.time||0);
+    let held=0;
+    for(const trap of (world?.itemsOfType?.("bear_trap")||[])){
+      if(!trap||trap.dead||!trap.trapClosed||now>=Number(trap.trapUntil||0))continue;
+      const target=trapTarget(trap,world);
+      if(target&&holdTrapTarget(trap,target,world)) held++;
+    }
+    if(held) world?.markSpatialDirty?.("bear-trap-hold");
+    return held;
+  }
+
+  function leakageRadius(item){ return Math.max(260,(Number(item?.r)||34)*8.2); }
+
+  function pulseLeakage(item,world){
+    if(!item||item.dead||!world)return 0;
+    const powered=Boolean(item._signalDriven&&item._signalOn);
+    if(!powered)return 0;
+    const now=Number(world.time||0);
+    if(now<Number(item.nextLeakagePulseAt||0))return 0;
+    item.nextLeakagePulseAt=now+.24;
+    const radius=leakageRadius(item);
+    let hit=0;
+    for(const t of world.tarinai||[]){
+      if(!t||t.dead||world.isTarinaiHiddenInNestBox?.(t))continue;
+      const d=distXY(item.x,item.y,t.x,t.y);
+      if(d>radius+(t.radius||18))continue;
+      const q=Math.max(.2,1-d/Math.max(1,radius));
+      t.damage?.(1.5+.9*q,"\u6f0f\u96fb",{source:item});
+      t.hurtTimer=Math.max(t.hurtTimer||0,.22);
+      t.electricShockUntil=Math.max(Number(t.electricShockUntil||0),now+.48);
+      t.setActionState?.("panic",{target:null,reason:"\u611f\u96fb\u3057\u3066\u3044\u308b\u3002",wake:true,sleeping:false});
+      if(t.isAcquiredTarinai&&now>=Number(t.ochibiElectricVoiceAt||0)){t.ochibiElectricVoiceAt=now+1.8;if(t.bubble?.("びりびりちゃ！",1.4,"rgba(70,104,168,0.82)",{force:true})){const a=globalThis.TarinaiAudio;if(a?.playSample)a.playSample("voice_ochibi_electric_006",.9,"voice")||a.play?.("voice_ochibi_electric_006",{category:"voice",minGap:.9});}}
+      world.queueEffect?.("electric_shock",t.x,t.y-Math.max(2,(t.radius||18)*.15),{size:Math.max(18,(t.radius||18)*1.35),life:.32,color:"rgba(122,224,255,0.98)",importance:3,forceVisual:true});
+      hit++;
+    }
+    for(const ant of world.ants||[]){
+      if(!ant||ant.dead)continue;
+      const d=distXY(item.x,item.y,ant.x,ant.y);
+      if(d>radius+(ant.r||6))continue;
+      ant.hp=Math.max(0,Number(ant.hp??ant.maxHp??32)-1.4);
+      ant.hpBarTimer=Math.max(Number(ant.hpBarTimer||0),.7);
+      hit++;
+    }
+    world.queueEffect?.("ring",item.x,item.y,{size:radius*.62,life:.22,color:"rgba(112,206,255,0.38)"});
+    world.drawListDirty=true;
+    return hit;
+  }
+
+  function updateLeakage(item,dt,world){
+    // Electrical damage is applied after the signal graph has been resolved for
+    // this simulation step. Keep the per-item update as a lightweight no-op.
+    return true;
+  }
+
+  function updatePoweredHazards(world,dt){
+    let hit=0;
+    for(const item of (world?.itemsOfType?.("leakage_device")||[])) hit+=pulseLeakage(item,world);
+    return hit;
+  }
+
+  function spawnPoisonGas(world,can){
+    if(!world||!can||can._gasReleased)return 0;
+    can._gasReleased=true;
+    let n=0;
+    const sizeScale=Math.max(.55,Math.min(1.8,Number(can.r||28)/28));
+    const count=Math.max(7,Math.round(10*sizeScale));
+    for(let i=0;i<count;i++){
+      const a=Math.PI*2*i/count+Math.random()*.28;
+      const d=(10+Math.random()*56)*sizeScale;
+      const g=new Item("poison_gas",can.x+Math.cos(a)*d,can.y+Math.sin(a)*d*.72);
+      g.r=(82+Math.random()*48)*sizeScale;
+      g.gasConcentration=.82+Math.random()*.28;
+      g.gasLife=(18+Math.random()*8)*Math.sqrt(sizeScale);
+      g.gasExpansion=(58+Math.random()*42)*sizeScale;
+      g.vx=Math.cos(a)*(10+Math.random()*20)*sizeScale;
+      g.vy=Math.sin(a)*(10+Math.random()*20)*sizeScale;
+      if(world.addItem?.(g,"poison-gas",{terrain:false}))n++;
+    }
+    world.drawListDirty=true;
+    return n;
+  }
+
+  function burstPoisonGasCan(item,world,reason="fuse"){
+    if(!item||item.dead||item._gasReleased)return false;
+    const x=item.x,y=item.y;
+    const sizeScale=Math.max(.55,Math.min(1.8,Number(item.r||28)/28));
+    spawnPoisonGas(world,item);
+    world?.spawnEffect?.("explosion",x,y,{size:72*sizeScale,life:.58,color:"rgba(136,74,170,0.78)"});
+    world?.spawnEffect?.("ring",x,y,{size:112*sizeScale,life:.54,color:"rgba(184,108,216,0.52)"});
+    world?.applyExplosionExternalForces?.(x,y,105*sizeScale,item,.42*sizeScale,"poison-gas-can");
+    item.amount=0;
+    item.hp=0;
+    world?.markItemBucketsDirty?.("poison-gas-can-burst");
+    world?.markSpatialDirty?.("poison-gas-can-burst");
+    world && (world.drawListDirty=true);
+    global.TarinaiAudio?.explode?.();
+    world?.log?.("\u6bd2\u30ac\u30b9\u7f36\u304c\u7834\u88c2\u3057\u3001\u6bd2\u30ac\u30b9\u304c\u5e83\u304c\u3063\u305f\u3002","accident");
+    return true;
+  }
+
+  function updatePoisonGasCan(item,dt,world){
+    item.fuseTimer=Math.max(0,Number(item.fuseTimer??5)-Math.max(0,Number(dt||0)));
+    if(item.fuseTimer<=0) burstPoisonGasCan(item,world,"fuse");
+    return true;
+  }
+
+  function updateGas(item,dt,world){
+    item.gasAge=(item.gasAge||0)+dt;
+    const life=Math.max(1,item.gasLife||22);
+    item.gasConcentration=Math.max(0,1-item.gasAge/life);
+    item.r+=(Math.max(36,Number(item.gasExpansion||72))/life)*dt;
+    for(const fan of (world?.itemsOfType?.("fan")||[])){
+      const wind=global.TarinaiItemDynamicBallSystem?.fanWindAt?.(fan,item.x,item.y,{range:430});
+      if(wind){
+        const a=itemAngleFor(fan),f=82*wind.falloff*dt;
+        item.vx=(item.vx||0)+Math.cos(a)*f;
+        item.vy=(item.vy||0)+Math.sin(a)*f;
+      }
+    }
+    item.x+=(item.vx||0)*dt;
+    item.y+=(item.vy||0)*dt;
+    item.vx*=Math.pow(.62,dt);
+    item.vy*=Math.pow(.62,dt);
+    for(const t of world?.tarinai||[]){
+      if(!t||t.dead)continue;
+      if(distXY(item.x,item.y,t.x,t.y)<=item.r+(t.radius||18)) t.damage?.(.16*item.gasConcentration*dt,"\u6bd2\u30ac\u30b9",{source:item});
+    }
+    if(item.gasConcentration<=.01)item.amount=0;
+    return true;
+  }
+
+  function update(item,dt,world){
+    if(!item||item.dead)return false;
+    if(item.type==="oil")return updateOil(item,dt,world);
+    if(item.type==="bear_trap")return updateBearTrap(item,dt,world);
+    if(item.type==="leakage_device")return updateLeakage(item,dt,world);
+    if(item.type==="poison_gas_can")return updatePoisonGasCan(item,dt,world);
+    if(item.type==="poison_gas")return updateGas(item,dt,world);
+    if(item.type==="mamekusaredake"||item.type==="mame_spore") return global.TarinaiMamekusaredakeSystem?.updateItem?.(item,dt,world) || false;
+    return false;
+  }
+
+  global.TarinaiItemEnvironmentHazardSystem=Object.freeze({
+    update,
+    updatePoweredHazards,
+    enforceTrapHolds,
+    groundFrictionMultiplier,
+    igniteOil,
+    igniteOilNear,
+    spawnPoisonGas,
+    burstPoisonGasCan,
+    leakageRadius,
+  });
+})(typeof window!=="undefined"?window:globalThis);
diff --git a/js/item_lifecycle_step_frame.js b/js/item_lifecycle_step_frame.js
index a8eddc3..8db4499 100644
--- a/js/item_lifecycle_step_frame.js
+++ b/js/item_lifecycle_step_frame.js
@@ -6,7 +6,7 @@
 (function (global) {
   function update(item, dt, worldRef) {
     if (!item || item.dead) return { done: true };
-    item.age += dt;
+    item.age = Math.max(0, Number.isFinite(Number(item.age)) ? Number(item.age) : 0) + Math.max(0, Number(dt) || 0);
     if (item.type === "zunchi") item.spawnGrace = Math.max(0, (item.spawnGrace || 0) - dt);
     if (item.type === "toilet") item.toiletFlash = Math.max(0, (item.toiletFlash || 0) - dt * 1.8);
     if (item.dropTimer > 0) {
diff --git a/js/item_lifecycle_support.js b/js/item_lifecycle_support.js
index 4c4482e..2eba1ed 100644
--- a/js/item_lifecycle_support.js
+++ b/js/item_lifecycle_support.js
@@ -69,7 +69,7 @@ function duplicatorSetStoredType(duplicator, storedType = "", worldRef = null, o
   worldRef?.markItemBucketsDirty?.(changed ? "duplicator-direct-reloaded" : "duplicator-direct-loaded");
   worldRef?.markSpatialDirty?.(changed ? "duplicator-direct-reloaded" : "duplicator-direct-loaded");
   worldRef?.markTerrainDirty?.(changed ? "duplicator-direct-reloaded" : "duplicator-direct-loaded");
-  if (options.log !== false) worldRef?.log?.(`\u8907\u88fd\u6a5f\u306b${duplicator.storedFoodLabel}\u3092\u30bb\u30c3\u30c8\u3057\u305f\u3002`, isPinType(loadType) ? "observe" : "food");
+  // Direct duplicator loading is a player operation and is not an event-log entry.
   return true;
 }
 
@@ -102,7 +102,7 @@ function duplicatorApplyStoredPin(duplicator, worldRef) {
     duplicator.usedCount = (duplicator.usedCount || 0) + 1;
     duplicator.nextDuplicatedPinAt = now + 0.82;
     duplicator.duplicatorPinFlash = 0.24;
-    worldRef.effects?.push(new Effect("ring", dish.x, dish.y, { size: Math.max(15, (duplicator.r || 34) * 0.62), life: 0.18, color: storedType === "oshibyo" ? "rgba(73,119,205,0.40)" : "rgba(214,72,72,0.42)" }));
+    worldRef.queueEffect?.("ring", dish.x, dish.y, { size: Math.max(15, (duplicator.r || 34) * 0.62), life: 0.18, color: storedType === "oshibyo" ? "rgba(73,119,205,0.40)" : "rgba(214,72,72,0.42)" });
     worldRef.drawListDirty = true;
     worldRef.markSpatialDirty?.("duplicator-pin-lodged");
     return true;
diff --git a/js/item_render_runtime.js b/js/item_render_runtime.js
index 1af3332..1bc87cb 100644
--- a/js/item_render_runtime.js
+++ b/js/item_render_runtime.js
@@ -629,37 +629,50 @@ draw(ctx, t, lighting = null) {
       const r = this.r || 60;
       const tilt = Number(this.seesawTilt || 0) || 0;
       ctx.save();
-      ctx.fillStyle = styleNight ? "rgba(81,68,57,0.96)" : "rgba(130,99,69,0.98)";
-      ctx.strokeStyle = styleNight ? "rgba(41,34,29,0.86)" : "rgba(78,55,37,0.82)";
-      ctx.lineWidth = 2.4;
+      const standGrad = ctx.createLinearGradient(-r * 0.30, -r * 0.05, r * 0.30, r * 0.55);
+      standGrad.addColorStop(0, styleNight ? "#667078" : "#a9b6bd");
+      standGrad.addColorStop(0.55, styleNight ? "#3f474d" : "#718089");
+      standGrad.addColorStop(1, styleNight ? "#2b3135" : "#4a555c");
+      ctx.fillStyle = standGrad;
+      ctx.strokeStyle = styleNight ? "rgba(22,25,28,0.94)" : "rgba(48,57,63,0.92)";
+      ctx.lineWidth = 2.6;
       ctx.beginPath();
-      ctx.moveTo(-r * 0.22, r * 0.42);
-      ctx.lineTo(0, -r * 0.05);
-      ctx.lineTo(r * 0.22, r * 0.42);
-      ctx.closePath(); ctx.fill(); ctx.stroke();
+      ctx.moveTo(-r * 0.34, r * 0.52);
+      ctx.lineTo(-r * 0.12, -r * 0.04);
+      ctx.quadraticCurveTo(0, -r * 0.20, r * 0.12, -r * 0.04);
+      ctx.lineTo(r * 0.34, r * 0.52);
+      ctx.closePath();
+      ctx.fill(); ctx.stroke();
+      ctx.fillStyle = styleNight ? "#31383c" : "#526069";
+      roundedRect(ctx, -r * 0.52, r * 0.45, r * 1.04, r * 0.16, r * 0.07);
+      ctx.fill(); ctx.stroke();
       ctx.save();
       ctx.rotate(tilt);
-      const grad = ctx.createLinearGradient(0, -r * 0.14, 0, r * 0.14);
-      grad.addColorStop(0, styleNight ? "#c5895c" : "#f0ad6f");
-      grad.addColorStop(1, styleNight ? "#8d5d3f" : "#ba7447");
-      ctx.fillStyle = grad;
-      ctx.strokeStyle = styleNight ? "rgba(57,37,29,0.9)" : "rgba(104,59,35,0.85)";
-      roundedRect(ctx, -r * 1.08, -r * 0.13, r * 2.16, r * 0.26, r * 0.08);
+      const boardGrad = ctx.createLinearGradient(0, -r * 0.17, 0, r * 0.17);
+      boardGrad.addColorStop(0, styleNight ? "#c58a27" : "#ffc94f");
+      boardGrad.addColorStop(0.48, styleNight ? "#9e681c" : "#eaa52d");
+      boardGrad.addColorStop(1, styleNight ? "#774b17" : "#b96c1c");
+      ctx.fillStyle = boardGrad;
+      ctx.strokeStyle = styleNight ? "#4b2f12" : "#734315";
+      ctx.lineWidth = 3;
+      roundedRect(ctx, -r * 1.16, -r * 0.14, r * 2.32, r * 0.28, r * 0.10);
       ctx.fill(); ctx.stroke();
+      ctx.fillStyle = "rgba(255,255,255,0.28)";
+      roundedRect(ctx, -r * 1.05, -r * 0.095, r * 2.10, r * 0.055, r * 0.025);
+      ctx.fill();
       for (const side of [-1, 1]) {
-        ctx.fillStyle = side < 0 ? "rgba(88,177,231,0.98)" : "rgba(239,111,116,0.98)";
-        roundedRect(ctx, side * r * 0.79 - r * 0.18, -r * 0.26, r * 0.36, r * 0.22, r * 0.07);
+        ctx.fillStyle = side < 0 ? (styleNight ? "#6a314a" : "#df5f8d") : (styleNight ? "#31577a" : "#5d9ee0");
+        ctx.strokeStyle = styleNight ? "#1f2428" : "#3c4650";
+        ctx.lineWidth = 2.2;
+        roundedRect(ctx, side * r * 0.78 - r * 0.22, -r * 0.22, r * 0.44, r * 0.24, r * 0.09);
         ctx.fill(); ctx.stroke();
-        ctx.strokeStyle = "rgba(70,55,45,0.75)";
-        ctx.lineWidth = 2;
-        ctx.beginPath();
-        ctx.moveTo(side * r * 0.90, -r * 0.22);
-        ctx.lineTo(side * r * 0.90, -r * 0.52);
-        ctx.stroke();
       }
+      ctx.fillStyle = styleNight ? "#b8c0c4" : "#dce3e5";
+      ctx.strokeStyle = styleNight ? "#3a4145" : "#59656b";
+      ctx.lineWidth = 2;
+      ctx.beginPath(); ctx.arc(0, 0, r * 0.13, 0, Math.PI * 2); ctx.fill(); ctx.stroke();
+      ctx.beginPath(); ctx.arc(0, 0, r * 0.045, 0, Math.PI * 2); ctx.fillStyle = "#596168"; ctx.fill();
       ctx.restore();
-      ctx.fillStyle = "rgba(70,58,48,0.9)";
-      ctx.beginPath(); ctx.arc(0, 0, r * 0.13, 0, Math.PI * 2); ctx.fill();
       ctx.restore();
     } else if (this.type === "circuit_board") {
       const circuit = globalThis.TarinaiCircuitBoardSystem;
@@ -823,33 +836,57 @@ draw(ctx, t, lighting = null) {
     } else if (this.type === "stove") {
       const r = this.r || 24;
       const powered = globalThis.TarinaiSignalSystem?.powerOverride?.(this) !== false;
+      const timeNow = this.world?.time || (typeof performance !== "undefined" ? performance.now() * 0.001 : 0);
       ctx.save();
       if (powered && itemShadowsEnabled()) {
-        ctx.shadowColor = "rgba(255, 120, 43, 0.34)";
-        ctx.shadowBlur = 9;
+        ctx.shadowColor = "rgba(255, 116, 36, 0.42)";
+        ctx.shadowBlur = 13;
       }
-      ctx.fillStyle = styleNight ? "rgba(96, 72, 58, 0.96)" : "rgba(150, 104, 76, 0.96)";
-      ctx.strokeStyle = styleNight ? "rgba(49, 35, 29, 0.78)" : "rgba(92, 62, 45, 0.72)";
-      ctx.lineWidth = 2.2;
-      roundedRect(ctx, -r * 0.78, -r * 0.62, r * 1.56, r * 1.24, r * 0.20);
-      ctx.fill();
-      ctx.stroke();
-      ctx.fillStyle = "rgba(42, 32, 28, 0.92)";
-      roundedRect(ctx, -r * 0.48, -r * 0.34, r * 0.96, r * 0.62, r * 0.14);
-      ctx.fill();
+      const iron = ctx.createLinearGradient(-r, -r, r, r);
+      iron.addColorStop(0, styleNight ? "#4a4d4e" : "#737778");
+      iron.addColorStop(0.45, styleNight ? "#292c2d" : "#484d4e");
+      iron.addColorStop(1, styleNight ? "#17191a" : "#292d2e");
+      ctx.fillStyle = iron;
+      ctx.strokeStyle = "rgba(18,20,20,0.94)";
+      ctx.lineWidth = 2.6;
+      roundedRect(ctx, -r * 0.22, -r * 1.34, r * 0.44, r * 0.72, r * 0.08);
+      ctx.fill(); ctx.stroke();
+      ctx.fillStyle = styleNight ? "#26292a" : "#3f4445";
+      roundedRect(ctx, -r * 0.84, -r * 0.70, r * 1.68, r * 1.38, r * 0.18);
+      ctx.fill(); ctx.stroke();
+      ctx.fillStyle = styleNight ? "#101213" : "#242829";
+      ctx.beginPath(); ctx.ellipse(0, -r * 0.68, r * 0.62, r * 0.18, 0, 0, Math.PI * 2); ctx.fill(); ctx.stroke();
+      ctx.strokeStyle = powered ? "rgba(255,136,54,0.76)" : "rgba(112,116,115,0.62)";
+      ctx.lineWidth = 1.8;
+      for (const rr of [0.44, 0.28]) { ctx.beginPath(); ctx.ellipse(0, -r * 0.68, r * rr, r * rr * 0.29, 0, 0, Math.PI * 2); ctx.stroke(); }
+      ctx.fillStyle = "#0d1010";
+      ctx.strokeStyle = styleNight ? "#6a6f70" : "#8b9293";
+      ctx.lineWidth = 2.4;
+      roundedRect(ctx, -r * 0.54, -r * 0.30, r * 1.08, r * 0.68, r * 0.10);
+      ctx.fill(); ctx.stroke();
       if (powered) {
-        const flame = 0.85 + 0.15 * Math.sin((this.world?.time || (typeof performance !== "undefined" ? performance.now() * 0.001 : 0)) * 4.2 + (this.seed || 0));
-        ctx.fillStyle = "rgba(255, 168, 57, 0.92)";
+        const flicker = 0.88 + Math.sin(timeNow * 5.1 + (this.seed || 0)) * 0.08;
+        const fireGrad = ctx.createRadialGradient(0, r * 0.16, 1, 0, r * 0.10, r * 0.54);
+        fireGrad.addColorStop(0, "rgba(255,246,150,0.98)");
+        fireGrad.addColorStop(0.35, "rgba(255,169,53,0.96)");
+        fireGrad.addColorStop(1, "rgba(194,49,20,0.28)");
+        ctx.fillStyle = fireGrad;
         ctx.beginPath();
-        ctx.moveTo(0, r * 0.16);
-        ctx.bezierCurveTo(-r * 0.38, -r * 0.10, -r * 0.10, -r * 0.52 * flame, 0, -r * 0.66 * flame);
-        ctx.bezierCurveTo(r * 0.34, -r * 0.20, r * 0.40, -r * 0.02, 0, r * 0.16);
-        ctx.fill();
-        ctx.fillStyle = "rgba(255, 235, 120, 0.82)";
-        ctx.beginPath();
-        ctx.ellipse(0, -r * 0.10, r * 0.16, r * 0.28 * flame, 0, 0, Math.PI * 2);
-        ctx.fill();
+        ctx.moveTo(-r * 0.42, r * 0.30);
+        ctx.bezierCurveTo(-r * 0.48, r * 0.02, -r * 0.28, -r * 0.20 * flicker, -r * 0.10, r * 0.03);
+        ctx.bezierCurveTo(0, -r * 0.34 * flicker, r * 0.25, -r * 0.12, r * 0.16, r * 0.05);
+        ctx.bezierCurveTo(r * 0.42, -r * 0.04, r * 0.46, r * 0.17, r * 0.40, r * 0.30);
+        ctx.closePath(); ctx.fill();
+        ctx.strokeStyle = "rgba(255,106,36,0.90)"; ctx.lineWidth = r * 0.11; ctx.lineCap = "round";
+        ctx.beginPath(); ctx.moveTo(-r * 0.31, r * 0.25); ctx.lineTo(r * 0.26, r * 0.13); ctx.moveTo(-r * 0.25, r * 0.10); ctx.lineTo(r * 0.31, r * 0.26); ctx.stroke();
       }
+      ctx.fillStyle = styleNight ? "#858b8d" : "#aeb5b6";
+      ctx.beginPath(); ctx.arc(r * 0.42, r * 0.02, r * 0.065, 0, Math.PI * 2); ctx.fill();
+      ctx.strokeStyle = styleNight ? "#686e70" : "#9da4a5"; ctx.lineWidth = 2;
+      for (const sx of [-1, 1]) { ctx.beginPath(); ctx.moveTo(sx * r * 0.70, -r * 0.15); ctx.lineTo(sx * r * 0.70, r * 0.30); ctx.stroke(); }
+      ctx.fillStyle = styleNight ? "#1a1c1d" : "#303435";
+      roundedRect(ctx, -r * 0.68, r * 0.58, r * 0.28, r * 0.30, r * 0.05); ctx.fill();
+      roundedRect(ctx, r * 0.40, r * 0.58, r * 0.28, r * 0.30, r * 0.05); ctx.fill();
       ctx.restore();
     } else if (this.type === "ant_nest") {
       const count = clamp(Math.round(this.antCount ?? ANT_NEST_START_COUNT ?? 6), 0, ANT_NEST_MAX_COUNT ?? 10);
@@ -944,6 +981,321 @@ draw(ctx, t, lighting = null) {
         ctx.stroke();
       }
       ctx.restore();
+    } else if (this.type === "oil") {
+      const r = this.r || 58;
+      const seed = Number(this.seed || 0);
+      ctx.save();
+      ctx.scale(1.42, 0.70);
+      const puddle = ctx.createRadialGradient(-r * 0.28, -r * 0.30, r * 0.08, 0, 0, r * 1.05);
+      if (this.oilBurning) {
+        puddle.addColorStop(0, "rgba(92,65,25,0.96)");
+        puddle.addColorStop(0.48, "rgba(54,42,23,0.96)");
+        puddle.addColorStop(1, "rgba(22,20,16,0.94)");
+      } else {
+        puddle.addColorStop(0, "rgba(118,94,42,0.94)");
+        puddle.addColorStop(0.42, "rgba(58,51,34,0.96)");
+        puddle.addColorStop(1, "rgba(20,22,19,0.94)");
+      }
+      ctx.fillStyle = puddle;
+      ctx.strokeStyle = "rgba(16,17,14,0.78)";
+      ctx.lineWidth = 2.2;
+      ctx.beginPath();
+      const points = 18;
+      for (let i = 0; i <= points; i++) {
+        const a = Math.PI * 2 * i / points;
+        const wobble = 0.86 + 0.10 * Math.sin(seed * 0.37 + i * 1.73) + 0.06 * Math.cos(seed * 0.19 + i * 2.41);
+        const px = Math.cos(a) * r * wobble;
+        const py = Math.sin(a) * r * wobble;
+        if (i === 0) ctx.moveTo(px, py); else ctx.lineTo(px, py);
+      }
+      ctx.closePath();
+      ctx.fill();
+      ctx.stroke();
+      ctx.globalAlpha *= 0.62;
+      ctx.strokeStyle = this.oilBurning ? "rgba(255,151,45,0.46)" : "rgba(142,184,149,0.44)";
+      ctx.lineWidth = 3.2;
+      ctx.beginPath();
+      ctx.ellipse(-r * 0.20, -r * 0.18, r * 0.50, r * 0.17, -0.18, 3.42, 5.82);
+      ctx.stroke();
+      ctx.strokeStyle = this.oilBurning ? "rgba(255,207,92,0.32)" : "rgba(180,135,214,0.32)";
+      ctx.lineWidth = 2.1;
+      ctx.beginPath();
+      ctx.ellipse(r * 0.22, r * 0.16, r * 0.34, r * 0.10, 0.24, 0.15, 2.82);
+      ctx.stroke();
+      ctx.restore();
+    } else if (this.type === "bear_trap") {
+      const r = this.r || 34;
+      const closed = Boolean(this.trapClosed || this.trapTargetId);
+      ctx.save();
+      ctx.rotate((this.angle || 0) + 0.02 * Math.sin(this.seed || 0));
+      if (itemShadowsEnabled()) {
+        ctx.shadowColor = "rgba(0,0,0,0.22)";
+        ctx.shadowBlur = 4;
+        ctx.shadowOffsetY = 3;
+      }
+      // Chain and anchor ring.
+      ctx.strokeStyle = "rgba(72,66,61,0.95)";
+      ctx.lineWidth = 3.3;
+      for (let i = 0; i < 5; i++) {
+        const x = r * 0.78 + i * r * 0.28;
+        ctx.beginPath();
+        ctx.ellipse(x, r * 0.52 + Math.sin(i * 1.8) * 2, r * 0.16, r * 0.10, i % 2 ? 0.9 : -0.9, 0, Math.PI * 2);
+        ctx.stroke();
+      }
+      ctx.beginPath();
+      ctx.arc(r * 2.05, r * 0.52, r * 0.23, 0, Math.PI * 2);
+      ctx.stroke();
+      // Heavy base ring.
+      const metal = ctx.createLinearGradient(0, -r, 0, r);
+      metal.addColorStop(0, "#c6c8c6");
+      metal.addColorStop(0.48, "#757a78");
+      metal.addColorStop(1, "#3f4543");
+      ctx.fillStyle = "rgba(63,68,66,0.94)";
+      ctx.strokeStyle = "rgba(38,42,41,0.98)";
+      ctx.lineWidth = 5;
+      ctx.beginPath();
+      ctx.ellipse(0, 0, r * 0.88, r * 0.68, 0, 0, Math.PI * 2);
+      ctx.stroke();
+      // Side springs.
+      for (const sx of [-1, 1]) {
+        ctx.save();
+        ctx.translate(sx * r * 0.76, 0);
+        ctx.strokeStyle = "rgba(84,88,86,0.98)";
+        ctx.lineWidth = 3;
+        ctx.beginPath();
+        for (let i = 0; i <= 7; i++) {
+          const yy = -r * 0.30 + i * r * 0.086;
+          const xx = (i % 2 ? 1 : -1) * r * 0.09;
+          if (i === 0) ctx.moveTo(xx, yy); else ctx.lineTo(xx, yy);
+        }
+        ctx.stroke();
+        ctx.restore();
+      }
+      const gap = closed ? r * 0.14 : r * 0.46;
+      // Two opposing toothed jaws.
+      for (const side of [-1, 1]) {
+        ctx.save();
+        ctx.translate(0, side * gap);
+        ctx.scale(1, side);
+        ctx.fillStyle = metal;
+        ctx.strokeStyle = "rgba(52,57,55,0.98)";
+        ctx.lineWidth = 2.5;
+        ctx.beginPath();
+        ctx.moveTo(-r * 0.80, 0);
+        ctx.quadraticCurveTo(0, -r * 0.36, r * 0.80, 0);
+        ctx.lineTo(r * 0.70, r * 0.14);
+        ctx.quadraticCurveTo(0, -r * 0.16, -r * 0.70, r * 0.14);
+        ctx.closePath();
+        ctx.fill();
+        ctx.stroke();
+        for (let i = -4; i <= 4; i++) {
+          const x = i * r * 0.16;
+          const toothH = r * (closed ? 0.18 : 0.25);
+          ctx.fillStyle = "#b8bbb8";
+          ctx.strokeStyle = "rgba(54,58,56,0.96)";
+          ctx.lineWidth = 1.4;
+          ctx.beginPath();
+          ctx.moveTo(x - r * 0.055, -r * 0.03);
+          ctx.lineTo(x + r * 0.055, -r * 0.03);
+          ctx.lineTo(x, -toothH);
+          ctx.closePath();
+          ctx.fill();
+          ctx.stroke();
+        }
+        ctx.restore();
+      }
+      if (!closed) {
+        ctx.fillStyle = "#737873";
+        ctx.strokeStyle = "#454a47";
+        ctx.lineWidth = 2;
+        ctx.beginPath();
+        ctx.ellipse(0, 0, r * 0.34, r * 0.24, 0, 0, Math.PI * 2);
+        ctx.fill();
+        ctx.stroke();
+        ctx.fillStyle = "rgba(220,224,218,0.26)";
+        ctx.beginPath();
+        ctx.ellipse(-r * 0.08, -r * 0.06, r * 0.18, r * 0.08, -0.3, 0, Math.PI * 2);
+        ctx.fill();
+      }
+      ctx.restore();
+    } else if (this.type === "leakage_device") {
+      const r = this.r || 34;
+      const powered = Boolean(this._signalDriven && this._signalOn);
+      ctx.save();
+      if (itemShadowsEnabled()) {
+        ctx.shadowColor = "rgba(0,0,0,0.24)";
+        ctx.shadowBlur = 5;
+        ctx.shadowOffsetY = 4;
+      }
+      const baseGrad = ctx.createLinearGradient(-r, -r, r, r);
+      baseGrad.addColorStop(0, "#58636a");
+      baseGrad.addColorStop(0.5, "#30383e");
+      baseGrad.addColorStop(1, "#1c2429");
+      ctx.fillStyle = baseGrad;
+      ctx.strokeStyle = "#151b1f";
+      ctx.lineWidth = 2.6;
+      ctx.beginPath();
+      ctx.roundRect(-r * 0.92, r * 0.18, r * 1.84, r * 0.72, r * 0.12);
+      ctx.fill();
+      ctx.stroke();
+      // Porcelain insulators.
+      for (const sx of [-1, 1]) {
+        ctx.save();
+        ctx.translate(sx * r * 0.52, -r * 0.18);
+        const porcelain = ctx.createLinearGradient(-r * 0.22, 0, r * 0.22, 0);
+        porcelain.addColorStop(0, "#8e9697");
+        porcelain.addColorStop(0.45, "#eef0e8");
+        porcelain.addColorStop(1, "#747d7e");
+        ctx.fillStyle = porcelain;
+        ctx.strokeStyle = "rgba(65,72,73,0.94)";
+        ctx.lineWidth = 1.6;
+        ctx.fillRect(-r * 0.13, -r * 0.58, r * 0.26, r * 0.70);
+        for (let i = 0; i < 4; i++) {
+          ctx.beginPath();
+          ctx.ellipse(0, -r * 0.50 + i * r * 0.17, r * 0.24, r * 0.075, 0, 0, Math.PI * 2);
+          ctx.fill();
+          ctx.stroke();
+        }
+        ctx.fillStyle = "#9f713d";
+        ctx.fillRect(-r * 0.07, -r * 0.76, r * 0.14, r * 0.18);
+        ctx.restore();
+      }
+      // Copper transformer coil.
+      ctx.strokeStyle = powered ? "#ffc763" : "#b4773b";
+      ctx.lineWidth = 3.2;
+      for (let i = 0; i < 7; i++) {
+        const yy = -r * 0.35 + i * r * 0.10;
+        ctx.beginPath();
+        ctx.ellipse(0, yy, r * 0.27, r * 0.08, 0, 0, Math.PI * 2);
+        ctx.stroke();
+      }
+      ctx.fillStyle = "rgba(241,194,62,0.95)";
+      ctx.strokeStyle = "rgba(80,61,18,0.95)";
+      ctx.lineWidth = 1.5;
+      ctx.beginPath();
+      ctx.moveTo(-r * 0.18, r * 0.46);
+      ctx.lineTo(0, r * 0.22);
+      ctx.lineTo(r * 0.18, r * 0.46);
+      ctx.closePath();
+      ctx.fill();
+      ctx.stroke();
+      if (powered) {
+        ctx.shadowColor = "rgba(112,220,255,0.78)";
+        ctx.shadowBlur = 10;
+        ctx.strokeStyle = "rgba(142,232,255,0.96)";
+        ctx.lineWidth = 2.2;
+        for (let arc = 0; arc < 3; arc++) {
+          const phase = t * 13 + (this.seed || 0) * 0.17 + arc * 1.9;
+          ctx.beginPath();
+          let x = -r * 0.48;
+          let y = -r * 0.73;
+          ctx.moveTo(x, y);
+          for (let j = 1; j <= 6; j++) {
+            x = -r * 0.48 + j * r * 0.16;
+            y = -r * 0.73 + Math.sin(phase + j * 2.1) * r * 0.16;
+            ctx.lineTo(x, y);
+          }
+          ctx.stroke();
+        }
+      }
+      ctx.restore();
+    } else if (this.type === "poison_gas_can") {
+      const r = this.r || 28;
+      const fuseRatio = clamp((this.fuseTimer ?? 5) / Math.max(0.1, this.fuseMax || 5), 0, 1);
+      ctx.save();
+      if (itemShadowsEnabled()) {
+        ctx.shadowColor = "rgba(0,0,0,0.26)";
+        ctx.shadowBlur = 5;
+        ctx.shadowOffsetY = 4;
+      }
+      const body = ctx.createLinearGradient(-r * 0.72, 0, r * 0.72, 0);
+      body.addColorStop(0, "#493552");
+      body.addColorStop(0.24, "#80588f");
+      body.addColorStop(0.54, "#9c72a7");
+      body.addColorStop(0.78, "#64446f");
+      body.addColorStop(1, "#382d41");
+      ctx.fillStyle = body;
+      ctx.strokeStyle = "rgba(49,36,56,0.98)";
+      ctx.lineWidth = 2.4;
+      ctx.beginPath();
+      ctx.roundRect(-r * 0.62, -r * 0.82, r * 1.24, r * 1.64, r * 0.28);
+      ctx.fill();
+      ctx.stroke();
+      // Reinforcing bands.
+      for (const yy of [-r * 0.44, r * 0.38]) {
+        ctx.fillStyle = "rgba(49,43,52,0.88)";
+        ctx.fillRect(-r * 0.67, yy, r * 1.34, r * 0.12);
+        ctx.fillStyle = "rgba(190,151,72,0.72)";
+        for (let i = -2; i <= 2; i++) ctx.fillRect(i * r * 0.25 - r * 0.05, yy, r * 0.10, r * 0.12);
+      }
+      // Valve, cap and pressure gauge.
+      ctx.fillStyle = "#6d7471";
+      ctx.strokeStyle = "#303633";
+      ctx.lineWidth = 2;
+      ctx.fillRect(-r * 0.18, -r * 1.02, r * 0.36, r * 0.23);
+      ctx.strokeRect(-r * 0.18, -r * 1.02, r * 0.36, r * 0.23);
+      ctx.beginPath();
+      ctx.arc(r * 0.35, -r * 0.91, r * 0.18, 0, Math.PI * 2);
+      ctx.fillStyle = "#d9d6c5";
+      ctx.fill();
+      ctx.stroke();
+      ctx.strokeStyle = fuseRatio < 0.28 && Math.sin(t * 20) > 0 ? "#ff4f5f" : "#6e2d37";
+      ctx.lineWidth = 2.2;
+      ctx.beginPath();
+      ctx.moveTo(r * 0.35, -r * 0.91);
+      ctx.lineTo(r * 0.35 + Math.cos(-2.5 + fuseRatio * 2.0) * r * 0.12, -r * 0.91 + Math.sin(-2.5 + fuseRatio * 2.0) * r * 0.12);
+      ctx.stroke();
+      // Corrosion and vent dots.
+      ctx.fillStyle = "rgba(66,42,31,0.54)";
+      for (let i = 0; i < 7; i++) {
+        const a = (this.seed || 0) * 0.21 + i * 1.7;
+        ctx.beginPath();
+        ctx.arc(Math.sin(a) * r * 0.43, Math.cos(a * 1.3) * r * 0.58, r * (0.035 + (i % 3) * 0.018), 0, Math.PI * 2);
+        ctx.fill();
+      }
+      ctx.fillStyle = "rgba(225,205,118,0.88)";
+      ctx.beginPath();
+      ctx.moveTo(0, -r * 0.18);
+      ctx.lineTo(-r * 0.24, r * 0.18);
+      ctx.lineTo(r * 0.24, r * 0.18);
+      ctx.closePath();
+      ctx.fill();
+      ctx.fillStyle = "rgba(73,45,82,0.95)";
+      ctx.beginPath();
+      ctx.arc(0, r * 0.04, r * 0.06, 0, Math.PI * 2);
+      ctx.fill();
+      const timerText = String(Math.max(0, Math.ceil(this.fuseTimer ?? 5)));
+      ctx.fillStyle = "rgba(255,249,230,0.98)";
+      ctx.strokeStyle = "rgba(53,31,61,0.98)";
+      ctx.lineWidth = Math.max(2.4, r * 0.09);
+      ctx.font = `900 ${Math.max(12, r * 0.68)}px ui-rounded, sans-serif`;
+      ctx.textAlign = "center";
+      ctx.textBaseline = "middle";
+      ctx.strokeText(timerText, 0, r * 0.08);
+      ctx.fillText(timerText, 0, r * 0.08);
+      ctx.restore();
+    } else if (this.type === "poison_gas") {
+      const r = this.r || 96;
+      const c = Math.max(0, Math.min(1, this.gasConcentration ?? 1));
+      ctx.save();
+      ctx.globalAlpha *= 0.16 + 0.46 * c;
+      for (let i = 0; i < 7; i++) {
+        const a = (this.seed || 0) * 0.13 + i * 2.17;
+        const ox = Math.cos(a) * r * (0.16 + (i % 3) * 0.07);
+        const oy = Math.sin(a * 1.21) * r * (0.12 + (i % 2) * 0.07);
+        const rr = r * (0.48 + (i % 4) * 0.08);
+        const g = ctx.createRadialGradient(ox - rr * 0.18, oy - rr * 0.18, rr * 0.10, ox, oy, rr);
+        g.addColorStop(0, `rgba(198,112,226,${0.60 + c * 0.22})`);
+        g.addColorStop(0.54, `rgba(132,62,166,${0.34 + c * 0.28})`);
+        g.addColorStop(1, "rgba(83,39,112,0.02)");
+        ctx.fillStyle = g;
+        ctx.beginPath();
+        ctx.arc(ox, oy, rr, 0, Math.PI * 2);
+        ctx.fill();
+      }
+      ctx.restore();
+    } else if (this.type === "mamekusaredake" || this.type === "mame_spore") {
+      globalThis.TarinaiMamekusaredakeSystem?.drawItem?.(ctx, this, t);
     } else if (this.type === "fan") {
       const r = this.r || 26;
       const bodyAngle = Number.isFinite(Number(this.fanBodyAngle)) ? normalizedItemAngle(Number(this.fanBodyAngle), itemAngleFor(this)) : itemAngleFor(this);
@@ -1163,34 +1515,73 @@ draw(ctx, t, lighting = null) {
       const fuse = clamp((this.fuseTimer ?? 5) / Math.max(this.fuseMax || 5, 0.1), 0, 1);
       const flash = fuse < 0.35 ? (0.5 + Math.sin(t * 20 + this.seed) * 0.5) : 0;
       const timerText = String(Math.max(0, Math.ceil(this.fuseTimer ?? 5)));
-      ctx.rotate(-0.22 + Math.sin(this.seed) * 0.12);
-      ctx.fillStyle = flash > 0.65 ? "#ffed77" : (flameMode ? "#d8241f" : "#5a4744");
-      ctx.strokeStyle = flameMode ? "rgba(96,18,18,0.88)" : "rgba(35,30,29,0.88)";
-      ctx.lineWidth = 2;
-      roundedRect(ctx, -this.r * 0.72, -this.r * 0.86, this.r * 1.44, this.r * 1.72, 5);
-      ctx.fill();
-      ctx.stroke();
-      ctx.fillStyle = flameMode ? "#ff6b32" : "#897065";
-      ctx.fillRect(-this.r * 0.55, -this.r * 0.54, this.r * 1.1, this.r * 0.20);
-      ctx.fillRect(-this.r * 0.55, this.r * 0.34, this.r * 1.1, this.r * 0.20);
-      ctx.strokeStyle = "rgba(48,38,31,0.86)";
-      ctx.lineWidth = 2.2;
-      ctx.beginPath();
-      ctx.moveTo(0, -this.r * 0.88);
-      ctx.quadraticCurveTo(this.r * 0.32, -this.r * 1.34, this.r * 0.92, -this.r * 1.42);
-      ctx.stroke();
-      ctx.fillStyle = flash > 0.1 ? "rgba(255,221,82,0.92)" : (flameMode ? "rgba(255,80,40,0.78)" : "rgba(188,148,88,0.62)");
-      ctx.beginPath();
-      ctx.arc(this.r * 0.98, -this.r * 1.42, 2.5 + flash * 2.2, 0, Math.PI * 2);
-      ctx.fill();
-      ctx.fillStyle = "rgba(255,246,214,0.92)";
-      ctx.strokeStyle = flameMode ? "rgba(84,18,14,0.92)" : "rgba(24,22,21,0.92)";
+      ctx.save();
+      ctx.rotate(-0.18 + Math.sin(this.seed) * 0.10);
+      const bodyGrad = ctx.createLinearGradient(-this.r * 0.74, 0, this.r * 0.74, 0);
+      if (flameMode) {
+        bodyGrad.addColorStop(0, flash > 0.72 ? "#ffe36c" : "#6c1516");
+        bodyGrad.addColorStop(0.28, "#d52c25");
+        bodyGrad.addColorStop(0.56, "#f2522d");
+        bodyGrad.addColorStop(1, "#7f1817");
+      } else {
+        bodyGrad.addColorStop(0, flash > 0.72 ? "#ffef91" : "#5e221f");
+        bodyGrad.addColorStop(0.28, "#a73a30");
+        bodyGrad.addColorStop(0.56, "#c74b3c");
+        bodyGrad.addColorStop(1, "#67241f");
+      }
+      ctx.fillStyle = bodyGrad;
+      ctx.strokeStyle = flameMode ? "rgba(80,16,14,0.96)" : "rgba(66,25,22,0.96)";
       ctx.lineWidth = 2.6;
-      ctx.font = `bold ${Math.max(10, this.r * 0.72)}px ui-rounded, sans-serif`;
+      roundedRect(ctx, -this.r * 0.66, -this.r * 0.88, this.r * 1.32, this.r * 1.76, this.r * 0.16);
+      ctx.fill(); ctx.stroke();
+      ctx.fillStyle = flameMode ? "#7f1717" : "#6d2822";
+      for (const sy of [-1, 1]) {
+        ctx.beginPath();
+        ctx.moveTo(-this.r * 0.58, sy * this.r * 0.80);
+        for (let i = 0; i <= 6; i++) {
+          const xx = -this.r * 0.58 + i * this.r * 0.193;
+          const yy = sy * this.r * (0.80 + (i % 2 ? 0.11 : 0.02));
+          ctx.lineTo(xx, yy);
+        }
+        ctx.lineTo(this.r * 0.58, sy * this.r * 0.80);
+        ctx.closePath(); ctx.fill();
+      }
+      ctx.fillStyle = flameMode ? "rgba(255,190,48,0.94)" : "rgba(245,222,180,0.90)";
+      roundedRect(ctx, -this.r * 0.52, -this.r * 0.38, this.r * 1.04, this.r * 0.76, this.r * 0.08);
+      ctx.fill();
+      if (flameMode) {
+        ctx.fillStyle = "#d43a22";
+        ctx.beginPath();
+        ctx.moveTo(0, this.r * 0.24);
+        ctx.bezierCurveTo(-this.r * 0.24, this.r * 0.03, -this.r * 0.08, -this.r * 0.19, 0, -this.r * 0.29);
+        ctx.bezierCurveTo(this.r * 0.28, -this.r * 0.06, this.r * 0.25, this.r * 0.12, 0, this.r * 0.24);
+        ctx.fill();
+      } else {
+        ctx.strokeStyle = "#8a342b"; ctx.lineWidth = 2;
+        ctx.beginPath(); ctx.moveTo(-this.r * 0.28, 0); ctx.lineTo(this.r * 0.28, 0); ctx.moveTo(0, -this.r * 0.22); ctx.lineTo(0, this.r * 0.22); ctx.stroke();
+      }
+      ctx.strokeStyle = "rgba(63,52,37,0.98)";
+      ctx.lineWidth = 3;
+      ctx.beginPath();
+      ctx.moveTo(this.r * 0.10, -this.r * 0.90);
+      ctx.bezierCurveTo(this.r * 0.30, -this.r * 1.18, this.r * 0.58, -this.r * 1.34, this.r * 0.88, -this.r * 1.25);
+      ctx.stroke();
+      ctx.strokeStyle = "rgba(196,151,73,0.82)"; ctx.lineWidth = 1;
+      ctx.beginPath(); ctx.moveTo(this.r * 0.13, -this.r * 0.92); ctx.bezierCurveTo(this.r * 0.34, -this.r * 1.16, this.r * 0.60, -this.r * 1.27, this.r * 0.86, -this.r * 1.23); ctx.stroke();
+      ctx.fillStyle = flash > 0.1 ? "rgba(255,235,104,0.98)" : "rgba(240,104,46,0.88)";
+      ctx.shadowColor = flash > 0.1 ? "rgba(255,186,44,0.85)" : "transparent";
+      ctx.shadowBlur = flash > 0.1 ? 8 : 0;
+      ctx.beginPath(); ctx.arc(this.r * 0.90, -this.r * 1.24, 3 + flash * 2.3, 0, Math.PI * 2); ctx.fill();
+      ctx.shadowBlur = 0;
+      ctx.fillStyle = "rgba(255,250,230,0.98)";
+      ctx.strokeStyle = flameMode ? "rgba(92,20,15,0.98)" : "rgba(65,25,22,0.98)";
+      ctx.lineWidth = 3;
+      ctx.font = `900 ${Math.max(11, this.r * 0.74)}px ui-rounded, sans-serif`;
       ctx.textAlign = "center";
       ctx.textBaseline = "middle";
       ctx.strokeText(timerText, 0, this.r * 0.02);
       ctx.fillText(timerText, 0, this.r * 0.02);
+      ctx.restore();
     } else if (this.type === "fence_v" || this.type === "fence_h" || this.type === "glass_wall" || this.type === "bounce_fence" || this.type === "bounce_fence_v" || this.type === "gate_fence" || this.type === "one_way_fence") {
       const bounce = this.type === "bounce_fence" || this.type === "bounce_fence_v";
       const gate = this.type === "gate_fence";
@@ -1202,9 +1593,9 @@ draw(ctx, t, lighting = null) {
       const open = gate && this.gateOpen;
       ctx.save();
       ctx.rotate(angle);
-      const wood = bounce ? (styleNight ? "#4e6f9f" : "#5aa2e0") : oneWay ? (styleNight ? "#6b5a86" : "#9b78c8") : gate ? (styleNight ? "#5d675f" : "#6f8b68") : (styleNight ? "#7a5b3c" : (styleWarm ? "#a96f35" : "#965f31"));
-      const edge = bounce ? (styleNight ? "#243755" : "#286093") : oneWay ? (styleNight ? "#352943" : "#593a80") : gate ? (styleNight ? "#334038" : "#375737") : (styleNight ? "#4d3d2f" : "#5f3f25");
-      const hi = bounce ? (styleNight ? "rgba(190,230,255,0.24)" : "rgba(235,252,255,0.54)") : oneWay ? (styleNight ? "rgba(232,220,255,0.25)" : "rgba(255,245,255,0.55)") : gate ? (styleNight ? "rgba(214,240,210,0.18)" : "rgba(220,255,210,0.34)") : (styleNight ? "rgba(198,166,116,0.20)" : "rgba(232,176,94,0.32)");
+      const wood = bounce ? (styleNight ? "#9b4f76" : "#ef76aa") : oneWay ? (styleNight ? "#6b5a86" : "#9b78c8") : gate ? (styleNight ? "#5d675f" : "#6f8b68") : (styleNight ? "#7a5b3c" : (styleWarm ? "#a96f35" : "#965f31"));
+      const edge = bounce ? (styleNight ? "#52253d" : "#a93f70") : oneWay ? (styleNight ? "#352943" : "#593a80") : gate ? (styleNight ? "#334038" : "#375737") : (styleNight ? "#4d3d2f" : "#5f3f25");
+      const hi = bounce ? (styleNight ? "rgba(255,213,235,0.24)" : "rgba(255,238,248,0.58)") : oneWay ? (styleNight ? "rgba(232,220,255,0.25)" : "rgba(255,245,255,0.55)") : gate ? (styleNight ? "rgba(214,240,210,0.18)" : "rgba(220,255,210,0.34)") : (styleNight ? "rgba(198,166,116,0.20)" : "rgba(232,176,94,0.32)");
       const drawRail = (x0, y0, w, h, alpha = 1) => {
         ctx.save();
         ctx.globalAlpha *= alpha;
diff --git a/js/item_tool_definitions.js b/js/item_tool_definitions.js
index 9a4850b..d71e146 100644
--- a/js/item_tool_definitions.js
+++ b/js/item_tool_definitions.js
@@ -13,6 +13,7 @@ const TOOL_DEFINITIONS = Object.freeze({
   poke: { id: "poke", label: "\u3064\u3064\u304f", placeable: false, scalable: false, iconText: "\u{1F448}", tooltip: "\u305f\u308a\u306a\u3044\u3092\u3064\u3064\u304f\u3002\u30dc\u30fc\u30eb\u3082\u3064\u3064\u3044\u3066\u8ee2\u304c\u305b\u308b\u3002" },
   pinch: { id: "pinch", label: "\u3064\u307e\u3080", placeable: false, scalable: false, iconText: "\u{1F90F}", tooltip: "\u305f\u308a\u306a\u3044\u3084\u4e00\u90e8\u306e\u7f6e\u304d\u3082\u306e\u3092\u79fb\u52d5\u3055\u305b\u308b\u3002" },
   new: { id: "new", label: "\u8ffd\u52a0", placeable: false, scalable: false, icon: "assets/ui/tool_new.webp", tooltip: "\u753b\u9762\u5916\u304b\u3089\u65b0\u3057\u3044\u305f\u308a\u306a\u3044\u3092\u547c\u3076\u3002" },
+  acquired_tarinai: { id: "acquired_tarinai", label: "おちび", placeable: false, scalable: false, icon: "assets/ui/tool_acquired_tarinai.webp", tooltip: "近所の鬼威惨から貰ったおちび。後天的なたりないらしい。" },
   water_hose: { id: "water_hose", label: "\u6d17\u6d44", placeable: false, scalable: false, iconText: "\u{1F6BF}", tooltip: "\u30c9\u30e9\u30c3\u30b0\u3067\u6c5a\u308c\u3084\u706b\u3092\u304d\u308c\u3044\u306b\u3059\u308b\u3002" },
   rope: { id: "rope", label: "\u30d2\u30e2", placeable: false, scalable: false, iconText: "\u2570", tooltip: "2\u3064\u306e\u5bfe\u8c61\u3092\u9806\u306b\u30af\u30ea\u30c3\u30af\u3057\u3066\u3075\u306b\u3083\u3075\u306b\u3083\u3057\u305f\u30d2\u30e2\u3067\u7e4b\u3050\u3002" },
   rod: { id: "rod", label: "\u68d2", placeable: false, scalable: false, iconText: "\u2501", tooltip: "2\u3064\u306e\u5bfe\u8c61\u3092\u9806\u306b\u30af\u30ea\u30c3\u30af\u3057\u3066\u3001\u66f2\u304c\u3089\u306a\u3044\u68d2\u3067\u63a5\u7d9a\u3059\u308b\u3002" },
@@ -20,6 +21,12 @@ const TOOL_DEFINITIONS = Object.freeze({
   wire: { id: "wire", label: "\u96fb\u7dda", placeable: false, scalable: false, iconText: "\u2301", tooltip: "\u691c\u77e5\u5668\u306e\u4fe1\u53f7\u3092\u96fb\u6c17\u3067\u4f1d\u3048\u308b\u3002\u89e6\u308b\u3068\u611f\u96fb\u3002" },
   insulated_wire: { id: "insulated_wire", label: "\u7d76\u7e01\u96fb\u7dda", placeable: false, scalable: false, iconText: "\u2301", tooltip: "\u691c\u77e5\u5668\u306e\u4fe1\u53f7\u3092\u96fb\u6c17\u3067\u4f1d\u3048\u308b\u3002\u611f\u96fb\u3057\u306a\u3044\u3002" },
   shoot: { id: "shoot", label: "\u5c04\u6483", placeable: false, scalable: false, icon: "assets/ui/tool_shoot.png", tooltip: "\u9283\u3067\u653b\u6483\u3059\u308b\u3002" },
+  oil: { id: "oil", itemType: "oil", label: "\u6cb9", placeable: true, scalable: true, radius: 58, amount: 100, iconText: "\u6cb9", tooltip: "\u6469\u64e6\u3092\u5927\u304d\u304f\u4e0b\u3052\u308b\u3002\u706b\u3084\u7206\u767a\u3067\u5f15\u706b\u3057\u3001\u71c3\u3048\u5c3d\u304d\u308b\u3068\u6d88\u3048\u308b\u3002" },
+  bear_trap: { id: "bear_trap", itemType: "bear_trap", label: "\u30c8\u30e9\u30d0\u30b5\u30df", placeable: true, scalable: false, radius: 34, amount: 999, iconText: "\u7f60", tooltip: "\u52d5\u304f\u3082\u306e\u3092\u6355\u3089\u3048\u3066\u3057\u3070\u3089\u304f\u96e2\u3055\u306a\u3044\u3002" },
+  leakage_device: { id: "leakage_device", itemType: "leakage_device", label: "\u6f0f\u96fb\u5668", placeable: true, scalable: false, radius: 34, amount: 999, iconText: "\u6f0f", tooltip: "\u901a\u96fb\u4e2d\u3001\u5e83\u7bc4\u56f2\u306b\u96fb\u6483\u30c0\u30e1\u30fc\u30b8\u3092\u4e0e\u3048\u308b\u3002" },
+  poison_gas_can: { id: "poison_gas_can", itemType: "poison_gas_can", label: "\u6bd2\u30ac\u30b9\u7f36", placeable: true, scalable: true, radius: 28, amount: 999, iconText: "\u6bd2", tooltip: "\u6bd2\u30ac\u30b9\u3092\u653e\u51fa\u3059\u308b\u3002" },
+  mamekusaredake: { id: "mamekusaredake", itemType: "mamekusaredake", label: "マメクサレダケ", placeable: true, scalable: false, radius: 34, amount: 999, icon: "assets/ui/tool_mamekusaredake.webp", tooltip: "胞子で感染する寄生キノコ。つまむと除去できる。" },
+  mame_spore: { id: "mame_spore", itemType: "mame_spore", label: "マメクサレダケ胞子", placeable: false, scalable: false, radius: 28, amount: 100, iconText: "胞", tooltip: "マメクサレダケの胞子。" },
   robot_cleaner: { id: "robot_cleaner", itemType: "robot_cleaner", label: "\u30ed\u30dc\u6383\u9664\u6a5f", placeable: true, scalable: false, radius: 22, amount: 999, iconText: "\u25c9", tooltip: "\u30b4\u30df\u3084\u6c5a\u308c\u3092\u7247\u4ed8\u3051\u308b\u3002\u30af\u30ea\u30c3\u30af\u3067\u8a73\u7d30\u8a2d\u5b9a\u3002" },
   zunchi: { id: "zunchi", itemType: "zunchi", label: "\u305a\u3093\u3061", placeable: true, scalable: true, radius: 14, amount: 240, icon: "assets/ui/tool_zunchi.webp", tooltip: "\u305f\u308a\u306a\u3044\u306e\u305a\u3093\u3061\u3002\u75c5\u6c17\u3084\u8349\u306e\u80a5\u6599\u306b\u95a2\u308f\u308b\u3002" },
   sweet: { id: "sweet", itemType: "sweet", label: "\u305a\u3093\u3060\u9905", placeable: true, scalable: true, radius: 13, amount: 62, icon: "assets/ui/tool_sweet.webp", tooltip: "\u305f\u308a\u306a\u3044\u306e\u5927\u597d\u7269\u3002\u4e00\u90e8\u306e\u75c5\u6c17\u3092\u6cbb\u305b\u308b\u3002" },
@@ -78,6 +85,7 @@ const TOOL_DEFINITIONS = Object.freeze({
   ant_corpse: { id: "ant_corpse", itemType: "ant_corpse", label: "\u30a2\u30ea\u306e\u6b7b\u9ab8", placeable: false, scalable: false, radius: 4, amount: 24, simulationOnly: true },
   toilet: { id: "toilet", itemType: "toilet", label: "\u30c8\u30a4\u30ec\u306e\u7802", placeable: true, scalable: true, radius: 48, amount: 999, iconText: "\u25a3", tooltip: "\u4e0a\u306b\u6392\u6cc4\u3055\u308c\u305f\u305a\u3093\u3061\u304c\u76f4\u3061\u306b\u6d88\u6ec5\u3059\u308b\u3002" },
   rain_shelter: { id: "rain_shelter", itemType: "rain_shelter", label: "\u30d1\u30e9\u30bd\u30eb", placeable: true, scalable: true, radius: 50, amount: 999, iconText: "\u26f1", tooltip: "\u96e8\u3068\u65e5\u5dee\u3057\u3092\u9632\u304e\u3001\u4f53\u611f\u6c17\u6e29\u3092\u7a4f\u3084\u304b\u306b\u3059\u308b\u3002" },
+  bell: { id: "bell", label: "呼び鈴", placeable: false, scalable: true, iconText: "🔔", tooltip: "周りのたりないを集める" },
   first_aid: { id: "first_aid", itemType: "first_aid", label: "\u6551\u6025\u85ac", placeable: true, scalable: true, radius: 13, amount: 58, iconText: "\u271a", tooltip: "\u98df\u3079\u308b\u3068HP\u3092\u5373\u6642\u56de\u5fa9\u3059\u308b\u3002" },
   sedative: { id: "sedative", itemType: "sedative", label: "\u93ae\u9759\u85ac", placeable: true, scalable: true, radius: 13, amount: 58, iconText: "\u25cc", tooltip: "\u98df\u3079\u308b\u3068\u6050\u6016\u3084\u3051\u3093\u304b\u6c17\u5206\u3092\u843d\u3061\u7740\u304b\u305b\u308b\u3002" },
 });
diff --git a/js/item_tool_metadata.js b/js/item_tool_metadata.js
index 9665b0d..3b6c5e3 100644
--- a/js/item_tool_metadata.js
+++ b/js/item_tool_metadata.js
@@ -5,18 +5,18 @@
   const ITEM_TRAITS = Object.freeze({
     obstacle: new Set(["stone", "ball", "balloon", "fan", "nest_box", "bed", "duplicator", "dry_ice", "stove", "rain_shelter", "fence_v", "fence_h", "glass_wall", "bounce_fence", "bounce_fence_v", "gate_fence", "one_way_fence", "rotator", "poison_block", "reciprocator", "pressure_switch", "circuit_board"]),
     food_interest: new Set(["food", "sweet", "love_mochi", "fight_mochi", "grass", "zunchi", "water", "ant_corpse", "duplicator", "first_aid", "sedative", "laxative", "protein", "niteropu", "ammo", "mystery_drug", "mercury", "giant_drug", "dwarf_drug", "zunda_juice", "slave_chain", "golden_crown", "sleep_drug"]),
-    hazard: new Set(["firecracker", "flame_firecracker", "sticky_bomb", "fire", "genkotsu", "pushpin", "poison_block", "sleep_drug", "zunchi", "splat", "mystery_drug", "laxative", "niteropu", "mercury", "giant_drug", "dwarf_drug"]),
+    hazard: new Set(["firecracker", "flame_firecracker", "sticky_bomb", "fire", "genkotsu", "pushpin", "poison_block", "sleep_drug", "zunchi", "splat", "mystery_drug", "laxative", "niteropu", "mercury", "giant_drug", "dwarf_drug", "mamekusaredake"]),
     pin: new Set(["pushpin", "oshibyo"]),
     kinematic: new Set(["ball", "balloon", "pushpin", "oshibyo", "zunchi"]),
     freeStackingMovable: new Set(["ball", "balloon", "pushpin", "oshibyo", "zunchi", "water", "zunda_juice", "mercury", "genkotsu", "stone", "firecracker", "flame_firecracker", "sticky_bomb", "ant_corpse"]),
     sleepFurniture: new Set(["bed", "nest_box", "pipe", "grass_bed"]),
-    draggable: new Set(["ball", "balloon", "fan", "stone", "firecracker", "flame_firecracker", "sticky_bomb", "bed", "nest_box", "pipe", "dry_ice", "stove", "rain_shelter", "signboard", "duplicator", "robot_cleaner", "pushpin", "oshibyo", "fence_v", "fence_h", "glass_wall", "bounce_fence", "bounce_fence_v", "gate_fence", "one_way_fence", "rotator", "poison_block", "reciprocator", "pressure_switch", "seesaw", "circuit_board"]),
+    draggable: new Set(["ball", "balloon", "fan", "stone", "firecracker", "flame_firecracker", "sticky_bomb", "bed", "nest_box", "pipe", "dry_ice", "stove", "rain_shelter", "signboard", "duplicator", "robot_cleaner", "oil", "bear_trap", "leakage_device", "poison_gas_can", "mamekusaredake", "pushpin", "oshibyo", "fence_v", "fence_h", "glass_wall", "bounce_fence", "bounce_fence_v", "gate_fence", "one_way_fence", "rotator", "poison_block", "reciprocator", "pressure_switch", "seesaw", "circuit_board"]),
   });
   
   
   const FENCE_ITEM_TYPES = Object.freeze(new Set(["fence_v", "fence_h", "glass_wall", "bounce_fence", "bounce_fence_v", "gate_fence", "one_way_fence"]));
   const MECHANICAL_ITEM_TYPES = Object.freeze(new Set(["rotator", "poison_block", "reciprocator"]));
-  const ELECTRIC_TOOL_IDS = Object.freeze(["pressure_switch", "wire", "insulated_wire", "circuit_board"]);
+  const ELECTRIC_TOOL_IDS = Object.freeze(["pressure_switch", "wire", "insulated_wire", "circuit_board", "leakage_device"]);
   const PHYSICS_TOOL_IDS = Object.freeze(["rope", "rod", "spring", "wire", "insulated_wire", "pressure_switch", "glass_wall", "bounce_fence", "gate_fence", "rotator", "poison_block", "reciprocator", "one_way_fence", "fence_h", "circuit_board"]);
   const PHYSICS_CATEGORY_TOOL_IDS = Object.freeze(PHYSICS_TOOL_IDS.filter(id => !ELECTRIC_TOOL_IDS.includes(id)));
   const ROTATABLE_ITEM_TYPES = Object.freeze(new Set([...FENCE_ITEM_TYPES, ...MECHANICAL_ITEM_TYPES, "fan", "circuit_board"]));
@@ -27,13 +27,13 @@
   });
 
   const TOOL_CATEGORIES = Object.freeze([
-    { id: "operate", label: "\u64cd\u4f5c", themeClass: "tool-category-operate", order: 10, toolIds: ["observe", "new", "poke", "pinch", "copy", "undo", "redo", "delete", "area_delete", "water_hose", "clear_tool"] },
+    { id: "operate", label: "\u64cd\u4f5c", themeClass: "tool-category-operate", order: 10, toolIds: ["observe", "new", "poke", "pinch", "copy", "undo", "redo", "delete", "area_delete", "clear_tool", "water_hose", "bell"] },
     { id: "food", label: "\u98df\u3079\u7269", themeClass: "tool-category-food", order: 20, toolIds: ["food", "sweet", "love_mochi", "fight_mochi", "grass", "water", "zunda_juice", "duplicator"] },
     { id: "medicine", label: "\u85ac", themeClass: "tool-category-medicine", order: 30, toolIds: ["first_aid", "sedative", "sleep_drug", "laxative", "protein", "niteropu", "ammo", "mystery_drug", "mercury", "giant_drug", "dwarf_drug", "slave_chain", "golden_crown"] },
-    { id: "habitat", label: "\u751f\u6d3b", themeClass: "tool-category-habitat", order: 40, toolIds: ["zunchi", "toilet", "rain_shelter", "robot_cleaner", "bed", "nest_box", "pipe", "dry_ice", "stove", "ball", "balloon", "fan", "seesaw", "signboard"] },
+    { id: "habitat", label: "\u751f\u6d3b", themeClass: "tool-category-habitat", order: 40, toolIds: ["acquired_tarinai", "zunchi", "toilet", "rain_shelter", "robot_cleaner", "bed", "nest_box", "pipe", "dry_ice", "stove", "ball", "balloon", "fan", "seesaw", "signboard"] },
     { id: "physics", label: "\u7269\u7406", themeClass: "tool-category-physics", order: 45, toolIds: PHYSICS_CATEGORY_TOOL_IDS },
     { id: "electric", label: "\u96fb\u6c17", themeClass: "tool-category-electric", order: 46, toolIds: ELECTRIC_TOOL_IDS },
-    { id: "hazard", label: "\u5371\u967a", themeClass: "tool-category-hazard", order: 50, toolIds: ["stone", "genkotsu", "firecracker", "flame_firecracker", "sticky_bomb", "pushpin", "oshibyo", "shoot", "ant_nest"] },
+    { id: "hazard", label: "\u5371\u967a", themeClass: "tool-category-hazard", order: 50, toolIds: ["stone", "oil", "bear_trap", "poison_gas_can", "mamekusaredake", "genkotsu", "firecracker", "flame_firecracker", "sticky_bomb", "pushpin", "oshibyo", "shoot", "ant_nest"] },
   ]);
 
   const TOOL_SIZE_ORDER = Object.freeze(["small", "medium", "large"]);
diff --git a/js/item_type_initializers.js b/js/item_type_initializers.js
index 703e487..d714a4e 100644
--- a/js/item_type_initializers.js
+++ b/js/item_type_initializers.js
@@ -41,7 +41,7 @@ function initializeItemTypeState(item, type, x, y) {
   if (type === "water" || type === "zunda_juice") item.roles.drink = true;
   if (["sweet", "water", "zunda_juice", "slave_chain", "golden_crown"].includes(type) || isParamEffectItemType(type)) item.roles.medicine = true;
   if (type === "bed" || type === "nest_box" || type === "pipe") item.roles.sleepPlace = true;
-  if (["firecracker", "flame_firecracker", "sticky_bomb", "fire", "genkotsu", "pushpin", "poison_block", "splat"].includes(type)) item.roles.danger = true;
+  if (["firecracker", "flame_firecracker", "sticky_bomb", "fire", "genkotsu", "pushpin", "poison_block", "splat", "oil", "bear_trap", "leakage_device", "poison_gas_can", "poison_gas", "mamekusaredake", "mame_spore"].includes(type)) item.roles.danger = true;
   if (type === "grass") item.roles.grassMaterial = true;
   if (type === "grass") {
     item.grassStage = Math.floor(rand(0, 2.999));
@@ -305,6 +305,14 @@ function initializeItemTypeState(item, type, x, y) {
     item.amount = 999;
   }
 
+  if (type === "oil") { item.r = 58; item.amount = 100; item.oilBurning = false; item.oilBurnTimer = 0; item.nextOilFireAt = 0; item.deletable = true; }
+  if (type === "bear_trap") { item.r = 34; item.amount = 999; item.trapTargetId = ""; item.trapTargetRef = null; item.trapTriggeredAt = 0; item.trapUntil = 0; item.trapClosed = false; item.trapDamageableTarget = false; item.trapHoldDuration = 0; item.nextTrapDamageAt = 0; item.deletable = true; }
+  if (type === "leakage_device") { item.r = 34; item.amount = 999; item.nextLeakagePulseAt = 0; item.deletable = true; }
+  if (type === "poison_gas_can") { item.r = 28; item.amount = 999; item.fuseMax = 5; item.fuseTimer = 5; item._gasReleased = false; item.deletable = true; }
+  if (type === "poison_gas") { item.r = 96; item.amount = 100; item.gasConcentration = 1; item.gasAge = 0; item.gasLife = 22; item.gasExpansion = 72; item.vx = 0; item.vy = 0; item.deletable = false; }
+  if (type === "mamekusaredake") { item.r = 34; item.amount = 999; item.mamePlanted = true; item.nextSporeAt = 0; item.deletable = true; item.roles.danger = true; }
+  if (type === "mame_spore") { item.r = 28; item.amount = 100; item.sporeAge = 0; item.sporeLife = 9; item.sporeConcentration = 1; item.vx = 0; item.vy = 0; item.deletable = false; item.roles.danger = true; }
+
   if (globalThis.TarinaiPhysicsBodySystem.isPhysicsType(type)) {
     globalThis.TarinaiPhysicsBodySystem.invalidateItem(item, "item-initialized");
   }
diff --git a/js/item_update_policy.js b/js/item_update_policy.js
index 75c2a9b..bc9ec45 100644
--- a/js/item_update_policy.js
+++ b/js/item_update_policy.js
@@ -5,10 +5,10 @@
 // helpers and the item scheduler both read this single policy instead of
 // duplicating item-type timing rules.
 (function (global) {
-  const REALTIME_ITEM_TYPES = new Set(["ball", "balloon", "fan", "genkotsu", "firecracker", "flame_firecracker", "sticky_bomb", "robot_cleaner"]);
+  const REALTIME_ITEM_TYPES = new Set(["oil", "bear_trap", "leakage_device", "poison_gas_can", "poison_gas", "mamekusaredake", "mame_spore", "ball", "balloon", "fan", "genkotsu", "firecracker", "flame_firecracker", "sticky_bomb", "robot_cleaner"]);
   const PIN_ITEM_TYPES = new Set(["pushpin", "oshibyo"]);
   const SCHEDULED_ITEM_TYPES = Object.freeze([
-    "ball", "balloon", "fan", "genkotsu", "firecracker", "flame_firecracker", "sticky_bomb", "fire", "pushpin", "oshibyo",
+    "oil", "bear_trap", "leakage_device", "poison_gas_can", "poison_gas", "mamekusaredake", "mame_spore", "ball", "balloon", "fan", "genkotsu", "firecracker", "flame_firecracker", "sticky_bomb", "fire", "pushpin", "oshibyo",
     "plushie", "grass_bed", "zunchi", "robot_cleaner", "duplicator", "water", "trace", "splat", "ant_corpse", "food",
     "sweet", "love_mochi", "fight_mochi", "sleep_drug", "first_aid", "sedative", "laxative", "protein", "niteropu", "ammo", "mystery_drug", "mercury", "giant_drug", "dwarf_drug", "zunda_juice",
     "stone", "bed", "nest_box", "pipe", "toilet", "rain_shelter", "ant_nest", "signboard", "fence_v", "fence_h", "bounce_fence", "bounce_fence_v", "gate_fence", "one_way_fence", "rotator", "poison_block", "reciprocator", "rope", "rod", "spring", "wire", "insulated_wire", "pressure_switch",
@@ -38,9 +38,11 @@
       Number(item.lastShotAt || -999) || -999
     );
     if (now - lastActiveAt < 0.35) return true;
-    // Fan wind is a continuous force. Scheduling it as an idle item turns the
-    // accumulated dt into periodic gusts, so fans must remain in the realtime lane.
-    if (item.type === "fan") return true;
+    // Fan wind and bear-trap contact are continuous interactions. Scheduling
+    // them as idle items can turn movement/contact into periodic samples and
+    // let a moving object pass completely through between checks.
+    if (item.type === "fan" || item.type === "bear_trap") return true;
+    if (item.type === "poison_gas_can") return Number(item.fuseTimer ?? 5) > 0;
     if (item.type === "firecracker" || item.type === "flame_firecracker" || item.type === "sticky_bomb") return Boolean(item.fuseTimer > 0 || item.armed || item.active);
     if (item.type === "robot_cleaner") return Boolean(item.active || item.cleanerActive || item.targetId || item.targetRef || item.state === "clean" || item.state === "return");
     if (PIN_ITEM_TYPES.has(item.type)) return Boolean(item.pinState && item.pinState !== "idle" && item.pinState !== "ground");
@@ -50,6 +52,7 @@
 
   function idleRealtimeInterval(item) {
     if (!item) return Infinity;
+    if (item.type === "oil" || item.type === "bear_trap" || item.type === "leakage_device" || item.type === "poison_gas_can" || item.type === "poison_gas" || item.type === "mamekusaredake" || item.type === "mame_spore") return 0.18;
     if (item.type === "ball" || item.type === "balloon") return 0.24;
     if (item.type === "fan") return 0.60;
     if (item.type === "genkotsu") return 0.45;
@@ -89,8 +92,8 @@
     if (item.type === "grass") return Infinity;
     if (item.type === "duplicator") return adjustedInterval(0.5);
     if (item.type === "water") return adjustedInterval(1.8);
-    if (item.type === "trace" || item.type === "splat") return adjustedInterval(1.2);
-    if (item.type === "ant_corpse") return adjustedInterval(3.5);
+    if (item.type === "trace" || item.type === "splat") return adjustedInterval(2.8);
+    if (item.type === "ant_corpse") return adjustedInterval(5.5);
     if (typeof global.isServingFoodType === "function" && global.isServingFoodType(item.type)) return adjustedInterval(5.0);
     if (isServingFoodType(item.type)) return adjustedInterval(5.0);
     return Infinity;
diff --git a/js/item_update_scheduler.js b/js/item_update_scheduler.js
index fb9dae0..8b2a404 100644
--- a/js/item_update_scheduler.js
+++ b/js/item_update_scheduler.js
@@ -108,6 +108,20 @@
     return Math.max(1, Number(global.TarinaiPerf?.performanceProfile?.().scheduledItemBudget || 30));
   }
 
+  function beginTouchedFrame(worldRef, state) {
+    if (!state.touchedFrame) state.touchedFrame = [];
+    else state.touchedFrame.length = 0;
+    if (!state.touchedSet) state.touchedSet = new Set();
+    else state.touchedSet.clear();
+    worldRef._itemUpdateTouched = state.touchedFrame;
+  }
+
+  function recordTouched(state, item) {
+    if (!item || item.dead || state.touchedSet.has(item)) return;
+    state.touchedSet.add(item);
+    state.touchedFrame.push(item);
+  }
+
   function runRealtime(worldRef, state, dt) {
     let ran = 0;
     const now = worldRef.time || 0;
@@ -123,6 +137,7 @@
       }
       if (interval <= 0) {
         global.TarinaiItemRuntime.updateOne(item, dt, worldRef);
+        recordTouched(state, item);
         item._schedulerLastAt = now;
         ran += 1;
         const nextInterval = itemUpdateInterval(item);
@@ -155,6 +170,7 @@
       }
       const elapsed = Math.min(10, Math.max(0.001, now - (item._schedulerLastAt ?? entry.time - interval)));
       global.TarinaiItemRuntime.updateOne(item, elapsed, worldRef);
+      recordTouched(state, item);
       item._schedulerLastAt = now;
       ran += 1;
       dueRuns += 1;
@@ -197,6 +213,7 @@
     const end = global.TarinaiPerf.begin("update.items");
     try {
       const state = ensure(worldRef);
+      beginTouchedFrame(worldRef, state);
       const realtimeEnd = global.TarinaiPerf.begin("update.items.realtime");
       let realtimeRan = runRealtime(worldRef, state, dt);
       let ran = realtimeRan;
@@ -207,9 +224,11 @@
       ran += dueRan;
       if (dueEnd) dueEnd();
       global.TarinaiSignalSystem?.updateWorld?.(worldRef, dt);
+      global.TarinaiItemEnvironmentHazardSystem?.updatePoweredHazards?.(worldRef, dt);
       const physicsEnd = global.TarinaiPerf.begin("update.physicsWorld");
       const physicsBudget = physicsBudgetFor(worldRef);
       const physicsWorld = global.TarinaiPhysicsWorldSystem.updateWorld(worldRef, dt, physicsBudget);
+      const trapHeld = global.TarinaiItemEnvironmentHazardSystem?.enforceTrapHolds?.(worldRef) || 0;
       const mechanicalWorld = physicsWorld.mechanical || null;
       const constraintWorld = physicsWorld.constraintRan || 0;
       const postConstraintPairs = physicsWorld.postConstraintPairs || 0;
@@ -232,6 +251,7 @@
         physicsBudget,
         poisonContactBudget,
         poisonContactRemoved,
+        trapHeld,
         physics: physicsWorld || mechanicalWorld,
         constraints: constraintWorld,
         postConstraintPairs,
@@ -245,7 +265,7 @@
   }
 
   function trackedDynamicItems(worldRef) {
-    return worldRef?._itemUpdateRealtime || [];
+    return worldRef?._itemUpdateTouched || [];
   }
 
   global.TarinaiItemUpdateScheduler = Object.freeze({ run, trackedDynamicItems, wakeItem });
diff --git a/js/main.js b/js/main.js
index 6a967df..9f604aa 100644
--- a/js/main.js
+++ b/js/main.js
@@ -100,6 +100,7 @@ function loop() {
   window.TarinaiPerf.beginFrame();
   const endUpdate = window.TarinaiPerf.begin("update.total");
   world.update(dt);
+  if (typeof tickColonyHistorySampling === "function") tickColonyHistorySampling();
   if (endUpdate) endUpdate();
   const endRender = window.TarinaiPerf.begin("render.total");
   render();
@@ -146,3 +147,14 @@ if ("serviceWorker" in navigator) {
     navigator.serviceWorker.register(swUrl, { updateViaCache: "none" }).catch(() => undefined);
   });
 }
+
+
+// Expose the active build on the root element so stale-cache reports can be verified immediately.
+(function markActiveBuild() {
+  const apply = () => {
+    if (!document?.documentElement) return;
+    document.documentElement.dataset.tarinaiBuild = String(window.TARINAI_APP?.build || window.TARINAI_VERSION || "unknown");
+  };
+  if (document.readyState === "loading") document.addEventListener("DOMContentLoaded", apply, { once: true });
+  else apply();
+})();
diff --git a/js/mamekusaredake_system.js b/js/mamekusaredake_system.js
new file mode 100644
index 0000000..877b73a
--- /dev/null
+++ b/js/mamekusaredake_system.js
@@ -0,0 +1,187 @@
+"use strict";
+(function(global){
+  function mushroomImage(){ return global.getRenderableImage?.("mamekusaredake", "") || global.images?.get?.("mamekusaredake") || null; }
+  function growthOf(t){ return Math.max(0,Math.min(1,Number(t?.mamekusaredakeGrowth||0)||0)); }
+  const hostAlphaCache = typeof WeakMap !== "undefined" ? new WeakMap() : null;
+  function unit(seed="",salt=""){
+    if(typeof global.stableUnit==="function") return global.stableUnit(String(seed||"mame"),String(salt||""));
+    const s=`${seed}|${salt}`; let h=2166136261;
+    for(let i=0;i<s.length;i++){h^=s.charCodeAt(i);h=Math.imul(h,16777619);}
+    return ((h>>>0)%1000003)/1000003;
+  }
+  function alphaPointsForImage(img){
+    if(!img)return null;
+    if(hostAlphaCache?.has(img)) return hostAlphaCache.get(img);
+    let out=null;
+    try{
+      const c=document.createElement("canvas"); c.width=64; c.height=64;
+      const cx=c.getContext("2d",{willReadFrequently:true}); cx.clearRect(0,0,64,64); cx.drawImage(img,0,0,64,64);
+      const data=cx.getImageData(0,0,64,64).data, pts=[];
+      for(let y=3;y<61;y++) for(let x=3;x<61;x++) if(data[(y*64+x)*4+3]>=96) pts.push([x,y]);
+      out=pts.length?pts:null;
+    }catch(_){out=null;}
+    hostAlphaCache?.set(img,out); return out;
+  }
+  function hostPoint(t,img,dw,dh,index=0){
+    const seed=t?.birthSeed||t?.familyKey||t?.id||"mame-host";
+    const pts=alphaPointsForImage(img);
+    if(pts?.length){
+      const k=Math.min(pts.length-1,Math.floor(unit(seed,`mame-pos-${index}`)*pts.length));
+      const p=pts[k]||pts[0];
+      return {x:(p[0]/63-.5)*dw,y:(p[1]/63-.5)*dh};
+    }
+    // Fallback stays inside the usual non-transparent body ellipse.
+    const a=unit(seed,`mame-a-${index}`)*Math.PI*2, rr=Math.sqrt(unit(seed,`mame-r-${index}`))*.70;
+    return {x:Math.cos(a)*dw*.34*rr,y:Math.sin(a)*dh*.28*rr+dh*.03};
+  }
+  function hostMushroomCount(g){ return g<=.001?0:Math.max(1,Math.min(5,Math.ceil(g*5))); }
+  function infect(t, source=null){
+    if(!t||t.dead||t.mamekusaredakeDisease) return false;
+    t.mamekusaredakeDisease=true; t.mamekusaredakeGrowth=0; t.mamekusaredakeDeathPlanted=false;
+    t.mamekusaredakeSpeechAt=(t.world?.time||0)+3+Math.random()*5;
+    t.world?.log?.(`${t.name}がマメクサレダケ病に罹患した。`,"accident",{participants:[t]});
+    return true;
+  }
+  function visualSizeForHost(t,g=growthOf(t)){
+    const rendered=Number(t?._mameRenderedSize||0)||0;
+    if(rendered>0) return Math.max(3,rendered);
+    const radius=Math.max(16,Number(t?.radius||20)||20);
+    return Math.max(3,radius*1.16*Math.max(.05,g));
+  }
+  function spawnDetached(world,t,growth=growthOf(t)){
+    if(!world||!t||typeof Item==="undefined") return null;
+    const side=t.facingDir?.()||1;
+    const it=new Item("mamekusaredake", t.x+side*(t.radius||20)*0.46, t.y+(t.radius||20)*0.30);
+    it.mameDetached=true; it.mamePlanted=false; it.mameLife=1.25; it.vx=side*(35+Math.random()*25); it.vy=-35-Math.random()*20;
+    it.mameDetachedSize=visualSizeForHost(t,growth); it.r=Math.max(2,it.mameDetachedSize/2.15);
+    world.addItem?.(it,"mame-detached",{terrain:false}); return it;
+  }
+  function recover(t, reason="キノコが取れた"){
+    if(!t?.mamekusaredakeDisease) return false;
+    const growth=growthOf(t);
+    spawnDetached(t.world,t,growth);
+    t.mamekusaredakeDisease=false; t.mamekusaredakeGrowth=0; t.mamekusaredakeSpeechAt=0; t.mamekusaredakeDeathPlanted=false;
+    t.world?.spawnEffect?.("ring",t.x,t.y,{size:(t.radius||20)*(.55+.75*growth),life:.55,color:"rgba(190,153,80,.66)"});
+    t.world?.log?.(`${t.name}のマメクサレダケが外れて治った。`,"event",{participants:[t]}); return true;
+  }
+  function plantAt(world,x,y,r=34){
+    if(!world||typeof Item==="undefined")return null;
+    const it=new Item("mamekusaredake",x,y); it.r=r; it.mamePlanted=true; it.mameDetached=false; it.nextSporeAt=(world.time||0)+1.2+Math.random();
+    world.addItem?.(it,"mame-plant",{terrain:false}); return it;
+  }
+  function plantFromHost(t){
+    if(!t?.world||t.mamekusaredakeDeathPlanted) return null;
+    t.mamekusaredakeDeathPlanted=true;
+    const g=growthOf(t);
+    // 死亡サイズの50%以下なら地面には残らず消滅する。
+    if(g<=.5) return null;
+    // 表示上の本数とは無関係に、死亡時に植わるのは必ず1本だけ。
+    return plantAt(t.world,t.x,t.y,Math.max(22,(t.radius||20)*(.62+.32*g)));
+  }
+  function spawnSpore(world,m){
+    if(!world||typeof Item==="undefined")return null;
+    const a=Math.random()*Math.PI*2,d=Math.random()*(m.r||34)*.35;
+    const s=new Item("mame_spore",m.x+Math.cos(a)*d,m.y+Math.sin(a)*d*.55); s.r=22+Math.random()*18; s.sporeAge=0; s.sporeLife=7+Math.random()*5; s.sporeConcentration=.45+Math.random()*.25; s.vx=Math.cos(a)*(6+Math.random()*10); s.vy=-4+Math.sin(a)*5;
+    world.addItem?.(s,"mame-spore",{terrain:false}); return s;
+  }
+  function updateTarinai(t,dt){
+    if(!t||t.dead)return false;
+    const now=t.world?.time||0;
+    const sick=Boolean(t.zunchiDisease||t.sleepDisease||t.explosionDisease||t.fightDisease||t.mamekusaredakeDisease);
+    if(t.mamekusaredakeDisease){
+      if(t.state==="sunbath"||(t.sunbathTimer||0)>.04){
+        t.sunbathTimer=0; t.sunbathLeisure=false; t.sunbathCooldown=Math.max(t.sunbathCooldown||0,20);
+        t.visibleSpriteId=""; t.setActionState?.("idle",{target:null,reason:"マメクサレダケ病のため日光浴できない",sleeping:false,clearTarget:true});
+      }
+      t.mamekusaredakeGrowth=Math.min(1.08,(Number(t.mamekusaredakeGrowth||0)||0)+dt/90);
+      const g=growthOf(t);
+      if(g>=.5){
+        const maxEnergy=Math.max(1,typeof global.tarinaiMaxEnergy==="function"?global.tarinaiMaxEnergy(t):(Number(t.maxEnergy)||100));
+        const severity=Math.max(0,Math.min(1,(g-.5)/.5));
+        const loss=dt*maxEnergy*(.0018+.0037*severity);
+        t.energy=Math.max(0,(Number(t.energy)||0)-loss);
+        if(loss>.01) t.showHpBar?.();
+        if(t.energy<=.5){ t.die?.("マメクサレダケ病",{fromDamage:true}); return true; }
+      }
+    }
+    if(t.isAcquiredTarinai && sick && now>=Number(t.mamekusaredakeSpeechAt||0) && (t.nextBubbleAt||0)<=now){
+      const choices=[{text:"くるち、くるち",id:"voice_ochibi_disease_001"},{text:"おみじゅ...",id:"voice_ochibi_hot_007"},{text:"ぶるぶる",id:"voice_temp_cold"}];
+      const c=choices[Math.floor(Math.random()*choices.length)]; if(c&&t.bubble?.(c.text,4.5,"rgba(96,72,48,.82)")){ const a=global.TarinaiAudio; a?.playSample?.(c.id,1.1,"voice")||a?.play?.(c.id,{category:"voice",minGap:1.1}); }
+      t.mamekusaredakeSpeechAt=now+7+Math.random()*10;
+    }
+    if(t.mamekusaredakeDisease && t.mamekusaredakeGrowth>=1){ t.die?.("マメクサレダケ病"); }
+    return true;
+  }
+  function updateItem(item,dt,world){
+    if(item.type==="mamekusaredake"){
+      if(item.mameDetached){ item.mameLife=(item.mameLife||1)-dt; item.x+=(item.vx||0)*dt; item.y+=(item.vy||0)*dt; item.vy=(item.vy||0)+55*dt; item.vx*=Math.pow(.6,dt); if(item.mameLife<=0)item.amount=0; return true; }
+      item.mamePlanted=true; const now=world?.time||0; if(now>=Number(item.nextSporeAt||0)){ item.nextSporeAt=now+1.4+Math.random()*1.8; if(Math.random()<.75)spawnSpore(world,item); } return true;
+    }
+    if(item.type==="mame_spore"){
+      item.sporeAge=(item.sporeAge||0)+dt; const life=Math.max(1,item.sporeLife||9); item.sporeConcentration=Math.max(0,1-item.sporeAge/life); item.x+=(item.vx||0)*dt; item.y+=(item.vy||0)*dt; item.vx*=Math.pow(.72,dt); item.vy*=Math.pow(.72,dt);
+      for(const t of world?.tarinai||[]){ if(!t||t.dead||t.mamekusaredakeDisease)continue; if(distXY(item.x,item.y,t.x,t.y)<=item.r+(t.radius||18)*.45 && Math.random()<dt*.036*item.sporeConcentration) infect(t,item); }
+      if(item.sporeConcentration<=.01)item.amount=0; return true;
+    } return false;
+  }
+  function drawMushroom(ctx,x,y,size,alpha=1,rot=0){ const img=mushroomImage(); if(!img)return false; ctx.save();ctx.globalAlpha*=alpha;ctx.translate(x,y);ctx.rotate(rot);ctx.drawImage(img,-size*.44,-size*.55,size*.88,size);ctx.restore();return true; }
+  function drawOnTarinai(ctx,t,dw,dh,faceRight=false,hostImage=null,renderInfo=null){
+    if(!t?.mamekusaredakeDisease)return false;
+    const g=growthOf(t); if(g<=.001)return false;
+    const count=hostMushroomCount(g), seed=t.birthSeed||t.familyKey||t.id||"mame-host";
+    const baseSize=Math.max(4,dh*.34*g);
+    t._mameRenderedSize=baseSize;
+    t._mameHostLocalTargets=[];
+    t._mameHostWorldTargets=[];
+    const originX=Number(renderInfo?.originX);
+    const originY=Number(renderInfo?.originY);
+    const renderAngle=Number(renderInfo?.angle||0)||0;
+    const hasWorldTransform=Number.isFinite(originX)&&Number.isFinite(originY);
+    const cosA=Math.cos(renderAngle), sinA=Math.sin(renderAngle);
+    let drew=false;
+    for(let i=0;i<count;i++){
+      const p=hostPoint(t,hostImage,dw,dh,i);
+      const size=baseSize*(.72+unit(seed,`mame-size-${i}`)*.34);
+      const rot=(-40+unit(seed,`mame-rot-${i}`)*80)*Math.PI/180;
+      t._mameHostLocalTargets.push({x:p.x,y:p.y,size});
+      if(hasWorldTransform){
+        // draw() mirrors local X when faceRight, then rotates the whole sprite.
+        // Use the identical transform for hit testing so the first click lands
+        // on the mushroom that is actually visible on screen.
+        const lx=faceRight?-p.x:p.x, ly=p.y;
+        t._mameHostWorldTargets.push({
+          x:originX+cosA*lx-sinA*ly,
+          y:originY+sinA*lx+cosA*ly,
+          size
+        });
+      }
+      drew=drawMushroom(ctx,p.x,p.y,size,Math.min(1,.32+g*.82),rot)||drew;
+    }
+    return drew;
+  }
+  function drawItem(ctx,item,time=0){
+    if(item.type==="mamekusaredake"){
+      const alpha=item.mameDetached?Math.max(0,Math.min(1,(item.mameLife||0)/.45)):1;
+      const size=item.mameDetached&&Number(item.mameDetachedSize)>0?Number(item.mameDetachedSize):(item.r||34)*2.15;
+      if(!item.mameDetached){
+        ctx.save(); ctx.globalAlpha*=.34; ctx.fillStyle="rgba(38,28,18,.72)"; ctx.beginPath(); ctx.ellipse(size*.055,size*.41,size*.30,size*.085,0,0,Math.PI*2); ctx.fill(); ctx.restore();
+      }
+      return drawMushroom(ctx,0,0,size,alpha,item.mameDetached?(time*2.2):0);
+    }
+    if(item.type==="mame_spore"){ const r=item.r||28,c=Math.max(0,Math.min(1,item.sporeConcentration??1));ctx.save();ctx.globalAlpha*=.10+.22*c;ctx.fillStyle="rgba(181,139,65,.58)";for(let i=0;i<3;i++){const a=(item.seed||0)+i*2.2,rr=r*(.30+i*.06);ctx.beginPath();ctx.arc(Math.cos(a)*r*.18,Math.sin(a)*r*.12,rr,0,Math.PI*2);ctx.fill();}ctx.restore();return true;}
+    return false;
+  }
+  function mushroomHit(t,x,y){
+    if(!t?.mamekusaredakeDisease)return false;
+    const worldTargets=Array.isArray(t._mameHostWorldTargets)?t._mameHostWorldTargets:[];
+    for(const p of worldTargets){
+      if(distXY(x,y,p.x,p.y)<=Math.max(8,(p.size||10)*.52)) return true;
+    }
+    // Fallback for the short interval before the first render after infection.
+    // It intentionally stays conservative so pinching the body itself does not
+    // accidentally cure the disease.
+    const g=Math.max(.05,growthOf(t));
+    const face=typeof t.facingDir==="function"?(t.facingDir()||1):(t.facing||1);
+    return distXY(x,y,t.x+face*(t.radius||20)*.30,t.y+(t.radius||20)*.18)<=Math.max(7,(t.radius||20)*.34*g);
+  }
+  global.TarinaiMamekusaredakeSystem=Object.freeze({infect,recover,plantAt,plantFromHost,spawnSpore,updateTarinai,updateItem,drawOnTarinai,drawItem,mushroomHit});
+})(typeof window!=="undefined"?window:globalThis);
diff --git a/js/mechanical_system.js b/js/mechanical_system.js
index 3301ad6..ec9fbfe 100644
--- a/js/mechanical_system.js
+++ b/js/mechanical_system.js
@@ -636,6 +636,78 @@
     return applied;
   }
 
+  function applyExternalImpulse(item, contactX, contactY, fx, fy, worldRef = null, scale = 1) {
+    if (!item || item.dead || !isMechanicalType(item)) return false;
+    const sx = num(fx) * num(scale, 1);
+    const sy = num(fy) * num(scale, 1);
+    let changed = applyImpulse(item, contactX, contactY, sx, sy, item.type === "rotator" ? 1.05 : 0.72);
+    if (item.type === "rotator" || item.type === "reciprocator") {
+      const translationGain = item.type === "rotator" ? 0.28 : 0.18;
+      item.externalVx = clamp(num(item.externalVx) + sx * translationGain, -560, 560);
+      item.externalVy = clamp(num(item.externalVy) + sy * translationGain, -560, 560);
+      wakeItem(item, "external-impulse");
+      changed = true;
+    }
+    if (changed) {
+      worldRef?.markSpatialDirty?.("mechanical-external-impulse");
+      if (worldRef) worldRef.drawListDirty = true;
+    }
+    return changed;
+  }
+
+  function integrateExternalTranslation(item, dt = 0.016, worldRef = null) {
+    if (!item || item.dead || !isMechanicalType(item) || (item.type !== "rotator" && item.type !== "reciprocator")) return false;
+    const step = Math.max(0.001, Math.min(0.05, num(dt, 0.016)));
+    let vx = num(item.externalVx);
+    let vy = num(item.externalVy);
+    if (Math.hypot(vx, vy) < 0.05) { item.externalVx = 0; item.externalVy = 0; return false; }
+    const dx = vx * step;
+    const dy = vy * step;
+    if (item.type === "reciprocator") {
+      resetAnchor(item);
+      const rail = bodyRail(item);
+      if (rail) {
+        rail.anchorX = num(rail.anchorX, item.x) + dx;
+        rail.anchorY = num(rail.anchorY, item.y) + dy;
+        pset(item, "railAnchorX", rail.anchorX, "external-translation");
+        pset(item, "railAnchorY", rail.anchorY, "external-translation");
+      }
+      const pos = positionFromPhase(item);
+      item.x = pos.x;
+      item.y = pos.y;
+    } else {
+      item.x = num(item.x) + dx;
+      item.y = num(item.y) + dy;
+      if (item.physicsBody?.pose) { item.physicsBody.pose.x = item.x; item.physicsBody.pose.y = item.y; }
+    }
+    const pad = Number((typeof CONFIG !== "undefined" ? CONFIG.worldPadding : global.CONFIG?.worldPadding) || 16) || 16;
+    const rr = Math.max(18, Math.min(120, reach(item) * 0.24));
+    if (worldRef) {
+      item.x = clamp(item.x, pad + rr, num(worldRef.w, 1000) - pad - rr);
+      item.y = clamp(item.y, rr, num(worldRef.h, 800) - rr);
+      if (item.type === "reciprocator") {
+        const rail = bodyRail(item);
+        const pos = positionFromPhase(item);
+        const fixX = item.x - pos.x;
+        const fixY = item.y - pos.y;
+        if (rail && (Math.abs(fixX) > 0.001 || Math.abs(fixY) > 0.001)) {
+          rail.anchorX = num(rail.anchorX) + fixX;
+          rail.anchorY = num(rail.anchorY) + fixY;
+          pset(item, "railAnchorX", rail.anchorX, "external-boundary");
+          pset(item, "railAnchorY", rail.anchorY, "external-boundary");
+        }
+      }
+    }
+    const damp = Math.pow(0.12, step);
+    item.externalVx = vx * damp;
+    item.externalVy = vy * damp;
+    if (Math.abs(item.externalVx) < 0.05) item.externalVx = 0;
+    if (Math.abs(item.externalVy) < 0.05) item.externalVy = 0;
+    invalidateGeometry(item);
+    commitBody(item);
+    return true;
+  }
+
   function applyRailCorrection(item, nx, ny, overlap, scale = 1) {
     if (!item || item.dead || item.type !== "reciprocator" || item.playerHeld || item._heldByPlayer) return false;
     resetAnchor(item);
@@ -752,8 +824,31 @@
   }
 
 
+  function isPassiveDriveBlocker(other) {
+    if (!other || other.dead) return false;
+    if (other.type !== "rotator" && other.type !== "reciprocator") return false;
+    return !isPowered(other);
+  }
+
+  function hasPassiveDriveContactAhead(item, worldRef) {
+    if (!item || item.dead || item.type !== "reciprocator" || !worldRef) return false;
+    const source = worldRef.nearbyNonGrassItems?.(item.x, item.y, reach(item) + 110, true) || worldRef.items || [];
+    const a = axis(item);
+    const dir = Math.sign(ps(item, "railDir", 1)) || 1;
+    const driveX = a.x * dir, driveY = a.y * dir;
+    for (const other of source) {
+      if (!other || other === item || !isPassiveDriveBlocker(other)) continue;
+      const contact = strongestRectContact(obstacleRects(item), obstacleRects(other), 0.85);
+      if (!contact) continue;
+      const ahead = driveX * num(contact.info.nx) + driveY * num(contact.info.ny);
+      if (ahead >= 0.12) return true;
+    }
+    return false;
+  }
+
   function noteReciprocatorBlocked(item, dt = 0.016, worldRef = null, reason = "obstacle") {
     if (!item || item.dead || item.type !== "reciprocator" || !isPowered(item)) return false;
+    if (reason === "rail-stall-blocked" && hasPassiveDriveContactAhead(item, worldRef)) return false;
     const now = Number(worldRef?.time || item.world?.time || 0) || 0;
     const step = Math.max(0.012, Math.min(0.08, num(dt, 0.016)));
     if ((item._reciprocatorBlockedAt || -999) + 0.18 < now) item._reciprocatorBlockedTimer = 0;
@@ -998,8 +1093,8 @@
     let info = contact.info;
     // Reverse from the initial impact. Separation can fully clear the overlap,
     // but that still represents a real collision and must not skip reversal.
-    if (a.type === "reciprocator") reverseReciprocatorOnContact(a, info.nx, info.ny, dt, worldRef, "mechanical");
-    if (b.type === "reciprocator") reverseReciprocatorOnContact(b, -info.nx, -info.ny, dt, worldRef, "mechanical");
+    if (a.type === "reciprocator" && !isPassiveDriveBlocker(b)) reverseReciprocatorOnContact(a, info.nx, info.ny, dt, worldRef, "mechanical");
+    if (b.type === "reciprocator" && !isPassiveDriveBlocker(a)) reverseReciprocatorOnContact(b, -info.nx, -info.ny, dt, worldRef, "mechanical");
     const separated = applyMechanicalPairSeparation(a, b, info, dt, worldRef);
     if (separated) {
       // Position projection may fully clear the overlap.  Re-query before adding
@@ -1117,6 +1212,7 @@
     return runMechanicalStep(item, () => {
       item.amount = 999;
       if (item.playerHeld || item._heldByPlayer) return false;
+      const translated = integrateExternalTranslation(item, dt, worldRef);
       const powered = isPowered(item);
       const passiveSpeed = ps(item, "spin", 0);
       const speed = (powered ? ps(item, "motorSpeed", 0) : 0) + passiveSpeed;
@@ -1125,7 +1221,7 @@
       const ext = extent(item);
       item.r = Math.max(item.r || 64, Math.min(460, ext));
       const skipInteractions = opts.skipInteractions === true || opts.centralStep === true;
-      if (!speed || !Number.isFinite(speed)) return (!skipInteractions && hasInteractionCandidates(item, worldRef, ext + 90)) ? resolveInteractions(item, dt, worldRef) : false;
+      if (!speed || !Number.isFinite(speed)) return translated || ((!skipInteractions && hasInteractionCandidates(item, worldRef, ext + 90)) ? resolveInteractions(item, dt, worldRef) : false);
       const totalDelta = speed * dt;
       if (skipInteractions || !hasInteractionCandidates(item, worldRef, ext + 100)) {
         item.prevAngle = num(item.angle);
@@ -1223,6 +1319,7 @@
       item.amount = 999;
       resetAnchor(item);
       if (item.playerHeld || item._heldByPlayer) { item.prevX = item.x; item.prevY = item.y; return false; }
+      const translated = integrateExternalTranslation(item, dt, worldRef);
       const powered = isPowered(item);
       const prevX = num(item.x, ps(item, "railAnchorX", 0)), prevY = num(item.y, ps(item, "railAnchorY", 0));
       item.prevX = prevX; item.prevY = prevY;
@@ -1259,13 +1356,13 @@
         if (worldRef && opts.deferDirty !== true) { worldRef.drawListDirty = true; worldRef.markSpatialDirty?.("reciprocator-motion"); }
         return true;
       }
-      return false;
+      return translated;
     });
   }
 
   function constrainPassiveBlockInsideWorld(item, worldRef) {
     if (!item || !worldRef) return false;
-    const pad = Number(global.CONFIG?.worldPadding || 16) || 16;
+    const pad = Number((typeof CONFIG !== "undefined" ? CONFIG.worldPadding : global.CONFIG?.worldPadding) || 16) || 16;
     const reachValue = Math.max(24, reach(item));
     let changed = false;
     if (num(item.x) < pad + reachValue * 0.25) { item.x = pad + reachValue * 0.25; pset(item, "xv", Math.abs(ps(item, "xv", 0)) * 0.38, "world-boundary"); changed = true; }
@@ -1865,6 +1962,7 @@
     updateReciprocator,
     updatePoisonBlock,
     applyPokeImpulse,
+    applyExternalImpulse,
     hitTest,
     invalidateGeometry,
     wakeItem,
diff --git a/js/memorial_bell_system.js b/js/memorial_bell_system.js
new file mode 100644
index 0000000..38ce34b
--- /dev/null
+++ b/js/memorial_bell_system.js
@@ -0,0 +1,629 @@
+"use strict";
+
+(function (global) {
+  const BUILD_TEXT = "親しいたりないの墓を作っている。";
+  const MOURN_TEXT = "親しいたりないの墓が壊されて泣いている。";
+  const BELL_TEXT = "呼び鈴の鳴った場所に集まっている。";
+  const GRAVE_VISIT_APPROACH_TEXT = "親しいたりないの墓参りに向かっている。";
+  const GRAVE_VISIT_TEXT = "親しいたりないの墓参りをしている。";
+  const BELL_RANGES = Object.freeze({ small: 120, medium: 210, large: 350 });
+  const BELL_DURATIONS = Object.freeze({ small: 12, medium: 18, large: 26 });
+
+  function familyKeyOf(t) {
+    return String(t?.familyKey || t?.id || "");
+  }
+
+  function ensureRequests(worldRef) {
+    if (!worldRef) return [];
+    if (!Array.isArray(worldRef.memorialRequests)) worldRef.memorialRequests = [];
+    return worldRef.memorialRequests;
+  }
+
+  function requestById(worldRef, id) {
+    return ensureRequests(worldRef).find(req => req && req.id === id) || null;
+  }
+
+  function liveByFamilyKey(worldRef, key) {
+    if (!worldRef || !key) return null;
+    return (worldRef.tarinai || []).find(t => t && !t.dead && familyKeyOf(t) === key) || null;
+  }
+
+  function activeGraveFor(worldRef, deceasedFamilyKey) {
+    if (!worldRef || !deceasedFamilyKey) return null;
+    return (worldRef.items || []).find(item => item && !item.dead && item.type === "grave" && item.memorialFamilyKey === deceasedFamilyKey) || null;
+  }
+
+  function relatedGravesFor(worldRef, tarinai) {
+    if (!worldRef || !tarinai) return [];
+    const key = familyKeyOf(tarinai);
+    if (!key) return [];
+    return (worldRef.items || []).filter(item => item && !item.dead && item.type === "grave"
+      && Array.isArray(item.memorialEligibleFamilyKeys) && item.memorialEligibleFamilyKeys.includes(key));
+  }
+
+  function graveById(worldRef, id) {
+    if (!worldRef || !id) return null;
+    const item = worldRef.itemById?.(id) || (worldRef.items || []).find(entry => entry?.id === id) || null;
+    return item && !item.dead && item.type === "grave" ? item : null;
+  }
+
+  function calmEnoughForGraveVisit(t) {
+    if (!t || t.dead || isCritical(t)) return false;
+    if (!["idle", "wander"].includes(String(t.state || "idle"))) return false;
+    if ((t.hunger || 0) >= 62 || (t.energy || 100) <= 38 || (t.stress || 0) >= 72) return false;
+    const needValues = ["food", "sleep", "health", "safety", "social", "fulfill"]
+      .map(key => Number(t.needRaw?.[key] ?? t.needs?.[key] ?? 0) || 0);
+    return Math.max(0, ...needValues) < 58;
+  }
+
+  function clearGraveVisit(t, reason = "") {
+    if (!t) return;
+    const wasVisiting = t.state === "visit_grave";
+    t.graveVisitTargetId = "";
+    t.graveVisitUntil = 0;
+    t.graveVisitPhase = "";
+    t.graveVisitReliefApplied = false;
+    t.nextGraveVisitCheckAt = Math.max(Number(t.nextGraveVisitCheckAt || 0), Number(t.world?.time || 0) + 28);
+    if (wasVisiting) {
+      t.target = null;
+      t.goIdle?.(reason || "墓参りを終えた。");
+    }
+  }
+
+  function graveVisitHasUrgentNeed(t) {
+    if (!t) return true;
+    if ((t.hunger || 0) >= 78 || (t.energy || 100) <= 24 || (t.stress || 0) >= 84) return true;
+    const needValues = ["food", "sleep", "health", "safety"]
+      .map(key => Number(t.needRaw?.[key] ?? t.needs?.[key] ?? 0) || 0);
+    return Math.max(0, ...needValues) >= 76;
+  }
+
+  function maintainGraveVisit(t) {
+    if (!t || !t.graveVisitTargetId) return false;
+    if (t.state !== "visit_grave") { clearGraveVisit(t); return false; }
+    const worldRef = t.world;
+    const grave = graveById(worldRef, t.graveVisitTargetId);
+    if (!grave || isCritical(t) || graveVisitHasUrgentNeed(t)) { clearGraveVisit(t, grave ? "別の用事を優先した。" : "墓がなくなった。"); return false; }
+    const now = Number(worldRef?.time || 0) || 0;
+    if (t.graveVisitPhase === "visiting") {
+      if (now >= Number(t.graveVisitUntil || 0)) { clearGraveVisit(t, "墓参りを終えた。"); return false; }
+      const mournText = `${grave.memorialName || "親しいたりない"}を悼んでいる。`;
+      setSpecialBehavior(t, "visit_grave", mournText, grave);
+      return true;
+    }
+    const approachText = `${grave.memorialName || "親しいたりない"}の墓参りに向かっている。`;
+    setSpecialBehavior(t, "visit_grave", approachText, grave);
+    return true;
+  }
+
+  function maybeStartGraveVisit(t) {
+    const worldRef = t?.world;
+    if (!worldRef || !calmEnoughForGraveVisit(t)) return false;
+    const now = Number(worldRef.time || 0) || 0;
+    if (now < Number(t.nextGraveVisitCheckAt || 0)) return false;
+    t.nextGraveVisitCheckAt = now + 10;
+    const chance = 0.045; // checked at most once per 10 seconds while otherwise idle
+    const hit = typeof global.deterministicChance === "function"
+      ? global.deterministicChance(worldRef, "idle-grave-visit", chance, t, Math.floor(now / 10))
+      : Math.random() < chance;
+    if (!hit) return false;
+    const graves = relatedGravesFor(worldRef, t);
+    if (!graves.length) return false;
+    graves.sort((a, b) => Math.hypot(a.x - t.x, a.y - t.y) - Math.hypot(b.x - t.x, b.y - t.y));
+    const shortlist = graves.slice(0, Math.min(3, graves.length));
+    const unit = typeof global.stableUnit === "function" ? global.stableUnit(familyKeyOf(t), `grave-visit-${Math.floor(now / 10)}`) : Math.random();
+    const grave = shortlist[Math.min(shortlist.length - 1, Math.floor(unit * shortlist.length))] || shortlist[0];
+    if (!grave) return false;
+    t.graveVisitTargetId = grave.id || "";
+    t.graveVisitPhase = "approach";
+    t.graveVisitUntil = 0;
+    t.graveVisitReliefApplied = false;
+    setSpecialBehavior(t, "visit_grave", `${grave.memorialName || "親しいたりない"}の墓参りに向かっている。`, grave);
+    return true;
+  }
+
+  function relationAffinity(a, b) {
+    if (!a || !b) return -Infinity;
+    const aToB = Number(a.relationships?.[b.id]?.affinity);
+    const bToA = Number(b.relationships?.[a.id]?.affinity);
+    return Math.max(Number.isFinite(aToB) ? aToB : -Infinity, Number.isFinite(bToA) ? bToA : -Infinity);
+  }
+
+  function eligibleFamilyKeysAtDeath(worldRef, dead) {
+    const related = new Set([...(dead?.parents || []), ...(dead?.children || [])].filter(Boolean));
+    const threshold = typeof FRIEND_AFFINITY_THRESHOLD === "number" ? FRIEND_AFFINITY_THRESHOLD : 14;
+    for (const other of worldRef?.tarinai || []) {
+      if (!other || other.dead || other === dead) continue;
+      const key = familyKeyOf(other);
+      if (!key) continue;
+      if (related.has(key) || relationAffinity(dead, other) >= threshold) related.add(key);
+    }
+    related.delete(familyKeyOf(dead));
+    return Array.from(related).filter(key => liveByFamilyKey(worldRef, key));
+  }
+
+  const MEMORIAL_BUILD_CHANCE = 0.35;
+  const GRAVE_BREAK_FORCE = 720;
+
+  function createGraveFromRequest(worldRef, req, builderFamilyKey = "", reason = "memorial-built") {
+    if (!worldRef || !req || activeGraveFor(worldRef, req.deceasedFamilyKey)) return activeGraveFor(worldRef, req.deceasedFamilyKey);
+    const grave = global.StructureRegistry?.create?.("grave", null, req.x, req.y, worldRef) || null;
+    if (!grave) return null;
+    grave.memorialFamilyKey = req.deceasedFamilyKey;
+    grave.memorialName = req.deceasedName;
+    grave.memorialType = req.deceasedType;
+    grave.memorialDeathReason = req.deathReason;
+    grave.memorialDeathTime = req.deathTime;
+    grave.memorialBuilderFamilyKey = String(builderFamilyKey || "");
+    grave.memorialEligibleFamilyKeys = Array.from(new Set(req.eligibleFamilyKeys || []));
+    grave.memorialFavorite = Boolean(req.deceasedFavorite);
+    grave.memorialTarinaiKing = Boolean(req.deceasedTarinaiKing);
+    grave.memorialZunchiSlave = Boolean(req.deceasedZunchiSlave);
+    grave.createdAt = Number(worldRef.time || 0) || 0;
+    grave._naturalDecayLastWorldTime = grave.createdAt;
+    const added = worldRef.addItem?.(grave, reason) || null;
+    if (!added) return null;
+    worldRef.markItemBucketsDirty?.(reason);
+    worldRef.markSpatialDirty?.(reason);
+    worldRef.markTerrainDirtyAt?.(grave.x, grave.y, 52, reason);
+    worldRef.drawListDirty = true;
+    return grave;
+  }
+
+  function captureDeath(worldRef, dead, reason = "") {
+    if (!worldRef || !dead) return null;
+    const deceasedFamilyKey = familyKeyOf(dead);
+    if (!deceasedFamilyKey) return null;
+    const requests = ensureRequests(worldRef);
+    const existing = requests.find(req => req?.deceasedFamilyKey === deceasedFamilyKey && req.status !== "cancelled");
+    if (existing) return existing;
+    const eligibleFamilyKeys = eligibleFamilyKeysAtDeath(worldRef, dead);
+    const deceasedFavorite = Boolean(dead.favorite);
+    if (!deceasedFavorite && !eligibleFamilyKeys.length) return null;
+    if (!deceasedFavorite) {
+      const chanceHit = typeof global.deterministicChance === "function"
+        ? global.deterministicChance(worldRef, "memorial-build-at-death", MEMORIAL_BUILD_CHANCE, dead, deceasedFamilyKey)
+        : Math.random() < MEMORIAL_BUILD_CHANCE;
+      if (!chanceHit) return null;
+    }
+    const req = {
+      id: `memorial-${deceasedFamilyKey}-${Math.round(Number(worldRef.time || 0) * 10)}`,
+      deceasedFamilyKey,
+      deceasedName: String(dead.name || "たりない"),
+      deceasedType: String(dead.type || "smile"),
+      deathReason: String(reason || dead.deathReason || ""),
+      deathTime: dead.deathTime != null && Number.isFinite(Number(dead.deathTime)) ? Number(dead.deathTime) : Number(worldRef.time || 0),
+      deceasedFavorite,
+      deceasedTarinaiKing: Boolean(dead.isTarinaiChampion),
+      deceasedZunchiSlave: Boolean(dead.isZunchiSlave),
+      x: Number(dead.x || 0) || 0,
+      y: Number(dead.y || 0) || 0,
+      eligibleFamilyKeys,
+      builderFamilyKey: "",
+      splatId: "",
+      status: deceasedFavorite ? "building_direct" : "pending",
+      createdAt: Number(worldRef.time || 0) || 0,
+    };
+    requests.push(req);
+    if (deceasedFavorite) {
+      const grave = createGraveFromRequest(worldRef, req, "", "favorite-memorial-direct");
+      if (grave) {
+        req.status = "complete";
+        worldRef.spawnEffect?.("ring", grave.x, grave.y, { size: 44, life: 0.48, color: "rgba(171,154,118,0.44)" });
+      } else req.status = "cancelled";
+    }
+    return req;
+  }
+
+  function liveSplatForRequest(worldRef, req) {
+    if (!worldRef || !req) return null;
+    let best = null;
+    let bestD = Infinity;
+    for (const item of worldRef.residuesOfType?.("splat") || []) {
+      if (!item || item.dead || Number(item.amount || 0) <= 0) continue;
+      if (item._memorialReservedBy && item._memorialReservedBy !== req.id) continue;
+      const d = Math.hypot((Number(item.x || 0) || 0) - req.x, (Number(item.y || 0) || 0) - req.y);
+      if (d <= 190 && d < bestD) { best = item; bestD = d; }
+    }
+    return best;
+  }
+
+  function isCritical(t) {
+    if (!t || t.dead) return true;
+    if (t.burning || (t.burnTimer || 0) > 0.02 || t.sleepDisease || t.fightDisease) return true;
+    if ((t.fightTimer || 0) > 0.04 || (t.birthRitualTimer || 0) > 0.04 || (t.intimidateTimer || 0) > 0.04 || (t.eatTimer || 0) > 0.04) return true;
+    return ["panic", "fight", "birth_ritual", "intimidate", "ant_attack", "frozen"].includes(String(t.state || ""));
+  }
+
+  function setSpecialBehavior(t, state, text, target = null) {
+    t.setActionState?.(state, { target, reason: text, wake: true, sleeping: false });
+    t.thought = text;
+    t.target = target;
+    if (typeof global.setBehaviorText === "function") {
+      global.setBehaviorText(t, {
+        need: (state === "mourn_grave" || state === "visit_grave") ? "social" : "fulfill",
+        actionId: state,
+        actionLabel: text,
+        reasonText: text,
+        target,
+        phase: "perform",
+        source: "behavior",
+      });
+    }
+  }
+
+  function clearBuilderAssignment(t, req = null) {
+    if (req && req.builderFamilyKey === familyKeyOf(t)) req.builderFamilyKey = "";
+    const worldRef = t?.world;
+    const splat = req?.splatId ? worldRef?.residueByRuntimeId?.(req.splatId) : null;
+    if (splat && splat._memorialReservedBy === req?.id) splat._memorialReservedBy = "";
+    if (t) {
+      t.memorialRequestId = "";
+      t.memorialBuildProgress = 0;
+      if (t.state === "build_memorial") t.goIdle?.("墓作りをやめた");
+    }
+  }
+
+  function assignMemorial(t) {
+    const worldRef = t?.world;
+    if (!worldRef || !t || isCritical(t)) return false;
+    const key = familyKeyOf(t);
+    if (!key) return false;
+    for (const req of ensureRequests(worldRef)) {
+      if (!req || req.status !== "pending" || !req.eligibleFamilyKeys?.includes?.(key)) continue;
+      if (activeGraveFor(worldRef, req.deceasedFamilyKey)) { req.status = "complete"; continue; }
+      if (req.builderFamilyKey) {
+        const builder = liveByFamilyKey(worldRef, req.builderFamilyKey);
+        if (builder && builder.memorialRequestId === req.id) continue;
+        req.builderFamilyKey = "";
+      }
+      const splat = liveSplatForRequest(worldRef, req);
+      if (!splat) continue;
+      req.builderFamilyKey = key;
+      req.splatId = splat.id || "";
+      splat._memorialReservedBy = req.id;
+      t.memorialRequestId = req.id;
+      t.memorialBuildProgress = 0;
+      setSpecialBehavior(t, "build_memorial", BUILD_TEXT, splat);
+      return true;
+    }
+    return false;
+  }
+
+  function completeMemorial(t, req, splat) {
+    const worldRef = t?.world;
+    if (!worldRef || !req || !splat) return false;
+    const grave = createGraveFromRequest(worldRef, req, familyKeyOf(t), "memorial-built");
+    if (!grave) return false;
+    splat.amount = 0;
+    splat.hp = 0;
+    splat._memorialReservedBy = "";
+    worldRef.removeResidue?.(splat, "memorial-material-consumed");
+    req.status = "complete";
+    req.builderFamilyKey = "";
+    req.splatId = "";
+    t.memorialRequestId = "";
+    t.memorialBuildProgress = 0;
+    t.target = null;
+    if (typeof applyNeedRelief === "function") applyNeedRelief(t, { social: -48, fulfill: -8 });
+    t.goIdle?.("親しいたりないの墓を作った。");
+    worldRef.spawnEffect?.("ring", grave.x, grave.y, { size: 38, life: 0.42, color: "rgba(128,120,112,0.42)" });
+    return true;
+  }
+
+  function updateMemorialMotion(t, dt) {
+    const worldRef = t?.world;
+    const req = requestById(worldRef, t?.memorialRequestId);
+    if (!req || req.status !== "pending" || req.builderFamilyKey !== familyKeyOf(t)) {
+      if (t?.memorialRequestId) clearBuilderAssignment(t, req);
+      return false;
+    }
+    if (isCritical(t) && t.state !== "build_memorial") return false;
+    let splat = req.splatId ? worldRef.residueByRuntimeId?.(req.splatId) : null;
+    if (!splat || splat.dead || splat.type !== "splat" || Number(splat.amount || 0) <= 0) {
+      splat = liveSplatForRequest(worldRef, req);
+      if (!splat) { clearBuilderAssignment(t, req); return false; }
+      req.splatId = splat.id || "";
+      splat._memorialReservedBy = req.id;
+    }
+    setSpecialBehavior(t, "build_memorial", BUILD_TEXT, splat);
+    const d = Math.hypot((splat.x || 0) - t.x, (splat.y || 0) - t.y);
+    const reach = Math.max(28, (t.radius || 22) + (splat.r || 20) * 0.55);
+    if (d > reach) return false;
+    t.vx *= Math.pow(0.18, Math.max(0.016, dt) * 60);
+    t.vy *= Math.pow(0.18, Math.max(0.016, dt) * 60);
+    t.memorialBuildProgress = Math.max(0, Number(t.memorialBuildProgress || 0)) + dt;
+    if (t.memorialBuildProgress >= 9.0) completeMemorial(t, req, splat);
+    return true;
+  }
+
+  function maintainMourning(t, dt = 0) {
+    const now = Number(t?.world?.time || 0) || 0;
+    if (!t || !Number.isFinite(Number(t.graveMourningUntil)) || now >= Number(t.graveMourningUntil)) {
+      if (t?.state === "mourn_grave") t.goIdle?.("泣き止んだ");
+      return false;
+    }
+    setSpecialBehavior(t, "mourn_grave", MOURN_TEXT, null);
+    if (dt > 0) {
+      t.vx *= Math.pow(0.15, dt * 60);
+      t.vy *= Math.pow(0.15, dt * 60);
+    }
+    return true;
+  }
+
+  function maintainBellCall(t) {
+    const now = Number(t?.world?.time || 0) || 0;
+    if (!t || !t.bellCallTarget || now >= Number(t.bellCallUntil || 0)) {
+      if (t?.state === "bell_call") t.goIdle?.("呼び鈴の音が止んだ");
+      t && (t.bellCallTarget = null);
+      return false;
+    }
+    if (isCritical(t) && t.state !== "bell_call") return false;
+    const target = t.bellCallTarget;
+    const d = Math.hypot(target.x - t.x, target.y - t.y);
+    if (d <= Math.max(32, (t.radius || 22) * 1.15)) {
+      t.bellCallTarget = null;
+      t.target = null;
+      t.goIdle?.("呼び鈴の鳴った場所に集まった。");
+      return false;
+    }
+    setSpecialBehavior(t, "bell_call", BELL_TEXT, target);
+    return true;
+  }
+
+  function updateAi(t) {
+    if (!t || t.dead) return false;
+    if (maintainMourning(t, 0)) return true;
+    if (t.memorialRequestId) {
+      const req = requestById(t.world, t.memorialRequestId);
+      if (req?.status === "pending") {
+        setSpecialBehavior(t, "build_memorial", BUILD_TEXT, req.splatId ? t.world?.residueByRuntimeId?.(req.splatId) : t.target);
+        return true;
+      }
+      clearBuilderAssignment(t, req);
+    }
+    if (maintainBellCall(t)) return true;
+    if (assignMemorial(t)) return true;
+    if (maintainGraveVisit(t)) return true;
+    return maybeStartGraveVisit(t);
+  }
+
+  function updateMotion(t, dt) {
+    if (!t || t.dead) return { handled: false };
+    if (maintainMourning(t, dt)) return { handled: true };
+    if (t.memorialRequestId || t.state === "build_memorial") {
+      const handled = updateMemorialMotion(t, dt);
+      return { handled };
+    }
+    if (maintainBellCall(t)) return { handled: false };
+    if (t.graveVisitTargetId || t.state === "visit_grave") {
+      const grave = graveById(t.world, t.graveVisitTargetId);
+      if (!grave) { clearGraveVisit(t, "墓がなくなった。"); return { handled: false }; }
+      const d = Math.hypot((grave.x || 0) - t.x, (grave.y || 0) - t.y);
+      const reach = Math.max(38, (t.radius || 22) + (grave.r || 18) * 0.82);
+      if (t.graveVisitPhase === "visiting" || d <= reach) {
+        if (t.graveVisitPhase !== "visiting") {
+          const now = Number(t.world?.time || 0) || 0;
+          const unit = typeof global.stableUnit === "function" ? global.stableUnit(familyKeyOf(t), `grave-visit-duration-${grave.id || "grave"}-${Math.floor(now)}`) : Math.random();
+          t.graveVisitPhase = "visiting";
+          t.graveVisitUntil = now + 4.5 + unit * 4.0;
+          if (!t.graveVisitReliefApplied && typeof applyNeedRelief === "function") {
+            applyNeedRelief(t, { social: -42, fulfill: -6 });
+            t.graveVisitReliefApplied = true;
+          }
+          setSpecialBehavior(t, "visit_grave", `${grave.memorialName || "親しいたりない"}を悼んでいる。`, grave);
+        }
+        t.vx *= Math.pow(0.12, Math.max(0.016, dt) * 60);
+        t.vy *= Math.pow(0.12, Math.max(0.016, dt) * 60);
+        maintainGraveVisit(t);
+        return { handled: true };
+      }
+      maintainGraveVisit(t);
+      return { handled: false };
+    }
+    return { handled: false };
+  }
+
+  function ringAt(worldRef, x, y, requestedSize = "medium") {
+    if (!worldRef) return 0;
+    const size = ["small", "medium", "large"].includes(requestedSize) ? requestedSize : "medium";
+    const range = BELL_RANGES[size];
+    const duration = BELL_DURATIONS[size];
+    const now = Number(worldRef.time || 0) || 0;
+    global.TarinaiAudio?.bell?.();
+    const px = Number(x || 0) || 0;
+    const py = Number(y || 0) || 0;
+    const target = { id: `bell-call-${Math.round(now * 1000)}-${Math.round(px)}-${Math.round(py)}`, type: "bell_call", x: px, y: py, dead: false };
+    let affected = 0;
+    for (const t of worldRef.tarinai || []) {
+      if (!t || t.dead) continue;
+      if (Math.hypot(t.x - px, t.y - py) > range) continue;
+      t.bellCallTarget = target;
+      t.bellCallUntil = Math.max(Number(t.bellCallUntil || 0), now + duration);
+      if (t.graveVisitTargetId) {
+        t.graveVisitTargetId = "";
+        t.graveVisitUntil = 0;
+        t.graveVisitPhase = "";
+      }
+      if (!isCritical(t)) setSpecialBehavior(t, "bell_call", BELL_TEXT, target);
+      affected += 1;
+    }
+    worldRef.spawnEffect?.("ring", px, py, { size: range, life: 0.62, color: "rgba(219,164,70,0.52)" });
+    worldRef.spawnEffect?.("ring", px, py, { size: Math.min(92, 34 + range * 0.08), life: 0.48, color: "rgba(244,197,100,0.58)" });
+    worldRef.drawListDirty = true;
+    return affected;
+  }
+
+  const NATURAL_ASCENSION_SPRITES = Object.freeze(["sleep", "normal_happy"]);
+  const REMOVAL_ASCENSION_SPRITES = Object.freeze(["hurt", "flee", "flee_fear2", "cold_1"]);
+
+  function ascensionSpriteFor(worldRef, grave, sprites, salt = "grave-ascension") {
+    const list = Array.isArray(sprites) && sprites.length ? sprites : ["sleep"];
+    const unit = typeof global.stableUnit === "function"
+      ? global.stableUnit(grave?.memorialFamilyKey || grave?.id || "grave", `${salt}-${Math.floor(Number(worldRef?.time || 0) || 0)}`)
+      : Math.random();
+    return list[Math.min(list.length - 1, Math.floor(Math.max(0, Math.min(0.999999, unit)) * list.length))] || list[0];
+  }
+
+  function spawnGraveAscension(worldRef, grave, options = {}) {
+    if (!worldRef || !grave) return false;
+    const natural = options.natural === true;
+    const spriteId = ascensionSpriteFor(worldRef, grave, natural ? NATURAL_ASCENSION_SPRITES : REMOVAL_ASCENSION_SPRITES, natural ? "grave-natural-ascension" : "grave-removal-ascension");
+    worldRef.spawnEffect?.("ascend_soul", grave.x, grave.y - Math.max(2, (grave.r || 14) * 0.25), {
+      vx: 0,
+      vy: -34,
+      size: Math.max(18, (grave.r || 14) * 1.45),
+      life: 2.4,
+      importance: 3,
+      allowOffscreen: true,
+      forceVisual: true,
+      spriteId,
+    });
+    return true;
+  }
+
+  function applyExternalForce(worldRef, grave, magnitude = 0, breaker = null, reason = "external-force") {
+    if (!worldRef || !grave || grave.dead || grave.type !== "grave") return false;
+    const force = Math.max(0, Number(magnitude || 0) || 0);
+    if (force < GRAVE_BREAK_FORCE) return false;
+    const removed = Boolean(global.TarinaiStructureLifecycle?.deleteItem?.(worldRef, grave, {
+      reason: `grave-${reason}`,
+      userReason: "強い衝撃で墓が壊れた",
+      wake: true,
+      breaker,
+    }));
+    if (removed) {
+      worldRef.spawnEffect?.("ring", grave.x, grave.y, { size: 42, life: 0.28, color: "rgba(130,124,116,0.46)" });
+      worldRef.spawnEffect?.("fight", grave.x, grave.y, { size: 18, life: 0.24, color: "rgba(118,108,98,0.52)" });
+    }
+    return removed;
+  }
+
+  function onGraveDestroyed(worldRef, grave, breaker = null) {
+    if (!worldRef || !grave || grave.type !== "grave" || grave._memorialDestroyedHandled) return false;
+    grave._memorialDestroyedHandled = true;
+    if (grave._naturalDecaySilent) return false;
+    spawnGraveAscension(worldRef, grave, { natural: false });
+    const eligible = new Set(Array.isArray(grave.memorialEligibleFamilyKeys) ? grave.memorialEligibleFamilyKeys : []);
+    const now = Number(worldRef.time || 0) || 0;
+    let count = 0;
+    for (const t of worldRef.tarinai || []) {
+      if (!t || t.dead || !eligible.has(familyKeyOf(t))) continue;
+      if (t.graveVisitTargetId === grave.id) {
+        t.graveVisitTargetId = "";
+        t.graveVisitUntil = 0;
+        t.graveVisitPhase = "";
+      }
+      t.graveMourningUntil = Math.max(Number(t.graveMourningUntil || 0), now + 5.5);
+      t.bellCallTarget = null;
+      t.memorialRequestId = "";
+      setSpecialBehavior(t, "mourn_grave", MOURN_TEXT, null);
+      t.surpriseTimer = Math.max(t.surpriseTimer || 0, 0.75);
+      t.awakeLockTimer = Math.max(t.awakeLockTimer || 0, 2.5);
+      t.stress = Math.min(100, (Number(t.stress || 0) || 0) + 12);
+      worldRef.spawnBubble?.(t.x, t.y - (t.radius || 20) * 1.15, "……", "rgba(84,112,166,0.82)");
+      count += 1;
+    }
+    if (count) worldRef.log?.(`${grave.memorialName || "親しいたりない"}の墓が壊され、親しいたりないたちが泣いている。`, "death");
+    void breaker;
+    return count > 0;
+  }
+
+  function removeGraveNaturally(worldRef, grave, day) {
+    if (!worldRef || !grave || grave.dead || grave.type !== "grave" || grave.memorialFavorite) return false;
+    const disappears = typeof global.deterministicChance === "function"
+      ? global.deterministicChance(worldRef, "grave-natural-decay-0444", 0.25, grave.memorialFamilyKey || grave.id, day)
+      : Math.random() < 0.25;
+    if (!disappears) return false;
+    grave._naturalDecaySilent = true;
+    spawnGraveAscension(worldRef, grave, { natural: true });
+    const removed = Boolean(global.TarinaiStructureLifecycle?.deleteItem?.(worldRef, grave, {
+      reason: "grave-natural-decay",
+      userReason: "いつの間にか消えた",
+      wake: false,
+      panicOwner: false,
+    }));
+    if (removed) worldRef.spawnEffect?.("ring", grave.x, grave.y, { size: 30, life: 0.36, color: "rgba(164,156,143,0.26)", importance: 2 });
+    return removed;
+  }
+
+  function updateWorldNaturalDecay(worldRef) {
+    if (!worldRef) return 0;
+    const now = Math.max(0, Number(worldRef.time || 0) || 0);
+    const hasPrevious = Number.isFinite(Number(worldRef._graveNaturalDecayLastWorldTime));
+    const previous = hasPrevious ? Number(worldRef._graveNaturalDecayLastWorldTime) : now;
+    worldRef._graveNaturalDecayLastWorldTime = now;
+    if (!hasPrevious || now <= previous) return 0;
+
+    const dayLength = Math.max(1, Number((typeof CONFIG !== "undefined" ? CONFIG.dayLength : 120) || 120) || 120);
+    const targetFraction = (4 * 60 + 44) / (24 * 60);
+    const firstDay = Math.max(0, Math.floor(previous / dayLength));
+    const lastDay = Math.max(firstDay, Math.floor(now / dayLength));
+    let removedCount = 0;
+    for (let day = firstDay; day <= lastDay; day += 1) {
+      if (Number(worldRef._graveNaturalDecayLastCheckedDay) === day) continue;
+      const targetTime = day * dayLength + dayLength * targetFraction;
+      if (!(previous < targetTime && now >= targetTime)) continue;
+      worldRef._graveNaturalDecayLastCheckedDay = day;
+      const graveBucket = typeof worldRef.itemsOfType === "function" ? worldRef.itemsOfType("grave") : null;
+      const graves = graveBucket && typeof graveBucket.length === "number"
+        ? Array.from(graveBucket)
+        : (worldRef.items || []).filter(item => item && !item.dead && item.type === "grave");
+      for (const grave of graves) if (removeGraveNaturally(worldRef, grave, day)) removedCount += 1;
+    }
+    return removedCount;
+  }
+
+  // Kept for compatibility with older direct callers. Grave decay is now
+  // world-scheduled, so adding more graves does not add per-grave update work.
+  function updateGraveNaturalDecay(grave, worldRef) {
+    void grave;
+    void worldRef;
+    return false;
+  }
+
+  function formatWorldTime(timeValue) {
+    const value = Number(timeValue);
+    if (!Number.isFinite(value)) return "";
+    const dayLength = Math.max(1, Number((typeof CONFIG !== "undefined" ? CONFIG.dayLength : 120) || 120) || 120);
+    const completedDays = Math.max(0, Math.floor(value / dayLength));
+    const season = ["春", "夏", "秋", "冬"][Math.floor((completedDays % 20) / 5)] || "春";
+    const seasonDay = (completedDays % 5) + 1;
+    const progress = (((value % dayLength) + dayLength) % dayLength) / dayLength;
+    const totalMinutes = Math.floor(progress * 24 * 60 + 1e-7) % (24 * 60);
+    const hh = String(Math.floor(totalMinutes / 60)).padStart(2, "0");
+    const mm = String(totalMinutes % 60).padStart(2, "0");
+    return `${season}${seasonDay}日 ${hh}:${mm}`;
+  }
+
+  function graveTooltipLines(grave) {
+    if (!grave) return [];
+    const lines = ["墓"];
+    if (grave.memorialName) lines.push(`故人: ${grave.memorialName}`);
+    const died = formatWorldTime(grave.memorialDeathTime);
+    if (died) lines.push(`死亡日時: ${died}`);
+    if (grave.memorialDeathReason) lines.push(`死因: ${grave.memorialDeathReason}`);
+    return lines;
+  }
+
+  global.TarinaiMemorialBellSystem = Object.freeze({
+    BUILD_TEXT,
+    MOURN_TEXT,
+    BELL_TEXT,
+    GRAVE_VISIT_APPROACH_TEXT,
+    GRAVE_VISIT_TEXT,
+    BELL_RANGES,
+    MEMORIAL_BUILD_CHANCE,
+    GRAVE_BREAK_FORCE,
+    captureDeath,
+    ringAt,
+    updateAi,
+    updateMotion,
+    applyExternalForce,
+    onGraveDestroyed,
+    updateGraveNaturalDecay,
+    updateWorldNaturalDecay,
+    graveTooltipLines,
+    formatWorldTime,
+  });
+})(typeof window !== "undefined" ? window : globalThis);
diff --git a/js/perf_profiler.js b/js/perf_profiler.js
index c6a1466..813d746 100644
--- a/js/perf_profiler.js
+++ b/js/perf_profiler.js
@@ -18,7 +18,6 @@
   let frameCount = 0;
   let lastSmoothAt = 0;
   const storageKey = "tarinai_visual_settings_v2";
-  const legacyStorageKey = "tarinai_visual_settings_v1";
   const allowed = {
     effects: new Set(["off", "high"]),
     shadows: new Set(["off", "high"]),
@@ -32,32 +31,34 @@
     dprScale: 1,
     simulationThrottled: false,
     creatureCadenceScale: 0,
-    creatureBackgroundBudget: 1000000000,
-    pressureCreatureFullBudget: 1000000000,
-    pressureCreatureMotionBudget: 1000000000,
-    pressureObstacleContactBudget: 1000000000,
-    collisionSourceBudget: 1000000000,
-    collisionImpactBudget: 1000000000,
+    // High quality is still intentionally generous, but no subsystem is
+    // allowed to explode to effectively-unbounded work in a single frame.
+    creatureBackgroundBudget: 180,
+    pressureCreatureFullBudget: 240,
+    pressureCreatureMotionBudget: 360,
+    pressureObstacleContactBudget: 96,
+    collisionSourceBudget: 220,
+    collisionImpactBudget: 160,
     itemCadenceScale: 0,
-    scheduledItemBudget: 1000000000,
-    aiBudget: 1000000000,
-    envBudget: 1000000000,
-    effectCap: 1000000000,
-    effectUpdateBudget: 1000000000,
+    scheduledItemBudget: 180,
+    aiBudget: 96,
+    envBudget: 32,
+    effectCap: 520,
+    effectUpdateBudget: 280,
     effectDrawBudget: 160,
-    fireInteractionBudget: 1000000000,
-    activeFireLimit: 1000000000,
+    fireInteractionBudget: 96,
+    activeFireLimit: 260,
     physicsBudget: Object.freeze({
-      maxItems: 1000000000,
-      maxPairs: 1000000000,
-      maxLinks: 1000000000,
-      postMaxPairs: 1000000000,
-      maxSubsteps: 8,
-      focusThreshold: 1000000000,
-      maxSubstepPairs: 1000000000,
-      maxSubstepFenceItems: 1000000000,
+      maxItems: 560,
+      maxPairs: 960,
+      maxLinks: 520,
+      postMaxPairs: 300,
+      maxSubsteps: 6,
+      focusThreshold: 220,
+      maxSubstepPairs: 620,
+      maxSubstepFenceItems: 220,
     }),
-    poisonContactBudget: Object.freeze({ maxPoison: 1000000000, maxTargets: 1000000000, skip: false }),
+    poisonContactBudget: Object.freeze({ maxPoison: 72, maxTargets: 320, skip: false }),
   });
   const PROFILE_BALANCED = Object.freeze({
     id: "balanced",
@@ -130,6 +131,7 @@
   let visualSettings = loadVisualSettings();
   let resizeRequested = false;
   let autoProfileId = "full";
+  const FPS_UPDATE_INTERVAL_SECONDS = 0.75;
   let fpsAccumSeconds = 0;
   let fpsAccumFrames = 0;
   let smoothedFps = 0;
@@ -213,14 +215,7 @@
   function loadVisualSettings() {
     try {
       const current = global.localStorage?.getItem(storageKey);
-      if (current) return sanitizeVisualSettings(JSON.parse(current));
-      const legacy = global.localStorage?.getItem(legacyStorageKey);
-      if (!legacy) return { ...defaults };
-      const migrated = sanitizeVisualSettings(JSON.parse(legacy));
-      // Old builds had no automatic mode. Preserve explicit effect/shadow choices,
-      // but use the new automatic drawing mode as the migration default.
-      migrated.details = "auto";
-      return migrated;
+      return current ? sanitizeVisualSettings(JSON.parse(current)) : { ...defaults };
     } catch (_) {
       return { ...defaults };
     }
@@ -271,10 +266,10 @@
     if (!Number.isFinite(dt) || dt <= 0 || dt > 0.25 || global.document?.hidden) return;
     fpsAccumSeconds += dt;
     fpsAccumFrames += 1;
-    if (fpsAccumSeconds < 0.75) return;
+    if (fpsAccumSeconds < FPS_UPDATE_INTERVAL_SECONDS) return;
     const sampleSeconds = fpsAccumSeconds;
     const sampledFps = fpsAccumFrames / Math.max(0.001, sampleSeconds);
-    smoothedFps = smoothedFps > 0 ? smoothedFps * 0.65 + sampledFps * 0.35 : sampledFps;
+    smoothedFps = sampledFps;
     global.__tarinaiFps = Math.round(smoothedFps);
     fpsAccumSeconds = 0;
     fpsAccumFrames = 0;
diff --git a/js/physics_helpers.js b/js/physics_helpers.js
index 8d9219e..59b4ae1 100644
--- a/js/physics_helpers.js
+++ b/js/physics_helpers.js
@@ -188,7 +188,7 @@
         const now = worldRef.time || 0;
         if ((item.lastBounceFenceEffectAt || -999) + 0.08 <= now) {
           item.lastBounceFenceEffectAt = now;
-          worldRef.effects?.push(new Effect("ring", item.x, item.y, { size: Math.max(12, radius * 1.15), life: 0.16, color: "rgba(82,153,230,0.45)" }));
+          worldRef.queueEffect?.("ring", item.x, item.y, { size: Math.max(12, radius * 1.15), life: 0.16, color: "rgba(82,153,230,0.45)" });
         }
       }
     }
@@ -215,8 +215,10 @@
     bounceInsideWorld(item, worldRef, opts);
     resolveFenceBounce(item, worldRef, dt, opts);
     const ice = (worldRef?.groundType || "soil") === "ice";
-    const baseFriction = ice ? Math.max(Number(opts.frictionBase ?? 0.68), 0.93) : (opts.frictionBase ?? 0.68);
-    const frictionRate = ice ? Math.min(Number(opts.frictionRate ?? 1), 0.55) : (opts.frictionRate ?? 1);
+    let baseFriction = ice ? Math.max(Number(opts.frictionBase ?? 0.68), 0.93) : (opts.frictionBase ?? 0.68);
+    let frictionRate = ice ? Math.min(Number(opts.frictionRate ?? 1), 0.55) : (opts.frictionRate ?? 1);
+    const oilMul = global.TarinaiItemEnvironmentHazardSystem?.groundFrictionMultiplier?.(worldRef, item.x, item.y) ?? 1;
+    if (oilMul < 1) baseFriction = 1 - (1 - baseFriction) * oilMul;
     const friction = Math.pow(baseFriction, dt * frictionRate);
     item.vx *= friction;
     item.vy *= friction;
diff --git a/js/placement_preview_system.js b/js/placement_preview_system.js
index e4a2d3e..a70d97d 100644
--- a/js/placement_preview_system.js
+++ b/js/placement_preview_system.js
@@ -23,7 +23,6 @@
   }
   function pickMode(worldRef) {
     const value = String(worldRef?.toolPickMode || "free").toLowerCase();
-    if (value === "grid") return "grid40"; // compatibility with v39.16.34
     return new Set(["grid20", "grid40", "grid60"]).has(value) ? value : "free";
   }
   function gridStep(worldRef) {
@@ -51,12 +50,12 @@
   }
   function rectOutside(worldRef, rect, itemType = "") {
     if (!worldRef || !rect) return true;
-    const pad = global.CONFIG?.worldPadding || 30;
+    const pad = (typeof CONFIG !== "undefined" ? CONFIG.worldPadding : global.CONFIG?.worldPadding) || 30;
     return num(rect.left) < pad || num(rect.right) > (worldRef.w || 0) - pad || num(rect.top) < 0 || num(rect.bottom) > (worldRef.h || 0);
   }
   function circleOutside(worldRef, x, y, radius) {
     if (!worldRef) return true;
-    const pad = global.CONFIG?.worldPadding || 30;
+    const pad = (typeof CONFIG !== "undefined" ? CONFIG.worldPadding : global.CONFIG?.worldPadding) || 30;
     const r = Math.max(0, num(radius));
     return num(x) - r < pad || num(y) - r < 0 || num(x) + r > (worldRef.w || 0) - pad || num(y) + r > (worldRef.h || 0);
   }
@@ -153,7 +152,7 @@
   }
   function clampPointFor(worldRef, item, x = item?.x || 0, y = item?.y || 0) {
     if (!worldRef || !item) return { x, y };
-    const pad = global.CONFIG?.worldPadding || 30;
+    const pad = (typeof CONFIG !== "undefined" ? CONFIG.worldPadding : global.CONFIG?.worldPadding) || 30;
     const rects = rectsFor(worldRef, item);
     if (rects.length) {
       let left = 0, right = 0, top = 0, bottom = 0;
@@ -223,8 +222,11 @@
     const r = tmp.r;
     let extra = {};
     if (type === "dry_ice" || type === "stove") {
-      const range = Math.max(24, global.CONFIG?.temperatureItemRange ?? 190);
+      const range = Math.max(24, (typeof CONFIG !== "undefined" ? CONFIG.temperatureItemRange : global.CONFIG?.temperatureItemRange) ?? 190);
       extra.influence = { kind: "temperatureEffectRange", shape: "circle", x, y, radius: range, type };
+    } else if (type === "leakage_device") {
+      const range = global.TarinaiItemEnvironmentHazardSystem?.leakageRadius?.(tmp) ?? Math.max(260, (tmp.r || 34) * 8.2);
+      extra.influence = { kind: "leakageDamageRange", shape: "circle", x, y, radius: range, type };
     }
     if (type === "grass") {
       const overlaps = global.TarinaiPhysicsSoftClear.collectForPlacement(worldRef, tmp) || [];
diff --git a/js/render.js b/js/render.js
index 172eccb..6953529 100644
--- a/js/render.js
+++ b/js/render.js
@@ -510,8 +510,9 @@ function drawDeviceInfluenceShape(ctx, influence, blocked = false, alphaScale =
   ctx.lineWidth = 2.0;
   const tempRange = influence?.kind === "temperatureEffectRange";
   const hotRange = tempRange && influence?.type === "stove";
-  ctx.strokeStyle = blocked ? "rgba(194,70,58,0.72)" : (tempRange ? (hotRange ? "rgba(230,112,48,0.80)" : "rgba(74,166,230,0.82)") : "rgba(80,174,222,0.82)");
-  ctx.fillStyle = blocked ? "rgba(232,84,72,0.055)" : (tempRange ? (hotRange ? "rgba(255,138,56,0.075)" : "rgba(74,166,230,0.075)") : "rgba(80,174,222,0.075)");
+  const electricRange = influence?.kind === "leakageDamageRange";
+  ctx.strokeStyle = blocked ? "rgba(194,70,58,0.72)" : (electricRange ? "rgba(126,218,255,0.90)" : (tempRange ? (hotRange ? "rgba(230,112,48,0.80)" : "rgba(74,166,230,0.82)") : "rgba(80,174,222,0.82)"));
+  ctx.fillStyle = blocked ? "rgba(232,84,72,0.055)" : (electricRange ? "rgba(126,218,255,0.085)" : (tempRange ? (hotRange ? "rgba(255,138,56,0.075)" : "rgba(74,166,230,0.075)") : "rgba(80,174,222,0.075)"));
   ctx.beginPath();
   ctx.arc(x, y, radius, 0, Math.PI * 2);
   ctx.fill();
@@ -687,6 +688,33 @@ function drawPressureSwitchRangeOverlay(ctx, world) {
 function drawOperationToolPreview(ctx, world) {
   const p = world?.pointer;
   if (!p?.inside) return;
+  if (world?.tool === "bell") {
+    const size = world.toolSizeFor?.("bell") || "medium";
+    const ranges = globalThis.TarinaiMemorialBellSystem?.BELL_RANGES || { small: 120, medium: 210, large: 350 };
+    const range = Math.max(1, Number(ranges[size] || ranges.medium || 420) || 420);
+    ctx.save();
+    ctx.fillStyle = "rgba(229, 174, 70, 0.055)";
+    ctx.strokeStyle = "rgba(214, 151, 48, 0.76)";
+    ctx.lineWidth = Math.max(1.4, world.screenSizeToWorld ? world.screenSizeToWorld(2.0) : 2);
+    ctx.setLineDash([12, 9]);
+    ctx.beginPath();
+    ctx.arc(p.x, p.y, range, 0, Math.PI * 2);
+    ctx.fill();
+    ctx.stroke();
+    ctx.setLineDash([4, 10]);
+    ctx.globalAlpha = 0.62;
+    ctx.beginPath();
+    ctx.arc(p.x, p.y, range * 0.5, 0, Math.PI * 2);
+    ctx.stroke();
+    ctx.setLineDash([]);
+    ctx.globalAlpha = 0.88;
+    ctx.fillStyle = "rgba(214, 151, 48, 0.88)";
+    ctx.beginPath();
+    ctx.arc(p.x, p.y, Math.max(4, world.screenSizeToWorld ? world.screenSizeToWorld(5) : 5), 0, Math.PI * 2);
+    ctx.fill();
+    ctx.restore();
+    return;
+  }
   if (world?.tool === "copy" && world.copyBuffer) {
     const type = world.copyBuffer.type || "";
     const item = world.copyPreviewItemAt?.(p.x, p.y);
@@ -877,8 +905,9 @@ function invalidateRenderCaches(reason = "manual") {
   if (backgroundCache) backgroundCache.key = "";
   if (terrainChunkCache) {
     terrainChunkCache.key = "";
-    terrainChunkCache.chunks?.clear?.();
+    clearTerrainChunkCache();
   }
+  if (typeof clearSharedStaticBitmapCaches === "function") clearSharedStaticBitmapCaches();
 }
 
 // Cached low-priority terrain layer: grass, footprints and splats are mostly
@@ -890,8 +919,38 @@ const terrainChunkCache = {
   size: 256,
   key: "",
   chunks: new Map(),
+  minEntries: 64,
+  spareEntries: 24,
 };
 
+function releaseTerrainChunk(chunk) {
+  if (!chunk?.canvas) return;
+  chunk.canvas.width = 0;
+  chunk.canvas.height = 0;
+}
+
+function clearTerrainChunkCache() {
+  for (const chunk of terrainChunkCache.chunks.values()) releaseTerrainChunk(chunk);
+  terrainChunkCache.chunks.clear();
+}
+
+function touchTerrainChunk(key, chunk) {
+  // Map insertion order is our LRU order. Refresh entries when they are used.
+  terrainChunkCache.chunks.delete(key);
+  terrainChunkCache.chunks.set(key, chunk);
+}
+
+function pruneTerrainChunkCache(visibleKeys, visibleCount) {
+  const maxEntries = Math.max(terrainChunkCache.minEntries, Math.max(0, visibleCount || 0) + terrainChunkCache.spareEntries);
+  if (terrainChunkCache.chunks.size <= maxEntries) return;
+  for (const [key, chunk] of terrainChunkCache.chunks) {
+    if (terrainChunkCache.chunks.size <= maxEntries) break;
+    if (visibleKeys?.has?.(key)) continue;
+    terrainChunkCache.chunks.delete(key);
+    releaseTerrainChunk(chunk);
+  }
+}
+
 function isCachedTerrainItem(it) {
   if (!it || it.dead) return false;
   if (it.type === "grass" || it.type === "trace" || it.type === "splat") return true;
@@ -933,7 +992,7 @@ function linkIntersectsVisibleRect(it, worldRef, rect, margin = 18) {
 }
 
 function isBehindSpriteLayerItem(it) {
-  return Boolean(it && !it.dead && (isLinkRenderItem(it) || it.type === "bed" || it.type === "grass_bed" || it.type === "toilet" || it.type === "seesaw"));
+  return Boolean(it && !it.dead && (isLinkRenderItem(it) || it.type === "bed" || it.type === "grass_bed" || it.type === "toilet" || it.type === "oil" || it.type === "bear_trap" || it.type === "seesaw"));
 }
 
 function renderLayerSortY(entity) {
@@ -986,8 +1045,10 @@ function terrainChunkFor(cx, cy, worldRef) {
   const h = Math.max(1, Math.min(size, Math.ceil((worldRef.h || 1) - y)));
   if (!chunk) {
     const canvas = document.createElement("canvas");
-    chunk = { canvas, ctx: canvas.getContext("2d"), x, y, w, h, dirty: true, key: "" };
+    chunk = { cacheKey: key, canvas, ctx: canvas.getContext("2d"), x, y, w, h, dirty: true, key: "" };
     terrainChunkCache.chunks.set(key, chunk);
+  } else {
+    touchTerrainChunk(key, chunk);
   }
   if (chunk.w !== w || chunk.h !== h) {
     chunk.w = w;
@@ -997,6 +1058,40 @@ function terrainChunkFor(cx, cy, worldRef) {
   return chunk;
 }
 
+function drawTerrainResidue(ctx, residue) {
+  if (!residue || residue.dead || residue.amount <= 0) return;
+  ctx.save();
+  ctx.translate(residue.x || 0, residue.y || 0);
+  if (residue.type === "trace") {
+    const fade = Math.max(0, Math.min(1, (Number(residue.amount || 0) || 0) / 220));
+    ctx.globalAlpha *= 0.35 + fade * 0.65;
+    ctx.fillStyle = "rgba(122, 100, 76, 0.12)";
+    ctx.strokeStyle = "rgba(122, 100, 76, 0.16)";
+    ctx.lineWidth = 1.5;
+    ctx.beginPath();
+    ctx.ellipse(0, 0, (residue.r || 16) * 1.3, (residue.r || 16) * 0.75, Math.sin(residue.seed || 0) * 0.7, 0, Math.PI * 2);
+    ctx.fill(); ctx.stroke();
+  } else if (residue.type === "splat") {
+    const fade = Math.max(0, Math.min(1, (Number(residue.amount || 0) || 0) / 260));
+    ctx.globalAlpha *= fade;
+    ctx.fillStyle = `rgba(123, 214, 52, ${0.34 * fade})`;
+    ctx.strokeStyle = `rgba(85, 160, 38, ${0.22 * fade})`;
+    ctx.lineWidth = 1.8;
+    const blobs = [[-12,-2,10,8],[0,0,16,10],[13,5,10,8],[-2,-12,9,7],[7,-8,7,5],[-18,8,6,5]];
+    for (const [bx, by, bw, bh] of blobs) {
+      ctx.beginPath();
+      ctx.ellipse(bx, by, bw, bh, randSeed((residue.seed || 0) + bx * 0.1, -0.5, 0.5), 0, Math.PI * 2);
+      ctx.fill(); ctx.stroke();
+    }
+    for (let i = 0; i < 7; i++) {
+      ctx.beginPath();
+      ctx.arc(randSeed((residue.seed || 0) + i, -28, 24), randSeed((residue.seed || 0) + i + 9, -18, 18), randSeed((residue.seed || 0) + i + 19, 2.5, 4.8), 0, Math.PI * 2);
+      ctx.fill();
+    }
+  }
+  ctx.restore();
+}
+
 function redrawTerrainChunk(chunk, worldRef, lighting) {
   const c = chunk.ctx;
   chunk.canvas.width = Math.max(1, chunk.w);
@@ -1016,6 +1111,10 @@ function redrawTerrainChunk(chunk, worldRef, lighting) {
       if (!isCachedTerrainItem(it) || !isEntityVisibleInRect(it, rect, 80)) continue;
       it.draw(c, worldRef.time || 0, lighting);
     }
+    for (const residue of worldRef.nearbyResidues?.(cx, cy, radius) || []) {
+      if (!residue || residue.dead || !isPointVisibleInRect(residue.x, residue.y, (residue.r || 24) + 42, rect)) continue;
+      drawTerrainResidue(c, residue);
+    }
   } catch (err) {
     console.error("terrain chunk redraw failed", err);
   } finally {
@@ -1032,7 +1131,7 @@ function drawTerrainLayer(ctx, worldRef, lighting, visibleRect) {
     const key = terrainCacheKey(worldRef, lighting);
     if (terrainChunkCache.key !== key || worldRef.terrainDirtyGlobal || (worldRef.terrainDirty && !worldRef.terrainDirtyChunks?.size)) {
       terrainChunkCache.key = key;
-      terrainChunkCache.chunks.clear();
+      clearTerrainChunkCache();
       worldRef.terrainDirty = false;
       worldRef.terrainDirtyGlobal = false;
       worldRef.terrainDirtyChunks?.clear?.();
@@ -1049,13 +1148,28 @@ function drawTerrainLayer(ctx, worldRef, lighting, visibleRect) {
     const maxX = Math.min(Math.floor(((worldRef.w || 1) - 1) / size), Math.floor((visibleRect.right || 0) / size));
     const minY = Math.max(0, Math.floor((visibleRect.top || 0) / size));
     const maxY = Math.min(Math.floor(((worldRef.h || 1) - 1) / size), Math.floor((visibleRect.bottom || 0) / size));
-    for (let cy = minY; cy <= maxY; cy++) {
-      for (let cx = minX; cx <= maxX; cx++) {
-        const chunk = terrainChunkFor(cx, cy, worldRef);
-        if (chunk.dirty || chunk.key !== terrainChunkCache.key) redrawTerrainChunk(chunk, worldRef, lighting);
-        ctx.drawImage(chunk.canvas, chunk.x, chunk.y, chunk.w, chunk.h);
-      }
+    const visibleChunks = worldRef._renderTerrainChunkScratch || (worldRef._renderTerrainChunkScratch = []);
+    const visibleChunkKeys = worldRef._renderTerrainChunkKeyScratch || (worldRef._renderTerrainChunkKeyScratch = new Set());
+    visibleChunks.length = 0;
+    visibleChunkKeys.clear();
+    let dirtyVisibleCount = 0;
+    for (let cy = minY; cy <= maxY; cy++) for (let cx = minX; cx <= maxX; cx++) {
+      const chunk = terrainChunkFor(cx, cy, worldRef);
+      visibleChunks.push(chunk);
+      visibleChunkKeys.add(chunk.cacheKey || terrainChunkKey(cx, cy));
+      if (chunk.dirty || chunk.key !== terrainChunkCache.key) dirtyVisibleCount += 1;
     }
+    const deathBurst = /tarinai-death|splat-fade/.test(String(worldRef.terrainDirtyReason || "")) && dirtyVisibleCount > 8;
+    let redrawBudget = deathBurst ? 6 : Infinity;
+    if (deathBurst) visibleChunks.sort((a, b) => ((a.key === terrainChunkCache.key) ? 1 : 0) - ((b.key === terrainChunkCache.key) ? 1 : 0));
+    for (const chunk of visibleChunks) {
+      if (chunk.dirty || chunk.key !== terrainChunkCache.key) {
+        const usable = chunk.key === terrainChunkCache.key || (chunk.canvas.width > 1 && chunk.canvas.height > 1);
+        if (redrawBudget > 0 || !usable) { redrawTerrainChunk(chunk, worldRef, lighting); redrawBudget -= 1; }
+      }
+      ctx.drawImage(chunk.canvas, chunk.x, chunk.y, chunk.w, chunk.h);
+    }
+    pruneTerrainChunkCache(visibleChunkKeys, visibleChunks.length);
   } finally {
     if (end) end();
   }
@@ -1108,6 +1222,226 @@ function isEntityVisibleInRect(entity, rect, extra = 0) {
   return isPointVisibleInRect(entity.x, entity.y, renderRadiusForEntity(entity) + extra, rect);
 }
 
+// Stable field objects are expensive because their vector art and shadows were
+// rebuilt every frame even when nothing about the object changed. Cache only
+// genuinely static visual types; dynamic/mechanical/consumable items keep the
+// normal draw path. This preserves exact depth sorting because each item remains
+// an individual render-stack entry and only its pixels are reused.
+const STATIC_ITEM_BITMAP_TYPES = new Set([
+  // Cache only artwork whose vector reconstruction is expensive enough to
+  // justify a dedicated backing canvas. Small consumables, zunchi, water and
+  // corpses are cheaper to draw directly and can exist in large numbers, so
+  // per-item canvases for them waste substantially more memory than they save.
+  "stone", "bed", "grass_bed", "nest_box", "pipe", "toilet", "rain_shelter", "ant_nest", "signboard",
+  "fence_v", "fence_h", "glass_wall", "bounce_fence", "bounce_fence_v", "one_way_fence", "plushie", "grave"
+]);
+
+function canUseStaticItemBitmapCache(it, worldRef) {
+  if (!it || it.dead || !STATIC_ITEM_BITMAP_TYPES.has(String(it.type || ""))) return false;
+  if (isCachedTerrainItem(it) || isLinkRenderItem(it)) return false;
+  if (it.playerHeld || it._heldByPlayer || it.dragging || (it.dropTimer || 0) > 0) return false;
+  if (it.burning || (it.burnTimer || 0) > 0.02 || (it.nestFireEvacuationTimer || 0) > 0.02) return false;
+  if (it.isStructure && it.type === "plushie" && (it.carriedById || it.onHead)) return false;
+  if (Math.hypot(it.vx || 0, it.vy || 0) > 0.02) return false;
+  if (worldRef?.spatial?.isDynamicItem?.(it)) return false;
+  return true;
+}
+
+function staticItemBitmapState(it, lighting) {
+  return {
+    lightBucket: Math.round((lighting?.light || 0) * 6),
+    warmthBucket: Math.round((lighting?.warmth || 0) * 3),
+    r: Number(it.r || 0),
+    angle: Number(it.angle || 0),
+    amount: Number(it.amount || 0),
+    servings: Number(it.foodServingsRemaining ?? -1),
+    servingsMax: Number(it.foodServingsMax ?? -1),
+    variant: String(it.zunchiVariant || it.variant || it.plushieVariant || it.plushieKind || ""),
+    toolSize: String(it.toolSize || ""),
+    text: String(it.text || it.label || ""),
+    state: String(it.state || it.stage || ""),
+    freshness: Number(it.freshness ?? -1),
+    fertility: Number(it.fertility ?? -1),
+    flash: Number(it.toiletFlash ?? 0),
+    color: String(it.color || ""),
+    active: Boolean(it.active),
+    memorialFavorite: Boolean(it.memorialFavorite),
+  };
+}
+
+function releaseStaticItemBitmapCache(it) {
+  const cache = it?._staticRenderBitmapCache;
+  if (!cache) return false;
+  // Resetting canvas dimensions releases the backing pixel buffer in browsers
+  // before the item itself is eventually collected.
+  if (cache.canvas) {
+    cache.canvas.width = 0;
+    cache.canvas.height = 0;
+  }
+  it._staticRenderBitmapCache = null;
+  return true;
+}
+
+const SHARED_STATIC_ITEM_BITMAP_CACHE_MAX = 128;
+const sharedStaticItemBitmapCache = new Map();
+const sharedGraveBitmapCache = new Map();
+
+function clearSharedStaticBitmapCaches() {
+  for (const cache of sharedStaticItemBitmapCache.values()) {
+    if (cache?.canvas) { cache.canvas.width = 0; cache.canvas.height = 0; }
+  }
+  for (const cache of sharedGraveBitmapCache.values()) {
+    if (cache?.canvas) { cache.canvas.width = 0; cache.canvas.height = 0; }
+  }
+  sharedStaticItemBitmapCache.clear();
+  sharedGraveBitmapCache.clear();
+}
+
+function sharedStaticBitmapKey(it, state, radius) {
+  // Procedural decorations use a small stable variant pool instead of one
+  // canvas per item. This preserves visual variety while bounding memory.
+  const seedVariant = Math.abs(Math.floor(Number(it.seed || 0))) % 4;
+  return [
+    String(it.type || ""), radius, seedVariant,
+    state.lightBucket, state.warmthBucket, state.r, state.angle,
+    state.amount, state.servings, state.servingsMax, state.variant,
+    state.toolSize, state.text, state.state, state.freshness,
+    state.fertility, state.flash, state.color, state.active ? 1 : 0,
+    state.memorialFavorite ? 1 : 0,
+  ].join("|");
+}
+
+function getSharedStaticBitmap(key) {
+  const cache = sharedStaticItemBitmapCache.get(key);
+  if (!cache) return null;
+  sharedStaticItemBitmapCache.delete(key);
+  sharedStaticItemBitmapCache.set(key, cache);
+  return cache;
+}
+
+function putSharedStaticBitmap(key, cache) {
+  sharedStaticItemBitmapCache.set(key, cache);
+  while (sharedStaticItemBitmapCache.size > SHARED_STATIC_ITEM_BITMAP_CACHE_MAX) {
+    const oldestKey = sharedStaticItemBitmapCache.keys().next().value;
+    const oldest = sharedStaticItemBitmapCache.get(oldestKey);
+    sharedStaticItemBitmapCache.delete(oldestKey);
+    if (oldest?.canvas) { oldest.canvas.width = 0; oldest.canvas.height = 0; }
+  }
+}
+
+function drawSharedGraveBitmapCached(ctx, it, time, lighting, worldRef) {
+  const radius = Math.ceil(Math.max(42, renderRadiusForEntity(it) + 18));
+  const size = radius * 2;
+  const key = [
+    Math.round((lighting?.light || 0) * 6),
+    Math.round((lighting?.warmth || 0) * 3),
+    Number(it.r || 0),
+    it.memorialFavorite ? 1 : 0,
+    it.memorialTarinaiKing ? 1 : 0,
+    it.memorialZunchiSlave ? 1 : 0,
+    size,
+  ].join(":");
+  let cache = sharedGraveBitmapCache.get(key);
+  if (cache) {
+    sharedGraveBitmapCache.delete(key);
+    sharedGraveBitmapCache.set(key, cache);
+  }
+  if (!cache) {
+    const canvas = document.createElement("canvas");
+    canvas.width = size;
+    canvas.height = size;
+    const c = canvas.getContext("2d");
+    c.clearRect(0, 0, size, size);
+    c.save();
+    c.translate(radius - (it.x || 0), radius - (it.y || 0));
+    const pointer = worldRef?.pointer;
+    const oldInside = pointer?.inside;
+    if (pointer) pointer.inside = false;
+    try { it.draw(c, time, lighting); }
+    finally { if (pointer) pointer.inside = oldInside; c.restore(); }
+    cache = { canvas, radius };
+    sharedGraveBitmapCache.set(key, cache);
+    while (sharedGraveBitmapCache.size > 20) {
+      const oldestKey = sharedGraveBitmapCache.keys().next().value;
+      const oldest = sharedGraveBitmapCache.get(oldestKey);
+      sharedGraveBitmapCache.delete(oldestKey);
+      if (oldest?.canvas) { oldest.canvas.width = 0; oldest.canvas.height = 0; }
+    }
+  }
+  ctx.drawImage(cache.canvas, (it.x || 0) - cache.radius, (it.y || 0) - cache.radius);
+  return true;
+}
+
+function drawStaticItemBitmapCached(ctx, it, time, lighting, worldRef) {
+  if (!canUseStaticItemBitmapCache(it, worldRef)) {
+    releaseStaticItemBitmapCache(it);
+    it.draw(ctx, time, lighting);
+    return false;
+  }
+  // Close-up rendering remains vector-based, so cached rasterization never
+  // softens artwork. The expensive whole-field/zoomed-out path is cached.
+  if ((worldRef?.viewScale?.() || 1) > 1.35) {
+    releaseStaticItemBitmapCache(it);
+    it.draw(ctx, time, lighting);
+    return false;
+  }
+  if (it.type === "grave") {
+    releaseStaticItemBitmapCache(it);
+    return drawSharedGraveBitmapCached(ctx, it, time, lighting, worldRef);
+  }
+  // Clear any legacy per-item bitmap left by an older build. Static artwork is
+  // now shared by visual state, so hundreds of identical objects reuse a small
+  // bounded set of backing canvases.
+  releaseStaticItemBitmapCache(it);
+  const state = staticItemBitmapState(it, lighting);
+  const radius = Math.ceil(Math.max(42, renderRadiusForEntity(it) + 18));
+  const size = radius * 2;
+  const key = sharedStaticBitmapKey(it, state, radius);
+  let cache = getSharedStaticBitmap(key);
+  if (!cache) {
+    const canvas = document.createElement("canvas");
+    canvas.width = size;
+    canvas.height = size;
+    const c = canvas.getContext("2d");
+    c.clearRect(0, 0, size, size);
+    c.save();
+    c.translate(radius - (it.x || 0), radius - (it.y || 0));
+    const pointer = worldRef?.pointer;
+    const oldInside = pointer?.inside;
+    if (pointer) pointer.inside = false;
+    try {
+      it.draw(c, time, lighting);
+    } finally {
+      if (pointer) pointer.inside = oldInside;
+      c.restore();
+    }
+    cache = { canvas, radius };
+    putSharedStaticBitmap(key, cache);
+  }
+  ctx.drawImage(cache.canvas, (it.x || 0) - cache.radius, (it.y || 0) - cache.radius);
+  // Pointer hover is not baked into the bitmap. Draw only the hovered outline
+  // live so cached objects still react immediately to the cursor.
+  const pointer = worldRef?.pointer;
+  if (pointer?.inside && distXY(it.x || 0, it.y || 0, pointer.x || 0, pointer.y || 0) < (it.r || 18) * 2.2) {
+    ctx.save();
+    ctx.globalAlpha = 0.32;
+    ctx.strokeStyle = "rgba(255, 250, 220, 0.82)";
+    ctx.lineWidth = 1.4;
+    ctx.beginPath();
+    ctx.ellipse(it.x || 0, (it.y || 0) + (it.r || 18) * 0.1, (it.r || 18) * 1.35, (it.r || 18) * 0.92, 0, 0, Math.PI * 2);
+    ctx.stroke();
+    ctx.restore();
+  }
+  return true;
+}
+
+function drawRenderEntity(ctx, entity, time, lighting, worldRef) {
+  if (!entity) return false;
+  if (typeof Item !== "undefined" && entity instanceof Item) return drawStaticItemBitmapCached(ctx, entity, time, lighting, worldRef);
+  entity.draw(ctx, time, lighting);
+  return true;
+}
+
 function carriedPlushieRenderPose(it, worldRef) {
   if (!it || !worldRef || !it.isStructure || it.type !== "plushie" || !it.carriedById) return null;
   const owner = worldRef.liveTarinaiById?.(it.carriedById) || (worldRef.tarinai || []).find(t => t && !t.dead && t.id === it.carriedById);
@@ -1165,8 +1499,21 @@ function mergeSortedRenderEntries(a, b, out) {
   return out;
 }
 
+function backItemLayerRank(item) {
+  if (!item || item.dead) return 1;
+  // Ground decorations stay behind sleeping places. Oil is still below all
+  // creatures, but sits visually in front of ordinary beds.
+  if (item.type === "toilet") return 0;
+  if (item.type === "bed") return 1;
+  if (item.type === "oil" || item.type === "bear_trap") return 2;
+  if (item.type === "grass_bed") return 3;
+  return 1;
+}
+
 function compareBackItems(a, b) {
-  return (a._renderSortY ?? renderLayerSortY(a)) - (b._renderSortY ?? renderLayerSortY(b)) || (a.x || 0) - (b.x || 0);
+  return backItemLayerRank(a) - backItemLayerRank(b)
+    || (a._renderSortY ?? renderLayerSortY(a)) - (b._renderSortY ?? renderLayerSortY(b))
+    || (a.x || 0) - (b.x || 0);
 }
 
 function mergeSortedBackItems(a, b, out) {
@@ -1238,7 +1585,7 @@ function collectVisibleRenderStack(worldRef, visibleRect, creatureSortRect = vis
         const staticScratch = worldRef._renderVisibleStaticScratch || (worldRef._renderVisibleStaticScratch = []);
         const cacheRect = { left: visibleRect.left - 52, top: visibleRect.top - 52, right: visibleRect.right + 52, bottom: visibleRect.bottom + 52 };
         staticScratch.length = 0;
-        worldRef.spatial.nearbyRectInto(worldRef.spatial.staticItemCells || worldRef.spatial.itemCells, cacheRect, staticScratch);
+        worldRef.spatial.nearbyRectInto(worldRef.spatial.staticItemCells, cacheRect, staticScratch);
         const oldVisibleRect = visibleRect;
         visibleRect = cacheRect;
         for (const it of staticScratch) addItemTo(it, staticCache.backItems, staticCache.layered);
@@ -1849,7 +2196,7 @@ function render() {
   window.TarinaiPerf.setMetric("render.visibleLayered", renderStack.layered.length);
   const endBackItems = renderPerfBegin("render.draw.backItems");
   for (const it of renderStack.backItems) {
-    it.draw(ctx, world.time, lighting);
+    drawStaticItemBitmapCached(ctx, it, world.time, lighting, world);
   }
   renderPerfEnd(endBackItems);
 
@@ -1897,7 +2244,7 @@ function render() {
 
   const endLayered = renderPerfBegin("render.draw.layered");
   for (const entry of renderStack.layered) {
-    entry.entity.draw(ctx, world.time, lighting);
+    drawRenderEntity(ctx, entry.entity, world.time, lighting, world);
     drawAttachedPinsForEntity(entry.entity);
     // A carried plushie shares its owner's depth position instead of being
     // rendered above every entity as a global attachment layer.
@@ -1929,10 +2276,25 @@ function render() {
   const endEffects = renderPerfBegin("render.draw.effects");
   const effectLevel = renderVisualLevel("effects");
   let drawnEffects = 0;
+  let drawnAscensions = 0;
+  let drawnBubbles = 0;
   const maxEffects = visualEffectLimit(effectLevel);
   const effects = world.effects || [];
   const totalEffects = effects.length;
   let effectScanCap = 0;
+  const bubbleDrawLimit = Math.max(1, Number(CONFIG.bubbleLimit || 32) || 32);
+  for (let i = 0; i < totalEffects; i += 1) {
+    const ef = effects[i];
+    if (!ef || ef.dead) continue;
+    if (ef.type === "ascend_soul") {
+      if (isEntityVisibleInRect(ef, visibleRect, 180)) { ef.draw(ctx); drawnAscensions += 1; }
+      continue;
+    }
+    if (ef.type === "bubble" && drawnBubbles < bubbleDrawLimit && isEntityVisibleInRect(ef, visibleRect, 72)) {
+      ef.draw(ctx);
+      drawnBubbles += 1;
+    }
+  }
   if (totalEffects > 0 && maxEffects > 0) {
     const scanCap = totalEffects > 180 ? Math.min(totalEffects, Math.max(maxEffects * 8, 160)) : totalEffects;
     effectScanCap = scanCap;
@@ -1940,6 +2302,7 @@ function render() {
     for (let scanned = 0; scanned < scanCap && drawnEffects < maxEffects; scanned += 1) {
       const ef = effects[cursor];
       cursor = (cursor + 1) % totalEffects;
+      if (!ef || ef.dead || ef.type === "ascend_soul" || ef.type === "bubble") continue;
       if (isEntityVisibleInRect(ef, visibleRect)) {
         ef.draw(ctx);
         drawnEffects += 1;
@@ -1949,12 +2312,12 @@ function render() {
   }
   if (window.TarinaiPerf?.diagnosticsEnabled?.() === true) {
     world._effectRenderStats = {
-      total: totalEffects, drawn: drawnEffects, skipped: Math.max(0, totalEffects - drawnEffects),
+      total: totalEffects, drawn: drawnEffects + drawnAscensions + drawnBubbles, skipped: Math.max(0, totalEffects - drawnEffects - drawnAscensions - drawnBubbles),
       budget: maxEffects, scanCap: effectScanCap, level: effectLevel,
     };
-    window.TarinaiPerf.setMetric("render.visibleEffects", drawnEffects);
+    window.TarinaiPerf.setMetric("render.visibleEffects", drawnEffects + drawnAscensions + drawnBubbles);
     window.TarinaiPerf.setMetric("render.effectDrawBudget", maxEffects);
-    window.TarinaiPerf.setMetric("render.effectDrawSkipped", Math.max(0, totalEffects - drawnEffects));
+    window.TarinaiPerf.setMetric("render.effectDrawSkipped", Math.max(0, totalEffects - drawnEffects - drawnAscensions - drawnBubbles));
   } else world._effectRenderStats = null;
   renderPerfEnd(endEffects);
   drawPressureSwitchRangeOverlay(ctx, world);
@@ -1963,7 +2326,7 @@ function render() {
   // Light affecting the whole visible scene, including characters and ground.
   const endLighting = renderPerfBegin("render.lightingWeather");
   if (renderVisualLevel("details") !== "low") drawAtmosphericLighting(ctx, screenW, screenH, lighting);
-  if (world.weather === "light_rain") drawRain(ctx, screenW, screenH, world.time, { alphaScale: effectLevel === "off" ? 0.42 : 1 });
+  if (world.weather === "light_rain" && effectLevel !== "off") drawRain(ctx, screenW, screenH, world.time);
   renderPerfEnd(endLighting);
 
   const endUiOverlay = renderPerfBegin("render.uiOverlay");
diff --git a/js/robot_cleaner_system.js b/js/robot_cleaner_system.js
index 4e72cc4..227c8e4 100644
--- a/js/robot_cleaner_system.js
+++ b/js/robot_cleaner_system.js
@@ -14,8 +14,9 @@ const ROBOT_DEFAULT_MASK = 0b000011; // zunchi + corpses and stains
     grass: 1 << 3,
     grass_bed: 1 << 4,
     water: 1 << 5,
+    grave: 1 << 6,
   });
-  const ROBOT_TARGET_ORDER = Object.freeze(["zunchi", "ant_corpse", "tarinai", "grass", "grass_bed", "water"]);
+  const ROBOT_TARGET_ORDER = Object.freeze(["zunchi", "ant_corpse", "tarinai", "grass", "grass_bed", "water", "grave"]);
 
   function robotCleanerDefaultMask() {
     return ROBOT_DEFAULT_MASK;
@@ -28,7 +29,7 @@ const ROBOT_DEFAULT_MASK = 0b000011; // zunchi + corpses and stains
 
   function setRobotCleanerMask(item, mask = ROBOT_DEFAULT_MASK) {
     if (!item || item.type !== "robot_cleaner") return false;
-    item.robotCleanerMask = Math.max(0, Math.min(0x3f, Number(mask) | 0));
+    item.robotCleanerMask = Math.max(0, Math.min(0x7f, Number(mask) | 0));
     return true;
   }
 
@@ -62,6 +63,7 @@ const ROBOT_DEFAULT_MASK = 0b000011; // zunchi + corpses and stains
       case "grass": return "\u8349";
       case "grass_bed": return "\u304b\u3093\u305f\u3093\u30d9\u30c3\u30c9";
       case "water": return "\u6c34\u6ef4";
+      case "grave": return "\u5893";
       default: return "\u5bfe\u8c61";
     }
   }
@@ -69,17 +71,65 @@ const ROBOT_DEFAULT_MASK = 0b000011; // zunchi + corpses and stains
   function normalizeRobotCleanerState(item) {
     if (!item || item.type !== "robot_cleaner") return null;
     if (!Number.isFinite(Number(item.robotCleanerMask))) item.robotCleanerMask = ROBOT_DEFAULT_MASK;
-    item.robotCleanerMask = Math.max(0, Math.min(0x3f, Number(item.robotCleanerMask) | 0));
+    item.robotCleanerMask = Math.max(0, Math.min(0x7f, Number(item.robotCleanerMask) | 0));
     item.amount = Math.max(Number(item.amount || 0) || 0, 999);
     if (!Number.isFinite(Number(item.robotCleanerScanTimer))) item.robotCleanerScanTimer = 0;
     if (!Number.isFinite(Number(item.robotCleanerCleanFlash))) item.robotCleanerCleanFlash = 0;
     if (!Number.isFinite(Number(item.robotCleanerAngle))) item.robotCleanerAngle = Number(item.angle || 0) || 0;
     if (!Number.isFinite(Number(item.robotCleanerWanderAngle))) item.robotCleanerWanderAngle = Number(item.robotCleanerAngle || 0) || 0;
+    if (!item.robotCleanerUnreachableTargets || typeof item.robotCleanerUnreachableTargets !== "object") item.robotCleanerUnreachableTargets = Object.create(null);
+    if (!Number.isFinite(Number(item.robotCleanerPathFailTimer))) item.robotCleanerPathFailTimer = 0;
+    if (!Number.isFinite(Number(item.robotCleanerProgressTimer))) item.robotCleanerProgressTimer = 0;
+    if (!Number.isFinite(Number(item.robotCleanerProgressDistance))) item.robotCleanerProgressDistance = Infinity;
+    if (typeof item.robotCleanerProgressTargetId !== "string") item.robotCleanerProgressTargetId = "";
     item.robotCleanerHighSpeed = Boolean(item.robotCleanerHighSpeed);
     item.robotCleanerSpeed = robotCleanerEffectiveSpeed(item);
     return item;
   }
 
+  function robotTargetRuntimeId(target) {
+    return String(target?.id || target?.runtimeId || target?._runtimeId || "");
+  }
+
+  function robotTargetTemporarilyUnreachable(item, target, worldRef) {
+    const id = robotTargetRuntimeId(target);
+    if (!id) return false;
+    const record = item?.robotCleanerUnreachableTargets?.[id];
+    if (!record) return false;
+    const now = Number(worldRef?.time || 0) || 0;
+    if (typeof record === "number") return record > now;
+    const moved = distXY(Number(record.x || 0), Number(record.y || 0), Number(target.x || 0), Number(target.y || 0)) > 18;
+    const routeChanged = Number(record.obstacleVersion || 0) !== Number(worldRef?.routingObstacleVersion || 0);
+    if (moved || routeChanged || Number(record.until || 0) <= now) {
+      delete item.robotCleanerUnreachableTargets[id];
+      return false;
+    }
+    return true;
+  }
+
+  function markRobotTargetUnreachable(item, target, worldRef, seconds = 60) {
+    if (!item || !target) return false;
+    const id = robotTargetRuntimeId(target);
+    if (!id) return false;
+    if (!item.robotCleanerUnreachableTargets || typeof item.robotCleanerUnreachableTargets !== "object") item.robotCleanerUnreachableTargets = Object.create(null);
+    item.robotCleanerUnreachableTargets[id] = {
+      until: (Number(worldRef?.time || 0) || 0) + Math.max(15, Number(seconds || 60) || 60),
+      x: Number(target.x || 0) || 0,
+      y: Number(target.y || 0) || 0,
+      obstacleVersion: Number(worldRef?.routingObstacleVersion || 0) || 0,
+    };
+    if (String(item.robotCleanerTargetId || "") === id) {
+      item.robotCleanerTargetId = "";
+      item.robotCleanerTargetType = "";
+      item.robotCleanerScanTimer = 0;
+    }
+    item.robotCleanerPathFailTimer = 0;
+    item.robotCleanerProgressTimer = 0;
+    item.robotCleanerProgressDistance = Infinity;
+    item.robotCleanerProgressTargetId = "";
+    return true;
+  }
+
   function robotTargetAlive(target) {
     if (!target) return false;
     return !target.dead && Number.isFinite(Number(target.x)) && Number.isFinite(Number(target.y));
@@ -96,12 +146,13 @@ const ROBOT_DEFAULT_MASK = 0b000011; // zunchi + corpses and stains
     if (!key || !id || !worldRef) return null;
     if (key === "tarinai") {
       const t = worldRef.liveTarinaiById?.(id) || (worldRef.tarinai || []).find(t => t && t.id === id && !t.dead);
-      return robotTargetAlive(t) && !robotTargetBlocked(item, t, worldRef) ? t : null;
+      return robotTargetAlive(t) && !robotTargetTemporarilyUnreachable(item, t, worldRef) ? t : null;
     }
     const byId = typeof worldRef.itemById === "function" ? worldRef.itemById(id) : null;
-    const found = byId || (worldRef.items || []).find(it => it && it.id === id && !it.dead);
+    const found = byId || worldRef.residueByRuntimeId?.(id) || (worldRef.items || []).find(it => it && it.id === id && !it.dead);
     const matchesKey = found && (found.type === key || (key === "ant_corpse" && (found.type === "trace" || found.type === "splat")));
-    return matchesKey && robotTargetAlive(found) && !robotTargetBlocked(item, found, worldRef) ? found : null;
+    if (!matchesKey || !robotTargetAlive(found) || robotTargetTemporarilyUnreachable(item, found, worldRef)) return null;
+    return found;
   }
 
   function robotTargetCandidates(item, worldRef) {
@@ -116,17 +167,22 @@ const ROBOT_DEFAULT_MASK = 0b000011; // zunchi + corpses and stains
         for (const t of worldRef.tarinai || []) {
           if (!t || t.dead) continue;
           if (worldRef.isTarinaiHiddenInNestBox?.(t)) continue;
-          if (robotTargetBlocked(item, t, worldRef)) continue;
+          if (robotTargetTemporarilyUnreachable(item, t, worldRef)) continue;
           out.push({ target: t, type: key });
         }
         continue;
       }
       const buckets = key === "ant_corpse"
-        ? ["ant_corpse", "trace", "splat"].flatMap(type => worldRef.itemsOfType?.(type) || (worldRef.items || []).filter(it => it && it.type === type))
+        ? [
+            ...(worldRef.itemsOfType?.("ant_corpse") || []),
+            ...(worldRef.residuesOfType?.("trace") || []),
+            ...(worldRef.residuesOfType?.("splat") || []),
+          ]
         : (worldRef.itemsOfType?.(key) || (worldRef.items || []).filter(it => it && it.type === key));
       for (const it of buckets || []) {
         if (!it || it.dead || it === item) continue;
-        if (robotTargetBlocked(item, it, worldRef)) continue;
+        if (key === "grave" && it.memorialFavorite) continue;
+        if (robotTargetTemporarilyUnreachable(item, it, worldRef)) continue;
         out.push({ target: it, type: key });
       }
     }
@@ -145,11 +201,21 @@ const ROBOT_DEFAULT_MASK = 0b000011; // zunchi + corpses and stains
       const target = rec.target;
       if (!robotTargetAlive(target)) continue;
       const d = distXY(item.x, item.y, target.x, target.y);
-      if (d < bestD) { best = target; bestType = rec.type; bestD = d; }
+      // Do not discard a target merely because a nest box or fence blocks the
+      // direct segment. The movement step can route around it. Prefer direct
+      // targets when distances are otherwise similar to avoid needless detours.
+      const score = d + (robotTargetBlocked(item, target, worldRef) ? 120 : 0);
+      if (score < bestD) { best = target; bestType = rec.type; bestD = score; }
     }
     if (best) {
-      item.robotCleanerTargetId = best.id || "";
+      item.robotCleanerTargetId = best.id || best.runtimeId || best._runtimeId || "";
       item.robotCleanerTargetType = bestType || best.type || "";
+      if (item.robotCleanerProgressTargetId !== String(item.robotCleanerTargetId || "")) {
+        item.robotCleanerProgressTargetId = String(item.robotCleanerTargetId || "");
+        item.robotCleanerProgressDistance = distXY(item.x, item.y, best.x, best.y);
+        item.robotCleanerProgressTimer = 0;
+        item.robotCleanerPathFailTimer = 0;
+      }
     }
     return best;
   }
@@ -197,6 +263,10 @@ const ROBOT_DEFAULT_MASK = 0b000011; // zunchi + corpses and stains
 
   function cleanRobotTarget(item, target, worldRef, typeOverride = "") {
     if (!item || !target || !worldRef || target.dead) return false;
+    if (target.type === "grave" && target.memorialFavorite) {
+      clearRobotTrackedTargetIfMatched(item, target);
+      return false;
+    }
     const type = String(typeOverride || item.robotCleanerTargetType || target.type || "");
     const label = robotTargetLabel(type);
     let removed = false;
@@ -213,6 +283,8 @@ const ROBOT_DEFAULT_MASK = 0b000011; // zunchi + corpses and stains
         worldRef.markDead?.(target, cleanReason);
         removed = true;
       }
+    } else if (type === "trace" || type === "splat") {
+      removed = Boolean(worldRef.removeResidue?.(target, "robot-cleaner"));
     } else {
       removed = Boolean(global.TarinaiStructureLifecycle?.deleteItem?.(worldRef, target, {
         reason: "robot-cleaner",
@@ -232,16 +304,11 @@ const ROBOT_DEFAULT_MASK = 0b000011; // zunchi + corpses and stains
     item.robotCleanerCleanFlash = 0.42;
     item.robotCleanerCleanCount = (Number(item.robotCleanerCleanCount || 0) || 0) + 1;
     global.TarinaiAchievements?.recordRobotClean?.({ world: worldRef, robot: item, target, type });
-    worldRef.effects?.push(new Effect("ring", target.x, target.y, { size: Math.max(16, (target.r || target.radius || 14) * 1.8), life: 0.24, color: "rgba(146,206,220,0.36)" }));
+    worldRef.queueEffect?.("ring", target.x, target.y, { size: Math.max(16, (target.r || target.radius || 14) * 1.8), life: 0.24, color: "rgba(146,206,220,0.36)" });
     worldRef.markItemBucketsDirty?.("robot-cleaner");
     worldRef.markSpatialDirty?.("robot-cleaner");
-    if (target.type === "trace" || target.type === "splat") worldRef.markTerrainDirtyAt?.(target.x, target.y, Math.max(target.r || target.radius || 24, 36), "robot-cleaner");
     worldRef.updateItemCounts?.();
     worldRef.drawListDirty = true;
-    if ((worldRef.time || 0) - Number(item.robotCleanerLastLogAt || -999) > 1.2) {
-      worldRef.log?.(`\u30ed\u30dc\u6383\u9664\u6a5f\u304c${label}\u3092\u7247\u4ed8\u3051\u305f\u3002`, "observe");
-      item.robotCleanerLastLogAt = worldRef.time || 0;
-    }
     return true;
   }
 
@@ -259,6 +326,9 @@ const ROBOT_DEFAULT_MASK = 0b000011; // zunchi + corpses and stains
       if (!type) continue;
       const capture = robotCleanerCaptureRadius(item, target);
       if (distXY(item.x, item.y, target.x, target.y) <= capture) {
+        // Keep walls meaningful: a nearby target is collected only after the
+        // cleaner has reached a side with an unobstructed contact segment.
+        if (robotTargetBlocked(item, target, worldRef)) continue;
         if (cleanRobotTarget(item, target, worldRef, type)) changed = true;
       }
     }
@@ -271,9 +341,33 @@ const ROBOT_DEFAULT_MASK = 0b000011; // zunchi + corpses and stains
     let desiredAngle = Number(item.robotCleanerWanderAngle || 0) || 0;
     let desiredSpeed = speed;
     if (target && robotTargetAlive(target)) {
-      desiredAngle = Math.atan2((target.y || 0) - (item.y || 0), (target.x || 0) - (item.x || 0));
-      desiredSpeed = speed;
-    } else if ((item.robotCleanerWanderTimer || 0) <= 0) {
+      let moveTarget = target;
+      const blocked = robotTargetBlocked(item, target, worldRef);
+      if (blocked && typeof worldRef.findTarinaiPathWaypoint === "function") {
+        const waypoint = worldRef.findTarinaiPathWaypoint(item, target, {
+          padding: Math.max(18, r * 0.72),
+          state: "robot_cleaner",
+          preferFullPath: true,
+          maxChecks: 54,
+        });
+        if (waypoint) {
+          moveTarget = waypoint;
+          item.robotCleanerPathFailTimer = 0;
+        } else {
+          item.robotCleanerPathFailTimer = Math.max(0, Number(item.robotCleanerPathFailTimer || 0) || 0) + dt;
+          desiredSpeed = speed * 0.18;
+          if (item.robotCleanerPathFailTimer >= 0.75) {
+            markRobotTargetUnreachable(item, target, worldRef, 90);
+            target = null;
+            desiredSpeed = speed * 0.62;
+          }
+        }
+      } else {
+        item.robotCleanerPathFailTimer = 0;
+      }
+      if (target) desiredAngle = Math.atan2((moveTarget.y || 0) - (item.y || 0), (moveTarget.x || 0) - (item.x || 0));
+    }
+    if (!target && (item.robotCleanerWanderTimer || 0) <= 0) {
       desiredAngle = global.deterministicAngle(worldRef, "robot-cleaner-wander", item, Math.floor((worldRef.time || 0) * 2));
       item.robotCleanerWanderTimer = global.deterministicRange(worldRef, "robot-cleaner-wander-timer", 1.2, 3.2, item);
     }
@@ -288,6 +382,28 @@ const ROBOT_DEFAULT_MASK = 0b000011; // zunchi + corpses and stains
     item.prevY = item.y;
     item.x += item.vx * dt;
     item.y += item.vy * dt;
+    if (target && robotTargetAlive(target) && !isRobotTarinaiTarget(target)) {
+      const targetId = robotTargetRuntimeId(target);
+      const currentDistance = distXY(item.x, item.y, target.x, target.y);
+      if (item.robotCleanerProgressTargetId !== targetId) {
+        item.robotCleanerProgressTargetId = targetId;
+        item.robotCleanerProgressDistance = currentDistance;
+        item.robotCleanerProgressTimer = 0;
+      } else if (currentDistance <= Number(item.robotCleanerProgressDistance || Infinity) - 7) {
+        item.robotCleanerProgressDistance = currentDistance;
+        item.robotCleanerProgressTimer = 0;
+      } else {
+        item.robotCleanerProgressTimer = Math.max(0, Number(item.robotCleanerProgressTimer || 0) || 0) + dt;
+        if (item.robotCleanerProgressTimer >= 3.0 && currentDistance > robotCleanerCaptureRadius(item, target) * 1.35) {
+          markRobotTargetUnreachable(item, target, worldRef, 75);
+          target = null;
+        }
+      }
+    } else if (!target) {
+      item.robotCleanerProgressTargetId = "";
+      item.robotCleanerProgressDistance = Infinity;
+      item.robotCleanerProgressTimer = 0;
+    }
     const minX = CONFIG.worldPadding + r * 0.5;
     const minY = CONFIG.worldPadding + r * 0.5;
     const maxX = Math.max(minX, (worldRef.w || 0) - CONFIG.worldPadding - r * 0.5);
diff --git a/js/save_codec.js b/js/save_codec.js
index 3201227..deb7386 100644
--- a/js/save_codec.js
+++ b/js/save_codec.js
@@ -24,6 +24,7 @@
     "normalItems",
     "physicsItems",
     "achievementMetadata",
+    "extendedState",
   ]);
   let lastEncodeStats = null;
   let lastDecodeStats = null;
@@ -477,12 +478,6 @@
     return readBitFields(reader, Array.from({ length: count }, () => bits)).map(v => v * Math.max(1, step));
   }
 
-      function writeFixedPacked(writer, arr = [], count = 0, bits = 8, step = 1) {
-    writeQuantizedBitFields(writer, arr, count, bits, step);
-  }
-  function readFixedPacked(reader, count = 0, bits = 8, step = 1) {
-    return readQuantizedBitFields(reader, count, bits, step);
-  }
   function writeFixedDiffPacked(writer, base = [], current = [], count = 0, bits = 8) {
     let mask = 0;
     const values = [];
@@ -526,14 +521,14 @@
     return false;
   }
   function writeTimers(writer, timers = []) {
-    const defaults = [0, 0, 0, 0, 0, 0, 0, 0, 100];
+    const defaults = [0, 0, 0, 0, 0, 0, 0, 0, 100, 0];
     let mask = 0;
     for (let i = 0; i < defaults.length; i++) if (valuesDiffer(timers?.[i], defaults[i])) mask |= (1 << i);
     writeBitFields(writer, [mask], [defaults.length]);
     for (let i = 0; i < defaults.length; i++) if (mask & (1 << i)) writer.s(timers[i] || 0);
   }
   function readTimers(reader) {
-    const defaults = [0, 0, 0, 0, 0, 0, 0, 0, 100];
+    const defaults = [0, 0, 0, 0, 0, 0, 0, 0, 100, 0];
     const out = defaults.slice();
     const [mask] = readBitFields(reader, [defaults.length]);
     for (let i = 0; i < defaults.length; i++) if (mask & (1 << i)) out[i] = reader.s();
@@ -696,19 +691,6 @@
       Math.round((Number(genetics.temperatureOffset) || 0) * 10),
     ];
   }
-  function writeSignedDiffList(writer, base = [], current = [], count = 0) {
-    let mask = 0;
-    for (let i = 0; i < count; i++) if (valuesDiffer(current?.[i], base?.[i])) mask |= (1 << i);
-    writeBitFields(writer, [mask], [count]);
-    for (let i = 0; i < count; i++) if (mask & (1 << i)) writer.s((current?.[i] || 0) - (base?.[i] || 0));
-  }
-  function readSignedDiffList(reader, base = [], count = 0) {
-    const [mask] = readBitFields(reader, [count]);
-    const out = Array.from({ length: count }, (_, i) => base?.[i] || 0);
-    for (let i = 0; i < count; i++) if (mask & (1 << i)) out[i] = (base?.[i] || 0) + reader.s();
-    return out;
-  }
-
   class CompactBitWriter {
     constructor() { this.bytes = []; this.buffer = 0; this.bits = 0; }
     write(value = 0, width = 0) {
@@ -765,7 +747,7 @@
     const flags = row[0] || 0;
     const birth = birthSeedFromDescriptor(row[1], worldSeed, rowIndex + 1);
     const defaultPersonality = seedPersonalityArray(birth.seed, flags);
-    const defaultTimers = [0, 0, 0, 0, 0, 0, 0, 0, 100];
+    const defaultTimers = [0, 0, 0, 0, 0, 0, 0, 0, 100, 0];
     const genetics = Array.isArray(row[18]) ? row[18] : [];
     const fightStats = Array.isArray(row[19]) ? row[19] : [];
     let bodyMask = 0;
@@ -776,7 +758,7 @@
     if (arrayHasValues(row[14], [0, 0, 0])) bodyMask |= 16;
     const pinIdx = row[15] ?? -1;
     const nestIdx = row[16] ?? -1;
-    const stateId = row[17]?.[0] ? 1 : 0;
+    const stateId = Math.max(0, Math.min(15, Number(row[17]?.[0]) || 0));
     const stateTarget = row[17]?.[1] ?? -1;
     const geneticsBase = seedGeneticsArray(birth.seed, flags);
     let linkMask = 0;
@@ -786,7 +768,7 @@
       flags, birth, bodyMask, linkMask, pinIdx, nestIdx, stateId, stateTarget, genetics, fightStats,
       geneticsBase, geneticsMask: diffMask(geneticsBase, genetics, 5), fightMask: diffMask([0, 0, 0], fightStats, 3),
       hunger: Math.max(0, Math.min(100, Math.round(Number(row[6]) || 0))),
-      energy: Math.max(0, Math.min(100, Math.round(Number(row[7]) || 0))),
+      energy: Math.max(0, Math.min(240, Math.round(Number(row[7]) || 0))),
       sleepPressure: Math.max(0, Math.min(100, Math.round(Number(row[8]) || 0))),
     };
   }
@@ -794,11 +776,11 @@
   const TARINAI_COLUMN_LAYOUT = Object.freeze([
     ["flags", 10],
     ["hunger", 7],
-    ["energy", 7],
+    ["energy", 8],
     ["sleepPressure", 7],
     ["bodyMask", 5],
     ["linkMask", 2],
-    ["stateId", 1],
+    ["stateId", 4],
     ["geneticsMask", 5],
     ["fightMask", 3],
   ]);
@@ -899,7 +881,7 @@
     const current = (bodyMask & 1) ? readFixedDiffPacked(reader, defaultPersonality, 4, 8) : defaultPersonality;
     const parents = (bodyMask & 2) ? readIndexList(reader) : [];
     const relationships = (bodyMask & 4) ? readRelationships(reader) : [];
-    const timers = (bodyMask & 8) ? readTimers(reader) : [0, 0, 0, 0, 0, 0, 0, 0, 100];
+    const timers = (bodyMask & 8) ? readTimers(reader) : [0, 0, 0, 0, 0, 0, 0, 0, 100, 0];
     const modes = (bodyMask & 16) ? readModes(reader) : [0, 0, 0];
     const pinIdx = (linkMask & 1) ? reader.u() : -1;
     const nestIdx = (linkMask & 2) ? reader.u() : -1;
@@ -1473,13 +1455,16 @@
     return items;
   }
 
-  const ACHIEVEMENT_METADATA_BINARY_VERSION = 1;
-  const ACHIEVEMENT_SPELL_BINARY_VERSION = 8;
+  const ACHIEVEMENT_METADATA_BINARY_VERSION = 3;
+  const ACHIEVEMENT_SPELL_BINARY_VERSION = 11;
   const ACHIEVEMENT_MASK_BYTES = 10;
-  const ACHIEVEMENT_PROGRESS_BITS = Object.freeze([7, 4, 7, 12, 5, 5, 5, 11, 6, 10, 9, 10, 3, 17, 5, 14, 7]);
-  const ACHIEVEMENT_PROGRESS_MAX = Object.freeze([100, 15, 100, 3333, 30, 20, 20, 2047, 50, 666, 333, 721, 7, 131071, 30, 10000, 100]);
+  const ACHIEVEMENT_PROGRESS_BITS_V9 = Object.freeze([7, 4, 7, 12, 5, 5, 5, 11, 6, 10, 9, 10, 3, 17, 5, 14, 7]);
+  const ACHIEVEMENT_PROGRESS_MAX_V9 = Object.freeze([100, 15, 100, 3333, 30, 20, 20, 2047, 50, 666, 333, 721, 7, 131071, 30, 10000, 100]);
+  const ACHIEVEMENT_PROGRESS_BITS = Object.freeze([...ACHIEVEMENT_PROGRESS_BITS_V9, 4, 6, 8]);
+  const ACHIEVEMENT_PROGRESS_MAX = Object.freeze([...ACHIEVEMENT_PROGRESS_MAX_V9, 10, 33, 200]);
 
   function finiteNumberOrNull(value) {
+    if (value === null || value === undefined) return null;
     const n = Number(value);
     return Number.isFinite(n) ? n : null;
   }
@@ -1501,9 +1486,9 @@
   }
   function achievementMaskBytesFromSpell(spell = null) {
     const bytes = new Uint8Array(ACHIEVEMENT_MASK_BYTES);
-    if (!Array.isArray(spell)) return { bytes, baseMinute: 0, deltas: [], progress: [] };
+    if (!Array.isArray(spell)) return { bytes, baseMinute: 0, deltas: [], progress: [], mysteryDrugIds: [] };
     const version = Number(spell[0]);
-    if (version !== ACHIEVEMENT_SPELL_BINARY_VERSION) throw new Error("unsupported achievement spell version");
+    if (![9, 10, ACHIEVEMENT_SPELL_BINARY_VERSION].includes(version)) throw new Error("unsupported achievement spell version");
     const low = Math.max(0, Math.min(0xffffffff, Math.floor(Number(spell[1]) || 0)));
     const high = Math.max(0, Math.min(0xffffffff, Math.floor(Number(spell[2]) || 0)));
     const extra = Math.max(0, Math.min(0xffff, Math.floor(Number(spell[3]) || 0)));
@@ -1514,21 +1499,26 @@
     const baseMinute = toSafeUInt(spell[4]);
     const deltas = Array.isArray(spell[5]) ? spell[5].map(toSafeUInt) : [];
     const progress = Array.isArray(spell[6]) ? spell[6] : [];
+    const mysteryDrugIds = version >= 10 && Array.isArray(spell[7])
+      ? [...new Set(spell[7].map(value => String(value || "")).filter(Boolean))].slice(0, 10)
+      : [];
     let unlockedCount = 0;
     for (const byte of bytes) {
       let value = byte;
       while (value) { unlockedCount += value & 1; value >>>= 1; }
     }
     if (deltas.length !== unlockedCount) throw new Error("invalid achievement spell timestamps");
-    return { bytes, baseMinute, deltas, progress };
+    return { bytes, baseMinute, deltas, progress, mysteryDrugIds };
   }
 
-  function spellFromAchievementMaskBytes(bytes = [], baseMinute = 0, deltas = [], progress = []) {
+  function spellFromAchievementMaskBytes(bytes = [], baseMinute = 0, deltas = [], progress = [], version = ACHIEVEMENT_SPELL_BINARY_VERSION, mysteryDrugIds = []) {
     let low = 0;
     let high = 0;
     for (let i = 0; i < 4; i++) low += (Number(bytes[i]) || 0) * (2 ** (i * 8));
     for (let i = 0; i < 4; i++) high += (Number(bytes[i + 4]) || 0) * (2 ** (i * 8));
-    return [ACHIEVEMENT_SPELL_BINARY_VERSION, low >>> 0, high >>> 0, (Number(bytes[8]) || 0) + (Number(bytes[9]) || 0) * 256, toSafeUInt(baseMinute), deltas.map(toSafeUInt), progress];
+    const spell = [version, low >>> 0, high >>> 0, (Number(bytes[8]) || 0) + (Number(bytes[9]) || 0) * 256, toSafeUInt(baseMinute), deltas.map(toSafeUInt), progress];
+    if (version >= 10) spell.push([...new Set((mysteryDrugIds || []).map(value => String(value || "")).filter(Boolean))].slice(0, 10));
+    return spell;
   }
   function writeAchievementProgress(writer, values = [], bits = ACHIEVEMENT_PROGRESS_BITS, maxima = ACHIEVEMENT_PROGRESS_MAX) {
     const normalized = maxima.map((max, index) => Math.max(0, Math.min(max, toSafeUInt(values?.[index]))));
@@ -1560,9 +1550,11 @@
     writer.raw(normalized.bytes);
     writer.u(normalized.baseMinute);
     for (const delta of normalized.deltas) writer.u(delta);
-    writeAchievementProgress(writer, normalized.progress);
+    writeAchievementProgress(writer, normalized.progress, ACHIEVEMENT_PROGRESS_BITS, ACHIEVEMENT_PROGRESS_MAX);
+    writer.u(normalized.mysteryDrugIds.length);
+    for (const id of normalized.mysteryDrugIds) writer.str(id);
   }
-  function readAchievementSpell(reader) {
+  function readAchievementSpell(reader, metadataVersion = ACHIEVEMENT_METADATA_BINARY_VERSION) {
     const bytes = reader.raw(ACHIEVEMENT_MASK_BYTES);
     let unlockedCount = 0;
     for (const byte of bytes) {
@@ -1572,8 +1564,21 @@
     const baseMinute = reader.u();
     const deltas = [];
     for (let i = 0; i < unlockedCount; i++) deltas.push(reader.u());
-    const progress = readAchievementProgress(reader, ACHIEVEMENT_PROGRESS_BITS, ACHIEVEMENT_PROGRESS_MAX);
-    return spellFromAchievementMaskBytes(bytes, baseMinute, deltas, progress);
+    const current = metadataVersion >= 3;
+    const progress = readAchievementProgress(
+      reader,
+      current ? ACHIEVEMENT_PROGRESS_BITS : ACHIEVEMENT_PROGRESS_BITS_V9,
+      current ? ACHIEVEMENT_PROGRESS_MAX : ACHIEVEMENT_PROGRESS_MAX_V9,
+    );
+    const mysteryDrugIds = [];
+    if (current) {
+      const count = Math.min(10, reader.u());
+      for (let i = 0; i < count; i++) {
+        const id = String(reader.str() || "");
+        if (id && !mysteryDrugIds.includes(id)) mysteryDrugIds.push(id);
+      }
+    }
+    return spellFromAchievementMaskBytes(bytes, baseMinute, deltas, progress, current ? ACHIEVEMENT_SPELL_BINARY_VERSION : 9, mysteryDrugIds);
   }
   function writeAchievementMetadata(writer, metadata = null, tarinaiCount = 0, itemCount = 0) {
     const value = metadata && typeof metadata === "object" ? metadata : {};
@@ -1588,19 +1593,27 @@
       Math.min(10, toSafeUInt(w[4])),
     ], [6, 8, 4]);
 
-    const timeDefaults = [null, -1, null, 0, -1, -1];
-    const timeValues = [w[5], w[6], w[7], w[8], w[9], w[10]];
-    let timeMask = 0;
+    const timeDefaults = [null, -1, null, 0, -1, -1, -1];
+    const timeValues = [w[5], w[6], w[7], w[8], w[9], w[10], w[11]];
+    // Two-bit state per value: 0 = schema default, 1 = explicit null,
+    // 2 = explicit finite number. This preserves null separately from 0/-1.
+    const timeStates = [];
     const encodedTimes = [];
     timeValues.forEach((raw, index) => {
       const finite = finiteNumberOrNull(raw);
       const defaultValue = timeDefaults[index];
-      const sameAsDefault = finite == null ? defaultValue == null : finite === defaultValue;
-      if (sameAsDefault) return;
-      timeMask |= 1 << index;
-      encodedTimes.push(quantizedTenths(finite == null ? defaultValue || 0 : finite));
+      if (finite == null) {
+        timeStates.push(defaultValue == null ? 0 : 1);
+        return;
+      }
+      if (finite === defaultValue) {
+        timeStates.push(0);
+        return;
+      }
+      timeStates.push(2);
+      encodedTimes.push(quantizedTenths(finite));
     });
-    writeBitFields(writer, [timeMask], [timeDefaults.length]);
+    writeBitFields(writer, timeStates, timeStates.map(() => 2));
     encodedTimes.forEach(value => writer.s(value));
 
     const tarRows = Array.isArray(value.t) ? value.t : [];
@@ -1611,12 +1624,21 @@
       const treatment = toSafeUInt(row[1]);
       const fightAt = finiteNumberOrNull(row[2]);
       const saunaAt = finiteNumberOrNull(row[3]);
-      if (feed || treatment || fightAt != null || saunaAt != null) activeTarRows.push({ index, feed, treatment, fightAt, saunaAt });
+      const slaveDepth = toSafeUInt(row[4]);
+      const kingDepth = toSafeUInt(row[5]);
+      if (feed || treatment || fightAt != null || saunaAt != null || slaveDepth || kingDepth) {
+        activeTarRows.push({ index, feed, treatment, fightAt, saunaAt, slaveDepth, kingDepth });
+      }
     }
     writer.u(activeTarRows.length);
     let previousTarIndex = -1;
     for (const row of activeTarRows) { writer.u(row.index - previousTarIndex - 1); previousTarIndex = row.index; }
-    for (const row of activeTarRows) { writer.u(row.feed); writer.u(row.treatment); }
+    for (const row of activeTarRows) {
+      writer.u(row.feed);
+      writer.u(row.treatment);
+      writer.u(row.slaveDepth);
+      writer.u(row.kingDepth);
+    }
     const tarFlags = [];
     for (const row of activeTarRows) tarFlags.push(row.fightAt != null ? 1 : 0, row.saunaAt != null ? 1 : 0);
     if (tarFlags.length) writeBitFields(writer, tarFlags, tarFlags.map(() => 1));
@@ -1645,18 +1667,22 @@
   }
   function readAchievementMetadata(reader, tarinaiCount = 0, itemCount = 0) {
     const version = reader.b();
-    if (version !== ACHIEVEMENT_METADATA_BINARY_VERSION) throw new Error("unsupported achievement metadata schema");
+    if (![2, ACHIEVEMENT_METADATA_BINARY_VERSION].includes(version)) throw new Error("unsupported achievement metadata schema");
     const [flags] = readBitFields(reader, [1]);
     const w = [readPositiveDeltaList(reader), readPositiveDeltaList(reader)];
     const [directFeed, robotClean, enemyAntKills] = readBitFields(reader, [6, 8, 4]);
     w.push(directFeed, robotClean, enemyAntKills);
-    const timeDefaults = [null, -1, null, 0, -1, -1];
-    const [timeMask] = readBitFields(reader, [timeDefaults.length]);
+    const timeDefaults = version >= 3 ? [null, -1, null, 0, -1, -1, -1] : [null, -1, null, 0, -1, -1];
+    const timeStates = readBitFields(reader, timeDefaults.map(() => 2));
     for (let index = 0; index < timeDefaults.length; index++) {
-      w.push(timeMask & (1 << index) ? unquantizedTenths(reader.s()) : timeDefaults[index]);
+      const state = timeStates[index];
+      if (state === 0) w.push(timeDefaults[index]);
+      else if (state === 1) w.push(null);
+      else if (state === 2) w.push(unquantizedTenths(reader.s()));
+      else throw new Error("invalid achievement metadata time state");
     }
 
-    const t = Array.from({ length: tarinaiCount }, () => [0, 0, null, null]);
+    const t = Array.from({ length: tarinaiCount }, () => [0, 0, null, null, 0, 0]);
     const tarCount = reader.u();
     const tarIndexes = [];
     let previousTarIndex = -1;
@@ -1665,13 +1691,22 @@
       if (previousTarIndex >= tarinaiCount) throw new Error("invalid achievement tarinai metadata index");
       tarIndexes.push(previousTarIndex);
     }
-    const tarCounters = tarIndexes.map(() => [reader.u(), reader.u()]);
+    const tarCounters = tarIndexes.map(() => version >= 3
+      ? [reader.u(), reader.u(), reader.u(), reader.u()]
+      : [reader.u(), reader.u(), 0, 0]);
     const tarFlagWidths = Array.from({ length: tarCount * 2 }, () => 1);
     const tarFlags = tarFlagWidths.length ? readBitFields(reader, tarFlagWidths) : [];
     tarIndexes.forEach((index, rowIndex) => {
       const fightAt = tarFlags[rowIndex * 2] ? unquantizedTenths(reader.s()) : null;
       const saunaAt = tarFlags[rowIndex * 2 + 1] ? unquantizedTenths(reader.s()) : null;
-      t[index] = [tarCounters[rowIndex][0], tarCounters[rowIndex][1], fightAt, saunaAt];
+      t[index] = [
+        tarCounters[rowIndex][0],
+        tarCounters[rowIndex][1],
+        fightAt,
+        saunaAt,
+        tarCounters[rowIndex][2],
+        tarCounters[rowIndex][3],
+      ];
     });
 
     const i = Array.from({ length: itemCount }, () => [0, null]);
@@ -1691,7 +1726,7 @@
       i[index] = [placed, placedAt];
     });
     const metadata = { w, t, i };
-    if (flags & 1) metadata.s = readAchievementSpell(reader);
+    if (flags & 1) metadata.s = readAchievementSpell(reader, version);
     return metadata;
   }
 
@@ -1730,6 +1765,7 @@
       const itemRows = Array.isArray(snapshot.i) ? snapshot.i : [];
       writeItemBlocks(writer, itemRows);
       writer.category("achievementMetadata", () => writeAchievementMetadata(writer, snapshot.g || null, tarinaiRows.length, itemRows.length));
+      writer.category("extendedState", () => writer.str(JSON.stringify(snapshot.x || {})));
       return writer.out();
     } finally {
       activeStringWriteMap = null;
@@ -1743,7 +1779,7 @@
       const formatHeader = reader.b();
       const schema = formatHeader & 0x7f;
       const hasStringTable = Boolean(formatHeader & 0x80);
-      if (schema !== BINARY_SCHEMA_VERSION) throw new Error("unsupported binary save schema");
+      if (![54, BINARY_SCHEMA_VERSION].includes(schema)) throw new Error("unsupported binary save schema");
       readStringTable(reader, hasStringTable);
       const w = readWorld(reader);
       const tCount = reader.u();
@@ -1758,8 +1794,10 @@
       } catch (_) {
         throw new Error("invalid achievement metadata in binary save");
       }
+      let x = {};
+      try { x = JSON.parse(reader.str() || "{}"); } catch (_) { throw new Error("invalid extended state in binary save"); }
       if (reader.pos !== reader.bytes.length) throw new Error("trailing bytes in binary save");
-      return { v: Snapshot.version, a: "tj1", m: summaryFromPayload(w, t.length), w, t, i: items, g };
+      return { v: Snapshot.version, a: "tj1", m: summaryFromPayload(w, t.length), w, t, i: items, r: [], g, x };
     } finally {
       activeStringReadList = null;
     }
diff --git a/js/save_schema.js b/js/save_schema.js
index 4906bdc..e3f9d3c 100644
--- a/js/save_schema.js
+++ b/js/save_schema.js
@@ -8,8 +8,8 @@
   if (!ids) throw new Error("TarinaiDomainIds must be loaded before save_schema.js");
   if (!itemCatalog) throw new Error("TarinaiItemTypeCatalog must be loaded before save_schema.js");
 
-  const SNAPSHOT_VERSION = 40;
-  const BINARY_SCHEMA_VERSION = 53;
+  const SNAPSHOT_VERSION = 42;
+  const BINARY_SCHEMA_VERSION = 55;
 
   function moodValue(index, fallback = "relaxed") {
     return ids.canonicalMoodId(ids.enumValue(ids.MOOD_IDS, index, fallback));
diff --git a/js/save_system.js b/js/save_system.js
index ee9d42d..df1ed4b 100644
--- a/js/save_system.js
+++ b/js/save_system.js
@@ -65,10 +65,13 @@
     dialog.className = "field-dialog hidden";
     dialog.setAttribute("role", "dialog");
     dialog.setAttribute("aria-modal", "true");
+    dialog.setAttribute("aria-labelledby", "saveDialogTitle");
+    dialog.setAttribute("aria-hidden", "true");
+    dialog.tabIndex = -1;
     dialog.innerHTML = `
       <div class="field-dialog-panel save-dialog-panel">
         <h2 id="saveDialogTitle">\u30bb\u30fc\u30d6 / \u30ed\u30fc\u30c9</h2>
-        <p class="hint save-warning">\u30bb\u30fc\u30d6\u306f\u5b9f\u9a13\u7684\u6a5f\u80fd\u3067\u3042\u308a\u4fdd\u8a3c\u5bfe\u8c61\u5916\u3067\u3059\u3002</p>
+        <p class="hint save-warning">\u500b\u4f53\u30fb\u7269\u4f53\u30fb\u5929\u5019\u30fb\u30ed\u30b0\u306e\u72b6\u614b\u3092\u4fdd\u5b58\u3057\u307e\u3059\u3002\u884c\u52d5\u30af\u30fc\u30eb\u30c0\u30a6\u30f3\u306e\u307f\u30bb\u30c3\u30b7\u30e7\u30f3\u5185\u72b6\u614b\u306e\u305f\u3081\u5fa9\u5143\u3055\u308c\u307e\u305b\u3093\u3002</p>
         <div id="saveSlotList" class="save-slot-list"></div>
         <div class="save-export-panel">
           <div class="save-export-actions">
@@ -109,11 +112,22 @@
   function openDialog() {
     const dialog = ensureDialog();
     renderSlotList();
-    dialog.classList.remove("hidden");
+    if (global.TarinaiManagedDialogs?.open) global.TarinaiManagedDialogs.open(dialog);
+    else {
+      dialog.classList.remove("hidden");
+      dialog.setAttribute("aria-hidden", "false");
+      global.setTimeout(() => dialog.querySelector("button:not([disabled]), textarea:not([disabled])")?.focus?.(), 0);
+    }
   }
 
   function closeDialog() {
-    document.getElementById("saveDialog")?.classList.add("hidden");
+    const dialog = document.getElementById("saveDialog");
+    if (global.TarinaiManagedDialogs?.close) global.TarinaiManagedDialogs.close(dialog);
+    else {
+      dialog?.classList.add("hidden");
+      dialog?.setAttribute("aria-hidden", "true");
+      document.getElementById("saveBtn")?.focus?.();
+    }
   }
 
   function bindSaveSystem() {
@@ -121,12 +135,13 @@
     if (!btn || btn.dataset.saveBound === "1") return;
     btn.dataset.saveBound = "1";
     btn.addEventListener("click", () => {
-      global.audio?.uiClick?.();
+      global.TarinaiAudio?.uiClick?.();
       openDialog();
     });
     const dialog = ensureDialog();
     if (dialog.dataset.saveDialogBound === "1") return;
     dialog.dataset.saveDialogBound = "1";
+    dialog.addEventListener("tarinai:dialog-close-request", closeDialog);
     dialog.addEventListener("click", async (e) => {
       if (e.target === dialog) { closeDialog(); return; }
       const saveBtn = e.target.closest("[data-save-slot]");
@@ -137,7 +152,7 @@
         try {
           await saveSlot(slot);
           renderSlotList();
-          global.audio?.notify?.();
+          global.TarinaiAudio?.notify?.();
           global.showToast?.(`\u30b9\u30ed\u30c3\u30c8${slot}\u306b\u30bb\u30fc\u30d6\u3057\u307e\u3057\u305f\u3002`);
         } catch (error) {
           console.warn(error);
@@ -155,7 +170,7 @@
         try {
           await loadSlot(slot);
           closeDialog();
-          global.audio?.notify?.();
+          global.TarinaiAudio?.notify?.();
           global.showToast?.(`\u30b9\u30ed\u30c3\u30c8${slot}\u3092\u30ed\u30fc\u30c9\u3057\u307e\u3057\u305f\u3002`);
         } catch (error) {
           console.warn(error);
@@ -173,7 +188,7 @@
         })) return;
         deleteSlot(slot);
         renderSlotList();
-        global.audio?.delete?.();
+        global.TarinaiAudio?.delete?.();
         global.showToast?.(`\u30b9\u30ed\u30c3\u30c8${slot}\u3092\u6d88\u3057\u307e\u3057\u305f\u3002`);
         return;
       }
diff --git a/js/seesaw_system.js b/js/seesaw_system.js
index 3f4486e..1cb5cb5 100644
--- a/js/seesaw_system.js
+++ b/js/seesaw_system.js
@@ -185,7 +185,7 @@
         const side = index === 1 ? 1 : -1;
         const lift = Math.sin(item.seesawPhase) * 9 * side;
         actor.x = base.x;
-        actor.y = base.y - 12 + (playing ? lift : 0);
+        actor.y = base.y - 16 + (playing ? lift : 0);
         actor.vx = 0; actor.vy = 0;
         const actionText = playing ? "\u30b7\u30fc\u30bd\u30fc\u3092\u3057\u3066\u3044\u308b\u3002" : "\u76f8\u624b\u3092\u5f85\u3063\u3066\u3044\u308b";
         actor.thought = actionText;
diff --git a/js/signal_system.js b/js/signal_system.js
index 750d993..2975969 100644
--- a/js/signal_system.js
+++ b/js/signal_system.js
@@ -5,7 +5,7 @@
   const WIRE_TYPES = new Set(["wire", "insulated_wire"]);
   const LINK_TYPES = new Set(["rope", "rod", "spring", "wire", "insulated_wire"]);
   const SIGNAL_SOURCE_TYPES = new Set(["pressure_switch"]);
-  const DIRECT_SIGNAL_SINK_TYPES = new Set(["rotator", "reciprocator", "robot_cleaner", "gate_fence", "fan", "stove", "dry_ice", "duplicator"]);
+  const DIRECT_SIGNAL_SINK_TYPES = new Set(["rotator", "reciprocator", "robot_cleaner", "gate_fence", "fan", "stove", "dry_ice", "duplicator", "leakage_device"]);
   const DETECTOR_METRICS = Object.freeze({
     tarinai_count: { label: "\u305f\u308a\u306a\u3044\u6570", defaultThreshold: 1 },
     hunger_avg: { label: "\u5e73\u5747\u7a7a\u8179", defaultThreshold: 70 },
@@ -64,9 +64,11 @@
 
   function emitEffect(worldRef, type, x, y, options = {}) {
     if (!worldRef?.effects) return false;
+    if (typeof worldRef.queueEffect === "function") return Boolean(worldRef.queueEffect(type, x, y, options));
+    if (global.TarinaiPerf?.visualLevel?.("effects", "high") === "off") return false;
     const EffectCtor = global.TarinaiEffect || (typeof Effect === "function" ? Effect : null);
     if (typeof EffectCtor !== "function") return false;
-    worldRef.effects.push(new EffectCtor(type, x, y, options));
+    worldRef.queueEffect?.(type, x, y, options);
     return true;
   }
 
@@ -152,9 +154,10 @@
     return actors.length;
   }
 
-  function updatePressureSwitches(worldRef) {
+  function updatePressureSwitches(worldRef, pressureSwitches = null) {
     const minute = currentMinuteOfDay(worldRef);
-    for (const item of worldRef.itemsOfType?.("pressure_switch") || []) {
+    const switches = pressureSwitches || worldRef.itemsOfType?.("pressure_switch") || [];
+    for (const item of switches) {
       if (!item || item.dead) continue;
       item.pressureTarget = normalizePressureTarget(item.pressureTarget);
       const defaultThreshold = PRESSURE_TARGETS[item.pressureTarget]?.defaultThreshold ?? 1;
@@ -182,13 +185,22 @@
     }
   }
 
-  function setEffectivePower(node, directDriven, directOn, worldRef) {
+  function setEffectivePower(node, directDriven, directOn, worldRef, provenance = {}) {
     const wasOn = Boolean(node?._achievementSignalWasOn);
     node._directSignalDriven = Boolean(directDriven);
     node._directSignalOn = Boolean(directDriven && directOn);
     node._achievementSignalWasOn = node._directSignalOn;
     if (!wasOn && node._directSignalOn) {
-      global.TarinaiAchievements?.recordSignalActivation?.({ world: worldRef, target: node, type: node.type });
+      const detectorSources = [...new Set((Array.isArray(provenance.detectorSources) ? provenance.detectorSources : []).filter(Boolean))];
+      global.TarinaiAchievements?.recordSignalActivation?.({
+        world: worldRef,
+        target: node,
+        type: node.type,
+        source: detectorSources[0] || null,
+        detectorSources,
+        detectorDriven: detectorSources.length > 0,
+        connected: Boolean(directDriven),
+      });
       if (node.type === "robot_cleaner") global.TarinaiAchievements?.evaluateCleanFreak?.(worldRef, { robot: node, source: "signal-power" });
     }
     node._signalDriven = node._directSignalDriven;
@@ -203,7 +215,62 @@
     }
   }
 
-  function buildSignalNetwork(worldRef) {
+  function collectSignalSinks(worldRef, out) {
+    if (!worldRef || !out) return out;
+    if (typeof worldRef.itemsOfType === "function") {
+      for (const type of DIRECT_SIGNAL_SINK_TYPES) {
+        const bucket = worldRef.itemsOfType(type) || [];
+        if (bucket.length) out.sinks.push(...bucket);
+      }
+      return out;
+    }
+    for (const item of worldRef.items || []) {
+      if (item && !item.dead && DIRECT_SIGNAL_SINK_TYPES.has(item.type)) out.sinks.push(item);
+    }
+    return out;
+  }
+
+  function collectSignalBuckets(worldRef, includeSinks = true) {
+    const out = { pressureSwitches: [], boards: [], wires: [], sinks: [] };
+    if (!worldRef) return out;
+    if (typeof worldRef.itemsOfType === "function") {
+      out.pressureSwitches = worldRef.itemsOfType("pressure_switch") || [];
+      out.boards = worldRef.itemsOfType("circuit_board") || [];
+      out.wires = [
+        ...(worldRef.itemsOfType("wire") || []),
+        ...(worldRef.itemsOfType("insulated_wire") || []),
+      ];
+      if (includeSinks) collectSignalSinks(worldRef, out);
+      return out;
+    }
+    // Compatibility fallback for lightweight test worlds that do not expose
+    // item buckets. Production worlds use the branch above and avoid a full
+    // world.items scan entirely.
+    for (const item of worldRef.items || []) {
+      if (!item || item.dead) continue;
+      if (item.type === "pressure_switch") out.pressureSwitches.push(item);
+      else if (item.type === "circuit_board") out.boards.push(item);
+      if (WIRE_TYPES.has(item.type)) out.wires.push(item);
+      if (includeSinks && DIRECT_SIGNAL_SINK_TYPES.has(item.type)) out.sinks.push(item);
+    }
+    return out;
+  }
+
+  function clearSignalSinks(worldRef, sinks) {
+    let changed = false;
+    for (const item of sinks || []) {
+      if (!item || item.dead) continue;
+      if (item._signalDriven || item._signalOn || item._wireSignalDriven || item._wireSignalOn) changed = true;
+      item._wireSignalDriven = false;
+      item._wireSignalOn = false;
+      setEffectivePower(item, false, false, worldRef);
+    }
+    if (changed) worldRef.drawListDirty = true;
+    return changed;
+  }
+
+  function buildSignalNetwork(worldRef, signalBuckets = null) {
+    const buckets = signalBuckets || collectSignalBuckets(worldRef);
     const adjacency = new Map();
     const connectedNodes = new Set();
     const wires = [];
@@ -217,20 +284,19 @@
       connectedNodes.add(a); connectedNodes.add(b);
     };
     const boards = [];
-    for (const item of worldRef.items || []) {
+    for (const item of buckets.sinks || []) {
       if (!item || item.dead) continue;
-      if (DIRECT_SIGNAL_SINK_TYPES.has(item.type)) {
-        item._wireSignalDriven = false; item._wireSignalOn = false;
-        item._directSignalDriven = false; item._directSignalOn = false;
-      }
-      if (item.type === "circuit_board") {
-        circuit?.ensureConfig?.(item);
-        item._circuitInputState = Object.create(null);
-        if (!item._circuitOutputState || typeof item._circuitOutputState !== "object") circuit?.evaluate?.(item, item._circuitInputState);
-        boards.push(item);
-      }
+      item._wireSignalDriven = false; item._wireSignalOn = false;
+      item._directSignalDriven = false; item._directSignalOn = false;
     }
-    for (const wire of worldRef.items || []) {
+    for (const item of buckets.boards || []) {
+      if (!item || item.dead) continue;
+      circuit?.ensureConfig?.(item);
+      item._circuitInputState = Object.create(null);
+      if (!item._circuitOutputState || typeof item._circuitOutputState !== "object") circuit?.evaluate?.(item, item._circuitInputState);
+      boards.push(item);
+    }
+    for (const wire of buckets.wires || []) {
       if (!isWire(wire)) continue;
       const pb = global.TarinaiPhysicsBodySystem;
       const endpointA = pb?.endpoint?.(wire, 0);
@@ -266,7 +332,12 @@
         visited.add(node); nodes.push(node);
         for (const next of adjacency.get(node) || []) if (!visited.has(next)) stack.push(next);
       }
-      const component = { nodes, active: false, hasSource: nodes.some(node => SIGNAL_SOURCE_TYPES.has(node.type) || (node.type === "circuit_terminal" && node.direction === "output")) };
+      const component = {
+        nodes,
+        active: false,
+        hasSource: nodes.some(node => SIGNAL_SOURCE_TYPES.has(node.type) || (node.type === "circuit_terminal" && node.direction === "output")),
+        detectorSources: [],
+      };
       components.push(component);
       nodes.forEach(node => componentOf.set(node, component));
     }
@@ -274,33 +345,55 @@
     // Board outputs can depend on other boards, so resolve the graph to a
     // fixed point. Unstable internal combinational cycles are forced OFF by the
     // board evaluator; external feedback is still bounded to avoid hanging the simulation.
+    const detectorSourceSignature = sources => [...new Set((sources || []).map(source => String(source?.id || source?.familyKey || ""))).values()].sort().join("|");
+    const refreshComponentState = component => {
+      const directDetectors = component.nodes.filter(node => SIGNAL_SOURCE_TYPES.has(node.type) && node.signalActive);
+      const outputDetectors = component.nodes.flatMap(node => (
+        node.type === "circuit_terminal" && node.direction === "output" && node.signalActive
+          ? (Array.isArray(node._signalDetectorSources) ? node._signalDetectorSources : [])
+          : []
+      ));
+      const nextSources = [...new Set([...directDetectors, ...outputDetectors].filter(Boolean))];
+      const active = component.hasSource && component.nodes.some(node => (
+        (SIGNAL_SOURCE_TYPES.has(node.type) && node.signalActive)
+        || (node.type === "circuit_terminal" && node.direction === "output" && node.signalActive)
+      ));
+      const changed = active !== component.active
+        || detectorSourceSignature(nextSources) !== detectorSourceSignature(component.detectorSources);
+      component.active = active;
+      component.detectorSources = active ? nextSources : [];
+      return changed;
+    };
+
     const maxCircuitPasses = Math.min(256, Math.max(16, boards.length * 2 + 4));
     for (let pass = 0; pass < maxCircuitPasses; pass += 1) {
       let changed = false;
-      for (const component of components) {
-        const active = component.hasSource && component.nodes.some(node => (SIGNAL_SOURCE_TYPES.has(node.type) && node.signalActive) || (node.type === "circuit_terminal" && node.direction === "output" && node.signalActive));
-        if (active !== component.active) { component.active = active; changed = true; }
-      }
+      for (const component of components) changed = refreshComponentState(component) || changed;
       for (const board of boards) {
         const inputs = Object.create(null);
+        const inputProvenance = Object.create(null);
         for (const port of circuit?.ports?.(board) || []) {
           if (port.direction !== "input") continue;
           const terminal = circuit.terminal(board, port.portId);
-          inputs[port.id] = Boolean(componentOf.get(terminal)?.active);
+          const component = componentOf.get(terminal);
+          inputs[port.id] = Boolean(component?.active);
+          inputProvenance[port.id] = component?.detectorSources || [];
         }
         const before = JSON.stringify(board._circuitOutputState || {});
-        circuit?.evaluate?.(board, inputs);
-        if (before !== JSON.stringify(board._circuitOutputState || {})) changed = true;
+        const beforeSources = JSON.stringify(Object.fromEntries(Object.entries(board._circuitOutputDetectorSources || {}).map(([id, sources]) => [id, detectorSourceSignature(sources)])));
+        circuit?.evaluate?.(board, inputs, inputProvenance);
+        const afterSources = JSON.stringify(Object.fromEntries(Object.entries(board._circuitOutputDetectorSources || {}).map(([id, sources]) => [id, detectorSourceSignature(sources)])));
+        if (before !== JSON.stringify(board._circuitOutputState || {}) || beforeSources !== afterSources) changed = true;
       }
       if (!changed) break;
     }
     for (const component of components) {
-      component.active = component.hasSource && component.nodes.some(node => (SIGNAL_SOURCE_TYPES.has(node.type) && node.signalActive) || (node.type === "circuit_terminal" && node.direction === "output" && node.signalActive));
+      refreshComponentState(component);
       for (const node of component.nodes) {
         if (!DIRECT_SIGNAL_SINK_TYPES.has(node.type)) continue;
         node._wireSignalDriven = component.hasSource;
         node._wireSignalOn = component.hasSource && component.active;
-        setEffectivePower(node, component.hasSource, component.active, worldRef);
+        setEffectivePower(node, component.hasSource, component.active, worldRef, { detectorSources: component.detectorSources });
       }
     }
     for (const entry of wires) {
@@ -322,13 +415,10 @@
       global.TarinaiAchievements?.recordCircuitBoardSignalTransfer?.(sourceBoard, targetBoard, entry.wire, { world: worldRef });
     }
 
-    for (const item of worldRef.items || []) {
-      if (!item || item.dead) continue;
-      if (DIRECT_SIGNAL_SINK_TYPES.has(item.type) && !componentOf.has(item)) {
-        item._wireSignalDriven = false; item._wireSignalOn = false;
-        setEffectivePower(item, false, false, worldRef);
-      }
-      if (isWire(item) && !wires.some(entry => entry.wire === item)) item.signalActive = false;
+    for (const item of buckets.sinks || []) {
+      if (!item || item.dead || componentOf.has(item)) continue;
+      item._wireSignalDriven = false; item._wireSignalOn = false;
+      setEffectivePower(item, false, false, worldRef);
     }
     if (wireGeometryMoved) {
       worldRef.drawListDirty = true;
@@ -337,8 +427,6 @@
     return wires;
   }
 
-  const distanceToSegment = (px, py, ax, ay, bx, by) => global.TarinaiGeometry.pointSegmentDistance(px, py, ax, ay, bx, by);
-
   function shockTarget(worldRef, wire, target, now, { connected = false } = {}) {
     if (!target || target.dead) return false;
     if (!wire._shockCooldowns || typeof wire._shockCooldowns.get !== "function") wire._shockCooldowns = new WeakMap();
@@ -361,6 +449,13 @@
       target.fearTimer = Math.max(num(target.fearTimer), 0.8);
       target.electricShockUntil = Math.max(num(target.electricShockUntil), now + 0.62);
       target.setActionState?.("panic", { target: null, reason: "\u611f\u96fb\u3057\u3066\u3044\u308b", wake: true, sleeping: false });
+      if (target.isAcquiredTarinai && now >= Number(target.ochibiElectricVoiceAt || 0)) {
+        target.ochibiElectricVoiceAt = now + 1.8;
+        if (target.bubble?.("びりびりちゃ！", 1.4, "rgba(70,104,168,0.82)", { force: true })) {
+          const a = global.TarinaiAudio;
+          if (a?.playSample) a.playSample("voice_ochibi_electric_006", 0.9, "voice") || a.play?.("voice_ochibi_electric_006", { category: "voice", minGap: 0.9 });
+        }
+      }
     }
     emitEffect(worldRef, "electric_shock", target.x, target.y - Math.max(3, num(target.radius ?? target.r, 12) * 0.12), {
       size: Math.max(12, num(target.radius ?? target.r, 12) * 1.15),
@@ -389,13 +484,13 @@
       const near = worldRef.nearbyTarinai?.(cx, cy, radius, true) || worldRef.tarinai || [];
       for (const t of near) {
         if (!t || t.dead || worldRef.isTarinaiHiddenInNestBox?.(t)) continue;
-        if (distanceToSegment(t.x, t.y, pointA.x, pointA.y, pointB.x, pointB.y) > Math.max(8, num(t.radius, 20) * 0.48)) continue;
+        if (global.TarinaiGeometry.pointSegmentDistance(t.x, t.y, pointA.x, pointA.y, pointB.x, pointB.y) > Math.max(8, num(t.radius, 20) * 0.48)) continue;
         shockTarget(worldRef, wire, t, now, { connected: false });
       }
       const ants = worldRef.nearbyAnts?.(cx, cy, radius, true) || worldRef.ants || [];
       for (const ant of ants) {
         if (!ant || ant.dead) continue;
-        if (distanceToSegment(ant.x, ant.y, pointA.x, pointA.y, pointB.x, pointB.y) > Math.max(5, num(ant.r, 6) * 0.9)) continue;
+        if (global.TarinaiGeometry.pointSegmentDistance(ant.x, ant.y, pointA.x, pointA.y, pointB.x, pointB.y) > Math.max(5, num(ant.r, 6) * 0.9)) continue;
         shockTarget(worldRef, wire, ant, now, { connected: false });
       }
     }
@@ -407,10 +502,30 @@
   }
 
   function updateWorld(worldRef, dt = 0.016) {
-    if (!worldRef?.items) return false;
-    updatePressureSwitches(worldRef);
-    const wires = buildSignalNetwork(worldRef);
-    damageFromWires(worldRef, wires);
+    if (!worldRef) return false;
+    const buckets = collectSignalBuckets(worldRef, false);
+    const hasSwitches = buckets.pressureSwitches.length > 0;
+    const hasNetwork = buckets.wires.length > 0 || buckets.boards.length > 0;
+
+    // Normal worlds with no signal controllers stop after four O(1) bucket
+    // lookups. Sink buckets are only touched while a network exists or once
+    // when a removed network needs to clear stale power flags.
+    if (!hasSwitches && !hasNetwork && !worldRef._signalSystemHadNetwork) return false;
+
+    if (hasSwitches) updatePressureSwitches(worldRef, buckets.pressureSwitches);
+    if (!hasNetwork) {
+      if (worldRef._signalSystemHadNetwork) {
+        collectSignalSinks(worldRef, buckets);
+        clearSignalSinks(worldRef, buckets.sinks);
+      }
+      worldRef._signalSystemHadNetwork = false;
+      return hasSwitches;
+    }
+
+    collectSignalSinks(worldRef, buckets);
+    const wires = buildSignalNetwork(worldRef, buckets);
+    worldRef._signalSystemHadNetwork = true;
+    if (wires.length) damageFromWires(worldRef, wires);
     return true;
   }
 
@@ -427,5 +542,6 @@
     DETECTOR_METRICS,
     PRESSURE_TARGETS,
     detectorMetricValue,
+    normalizeMinute,
   });
 })(typeof window !== "undefined" ? window : globalThis);
diff --git a/js/sim_core.js b/js/sim_core.js
index b25c805..8c91773 100644
--- a/js/sim_core.js
+++ b/js/sim_core.js
@@ -109,8 +109,12 @@ function inheritedGenetics(a, b, seed = "") {
     const fallback = key === "temperatureOffset" ? 0 : 1;
     const av = Number.isFinite(Number(ga[key])) ? Number(ga[key]) : fallback;
     const bv = Number.isFinite(Number(gb[key])) ? Number(gb[key]) : fallback;
-    const base = (av + bv) / 2;
-    const mutationScale = key === "temperatureOffset" ? 2.5 : 0.10;
+    // Keep offspring much closer to the parental range.  A small deterministic
+    // dominance bias prevents every lineage from collapsing immediately to the
+    // exact midpoint, while mutation is intentionally modest.
+    const aWeight = 0.42 + stableUnit(seed, `gene-parent-weight-${key}`) * 0.16;
+    const base = av * aWeight + bv * (1 - aWeight);
+    const mutationScale = key === "temperatureOffset" ? 0.6 : 0.024;
     const mutation = (stableUnit(seed, `gene-mut-${key}`) - 0.5) * mutationScale;
     out[key] = clampGeneticValue(key, base + mutation);
   }
@@ -419,8 +423,10 @@ class Effect {
     this.color = options.color || "#fff4a8";
     this.seed = Math.random() * 1000;
     this.text = options.text || "";
+    this.spriteId = options.spriteId || (type === "ascend_soul" ? "sleep" : "");
     this._effectPooled = false;
     this._effectUpdatedFrame = 0;
+    this._forceVisual = options.forceVisual === true || type === "ascend_soul";
     return this;
   }
 
@@ -428,6 +434,11 @@ class Effect {
     this.life -= dt;
     this.x += this.vx * dt;
     this.y += this.vy * dt;
+    if (this.type === "ascend_soul") {
+      this.vx *= Math.pow(0.985, dt * 60);
+      this.vy *= Math.pow(0.997, dt * 60);
+      return;
+    }
     this.vx *= Math.pow(0.92, dt * 60);
     this.vy *= Math.pow(0.92, dt * 60);
   }
@@ -455,6 +466,42 @@ class Effect {
       const s = this.size * (0.80 + (1 - alpha) * 0.36);
       ctx.rotate(Math.sin(this.seed + (1 - alpha) * 3.2) * 0.18);
       drawHeartShape(ctx, 0, 0, s, { fill: this.color || "rgba(240,91,135,0.92)", stroke: "rgba(255,252,246,0.88)", alpha: 1 });
+    } else if (this.type === "ascend_soul") {
+      const phase = 1 - alpha;
+      const spriteId = this.spriteId || "sleep";
+      const img = typeof getRenderableImage === "function" ? getRenderableImage(spriteId, spriteId) : null;
+      const sway = Math.sin(this.seed + phase * Math.PI * 3.2) * this.size * 0.12;
+      const scale = 0.86 + phase * 0.18;
+      ctx.save();
+      ctx.globalCompositeOperation = "screen";
+      const pillarH = this.size * 6.4;
+      const pillarW = this.size * (1.35 + phase * 0.35);
+      const gradient = ctx.createLinearGradient(0, -pillarH, 0, this.size * 0.8);
+      gradient.addColorStop(0, "rgba(244,248,255,0)");
+      gradient.addColorStop(0.28, `rgba(238,246,255,${0.16 * alpha})`);
+      gradient.addColorStop(0.72, `rgba(255,247,207,${0.30 * alpha})`);
+      gradient.addColorStop(1, "rgba(255,244,194,0)");
+      ctx.fillStyle = gradient;
+      ctx.beginPath();
+      ctx.ellipse(0, -pillarH * 0.40, pillarW * 0.58, pillarH * 0.58, 0, 0, Math.PI * 2);
+      ctx.fill();
+      ctx.globalAlpha = Math.min(0.75, alpha * 0.62);
+      ctx.fillStyle = "rgba(255,250,220,0.72)";
+      ctx.fillRect(-Math.max(1.5, this.size * 0.075), -pillarH * 0.92, Math.max(3, this.size * 0.15), pillarH * 0.95);
+      ctx.restore();
+      ctx.translate(sway, 0);
+      ctx.globalAlpha = Math.min(1, alpha * 1.18) * (0.82 + Math.sin(phase * Math.PI) * 0.18);
+      if (img && img.complete && (img.naturalWidth || img.width)) {
+        const ratio = (img.naturalHeight || img.height || 1) / Math.max(1, (img.naturalWidth || img.width || 1));
+        const w = this.size * 2.25 * scale;
+        const h = w * ratio;
+        ctx.drawImage(img, -w * 0.5, -h * 0.72, w, h);
+      } else {
+        ctx.fillStyle = "rgba(245,248,255,0.72)";
+        ctx.beginPath();
+        ctx.ellipse(0, -this.size * 0.35, this.size * 0.62, this.size * 0.46, 0, 0, Math.PI * 2);
+        ctx.fill();
+      }
     } else if (this.type === "ring") {
       ctx.strokeStyle = this.color;
       ctx.lineWidth = 2;
@@ -613,32 +660,10 @@ class Effect {
       }
     } else if (this.type === "bubble") {
       ctx.font = "bold 12px Yomogi, ui-rounded, sans-serif";
-      const maxTextW = 118;
-      const lineH = 14;
-      const ellipsize = (text, maxW) => globalThis.canvasEllipsizeText(ctx, text, maxW);
-      const wrap = (text, maxW) => {
-        const src = String(text || "").replace(/\s+/g, " ").trim() || " ";
-        const units = src.includes(" ") ? src.split(/(\s+)/).filter(Boolean) : Array.from(src);
-        const out = [];
-        let line = "";
-        for (const unit of units) {
-          const candidate = line ? `${line}${unit}` : unit;
-          if (ctx.measureText(candidate).width <= maxW) line = candidate;
-          else {
-            if (line) out.push(line.trim());
-            line = unit.trim();
-            if (ctx.measureText(line).width > maxW) { out.push(ellipsize(line, maxW)); line = ""; }
-          }
-          if (out.length >= 3) break;
-        }
-        if (line && out.length < 3) out.push(line.trim());
-        if (out.length > 2) out[1] = ellipsize([out[1], ...out.slice(2)].join(""), maxW);
-        return out.slice(0, 2).map(line => ellipsize(line, maxW));
-      };
-      const lines = wrap(this.text, maxTextW);
-      const textW = lines.reduce((m, line) => Math.max(m, ctx.measureText(line).width), 0);
-      const w = Math.max(30, Math.min(142, textW + 18));
-      const h = Math.max(20, 10 + lines.length * lineH);
+      const line = String(this.text || "").replace(/[\r\n]+/g, " ").replace(/\s+/g, " ").trim() || " ";
+      const textW = Math.ceil(ctx.measureText(line).width);
+      const w = Math.max(30, textW + 20);
+      const h = 28;
       ctx.globalAlpha = Math.min(1, alpha * 1.25);
       ctx.fillStyle = "rgba(255, 252, 240, 0.92)";
       ctx.strokeStyle = "rgba(78, 64, 48, 0.22)";
@@ -657,9 +682,7 @@ class Effect {
       ctx.fillStyle = this.color || "rgba(42,36,29,0.78)";
       ctx.textAlign = "center";
       ctx.textBaseline = "middle";
-      for (let i = 0; i < lines.length; i++) {
-        ctx.fillText(lines[i], 0, -h + 8 + lineH * i + lineH / 2);
-      }
+      ctx.fillText(line, 0, -h / 2);
     }
     ctx.restore();
   }
@@ -671,7 +694,6 @@ globalThis.TarinaiEffect = Effect;
 class SpatialGrid {
   constructor(cellSize = 96) {
     this.cellSize = cellSize;
-    this.itemCells = new Map();
     this.staticItemCells = new Map();
     this.dynamicItemCells = new Map();
     // Grass is passive terrain/food. Keep a second item index without grass so
@@ -687,9 +709,6 @@ class SpatialGrid {
     this._indexedTarinai = new Set();
     this._tarinaiSyncStamp = 0;
     this.antCells = new Map();
-    this.obstacleCells = new Map();
-    this.foodCells = new Map();
-    this.hazardCells = new Map();
     this.staticObstacleCells = new Map();
     this.dynamicObstacleCells = new Map();
     this.staticFoodCells = new Map();
@@ -705,16 +724,12 @@ class SpatialGrid {
   }
 
   clearItems() {
-    this.itemCells.clear();
     this.staticItemCells.clear();
     this.dynamicItemCells.clear();
     this.staticNonGrassItemCells.clear();
     this.dynamicNonGrassItemCells.clear();
     this.grassCells.clear();
     this.linkRenderCells.clear();
-    this.obstacleCells.clear();
-    this.foodCells.clear();
-    this.hazardCells.clear();
     this.staticObstacleCells.clear();
     this.dynamicObstacleCells.clear();
     this.staticFoodCells.clear();
@@ -916,7 +931,6 @@ class SpatialGrid {
     this.add(target, it);
     if (it.type === "grass") this.add(this.grassCells, it);
     else this.add(dynamic ? this.dynamicNonGrassItemCells : this.staticNonGrassItemCells, it);
-    this.add(this.itemCells, it);
     this.addLinkRenderItem(it);
     this.addItemToTraitCells(it, dynamic);
   }
@@ -924,7 +938,6 @@ class SpatialGrid {
   rebuildItems(items) {
     this.clearItems();
     for (const it of items || []) this.classifyItem(it);
-    this.rebuildCombinedItemCells();
   }
 
   rebuildStaticItems(items, opts = {}) {
@@ -941,7 +954,6 @@ class SpatialGrid {
       else this.add(this.staticNonGrassItemCells, it);
       this.addItemToTraitCells(it, false);
     }
-    if (opts.rebuildCombined) this.rebuildCombinedItemCells();
   }
 
   rebuildLinkRenderItems(items) {
@@ -961,33 +973,6 @@ class SpatialGrid {
       if (it.type !== "grass") this.add(this.dynamicNonGrassItemCells, it);
       this.addItemToTraitCells(it, true);
     }
-    if (opts.rebuildCombined) this.rebuildCombinedItemCells();
-  }
-
-  copyCells(src, dst) {
-    for (const [key, bucket] of src.entries()) {
-      let out = dst.get(key);
-      if (!out) {
-        out = [];
-        dst.set(key, out);
-      }
-      for (const entity of bucket) out.push(entity);
-    }
-  }
-
-  rebuildCombinedItemCells() {
-    this.itemCells.clear();
-    this.obstacleCells.clear();
-    this.foodCells.clear();
-    this.hazardCells.clear();
-    this.copyCells(this.staticItemCells, this.itemCells);
-    this.copyCells(this.dynamicItemCells, this.itemCells);
-    this.copyCells(this.staticObstacleCells, this.obstacleCells);
-    this.copyCells(this.dynamicObstacleCells, this.obstacleCells);
-    this.copyCells(this.staticFoodCells, this.foodCells);
-    this.copyCells(this.dynamicFoodCells, this.foodCells);
-    this.copyCells(this.staticHazardCells, this.hazardCells);
-    this.copyCells(this.dynamicHazardCells, this.hazardCells);
   }
 
   rebuildTarinai(tarinai) {
diff --git a/js/simulation_creature_system.js b/js/simulation_creature_system.js
index 61dfb10..51fc8b5 100644
--- a/js/simulation_creature_system.js
+++ b/js/simulation_creature_system.js
@@ -96,15 +96,40 @@
     return true;
   }
 
+  function updateCursorCare(worldRef, dt) {
+    const pointer = worldRef?.pointer;
+    if (!pointer?.inside || !global.TarinaiCursorCareSystem?.updateOne) return 0;
+    // Cursor care is a direct pointer interaction and must remain responsive even
+    // when the expensive creature pipeline is cadence-throttled. One spatial
+    // query per frame is cheaper than testing every creature individually.
+    const candidates = worldRef.nearbyTarinai?.(pointer.x || 0, pointer.y || 0, 220, true) || [];
+    let updated = 0;
+    for (const t of candidates) {
+      if (!t || t.dead) continue;
+      if (global.TarinaiCursorCareSystem.updateOne(t, dt)) updated += 1;
+    }
+    return updated;
+  }
+
   function updateCreatures(worldRef, dt) {
     const h = helpers;
     const end = global.TarinaiPerf.begin("update.tarinai.individual") || null;
     const visibleRect = h.updateVisibleWorldRect(worldRef, 160);
     const nearVisibleRect = h.updateVisibleWorldRect(worldRef, 520);
     const now = worldRef.time || 0;
+    updateCursorCare(worldRef, dt);
     const pressure = prepareMechanicalCrowdPressure(worldRef, visibleRect);
     const pressureActive = Boolean(pressure?.active);
-    const visibleFullBudget = pressureActive ? Math.max(1, profileNumber("pressureCreatureFullBudget", 24)) : 1000000000;
+    // Prevent a low-FPS feedback loop: at large populations a long frame makes
+    // nearly every visible creature's full update become due at once, which makes
+    // the next frame even longer. Under normal frame times this cap is disabled;
+    // only slow frames spread expensive full updates across subsequent frames.
+    const creatureCountForBudget = (worldRef.tarinai || []).length;
+    const antiSpiralVisibleBudget = creatureCountForBudget >= 160 && dt > 0.028
+      ? Math.max(36, Math.min(96, Math.floor(2.8 / Math.max(0.028, dt))))
+      : 1000000000;
+    const pressureVisibleBudget = pressureActive ? Math.max(1, profileNumber("pressureCreatureFullBudget", 24)) : 1000000000;
+    const visibleFullBudget = Math.min(antiSpiralVisibleBudget, pressureVisibleBudget);
     const visibleMotionBudget = pressureActive ? Math.max(1, profileNumber("pressureCreatureMotionBudget", 36)) : 1000000000;
     const collectDiagnostics = global.TarinaiPerf?.diagnosticsEnabled?.() === true;
     const stats = {
@@ -169,6 +194,11 @@
         if (creatureIndex >= creatureCount) creatureIndex = 0;
         const t = creatureList[creatureIndex++];
         if (!t || t.dead) continue;
+        // Reproduction cooldown is simulation time, not AI-think time.  Keep it
+        // advancing even when the expensive creature pipeline is cadence/budget
+        // throttled; otherwise large colonies can stay reproductively locked for
+        // many in-game minutes after the early population burst.
+        t.reproductionTimer = (Number(t.reproductionTimer || 0) || 0) - dt;
         stats.total += 1;
         const behaviorId = updatePolicy.behaviorId(t);
         inc(stats.states, behaviorId);
@@ -205,8 +235,17 @@
             const jitter = stableUnit(t.id || t.familyKey || Math.random(), `visible-creature-budget:${Math.floor(now * 5)}`);
             t._nextLowFreqUpdateAt = now + Math.max(dt, interval * (0.20 + jitter * 0.25));
             stats.visibleFullSkips += 1;
-            stats.skipped += 1;
-            inc(stats.skippedStates, behaviorId);
+            // Keep movement visually continuous while deferring only the heavy
+            // AI/environment portion of the update.
+            if (cadence.smoothMotion && stats.visibleMotionUsed < stats.visibleMotionBudget
+              && global.TarinaiCreatureRuntime.updateMotionOnly(t, dt, { context })) {
+              stats.smooth += 1;
+              stats.visibleMotionUsed += 1;
+              inc(stats.smoothStates, behaviorId);
+            } else {
+              stats.skipped += 1;
+              inc(stats.skippedStates, behaviorId);
+            }
             continue;
           }
           if (usesBackgroundBudget && stats.fullBudgetUsed >= stats.fullBudget) {
@@ -225,7 +264,14 @@
           stats.full += 1;
           if (cadence.visible) stats.visibleFullUsed += 1;
           if (usesBackgroundBudget) stats.fullBudgetUsed += 1;
-          global.TarinaiCreatureRuntime.updateOne(t, runDt, { context });
+          // Camera zoom must never change simulation travel distance. Off-screen
+          // creatures receive the same accumulated movement time as metabolism,
+          // AI timers, and health. The light collision path keeps the catch-up
+          // affordable while moveTarinaiWithCollision still substeps long travel.
+          const runContext = cadence.visible
+            ? context
+            : { ...context, motionDt: Math.min(runDt, 2.4), offscreenCatchup: true };
+          global.TarinaiCreatureRuntime.updateOne(t, runDt, { context: runContext });
         } else if (cadence.smoothMotion) {
           if (cadence.visible && stats.visibleMotionUsed >= stats.visibleMotionBudget) {
             stats.visibleMotionSkips += 1;
diff --git a/js/simulation_effects_system.js b/js/simulation_effects_system.js
index 275f36f..ae72c8f 100644
--- a/js/simulation_effects_system.js
+++ b/js/simulation_effects_system.js
@@ -4,8 +4,10 @@
 // Owns frame updates for transient visual/effect entities.
 (function (global) {
   function effectPriority(effect) {
+    const explicit = Number(effect?._effectImportance);
+    if (Number.isFinite(explicit)) return Math.max(0, Math.min(3, explicit));
     const type = String(effect?.type || "");
-    if (type === "explosion" || type === "shoot_impact" || type === "bubble" || type === "heart" || type === "electric_shock") return 3;
+    if (type === "explosion" || type === "shoot_impact" || type === "bubble" || type === "heart" || type === "electric_shock" || type === "ascend_soul") return 3;
     if (type === "ring" || type === "fall") return 2;
     return 1;
   }
@@ -29,6 +31,7 @@
     for (let priority = 1; priority <= 3 && needDrop > 0; priority += 1) {
       for (let i = 0; i < effects.length && needDrop > 0; i += 1) {
         if (dropMask[i] || effectPriority(effects[i]) !== priority) continue;
+        if (effects[i]?._forceVisual === true || effects[i]?.type === "bubble" || effects[i]?.type === "ascend_soul") continue;
         dropMask[i] = 1;
         needDrop -= 1;
       }
@@ -60,8 +63,37 @@
     return true;
   }
 
+  function clearDisabledEffects(worldRef, effects, dt) {
+    if (!effects?.length) return 0;
+    let write = 0;
+    let updated = 0;
+    for (const effect of effects) {
+      if (!effect) continue;
+      const forced = effect._forceVisual === true || effect.type === "bubble" || effect.type === "ascend_soul";
+      if (!forced) {
+        worldRef.releaseEffect?.(effect);
+        continue;
+      }
+      if (!effect.dead) effect.update(Math.min(0.24, Math.max(0, dt)));
+      if (!effect.dead) {
+        effects[write++] = effect;
+        updated += 1;
+      } else worldRef.releaseEffect?.(effect);
+    }
+    effects.length = write;
+    worldRef._effectUpdateCursor = 0;
+    worldRef._renderEffectCursor = 0;
+    return updated;
+  }
+
   function updateEffects(worldRef, dt) {
     const effects = worldRef.effects || [];
+    if (global.TarinaiPerf?.visualLevel?.("effects", "high") === "off") {
+      clearDisabledEffects(worldRef, effects, dt);
+      worldRef._effectUpdateStats = null;
+      return;
+    }
+
     const beforePressure = effects.length;
     const pressure = compactEffectPressure(worldRef, effects);
     const total = effects.length;
@@ -69,36 +101,36 @@
     worldRef._effectUpdateFrameId = frameId;
 
     let lightweight = 0;
-    const budgeted = [];
+    let active = 0;
     for (const effect of effects) {
       if (!effect || effect.dead) continue;
       if (effect.type === "ring") {
         effect.life -= dt;
         effect._effectUpdatedFrame = frameId;
         lightweight += 1;
-      } else {
-        budgeted.push(effect);
-      }
+      } else active += 1;
     }
 
-    const active = budgeted.length;
     const budget = effectUpdateBudgetFor(active);
     let updated = 0;
     let runScale = 1;
     if (budget >= active) {
-      for (const ef of budgeted) {
-        if (updateEffect(ef, dt, frameId, 1)) updated += 1;
+      for (const effect of effects) {
+        if (!effect || effect.dead || effect.type === "ring") continue;
+        if (updateEffect(effect, dt, frameId, 1)) updated += 1;
       }
     } else if (active > 0) {
+      // Walk the source array directly instead of allocating a temporary
+      // budgeted-effects array every animation frame.
       runScale = Math.min(3.0, Math.max(1, active / Math.max(1, budget)));
-      let cursor = Math.max(0, Math.floor(worldRef._effectUpdateCursor || 0)) % active;
+      let cursor = Math.max(0, Math.floor(worldRef._effectUpdateCursor || 0)) % Math.max(1, effects.length);
       let scanned = 0;
-      while (updated < budget && scanned < active) {
-        const ef = budgeted[cursor];
-        cursor = (cursor + 1) % active;
+      while (updated < budget && scanned < effects.length) {
+        const effect = effects[cursor];
+        cursor = (cursor + 1) % Math.max(1, effects.length);
         scanned += 1;
-        if (!ef || ef.dead) continue;
-        updateEffect(ef, dt, frameId, runScale);
+        if (!effect || effect.dead || effect.type === "ring") continue;
+        updateEffect(effect, dt, frameId, runScale);
         updated += 1;
       }
       worldRef._effectUpdateCursor = cursor;
diff --git a/js/simulation_maintenance_system.js b/js/simulation_maintenance_system.js
index fdaa012..3fb4242 100644
--- a/js/simulation_maintenance_system.js
+++ b/js/simulation_maintenance_system.js
@@ -12,7 +12,7 @@
     worldRef._nextItemCompactAt = now + 1.65;
     worldRef._nextAntCompactAt = now + 3.35;
     worldRef._nextEffectCountRefreshAt = now + 2.15;
-    worldRef._nextFamilyPruneAt = now + 9.1;
+    worldRef._nextTransientRuntimePruneAt = now + 4.75;
     if (!Number.isFinite(worldRef.nextGrassLimitCheckAt) || worldRef.nextGrassLimitCheckAt <= now) worldRef.nextGrassLimitCheckAt = now + 1.25;
     if (!Number.isFinite(worldRef.nextFireCompactAt) || worldRef.nextFireCompactAt <= now) worldRef.nextFireCompactAt = now + 0.45;
     if (!Number.isFinite(worldRef.nextGrassBedExpiryCheckAt) || worldRef.nextGrassBedExpiryCheckAt <= now) worldRef.nextGrassBedExpiryCheckAt = now + 2.85;
@@ -24,6 +24,9 @@
     const now = Number(worldRef.time || 0) || 0;
     let itemsCompacted = false;
 
+    worldRef.updateResidues?.(dt);
+    global.TarinaiMemorialBellSystem?.updateWorldNaturalDecay?.(worldRef);
+
     // Link/plushie reconciliation is a safety net. Deletions already reconcile
     // dependencies immediately, so a periodic pass is sufficient during normal play.
     if (now >= (worldRef._nextStructureDependencyCheckAt || 0)) {
@@ -50,12 +53,42 @@
       worldRef._nextAntCompactAt = now + 4.3;
       worldRef.compactAnts?.();
     }
-    if (worldRef.familyPrunePending && now >= (worldRef._nextFamilyPruneAt || 0)) {
-      worldRef._nextFamilyPruneAt = now + 8.0;
-      worldRef.familyPrunePending = false;
-      worldRef.pruneExtinctFamilies?.();
+    // Runtime-only collision/social dedupe caches must expire independently of
+    // deaths. Stable live population does not imply stable entity identities, and
+    // the old death-triggered cleanup let these collections grow for many seasons.
+    if (now >= (worldRef._nextTransientRuntimePruneAt || 0)) {
+      worldRef._nextTransientRuntimePruneAt = now + 5.0;
+      if (worldRef.ballCollisionMemo instanceof Map) {
+        for (const [key, at] of worldRef.ballCollisionMemo) {
+          if (now - Number(at || 0) > 2.0) worldRef.ballCollisionMemo.delete(key);
+        }
+      }
+      if (worldRef.tarinaiCollisionMemo instanceof Map) {
+        for (const [key, at] of worldRef.tarinaiCollisionMemo) {
+          if (now - Number(at || 0) > 2.0) worldRef.tarinaiCollisionMemo.delete(key);
+        }
+      }
+      if (worldRef.relationNotices && typeof worldRef.relationNotices === "object") {
+        for (const [key, at] of Object.entries(worldRef.relationNotices)) {
+          if (now - Number(at || 0) > 120) delete worldRef.relationNotices[key];
+        }
+      }
+      if (worldRef.fightPairCooldowns && typeof worldRef.fightPairCooldowns === "object") {
+        for (const [key, until] of Object.entries(worldRef.fightPairCooldowns)) {
+          if (Number(until || 0) <= now) delete worldRef.fightPairCooldowns[key];
+        }
+      }
+      if (worldRef.resolvedFightIds && typeof worldRef.resolvedFightIds === "object") {
+        for (const [key, at] of Object.entries(worldRef.resolvedFightIds)) {
+          if (!Number.isFinite(Number(at)) || now - Number(at) > 8.0) delete worldRef.resolvedFightIds[key];
+        }
+      }
     }
 
+    // Family graph normalization/component pruning is intentionally deferred to
+    // the family view. It is unrelated to simulation correctness and its full-
+    // graph sweep becomes increasingly expensive as generations accumulate.
+
     const itemCountChanged = worldRef.items.length !== itemCountBefore || worldRef.items.length !== (worldRef._lastMaintenanceItemCount ?? worldRef.items.length);
     const effectCountChanged = worldRef.effects.length !== (worldRef._lastMaintenanceEffectCount ?? worldRef.effects.length);
     if (itemsCompacted || itemCountChanged || worldRef.itemBucketsDirty) {
diff --git a/js/simulation_runtime_helpers.js b/js/simulation_runtime_helpers.js
index ccb7150..10860cb 100644
--- a/js/simulation_runtime_helpers.js
+++ b/js/simulation_runtime_helpers.js
@@ -45,11 +45,9 @@
     if (!worldRef) return false;
     const thresholdSq = threshold * threshold;
     let moved = false;
-    const tracked = global.TarinaiItemRuntime.trackedDynamicItems(worldRef);
-    const source = tracked && tracked.length ? tracked : null;
+    const tracked = global.TarinaiItemRuntime.trackedDynamicItems(worldRef) || [];
     const visit = (entity) => { moved = trackSpatialEntityMoved(entity, thresholdSq) || moved; };
-    if (source) for (const entity of source) visit(entity);
-    else forScheduledItems(worldRef, visit);
+    for (const entity of tracked) visit(entity);
     if (moved) worldRef.markSpatialDirty?.(reason);
     return moved;
   }
diff --git a/js/snapshot_system.js b/js/snapshot_system.js
index 25ba4b8..3bb490b 100644
--- a/js/snapshot_system.js
+++ b/js/snapshot_system.js
@@ -79,7 +79,7 @@
   function cloneSnapshotPlain(value, depth = 0) {
     if (value == null) return value;
     const type = typeof value;
-    if (type === "number") return Number.isFinite(value) ? value : 0;
+    if (type === "number") return Number.isFinite(value) ? value : null;
     if (type === "string" || type === "boolean") return value;
     if (type === "function" || type === "symbol" || type === "undefined") return undefined;
     if (depth > 8) return undefined;
@@ -100,6 +100,158 @@
     }
     return out;
   }
+  function cloneEntityState(entity, skip = []) {
+    const blocked = new Set(["world", "id", ...skip]);
+    const out = {};
+    for (const [key, value] of Object.entries(entity || {})) {
+      if (blocked.has(key) || DEFAULT_SKIP.has(key)) continue;
+      const cloned = cloneSnapshotPlain(value);
+      if (cloned !== undefined) out[key] = cloned;
+    }
+    return out;
+  }
+
+  function compactSnapshotExtension(worldRef, tarinaiLive, itemRecords) {
+    const tarIds = tarinaiLive.map(t => String(t?.id || ""));
+    const itemIds = itemRecords.map(rec => String(rec?.item?.id || ""));
+    const tarStates = tarinaiLive.map(t => {
+      // SV-11 is intentionally not serialized: actionCooldowns remain session-local.
+      const state = cloneEntityState(t, [
+        "liveToken", "familyKey", "birthSeed", "birthSerial", "parents", "parentNames", "children",
+        "actionCooldowns", "relationships", "target", "panicTarget", "targetRef", "targetEntity", "source",
+      ]);
+      state.__targetId = String(t?.target?.id || t?.targetId || "");
+      state.__panicTargetId = String(t?.panicTarget?.id || "");
+      state.__relationships = cloneSnapshotPlain(t?.relationships || {}) || {};
+      return state;
+    });
+    const itemStates = itemRecords.map(rec => cloneEntityState(rec?.item, ["type", "targetRef", "source"]));
+    const antStates = (worldRef?.ants || []).filter(a => a && !a.dead).map(a => {
+      const state = cloneEntityState(a, ["targetRef", "source"]);
+      state.id = String(a.id || "");
+      return state;
+    });
+    return {
+      ids: { t: tarIds, i: itemIds },
+      w: {
+        nextWeatherChange: finiteOrNull(worldRef?.nextWeatherChange),
+        effects: cloneSnapshotPlain((worldRef?.effects || []).slice(-256)) || [],
+        logs: cloneSnapshotPlain((worldRef?.logs || []).slice(-512)) || [],
+        relationNotices: cloneSnapshotPlain(worldRef?.relationNotices || {}) || {},
+        resolvedFightIds: cloneSnapshotPlain(worldRef?.resolvedFightIds || {}) || {},
+        eventCounters: cloneSnapshotPlain(worldRef?.eventCounters || {}) || {},
+      },
+      t: tarStates,
+      i: itemStates,
+      a: antStates,
+      r: cloneSnapshotPlain((worldRef?.residues || []).filter(r => r && !r.dead && Number(r.amount || 0) > 0)) || [],
+    };
+  }
+
+  const ID_KEYED_SNAPSHOT_MAPS = new Set(["__relationships", "relationships"]);
+  function snapshotFieldContainsEntityId(key = "") {
+    const name = String(key || "");
+    return name === "__targetId" || name === "__panicTargetId" || /(?:Id|Ids)$/.test(name);
+  }
+  function remapSnapshotValue(value, idMap, depth = 0, fieldName = "") {
+    if (depth > 12 || value == null) return value;
+    if (typeof value === "string") {
+      return snapshotFieldContainsEntityId(fieldName) ? (idMap.get(value) || value) : value;
+    }
+    if (Array.isArray(value)) return value.map(v => remapSnapshotValue(v, idMap, depth + 1, fieldName));
+    if (!isPlainObject(value)) return value;
+    const out = {};
+    const remapKeys = ID_KEYED_SNAPSHOT_MAPS.has(String(fieldName || ""));
+    for (const [key, child] of Object.entries(value)) {
+      const mappedKey = remapKeys ? (idMap.get(key) || key) : key;
+      out[mappedKey] = remapSnapshotValue(child, idMap, depth + 1, key);
+    }
+    return out;
+  }
+
+  function applySnapshotExtension(extension, worldRef) {
+    if (!extension || typeof extension !== "object") return false;
+    const oldTarIds = Array.isArray(extension.ids?.t) ? extension.ids.t : [];
+    const oldItemIds = Array.isArray(extension.ids?.i) ? extension.ids.i : [];
+    const idMap = new Map();
+    oldTarIds.forEach((id, index) => { if (id && worldRef.tarinai?.[index]?.id) idMap.set(String(id), worldRef.tarinai[index].id); });
+    oldItemIds.forEach((id, index) => { if (id && worldRef.items?.[index]?.id) idMap.set(String(id), worldRef.items[index].id); });
+
+    const tarStates = Array.isArray(extension.t) ? extension.t : [];
+    for (let index = 0; index < worldRef.tarinai.length; index++) {
+      const t = worldRef.tarinai[index];
+      const raw = isPlainObject(tarStates[index]) ? tarStates[index] : null;
+      if (!t || !raw) continue;
+      const state = remapSnapshotValue(raw, idMap);
+      const targetId = String(state.__targetId || "");
+      const panicTargetId = String(state.__panicTargetId || "");
+      const relationships = isPlainObject(state.__relationships) ? state.__relationships : null;
+      delete state.__targetId;
+      delete state.__panicTargetId;
+      delete state.__relationships;
+      delete state.actionCooldowns;
+      Object.assign(t, state);
+      // Explicitly preserve the requested exception.
+      t.actionCooldowns = {};
+      if (relationships) t.relationships = relationships;
+      t.target = targetId ? (worldRef.tarinai.find(v => v?.id === targetId) || worldRef.items.find(v => v?.id === targetId) || null) : null;
+      t.panicTarget = panicTargetId ? (worldRef.tarinai.find(v => v?.id === panicTargetId) || worldRef.items.find(v => v?.id === panicTargetId) || null) : null;
+      if (t.sleepSession && typeof t.sleepSession === "object" && t.sleepSession.targetId) {
+        t.sleepSession.targetId = idMap.get(String(t.sleepSession.targetId)) || String(t.sleepSession.targetId);
+      }
+      if (typeof t.refreshEffectiveSize === "function") {
+        const savedEnergy = Number(t.energy);
+        t.refreshEffectiveSize();
+        if (Number.isFinite(savedEnergy)) t.energy = Math.max(0, Math.min(Number(t.maxEnergy) || 240, savedEnergy));
+      }
+    }
+
+    const itemStates = Array.isArray(extension.i) ? extension.i : [];
+    for (let index = 0; index < worldRef.items.length; index++) {
+      const item = worldRef.items[index];
+      const raw = isPlainObject(itemStates[index]) ? itemStates[index] : null;
+      if (!item || !raw) continue;
+      Object.assign(item, remapSnapshotValue(raw, idMap));
+      item.world = worldRef;
+      if (item.type === "grass") {
+        if (!Number.isFinite(Number(item.grassStage))) item.grassStage = global.grassStageFromGrowth?.(item.growth, item.amount);
+        global.TarinaiGrass?.normalize?.(item);
+      }
+    }
+
+    worldRef.residues = [];
+    worldRef.residueSerial = 0;
+    for (const row of (Array.isArray(extension.r) ? extension.r : [])) {
+      if (!row || typeof row !== "object") continue;
+      worldRef.addResidue?.(String(row.type || "trace"), Number(row.x) || 0, Number(row.y) || 0, remapSnapshotValue(row, idMap));
+    }
+    worldRef.rebuildResidueIndex?.();
+
+    worldRef.ants = [];
+    const antRows = Array.isArray(extension.a) ? extension.a : [];
+    const AntClass = global.AntActor || (typeof AntActor !== "undefined" ? AntActor : null);
+    if (AntClass) {
+      for (const row of antRows) {
+        if (!isPlainObject(row)) continue;
+        const state = remapSnapshotValue(row, idMap);
+        const ant = new AntClass(worldRef, state);
+        Object.assign(ant, state);
+        ant.world = worldRef;
+        ant.targetRef = ant.targetId ? (worldRef.tarinai.find(t => t?.id === ant.targetId) || null) : null;
+        worldRef.ants.push(ant);
+      }
+    }
+
+    const worldState = isPlainObject(extension.w) ? remapSnapshotValue(extension.w, idMap) : {};
+    if (Number.isFinite(Number(worldState.nextWeatherChange))) worldRef.nextWeatherChange = Number(worldState.nextWeatherChange);
+    worldRef.effects = Array.isArray(worldState.effects) ? worldState.effects : [];
+    worldRef.logs = Array.isArray(worldState.logs) ? worldState.logs : [];
+    worldRef.relationNotices = isPlainObject(worldState.relationNotices) ? worldState.relationNotices : {};
+    worldRef.resolvedFightIds = isPlainObject(worldState.resolvedFightIds) ? worldState.resolvedFightIds : {};
+    worldRef.eventCounters = isPlainObject(worldState.eventCounters) ? worldState.eventCounters : {};
+    return true;
+  }
+
   function needsToArray(needs = {}) {
     return NEED_KEYS.map(k => q(needs[k], 1));
   }
@@ -149,6 +301,8 @@
     if (t.birthRitualLeader) flags |= 1 << 7;
     if (t.hasPaired) flags |= 1 << 8;
     if (t.isTarinaiChampion) flags |= 1 << 9;
+    if (t.isAcquiredTarinai) flags |= 1 << 10;
+    if (t.mamekusaredakeDisease) flags |= 1 << 11;
     return flags;
   }
   function flagApply(t, flags = 0) {
@@ -162,6 +316,8 @@
     t.birthRitualLeader = !!(flags & (1 << 7));
     t.hasPaired = !!(flags & (1 << 8));
     t.isTarinaiChampion = !!(flags & (1 << 9));
+    t.isAcquiredTarinai = !!(flags & (1 << 10));
+    t.mamekusaredakeDisease = !!(flags & (1 << 11));
     if (t.isZunchiSlave) t.zunchiSlaveLocked = true;
   }
   function compactWorld(worldRef) {
@@ -186,14 +342,14 @@
       q(worldRef?.birthSerial, 1, 0),
       q(worldRef?.tarinaiPopulationLimit, 1, 0),
       q(worldRef?.objectLimit, 1, 0),
-      [...new Set((worldRef?.achievementNaturalSlaveGenerations || []).map(value => Math.max(1, Math.floor(Number(value) || 1))))].sort((a, b) => a - b),
-      [...new Set((worldRef?.achievementNaturalKingGenerations || []).map(value => Math.max(1, Math.floor(Number(value) || 1))))].sort((a, b) => a - b),
-      q(worldRef?.achievementPlayerPlacementCount, 1, 0),
+      [], // legacy achievement slot 12
+      [], // legacy achievement slot 13
+      0,  // legacy achievement slot 14
       q(worldRef?.achievementLastInterventionAt, 10, 0),
       q(worldRef?.achievementNoDeathStartAt, 10, -10),
-      q(worldRef?.achievementDirectFeedCount, 1, 0),
+      0, // legacy achievement slot 17
       elapsedDays,
-      q(worldRef?.achievementManualTarinaiAddedCount, 1, 0),
+      0, // legacy achievement slot 19
     ];
   }
   function applyCompactWorld(worldRef, arr = [], meta = []) {
@@ -218,13 +374,8 @@
     worldRef.birthSerial = Math.max(0, u(arr[9], 1, 0));
     worldRef.tarinaiPopulationLimit = worldRef.normalizeColonyLimit?.(u(arr[10], 1, 0)) ?? Math.min(300, Math.max(0, u(arr[10], 1, 0)));
     worldRef.objectLimit = worldRef.normalizeColonyLimit?.(u(arr[11], 1, 0)) ?? Math.min(300, Math.max(0, u(arr[11], 1, 0)));
-    worldRef.achievementNaturalSlaveGenerations = Array.isArray(arr[12]) ? [...new Set(arr[12].map(value => Math.max(1, Math.floor(Number(value) || 1))))].sort((a, b) => a - b) : [];
-    worldRef.achievementNaturalKingGenerations = Array.isArray(arr[13]) ? [...new Set(arr[13].map(value => Math.max(1, Math.floor(Number(value) || 1))))].sort((a, b) => a - b) : [];
-    worldRef.achievementPlayerPlacementCount = Math.max(0, u(arr[14], 1, 0));
     worldRef.achievementLastInterventionAt = Math.max(0, u(arr[15], 10, totalTime));
     worldRef.achievementNoDeathStartAt = u(arr[16], 10, -1);
-    worldRef.achievementDirectFeedCount = Math.max(0, u(arr[17], 1, 0));
-    worldRef.achievementManualTarinaiAddedCount = Math.min(100, Math.max(0, u(arr[19], 1, 0)));
     worldRef.time = Math.max(0, totalTime);
     worldRef.elapsedDays = encodedElapsedDays;
     worldRef.day = worldRef.elapsedDays + 1;
@@ -239,6 +390,7 @@
     worldRef.setGroundType?.(enumValue(GROUND_IDS, arr[1], "soil"), { silent: true, force: true });
   }
   function finiteOrNull(value) {
+    if (value === null || value === undefined || value === "") return null;
     const n = Number(value);
     return Number.isFinite(n) ? n : null;
   }
@@ -246,13 +398,12 @@
     const isUnlocked = id => Boolean(global.TarinaiAchievements?.isUnlocked?.(id));
     const needSlaveGenerations = !isUnlocked("natural_zunchi_slave_5_generations");
     const needKingGenerations = !isUnlocked("natural_tarinai_king_3_generations");
-    const needDirectFeed = !isUnlocked("direct_feed_33");
-    const needRobotClean = !isUnlocked("robot_cleaner_100");
     const needEnemyFriend = !isUnlocked("enemy_enemy_friend");
     const needSelfSufficient = !isUnlocked("self_sufficient");
     const needIdleObserver = !isUnlocked("idle_observer_5_minutes");
     const needSafeColony = !isUnlocked("safe_colony_25_5_minutes");
     const needHappyColony = !isUnlocked("colony_happy");
+    const needEliteFew = !isUnlocked("elite_few");
     const needOverprotective = !isUnlocked("overprotective");
     const needSauna = !isUnlocked("sauna_cold_plunge");
     const needQuickDelete = !isUnlocked("unplanned_city_30");
@@ -260,23 +411,26 @@
     const needPlayerPlacedMetadata = needQuickDelete || needMinimalist;
     const metadata = {
       w: [
-        needSlaveGenerations ? [...new Set((worldRef?.achievementNaturalSlaveGenerations || []).map(value => Math.max(1, Math.floor(Number(value) || 1))))].sort((a, b) => a - b) : [],
-        needKingGenerations ? [...new Set((worldRef?.achievementNaturalKingGenerations || []).map(value => Math.max(1, Math.floor(Number(value) || 1))))].sort((a, b) => a - b) : [],
-        needDirectFeed ? Math.max(0, Math.floor(Number(worldRef?.achievementDirectFeedCount || 0) || 0)) : 0,
-        needRobotClean ? Math.max(0, Math.floor(Number(worldRef?.achievementRobotCleanCount || 0) || 0)) : 0,
+        [], // legacy lineage slot
+        [], // legacy lineage slot
+        0,  // legacy direct-feed slot
+        0,  // legacy robot-clean slot; old saves are still imported below
         needEnemyFriend ? Math.max(0, Math.floor(Number(worldRef?.achievementEnemyAntKills || 0) || 0)) : 0,
-        needEnemyFriend ? finiteOrNull(worldRef?.achievementLastTarinaiDamageAt) : null,
+        null, // legacy last-damage slot
         needSelfSufficient ? finiteOrNull(worldRef?.achievementSelfSufficientStartAt) : -1,
-        needSelfSufficient ? finiteOrNull(worldRef?.achievementLastDirectFeedAt) : null,
+        null, // legacy last-direct-feed slot
         needIdleObserver ? finiteOrNull(worldRef?.achievementLastInterventionAt) : 0,
         needSafeColony ? finiteOrNull(worldRef?.achievementNoDeathStartAt) : -1,
         needHappyColony ? finiteOrNull(worldRef?.achievementHappyStartAt) : -1,
+        needEliteFew ? finiteOrNull(worldRef?.achievementEliteFewStartAt) : -1,
       ],
       t: tarinaiLive.map(t => [
         needOverprotective ? Math.max(0, Math.floor(Number(t?._achievementDirectFeedCount || 0) || 0)) : 0,
         needOverprotective ? Math.max(0, Math.floor(Number(t?._achievementDirectTreatmentCount || 0) || 0)) : 0,
         null,
         needSauna ? finiteOrNull(t?._achievementSaunaHotAt) : null,
+        needSlaveGenerations ? Math.max(0, Math.floor(Number(t?._achievementNaturalSlaveLineageDepth || 0) || 0)) : 0,
+        needKingGenerations ? Math.max(0, Math.floor(Number(t?._achievementNaturalKingLineageDepth || 0) || 0)) : 0,
       ]),
       i: itemRecords.map(rec => [
         needPlayerPlacedMetadata && rec?.item?._achievementPlayerPlaced ? 1 : 0,
@@ -292,33 +446,33 @@
   function applyAchievementMetadata(worldRef, metadata = null) {
     if (!worldRef || !metadata || typeof metadata !== "object") return false;
     const w = Array.isArray(metadata.w) ? metadata.w : [];
-    worldRef.achievementNaturalSlaveGenerations = Array.isArray(w[0]) ? [...new Set(w[0].map(value => Math.max(1, Math.floor(Number(value) || 1))))].sort((a, b) => a - b) : (worldRef.achievementNaturalSlaveGenerations || []);
-    worldRef.achievementNaturalKingGenerations = Array.isArray(w[1]) ? [...new Set(w[1].map(value => Math.max(1, Math.floor(Number(value) || 1))))].sort((a, b) => a - b) : (worldRef.achievementNaturalKingGenerations || []);
-    worldRef.achievementDirectFeedCount = Math.max(0, Math.floor(Number(w[2] || 0) || 0));
-    worldRef.achievementRobotCleanCount = Math.max(0, Math.floor(Number(w[3] || 0) || 0));
+    const legacyRobotCleanCount = Math.max(0, Math.floor(Number(w[3] || 0) || 0));
+    global.TarinaiAchievements?.importWorldAchievementProgress?.({ robotCleanCount: legacyRobotCleanCount, source: "snapshot-metadata" });
     worldRef.achievementEnemyAntKills = Math.max(0, Math.floor(Number(w[4] || 0) || 0));
-    worldRef.achievementLastTarinaiDamageAt = w[5] != null && Number.isFinite(Number(w[5])) ? Number(w[5]) : -Infinity;
     worldRef.achievementSelfSufficientStartAt = w[6] != null && Number.isFinite(Number(w[6])) ? Number(w[6]) : -1;
-    worldRef.achievementLastDirectFeedAt = w[7] != null && Number.isFinite(Number(w[7])) ? Number(w[7]) : -Infinity;
     worldRef.achievementLastInterventionAt = w[8] != null && Number.isFinite(Number(w[8])) ? Number(w[8]) : Math.max(0, Number(worldRef.time || 0) || 0);
     worldRef.achievementNoDeathStartAt = w[9] != null && Number.isFinite(Number(w[9])) ? Number(w[9]) : -1;
     worldRef.achievementHappyStartAt = w[10] != null && Number.isFinite(Number(w[10])) ? Number(w[10]) : -1;
+    worldRef.achievementEliteFewStartAt = w[11] != null && Number.isFinite(Number(w[11])) ? Number(w[11]) : -1;
     const tarRows = Array.isArray(metadata.t) ? metadata.t : [];
     (worldRef.tarinai || []).forEach((t, index) => {
       const row = Array.isArray(tarRows[index]) ? tarRows[index] : [];
       t._achievementDirectFeedCount = Math.max(0, Math.floor(Number(row[0] || 0) || 0));
       t._achievementDirectTreatmentCount = Math.max(0, Math.floor(Number(row[1] || 0) || 0));
       t._achievementFightMochiAt = null;
-      t._achievementFightMochiSerial = 0;
       t._achievementFightMochiWorld = null;
       t._achievementSaunaHotAt = row[3] != null && Number.isFinite(Number(row[3])) ? Number(row[3]) : null;
+      t._achievementNaturalSlaveLineageDepth = Math.max(0, Math.floor(Number(row[4] || 0) || 0));
+      t._achievementNaturalKingLineageDepth = Math.max(0, Math.floor(Number(row[5] || 0) || 0));
     });
     const itemRows = Array.isArray(metadata.i) ? metadata.i : [];
     (worldRef.items || []).forEach((item, index) => {
       const row = Array.isArray(itemRows[index]) ? itemRows[index] : [];
       item._achievementPlayerPlaced = Boolean(row[0]);
+      item._achievementPlayerPlacedCounted = item._achievementPlayerPlaced;
       item._achievementPlacedAt = row[1] != null && Number.isFinite(Number(row[1])) ? Number(row[1]) : null;
     });
+    worldRef.achievementPlayerPlacedActiveCount = (worldRef.items || []).reduce((count, item) => count + (item && !item.dead && item._achievementPlayerPlaced ? 1 : 0), 0);
     return true;
   }
 
@@ -331,8 +485,7 @@
       const fear = Number(rel?.fear) || 0;
       const wins = Math.min(15, Math.max(0, Math.round(Number(rel?.fightsWon) || 0)));
       const losses = Math.min(15, Math.max(0, Math.round(Number(rel?.fightsLost) || 0)));
-      if (Math.abs(affinity) < 5 && fear < 5 && wins + losses < 1) continue;
-      out.push([idx, q(affinity, 2), q(fear, 2), wins | (losses << 4)]);
+      out.push([idx, q(affinity, 2), q(fear, 2), wins | (losses << 4), String(rel?.lastEvent || ""), q(rel?.lastTime, 10)]);
     }
     return out;
   }
@@ -348,8 +501,8 @@
         fear: u(row[2], 2),
         fightsWon: fight & 15,
         fightsLost: (fight >> 4) & 15,
-        lastEvent: fight ? "fight" : "",
-        lastTime: worldRef?.time || 0,
+        lastEvent: String(row[4] || ""),
+        lastTime: u(row[5], 10, worldRef?.time || 0),
       };
     }
     return out;
@@ -358,12 +511,11 @@
     const parentIdx = (t.parents || []).map(id => familyIndex.get(id)).filter(Number.isInteger);
     const timers = [
       q(t.reproductionTimer, 10), q(t.fightCooldown, 10), q(t.loveMochiTimer, 10), q(t.fightMochiTimer, 10),
-      q(t.zunchiDiseaseSeverity, 10), q(t.zunchiStain, 10), q(t.itemEffectTimers?.laxative, 10), q(t.itemEffectTimers?.ammo, 10), q(t.mercuryLifeMultiplier, 100, 100), q(t.itemEffectTimers?.sedative, 10)
-    ];
+      q(t.zunchiDiseaseSeverity, 10), q(t.zunchiStain, 10), q(t.itemEffectTimers?.laxative, 10), q(t.itemEffectTimers?.ammo, 10), q(t.mercuryLifeMultiplier, 100, 100), q(t.itemEffectTimers?.sedative, 10), q(t.mamekusaredakeGrowth, 100)];
     const modes = [enumIndex(POWER_MODE_IDS, t.powerItemMode || ""), enumIndex(SIZE_MODE_IDS, t.sizeItemMode || ""), enumIndex(LIFE_MODE_IDS, t.lifeItemMode || "")];
     const pinIdx = itemIndex.get(t.stuckPushpinId) ?? -1;
     const nestIdx = itemIndex.get(t.insideNestBoxId) ?? -1;
-    const state = t.state === "sleep" ? "sleep" : "idle";
+    const state = STATE_IDS.includes(String(t.state || "")) ? String(t.state) : "idle";
     let targetIdx = -1;
     if (state === "sleep") {
       const targetId = t.sleepSession?.targetId || t.pendingGrassBedWakeId || t.target?.id || "";
@@ -399,6 +551,8 @@
       needs, state: "idle",
       isZunchiSlave: Boolean((Number(row[0]) || 0) & (1 << 5)),
       isTarinaiChampion: Boolean((Number(row[0]) || 0) & (1 << 9)),
+      isAcquiredTarinai: Boolean((Number(row[0]) || 0) & (1 << 10)),
+      mamekusaredakeDisease: Boolean((Number(row[0]) || 0) & (1 << 11)),
       totalFightWins: Array.isArray(row[19]) ? u(row[19][0], 1) : 0,
       totalFightLosses: Array.isArray(row[19]) ? u(row[19][1], 1) : 0,
       tarinaiChampionSince: Array.isArray(row[19]) ? u(row[19][2], 10) : 0,
@@ -418,6 +572,7 @@
     const timers = Array.isArray(row[13]) ? row[13] : [];
     t.reproductionTimer = u(timers[0], 10); t.fightCooldown = u(timers[1], 10); t.loveMochiTimer = u(timers[2], 10); t.fightMochiTimer = u(timers[3], 10);
     t.zunchiDiseaseSeverity = u(timers[4], 10); t.zunchiStain = u(timers[5], 10);
+    t.mamekusaredakeGrowth = u(timers[10], 100, 0);
     t.itemEffectTimers = { ...(t.itemEffectTimers || {}), laxative: u(timers[6], 10), ammo: u(timers[7], 10), sedative: u(timers[9], 10) };
     t.mercuryLifeMultiplier = u(timers[8], 100, t.mercuryLifeMultiplier || 1);
     const modes = Array.isArray(row[14]) ? row[14] : [];
@@ -425,7 +580,9 @@
     t.sizeItemMode = enumValue(SIZE_MODE_IDS, modes[1], "");
     t.lifeItemMode = enumValue(LIFE_MODE_IDS, modes[2], "");
     t.__savedPinIdx = row[15]; t.__savedNestIdx = row[16]; t.__savedStateInfo = row[17];
+    const savedEnergy = u(row[7], 1);
     if (typeof t.refreshEffectiveSize === "function") t.refreshEffectiveSize();
+    t.energy = Math.max(0, Math.min(Number(t.maxEnergy) || 240, savedEnergy));
     return t;
   }
   function itemExtra(item, tarinaiIndex = new Map(), itemIndex = new Map()) {
@@ -434,12 +591,25 @@
       const owner = tarinaiIndex.get(item.ownerId) ?? -1;
       const carried = item.carriedById ? (tarinaiIndex.get(item.carriedById) ?? -1) : -1;
       const consumed = item.singleUseConsumedById ? (tarinaiIndex.get(item.singleUseConsumedById) ?? -1) : -1;
-      return [q(item.hp, 10), q(item.maxHp, 10), owner, carried, item.singleUsePending ? 1 : 0, consumed, q(item.createdAt, 10)];
+      const base = [q(item.hp, 10), q(item.maxHp, 10), owner, carried, item.singleUsePending ? 1 : 0, consumed, q(item.createdAt, 10)];
+      if (type === "grave") return base.concat([
+        String(item.memorialFamilyKey || ""),
+        String(item.memorialName || ""),
+        String(item.memorialType || ""),
+        String(item.memorialDeathReason || ""),
+        q(item.memorialDeathTime, 10, -1),
+        String(item.memorialBuilderFamilyKey || ""),
+        JSON.stringify(Array.isArray(item.memorialEligibleFamilyKeys) ? item.memorialEligibleFamilyKeys : []),
+        item.memorialFavorite ? 1 : 0,
+        item.memorialTarinaiKing ? 1 : 0,
+        item.memorialZunchiSlave ? 1 : 0,
+      ]);
+      return base;
     }
-    if (type === "grass") return [q(item.growth, 100), q(item.health, 100), q(item.fertilityBoost, 100), item.manualGrass || item.placedByPlayer ? 1 : 0];
-    if (type === "zunchi") return [enumIndex(STAGE_IDS, item.stage || "fresh"), q(item.freshness, 100), q(item.fertility, 100)];
+    if (type === "grass") return [q(item.growth, 100), q(item.health, 100), q(item.fertilityBoost, 100), item.manualGrass || item.placedByPlayer ? 1 : 0, q(item.grassStage, 1), item.burning ? 1 : 0, q(item.burnTimer, 10)];
+    if (type === "zunchi") return [enumIndex(STAGE_IDS, item.stage || "fresh"), q(item.freshness, 100), q(item.fertility, 100), q(item.stageTimer, 10), q(item.age, 10), item.burning ? 1 : 0, q(item.burnTimer, 10)];
     if (type === "signboard") return [item.text || ""];
-    if (type === "robot_cleaner") return [Math.max(0, Math.min(0x3f, Number(item.robotCleanerMask ?? 3) | 0)), item.robotCleanerHighSpeed ? 1 : 0];
+    if (type === "robot_cleaner") return [Math.max(0, Math.min(0x7f, Number(item.robotCleanerMask ?? 3) | 0)), item.robotCleanerHighSpeed ? 1 : 0];
     if (type === "circuit_board") return [JSON.stringify(global.TarinaiCircuitBoardSystem?.serializeConfig?.(item) || item.circuitConfig || {})];
     if (global.TarinaiPhysicsBodySystem.isPhysicsType(type)) {
       const packed = global.TarinaiPhysicsBodySystem.compactItemExtra(item, tarinaiIndex, itemIndex);
@@ -482,9 +652,32 @@
   }
   function compactItem(item, index, tarinaiIndex = new Map(), itemIndex = new Map()) {
     const typeId = itemTypeIndex(item?.type || "", -1);
-    if (typeId < 0 || item?.type === "trace") return null;
+    if (typeId < 0) return null;
     return [typeId, q(item?.x, 1), q(item?.y, 1), q(item?.amount ?? item?.hp, 10), itemExtra(item, tarinaiIndex, itemIndex)];
   }
+  function compactResidue(residue) {
+    if (!residue || residue.dead || Number(residue.amount || 0) <= 0) return null;
+    const typeCode = residue.type === "splat" ? 1 : (residue.type === "trace" ? 0 : -1);
+    if (typeCode < 0) return null;
+    return [
+      typeCode,
+      q(residue.x, 1),
+      q(residue.y, 1),
+      q(residue.amount, 10),
+      q(residue.r, 10, typeCode === 1 ? 260 : 160),
+      q(residue.seed, 100, 0),
+    ];
+  }
+  function restoreResidueRow(worldRef, row) {
+    if (!worldRef || !Array.isArray(row)) return null;
+    const type = Number(row[0]) === 1 ? "splat" : "trace";
+    return worldRef.addResidue?.(type, u(row[1], 1), u(row[2], 1), {
+      amount: u(row[3], 10, type === "splat" ? 260 : 220),
+      r: u(row[4], 10, type === "splat" ? 26 : 16),
+      seed: u(row[5], 100, 0),
+      reason: "restore-residue",
+    }) || null;
+  }
   function applyItemExtra(item, extra, tarinaiList = [], itemList = []) {
     const type = item.type || "";
     if (global.TarinaiPhysicsBodySystem.applyCompactExtra(item, extra, tarinaiList, itemList)) return;
@@ -504,6 +697,19 @@
       if (type === "plushie") {
         item.onHead = Boolean(item.carriedById);
       }
+      if (type === "grave") {
+        item.memorialFamilyKey = String(extra[7] || "");
+        item.memorialName = String(extra[8] || "");
+        item.memorialType = String(extra[9] || "");
+        item.memorialDeathReason = String(extra[10] || "");
+        item.memorialDeathTime = Number(extra[11]) >= 0 ? u(extra[11], 10, null) : null;
+        item.memorialBuilderFamilyKey = String(extra[12] || "");
+        try { item.memorialEligibleFamilyKeys = JSON.parse(String(extra[13] || "[]")); } catch (_) { item.memorialEligibleFamilyKeys = []; }
+        if (!Array.isArray(item.memorialEligibleFamilyKeys)) item.memorialEligibleFamilyKeys = [];
+        item.memorialFavorite = Boolean(extra[14]);
+        item.memorialTarinaiKing = Boolean(extra[15]);
+        item.memorialZunchiSlave = Boolean(extra[16]);
+      }
       const def = global.StructureRegistry?.get?.(type);
       if (def) {
         item.label = def.label;
@@ -514,14 +720,17 @@
     }
     if (type === "grass") {
       item.growth = u(extra[0], 100, item.growth || 0); item.health = u(extra[1], 100, item.health || 1); item.fertilityBoost = u(extra[2], 100, 0); item.manualGrass = !!extra[3]; item.placedByPlayer = !!extra[3];
+      item.grassStage = u(extra[4], 1, global.grassStageFromGrowth?.(item.growth, item.amount) || 0);
+      item.burning = Boolean(extra[5]); item.burnTimer = u(extra[6], 10, 0);
       global.TarinaiGrass.normalize(item);
     } else if (type === "zunchi") {
       item.stage = enumValue(STAGE_IDS, extra[0], "fresh"); item.freshness = u(extra[1], 100, item.freshness || 1); item.fertility = u(extra[2], 100, item.fertility || 1);
+      item.stageTimer = u(extra[3], 10, 0); item.age = u(extra[4], 10, item.age || 0); item.burning = Boolean(extra[5]); item.burnTimer = u(extra[6], 10, 0);
     } else if (type === "signboard") {
       item.text = String(extra[0] || "");
     } else if (type === "robot_cleaner") {
       const mask = Number(extra[0]);
-      item.robotCleanerMask = Number.isFinite(mask) ? Math.max(0, Math.min(0x3f, mask | 0)) : (global.TarinaiItemDynamicToolSystem?.robotCleanerDefaultMask?.() ?? 3);
+      item.robotCleanerMask = Number.isFinite(mask) ? Math.max(0, Math.min(0x7f, mask | 0)) : (global.TarinaiItemDynamicToolSystem?.robotCleanerDefaultMask?.() ?? 3);
       item.robotCleanerHighSpeed = Boolean(extra[1]);
       item.robotCleanerSpeed = global.TarinaiItemDynamicToolSystem?.robotCleanerEffectiveSpeed?.(item) ?? (item.robotCleanerHighSpeed ? 120 : 60);
       item.robotCleanerTargetId = "";
@@ -598,7 +807,7 @@
     tarinaiLive.forEach((t, i) => { if (t.id) tarinaiIndex.set(t.id, i); if (t.familyKey) familyIndex.set(t.familyKey, i); });
     const itemRecords = [];
     for (const it of (worldRef.items || [])) {
-      if (!it || it.dead || it.type === "trace") continue;
+      if (!it || it.dead || it.type === "trace" || it.type === "splat") continue;
       const typeId = itemTypeIndex(it.type || "", -1);
       if (typeId < 0) continue;
       itemRecords.push({ item: it, sortTypeId: typeId, sortX: q(it.x, 1), sortY: q(it.y, 1) });
@@ -606,6 +815,12 @@
     itemRecords.sort((a, b) => (a.sortTypeId || 0) - (b.sortTypeId || 0) || mortonKeyXY(a.sortX, a.sortY) - mortonKeyXY(b.sortX, b.sortY) || String(a.item?.id || "").localeCompare(String(b.item?.id || "")));
     const itemIndex = new Map();
     itemRecords.forEach((rec, i) => { if (rec.item?.id) itemIndex.set(rec.item.id, i); });
+    const residueRows = (worldRef.residues || [])
+      .filter(residue => residue && !residue.dead && Number(residue.amount || 0) > 0)
+      .slice()
+      .sort((a, b) => String(a.type || "").localeCompare(String(b.type || "")) || mortonKeyXY(a.x, a.y) - mortonKeyXY(b.x, b.y))
+      .map(compactResidue)
+      .filter(Boolean);
     const itemRows = itemRecords.map((rec, i) => compactItem(rec.item, i, tarinaiIndex, itemIndex)).filter(Boolean);
     return {
       v: SNAPSHOT_VERSION,
@@ -614,7 +829,9 @@
       w: compactWorld(worldRef),
       t: tarinaiLive.map((t, i) => compactTarinai(t, i, familyIndex, tarinaiIndex, itemIndex)),
       i: itemRows,
+      r: residueRows,
       g: compactAchievementMetadata(worldRef, tarinaiLive, itemRecords, options),
+      x: compactSnapshotExtension(worldRef, tarinaiLive, itemRecords),
     };
   }
   function restoreSnapshot(snapshot, worldRef = global.world) {
@@ -674,6 +891,7 @@
       applyItemExtra(item, item.__savedExtra || [], worldRef.tarinai, worldRef.items);
       delete item.__savedExtra;
     }
+    for (const row of (Array.isArray(snapshot.r) ? snapshot.r : [])) restoreResidueRow(worldRef, row);
     for (const t of worldRef.tarinai) {
       if (Number.isInteger(t.__savedPinIdx) && t.__savedPinIdx >= 0) t.stuckPushpinId = worldRef.items[t.__savedPinIdx]?.id || null;
       if (Number.isInteger(t.__savedNestIdx) && t.__savedNestIdx >= 0) t.insideNestBoxId = worldRef.items[t.__savedNestIdx]?.id || null;
@@ -704,11 +922,11 @@
     if (typeof updateNeedsRuntime === "function") {
       for (const t of worldRef.tarinai) updateNeedsRuntime(t, worldRef, 0);
     }
+    const restoredExtendedState = applySnapshotExtension(snapshot.x || null, worldRef);
 
-    // Velocity is not serialized. Start restored bodies from a neutral physical
-    // state, but do not grant a timed collision/damage immunity period.
+    // Legacy snapshots without extended state start from a neutral physical state.
     delete worldRef._restoreSettleUntil;
-    for (const t of worldRef.tarinai) {
+    if (!restoredExtendedState) for (const t of worldRef.tarinai) {
       if (!t || t.dead) continue;
       t.vx = 0;
       t.vy = 0;
@@ -731,9 +949,11 @@
     worldRef.familyTreeDirty = true;
     worldRef.drawListDirty = true;
     worldRef.terrainDirty = true;
-    worldRef.relationNotices = {};
-    worldRef.resolvedFightIds = {};
-    worldRef.eventCounters = {};
+    if (!restoredExtendedState) {
+      worldRef.relationNotices = {};
+      worldRef.resolvedFightIds = {};
+      worldRef.eventCounters = {};
+    }
     worldRef.rebuildTarinaiCountCache?.("restore");
     worldRef.updateItemCounts?.();
     worldRef.enforceGrassLimit?.("load-grass-limit");
@@ -755,4 +975,10 @@
     createSnapshot,
     restoreSnapshot,
   };
+  if (global.__TARINAI_TEST__) {
+    global.TarinaiSnapshotTestHooks = Object.freeze({
+      compactAchievementMetadata,
+      applyAchievementMetadata,
+    });
+  }
 })(typeof window !== "undefined" ? window : globalThis);
diff --git a/js/sound_pack.js b/js/sound_pack.js
index 31cc592..9663b67 100644
--- a/js/sound_pack.js
+++ b/js/sound_pack.js
@@ -7,6 +7,7 @@
     categoryGain: { voice: 3.2, notify: 18.0, ops: 16.0 },
     idGain: {
       sfx_notify: 2.60,
+      sfx_achievement_unlock: 1.00,
       sfx_ui_click: 2.35,
       sfx_ui_fold: 2.20,
       sfx_place: 2.10,
@@ -22,12 +23,47 @@
       sfx_firecracker_explode: 1.70,
       sfx_shoot: 0.725,
       sfx_bolt_action: 1.35,
+      sfx_bell: 1.00,
       voice_major_damage_01: 1.0,
       voice_major_damage_02: 1.0,
       voice_major_damage_03: 1.0,
       voice_major_damage_04: 1.0,
       voice_temp_cold: 1.0,
       voice_temp_hot: 1.0,
+      voice_acquired_stress_001: 1.0,
+      voice_acquired_stress_002: 1.0,
+      voice_acquired_stress_003: 1.0,
+      voice_acquired_stress_004: 1.0,
+      voice_acquired_stress_005: 1.0,
+      voice_acquired_stress_006: 1.0,
+      voice_acquired_stress_009: 1.0,
+      voice_ochibi_calm_001: 1.0,
+      voice_ochibi_calm_002: 1.0,
+      voice_ochibi_calm_003: 1.0,
+      voice_ochibi_calm_004: 1.0,
+      voice_ochibi_calm_005: 1.0,
+      voice_ochibi_calm_006: 1.0,
+      voice_ochibi_calm_007: 1.0,
+      voice_ochibi_calm_008: 1.0,
+      voice_ochibi_calm_009: 1.0,
+      voice_ochibi_dirty_004: 1.0,
+      voice_ochibi_damage_001: 1.0,
+      voice_ochibi_damage_002: 1.0,
+      voice_ochibi_damage_003: 1.0,
+      voice_ochibi_disease_001: 1.0,
+      voice_intimidate_alt: 1.0,
+      voice_ochibi_sleep_002: 1.0,
+      voice_ochibi_sleep_003: 1.0,
+      voice_ochibi_fight_hit_004: 1.0,
+      voice_ochibi_panic_005: 1.0,
+      voice_ochibi_electric_006: 1.0,
+      voice_ochibi_hot_007: 1.0,
+      voice_ochibi_stress_008: 1.0,
+      voice_ochibi_dirty_003: 1.0,
+      voice_ochibi_dirty_002: 1.0,
+      voice_ochibi_dirty_001: 1.0,
+      voice_acquired_stress_008: 1.0,
+      voice_acquired_stress_007: 1.0,
     },
     idMinGap: {
       sfx_ui_click: 0.030,
@@ -36,6 +72,7 @@
       sfx_zunchi: 0.14,
       sfx_ant_die: 0.14,
       sfx_notify: 0.10,
+      sfx_achievement_unlock: 0.35,
       voice_sunbath: 0.95,
       sfx_shoot: 0.045,
       sfx_bolt_action: 0.10,
@@ -45,6 +82,40 @@
       voice_major_damage_04: 0.45,
       voice_temp_cold: 1.20,
       voice_temp_hot: 1.20,
+      voice_acquired_stress_001: 1.50,
+      voice_acquired_stress_002: 1.50,
+      voice_acquired_stress_003: 1.50,
+      voice_acquired_stress_004: 1.50,
+      voice_acquired_stress_005: 1.50,
+      voice_acquired_stress_006: 1.50,
+      voice_acquired_stress_009: 1.50,
+      voice_ochibi_calm_001: 1.50,
+      voice_ochibi_calm_002: 1.50,
+      voice_ochibi_calm_003: 1.50,
+      voice_ochibi_calm_004: 1.50,
+      voice_ochibi_calm_005: 1.50,
+      voice_ochibi_calm_006: 1.50,
+      voice_ochibi_calm_007: 1.50,
+      voice_ochibi_calm_008: 1.50,
+      voice_ochibi_calm_009: 1.50,
+      voice_ochibi_dirty_004: 1.50,
+      voice_ochibi_damage_001: 1.25,
+      voice_ochibi_damage_002: 1.25,
+      voice_ochibi_damage_003: 1.25,
+      voice_ochibi_disease_001: 1.25,
+      voice_intimidate_alt: 1.35,
+      voice_ochibi_sleep_002: 1.35,
+      voice_ochibi_sleep_003: 1.35,
+      voice_ochibi_fight_hit_004: 1.35,
+      voice_ochibi_panic_005: 1.35,
+      voice_ochibi_electric_006: 1.35,
+      voice_ochibi_hot_007: 1.35,
+      voice_ochibi_stress_008: 1.35,
+      voice_ochibi_dirty_003: 1.50,
+      voice_ochibi_dirty_002: 1.50,
+      voice_ochibi_dirty_001: 1.50,
+      voice_acquired_stress_008: 1.50,
+      voice_acquired_stress_007: 1.50,
     },
     samplePaths: {
       voice_hau: "assets/sounds/voice_001_hau.wav",
@@ -57,12 +128,48 @@
       sfx_firecracker_explode: "assets/sounds/firecracker_explosion.mp3",
       sfx_shoot: "assets/sounds/shoot_pistol.mp3",
       sfx_bolt_action: "assets/sounds/shoot_bolt_action.mp3",
+      sfx_bell: "assets/sounds/bicycle_bell.mp3",
       voice_major_damage_01: "assets/sounds/major_damage_01.wav",
       voice_major_damage_02: "assets/sounds/major_damage_02.wav",
       voice_major_damage_03: "assets/sounds/major_damage_03.wav",
       voice_major_damage_04: "assets/sounds/major_damage_04.wav",
       voice_temp_cold: "assets/sounds/voice_008_temperature_buruburu.wav",
-      voice_temp_hot: "assets/sounds/voice_009_temperature_achui.wav"
+      voice_temp_hot: "assets/sounds/voice_009_temperature_achui.wav",
+      sfx_achievement_unlock: "assets/sounds/achievement_unlock.mp3",
+      voice_acquired_stress_001: "assets/sounds/acquired_stress_001.wav",
+      voice_acquired_stress_002: "assets/sounds/acquired_stress_002.wav",
+      voice_acquired_stress_003: "assets/sounds/acquired_stress_003.wav",
+      voice_acquired_stress_004: "assets/sounds/acquired_stress_004.wav",
+      voice_acquired_stress_005: "assets/sounds/acquired_stress_005.wav",
+      voice_acquired_stress_006: "assets/sounds/acquired_stress_006.wav",
+      voice_acquired_stress_009: "assets/sounds/acquired_stress_009.wav",
+      voice_ochibi_calm_001: "assets/sounds/ochibi_calm_001.wav",
+      voice_ochibi_calm_002: "assets/sounds/ochibi_calm_002.wav",
+      voice_ochibi_calm_003: "assets/sounds/ochibi_calm_003.wav",
+      voice_ochibi_calm_004: "assets/sounds/ochibi_calm_004.wav",
+      voice_ochibi_calm_005: "assets/sounds/ochibi_calm_005.wav",
+      voice_ochibi_calm_006: "assets/sounds/ochibi_calm_006.wav",
+      voice_ochibi_calm_007: "assets/sounds/ochibi_calm_007.wav",
+      voice_ochibi_calm_008: "assets/sounds/ochibi_calm_008.wav",
+      voice_ochibi_calm_009: "assets/sounds/ochibi_calm_009.wav",
+      voice_ochibi_dirty_001: "assets/sounds/ochibi_dirty_001.wav",
+      voice_ochibi_dirty_002: "assets/sounds/ochibi_dirty_002.wav",
+      voice_ochibi_dirty_003: "assets/sounds/ochibi_dirty_003.wav",
+      voice_ochibi_dirty_004: "assets/sounds/ochibi_dirty_004.wav",
+      voice_ochibi_damage_001: "assets/sounds/ochibi_damage_001.wav",
+      voice_ochibi_damage_002: "assets/sounds/ochibi_damage_002.wav",
+      voice_ochibi_damage_003: "assets/sounds/ochibi_damage_003.wav",
+      voice_ochibi_disease_001: "assets/sounds/ochibi_disease_001.wav",
+      voice_intimidate_alt: "assets/sounds/intimidate_alt_001.wav",
+      voice_ochibi_sleep_002: "assets/sounds/ochibi_sleep_002.wav",
+      voice_ochibi_sleep_003: "assets/sounds/ochibi_sleep_003.wav",
+      voice_ochibi_fight_hit_004: "assets/sounds/ochibi_fight_hit_004.wav",
+      voice_ochibi_panic_005: "assets/sounds/ochibi_panic_005.wav",
+      voice_ochibi_electric_006: "assets/sounds/ochibi_electric_006.wav",
+      voice_ochibi_hot_007: "assets/sounds/ochibi_hot_007.wav",
+      voice_ochibi_stress_008: "assets/sounds/ochibi_stress_008.wav",
+      voice_acquired_stress_008: "assets/sounds/acquired_stress_008.wav",
+      voice_acquired_stress_007: "assets/sounds/acquired_stress_007.wav",
     },
     categories: {
       voice: "\u305f\u308a\u306a\u3044\u306e\u58f0",
@@ -73,14 +180,19 @@
       voice_hau: "voice", voice_flee: "voice", voice_poop: "voice", voice_stress: "voice", voice_sunbath: "voice",
       voice_major_damage_01: "voice", voice_major_damage_02: "voice", voice_major_damage_03: "voice", voice_major_damage_04: "voice",
       voice_temp_cold: "voice", voice_temp_hot: "voice",
+      voice_acquired_stress_001: "voice", voice_acquired_stress_002: "voice", voice_acquired_stress_003: "voice", voice_acquired_stress_004: "voice", voice_acquired_stress_005: "voice", voice_acquired_stress_006: "voice", voice_acquired_stress_007: "voice", voice_acquired_stress_008: "voice", voice_acquired_stress_009: "voice",
+      voice_ochibi_calm_001: "voice", voice_ochibi_calm_002: "voice", voice_ochibi_calm_003: "voice", voice_ochibi_calm_004: "voice", voice_ochibi_calm_005: "voice", voice_ochibi_calm_006: "voice", voice_ochibi_calm_007: "voice", voice_ochibi_calm_008: "voice", voice_ochibi_calm_009: "voice",
+      voice_ochibi_dirty_001: "voice", voice_ochibi_dirty_002: "voice", voice_ochibi_dirty_003: "voice", voice_ochibi_dirty_004: "voice",
+      voice_ochibi_damage_001: "voice", voice_ochibi_damage_002: "voice", voice_ochibi_damage_003: "voice", voice_ochibi_disease_001: "voice",
+      voice_intimidate_alt: "voice", voice_ochibi_sleep_002: "voice", voice_ochibi_sleep_003: "voice", voice_ochibi_fight_hit_004: "voice", voice_ochibi_panic_005: "voice", voice_ochibi_electric_006: "voice", voice_ochibi_hot_007: "voice", voice_ochibi_stress_008: "voice",
       sfx_eat: "voice", sfx_sleep: "voice", sfx_wake: "voice", sfx_birth: "voice", sfx_death: "voice",
       sfx_damage_soft: "voice", sfx_damage_heavy: "voice", sfx_fight_hit: "voice", sfx_fight_finish: "voice",
       sfx_disease: "voice", sfx_heal: "voice", sfx_ant_drag: "voice", sfx_ant_die: "voice", sfx_queen_ant: "voice",
-      sfx_notify: "notify", sfx_phase: "notify",
+      sfx_notify: "notify", sfx_phase: "notify", sfx_achievement_unlock: "notify",
       sfx_ui_click: "ops", sfx_ui_fold: "ops", sfx_place: "ops", sfx_delete: "ops", sfx_poke: "ops",
       sfx_grab: "ops", sfx_drop: "ops", sfx_water_hose: "ops", sfx_drink: "ops",
       sfx_ball_hit: "ops", sfx_stone_impact: "ops", sfx_firecracker_fuse: "ops", sfx_firecracker_explode: "ops",
-      sfx_shoot: "ops", sfx_bolt_action: "ops",
+      sfx_shoot: "ops", sfx_bolt_action: "ops", sfx_bell: "ops",
       sfx_genkotsu_fall: "ops", sfx_genkotsu_impact: "ops", sfx_ground_rumble: "ops", sfx_grass: "ops",
       sfx_zunchi: "ops", sfx_ant_nest: "ops"
     }
diff --git a/js/structure_lifecycle.js b/js/structure_lifecycle.js
index 4551c0c..fefe54c 100644
--- a/js/structure_lifecycle.js
+++ b/js/structure_lifecycle.js
@@ -283,6 +283,7 @@
     const changed = markStructureGone(structure, reason);
     if (!changed) return false;
     worldRef.noteItemInactive?.(structure, reason);
+    if (structure.type === "grave") global.TarinaiMemorialBellSystem?.onGraveDestroyed?.(worldRef, structure, opts.breaker || null);
     removeDependentLinks(worldRef, structure, reason);
     if (ownerPanic && opts.panicOwner !== false) triggerOwnedStructureDestroyedPanic(worldRef, structure, opts.breaker || null, reason);
     markWorldAfterStructureChange(worldRef, reason);
@@ -305,6 +306,7 @@
     if (!item || item.dead) return false;
     const reason = opts.reason || "delete-tool";
     if (item.isStructure) return deleteStructure(worldRef, item, { reason, userReason: opts.userReason, wake: opts.wake, breaker: opts.breaker || null, panicOwner: opts.panicOwner });
+    if (item.type === "poison_gas_can") global.TarinaiItemEnvironmentHazardSystem?.spawnPoisonGas?.(worldRef, item);
     const changed = markLooseItemGone(item, reason);
     if (!changed) return false;
     worldRef.noteItemInactive?.(item, reason);
diff --git a/js/structures.js b/js/structures.js
index 41482ff..f0a8410 100644
--- a/js/structures.js
+++ b/js/structures.js
@@ -24,6 +24,7 @@
       this.amount = this.hp;
       this.seed = Math.random() * 1000;
       this.createdAt = Number.isFinite(Number(world?.time)) ? Number(world.time) : 0;
+      this.age = 0;
       this.roles = clonePlain(definition.roles);
       this.needEffects = clonePlain(definition.needEffects);
       this.carriedById = definition.type === "plushie" ? this.ownerId : "";
@@ -103,6 +104,9 @@
         this.y = owner.y - Math.max(22, (owner.radius || 24) * 1.02);
         if (owner.needs) owner.needs.fulfill = Math.max(0, (owner.needs.fulfill || 0) - dt * 2.8);
       }
+      if (this.type === "grave") {
+        if (global.TarinaiMemorialBellSystem?.updateGraveNaturalDecay?.(this, worldRef)) return;
+      }
       if (this.type === "grass_bed") {
         if (!Number.isFinite(this.hp) || this.hp <= 0) {
           this.hp = Math.max(1, Number(this.maxHp || 100) || 100);
@@ -214,7 +218,7 @@
       world?.markItemBucketsDirty?.("plushie-fling");
       world?.markSpatialDirty?.("plushie-fling");
       if (world) world.drawListDirty = true;
-      if (options.log !== false) world?.log?.("\u306C\u3044\u3050\u308B\u307F\u304C\u56DE\u8EE2\u3057\u306A\u304C\u3089\u98DB\u3093\u3067\u3044\u3063\u305F\u3002", "observe", { eventType: "plushie_fling", participants: owner ? [owner] : [] });
+      // Player-triggered plushie flings are intentionally excluded from the event log.
       return true;
     }
 
@@ -258,6 +262,86 @@
         ctx.beginPath();
         ctx.ellipse(0, this.r * 0.22, this.r * 1.28, this.r * 0.28, -0.06, 0, Math.PI * 2);
         ctx.fill();
+      } else if (this.type === "grave") {
+        const favoriteMemorial = Boolean(this.memorialFavorite);
+        const kingMemorial = Boolean(this.memorialTarinaiKing);
+        const slaveMemorial = Boolean(this.memorialZunchiSlave);
+        const graveScale = slaveMemorial ? 0.72 : (kingMemorial ? 1.10 : 1);
+        ctx.scale(graveScale, graveScale);
+        const stone = night ? (kingMemorial ? "rgb(139,139,149)" : favoriteMemorial ? "rgb(126,126,133)" : "rgb(111,112,116)") : (kingMemorial ? "rgb(197,190,174)" : favoriteMemorial ? "rgb(181,176,164)" : "rgb(163,158,149)");
+        const edge = night ? "rgb(58,60,66)" : "rgb(91,87,80)";
+        ctx.fillStyle = "rgba(56,47,40,0.18)";
+        ctx.beginPath(); ctx.ellipse(0, this.r * 0.58, this.r * 1.02, this.r * 0.28, 0, 0, Math.PI * 2); ctx.fill();
+        ctx.fillStyle = stone;
+        ctx.strokeStyle = edge;
+        ctx.lineWidth = kingMemorial ? 2.6 : 2;
+        ctx.beginPath();
+        ctx.moveTo(-this.r * 0.78, this.r * 0.22);
+        ctx.bezierCurveTo(-this.r * 0.88, -this.r * 0.38, -this.r * 0.46, -this.r * 0.80, this.r * 0.06, -this.r * 0.72);
+        ctx.bezierCurveTo(this.r * 0.62, -this.r * 0.68, this.r * 0.88, -this.r * 0.20, this.r * 0.72, this.r * 0.30);
+        ctx.bezierCurveTo(this.r * 0.44, this.r * 0.64, -this.r * 0.50, this.r * 0.62, -this.r * 0.78, this.r * 0.22);
+        ctx.closePath(); ctx.fill(); ctx.stroke();
+        ctx.fillStyle = night ? "rgba(165,166,174,0.42)" : "rgba(225,220,208,0.48)";
+        ctx.beginPath(); ctx.ellipse(-this.r * 0.18, -this.r * 0.30, this.r * 0.30, this.r * 0.13, -0.35, 0, Math.PI * 2); ctx.fill();
+
+        if (favoriteMemorial || kingMemorial) {
+          ctx.fillStyle = night ? "rgb(101,102,108)" : "rgb(154,150,143)";
+          const stones = kingMemorial ? [
+            [-1.02,0.40,0.42,0.26,-0.18],[0.94,0.42,0.38,0.24,0.18],[-0.66,0.62,0.29,0.18,0.10],[0.58,0.63,0.28,0.18,-0.12],[0.02,0.72,0.24,0.14,0]
+          ] : [
+            [-0.92,0.43,0.34,0.22,-0.18],[0.82,0.48,0.29,0.19,0.20],[-0.58,0.58,0.22,0.14,0.10]
+          ];
+          for (const stoneSpec of stones) {
+            ctx.beginPath();
+            ctx.ellipse(this.r * stoneSpec[0], this.r * stoneSpec[1], this.r * stoneSpec[2], this.r * stoneSpec[3], stoneSpec[4], 0, Math.PI * 2);
+            ctx.fill(); ctx.stroke();
+          }
+        }
+
+        const drawMemorialFlower = (flowerX, scale = 1, lean = 0, flowerY = 0) => {
+          const flowerBaseY = this.r * (0.50 + flowerY);
+          const flowerTopY = -this.r * (0.05 + 0.03 * scale - flowerY);
+          ctx.strokeStyle = night ? "rgb(72,114,73)" : "rgb(76,139,72)";
+          ctx.lineWidth = Math.max(1.1, this.r * 0.085 * scale);
+          ctx.beginPath(); ctx.moveTo(flowerX, flowerBaseY);
+          ctx.quadraticCurveTo(flowerX - this.r * (0.10 + lean), this.r * 0.20, flowerX + this.r * lean, flowerTopY); ctx.stroke();
+          ctx.fillStyle = night ? "rgb(128,149,104)" : "rgb(112,166,92)";
+          ctx.beginPath(); ctx.ellipse(flowerX - this.r * 0.10, this.r * 0.23, this.r * 0.18 * scale, this.r * 0.09 * scale, -0.55, 0, Math.PI * 2); ctx.fill();
+          const petal = night ? "rgb(205,190,203)" : "rgb(246,219,232)";
+          const petalR = Math.max(2.0, this.r * 0.14 * scale);
+          ctx.fillStyle = petal;
+          const cx = flowerX + this.r * lean;
+          for (let i = 0; i < 5; i++) {
+            const a = -Math.PI / 2 + i * Math.PI * 2 / 5;
+            ctx.beginPath(); ctx.arc(cx + Math.cos(a) * petalR * 0.78, flowerTopY + Math.sin(a) * petalR * 0.78, petalR * 0.66, 0, Math.PI * 2); ctx.fill();
+          }
+          ctx.fillStyle = night ? "rgb(196,153,70)" : "rgb(235,175,56)";
+          ctx.beginPath(); ctx.arc(cx, flowerTopY, petalR * 0.48, 0, Math.PI * 2); ctx.fill();
+        };
+        const drawWeed = (x, scale = 1, tilt = 0) => {
+          ctx.strokeStyle = night ? "rgb(74,94,65)" : "rgb(89,118,72)";
+          ctx.lineWidth = Math.max(1, this.r * 0.07 * scale);
+          for (let i = -1; i <= 1; i++) {
+            ctx.beginPath(); ctx.moveTo(x + i * this.r * 0.06, this.r * 0.56);
+            ctx.quadraticCurveTo(x + this.r * (tilt + i * 0.06), this.r * 0.18, x + this.r * (tilt + i * 0.12), -this.r * (0.08 + 0.06 * Math.abs(i))); ctx.stroke();
+          }
+        };
+
+        if (slaveMemorial) {
+          drawWeed(this.r * 0.56, 0.9, 0.04);
+          drawWeed(-this.r * 0.62, 0.72, -0.03);
+        } else if (kingMemorial) {
+          drawMemorialFlower(-this.r * 0.98, 0.90, -0.03, 0.03);
+          drawMemorialFlower(-this.r * 0.55, 1.05, 0.02, 0);
+          drawMemorialFlower(this.r * 0.62, 1.08, -0.02, 0);
+          drawMemorialFlower(this.r * 1.04, 0.90, 0.03, 0.04);
+        } else {
+          drawMemorialFlower(this.r * 0.78, 1, 0);
+          if (favoriteMemorial) {
+            drawMemorialFlower(-this.r * 0.72, 0.82, 0.035);
+            drawMemorialFlower(this.r * 1.02, 0.76, 0.035);
+          }
+        }
       } else if (this.type === "plushie") {
         const spriteId = "plushie_bear";
         const img = getRenderableImage(spriteId, spriteId);
@@ -322,6 +406,27 @@
     return hit;
   }
 
+  StructureRegistry.register({
+    type: "grave",
+    label: "墓",
+    buildNeed: "social",
+    buildTime: 9,
+    maxHp: 70,
+    materials: { splat: 1 },
+    roles: { memorial: true },
+    needEffects: { food: 0, sleep: 0, health: 0, safety: 0, social: 0, fulfill: 0 },
+    create(owner, x, y, world) {
+      const structure = new TarinaiStructure(this, null, x, y, world);
+      structure.ownerId = "";
+      structure.r = 18;
+      structure.memorialEligibleFamilyKeys = [];
+      return structure;
+    },
+    onDestroyed(structure, world, breaker) {
+      global.TarinaiMemorialBellSystem?.onGraveDestroyed?.(world, structure, breaker || null);
+    },
+  });
+
   StructureRegistry.register({
     type: "grass_bed",
     label: "\u304b\u3093\u305f\u3093\u30d9\u30c3\u30c9",
diff --git a/js/system_order.js b/js/system_order.js
index 30dfe45..4bb0d1b 100644
--- a/js/system_order.js
+++ b/js/system_order.js
@@ -16,6 +16,7 @@
     { id: "items_and_ants", run(worldRef, ctx) { ctx.mobile = phase("updateItemsAndAnts")?.(worldRef, ctx.dt) || null; } },
     { id: "effects", run(worldRef, ctx) { phase("updateEffects")?.(worldRef, ctx.dt); } },
     { id: "creatures", run(worldRef, ctx) { phase("updateCreatures")?.(worldRef, ctx.dt); } },
+    { id: "trap_holds", run(worldRef) { global.TarinaiItemEnvironmentHazardSystem?.enforceTrapHolds?.(worldRef); } },
     { id: "seesaws", run(worldRef, ctx) { global.TarinaiSeesawSystem?.updateWorld?.(worldRef, ctx.dt); } },
     { id: "maintenance", run(worldRef, ctx) { phase("runMaintenance")?.(worldRef, ctx.dt, ctx.mobile?.itemCountBefore ?? (worldRef.items || []).length); } },
     { id: "phase_events", run(worldRef) { phase("emitPhaseChange")?.(worldRef); } },
@@ -25,12 +26,8 @@
     { id: "diagnostics", run(worldRef) { phase("finalizeDiagnostics")?.(worldRef); } },
   ]);
 
-  function update(worldRef, dt) {
-    const normalize = phase("normalizeDelta");
-    if (!normalize) throw new Error("Tarinai simulation normalize phase is not available");
-    const frameDt = normalize(worldRef, dt);
-    if (frameDt === null) return;
-    const ctx = { dt: frameDt, mobile: null };
+  function runSimulationStep(worldRef, stepDt) {
+    const ctx = { dt: stepDt, mobile: null };
     const profiler = global.TarinaiPerf;
     for (const system of SYSTEM_ORDER) {
       const end = profiler.begin(`update.phase.${system.id}`) || null;
@@ -42,5 +39,39 @@
     }
   }
 
+  const FIXED_SIMULATION_STEP = 0.025;
+  const MAX_FIXED_STEPS_PER_FRAME = 40;
+
+  function update(worldRef, dt) {
+    const normalize = phase("normalizeDelta");
+    if (!normalize) throw new Error("Tarinai simulation normalize phase is not available");
+    const scaledDt = normalize(worldRef, dt);
+    if (scaledDt === null) return;
+
+    // Always advance the world with one fixed simulation quantum.  Previously
+    // slow speeds used many tiny render-frame-sized updates while fast speeds
+    // used fewer 0.05-second chunks.  Any per-update random choice, cooldown
+    // edge, collision pass, or AI decision could therefore change simply by
+    // changing the speed control.  A fixed accumulator keeps the number and
+    // size of simulation updates identical for the same amount of game time.
+    let accumulator = Math.max(0, Number(worldRef._fixedSimulationAccumulator || 0) || 0);
+    accumulator += Math.max(0, Number(scaledDt) || 0);
+    // Main-loop dt is capped and the public speed control tops out at x16, so
+    // this guard still covers the worst supported frame without dropping time.
+    let steps = 0;
+    while (accumulator + 1e-10 >= FIXED_SIMULATION_STEP && steps < MAX_FIXED_STEPS_PER_FRAME) {
+      runSimulationStep(worldRef, FIXED_SIMULATION_STEP);
+      accumulator -= FIXED_SIMULATION_STEP;
+      steps += 1;
+    }
+    // Keep a bounded remainder if an external caller supplies an unsupported
+    // delta.  Normal gameplay never reaches this branch, but avoiding an
+    // unbounded backlog is safer than a permanent catch-up spiral.
+    if (steps >= MAX_FIXED_STEPS_PER_FRAME && accumulator >= FIXED_SIMULATION_STEP) {
+      accumulator = Math.min(accumulator, FIXED_SIMULATION_STEP * 0.999999);
+    }
+    worldRef._fixedSimulationAccumulator = Math.max(0, accumulator);
+  }
+
   global.TarinaiSystemOrder = Object.freeze({ update });
 })(typeof window !== "undefined" ? window : globalThis);
diff --git a/js/tarinai.js b/js/tarinai.js
index 8f389e6..49ad6f1 100644
--- a/js/tarinai.js
+++ b/js/tarinai.js
@@ -16,17 +16,28 @@ function tarinaiRoundRectPath(ctx, x, y, w, h, r) {
 }
 
 function tarinaiChampionName(name = "") {
-  const map = { "\u306F": "\u8987", "\u3046": "\u5B87", "\u3045": "\u30A5", "\u3063": "\uFF01" };
-  return String(name || "").replace(/[\u306F\u3046\u3045\u3063]/g, ch => map[ch] || ch);
+  const raw = String(name || "");
+  if (/おちび(?:の王)?$/.test(raw)) return raw.endsWith("の王") ? raw : `${raw}の王`;
+  const map = { "は": "覇", "う": "宇", "ぅ": "ゥ", "っ": "！" };
+  return raw.replace(/[はうぅっ]/g, ch => map[ch] || ch);
 }
 if (typeof window !== "undefined") window.tarinaiChampionName = tarinaiChampionName;
 if (typeof globalThis !== "undefined") globalThis.tarinaiChampionName = tarinaiChampionName;
 
+const ACQUIRED_TARINAI_NAME_PREFIXES = ["かしこい", "すごい", "たくましい", "げんきな", "わんぱくな", "ぴかぴかあにゃるの", "しゅーるすとれみんぐ・", "つよい", "もちもちほっぺの", "でかずんぽの", "ちびずんぽの", "すばらしい", "かわいい", "ずんちがくさい", "やさしい", "ゆうかんな", "いいにおいの"];
+function acquiredTarinaiBaseName(seed = "", name = "") {
+  const raw = String(name || "").trim();
+  if (raw && raw !== "ずんちどれい") return raw.replace(/の王$/, "");
+  const pick = typeof stableChoice === "function" ? stableChoice(seed || raw || "acquired", "acquired-name-prefix", ACQUIRED_TARINAI_NAME_PREFIXES) : (ACQUIRED_TARINAI_NAME_PREFIXES[0] || "");
+  return `${pick || ACQUIRED_TARINAI_NAME_PREFIXES[0] || ""}おちび`;
+}
+
 class Tarinai {  constructor(world, opts = {}) {
     if (world && !opts.birthSeed && !opts.familyKey && !opts.id && globalThis.TarinaiSeedFactory.prepareAddOptions) {
       opts = globalThis.TarinaiSeedFactory.prepareAddOptions(world, opts) || opts;
     }
     this.world = world;
+    this.isAcquiredTarinai = Boolean(opts.isAcquiredTarinai);
     this.birthSeed = opts.birthSeed || opts.familyKey || opts.id || (globalThis.TarinaiSeedFactory.childSeed(world?.worldSeed || "", Number(world?.birthSerial || 0) + 1, []) || (crypto.randomUUID ? crypto.randomUUID() : `${Date.now()}-${Math.random()}`));
     this.birthSerial = Number.isFinite(opts.birthSerial) ? Number(opts.birthSerial) : (globalThis.TarinaiSeedFactory.serialFromBirthSeed(this.birthSeed) || 0);
     const birthProfile = globalThis.TarinaiSeedFactory.birthProfile(this.birthSeed, opts) || {};
@@ -34,6 +45,7 @@ class Tarinai {  constructor(world, opts = {}) {
     this.id = opts.id || "";
     this.liveToken = opts.liveToken || 0;
     this.name = opts.name || birthProfile.name || makeName(world);
+    this.acquiredBaseName = opts.acquiredBaseName || null;
     this.type = opts.type || birthProfile.type || baseSpriteId();
     const typeMeta = SPRITES.find(s => s.id === this.type);
     if (typeMeta?.actionOnly || typeMeta?.displayOnly) this.type = birthProfile.type || baseSpriteId();
@@ -97,6 +109,7 @@ class Tarinai {  constructor(world, opts = {}) {
     this.affection = opts.affection ?? rand(0, 30);
     this.dead = !!opts.dead;
     this.deathReason = opts.deathReason || "";
+    this.deathTime = opts.deathTime != null && Number.isFinite(Number(opts.deathTime)) ? Number(opts.deathTime) : null;
     this.lastDamageCause = opts.lastDamageCause || "";
     this.lastDamageAmount = opts.lastDamageAmount ?? 0;
     this.lastDamageAt = opts.lastDamageAt ?? -999;
@@ -119,6 +132,29 @@ class Tarinai {  constructor(world, opts = {}) {
     this.sleeping = false;
     this.awakeLockTimer = opts.awakeLockTimer ?? 0;
     this.goodMode = opts.goodMode ?? birthProfile.goodMode ?? stableChoice(this.birthSeed || this.familyKey, "good-mode", displayNormalSprites()) ?? "smile";
+    if (this.isAcquiredTarinai) {
+      const explicitAcquiredName = this.acquiredBaseName || (Object.prototype.hasOwnProperty.call(opts, "name") ? this.name : "");
+      this.acquiredBaseName = acquiredTarinaiBaseName(this.birthSeed || this.familyKey, explicitAcquiredName);
+      this.name = this.acquiredBaseName;
+    }
+    if (this.isAcquiredTarinai) {
+      const acquiredNeeds = { food: 22, sleep: 34, health: 78, safety: 100, social: 90, fulfill: 82 };
+      const hasExplicitNeedState = Boolean((opts.needs && typeof opts.needs === "object") || (opts.needRaw && typeof opts.needRaw === "object") || (opts.needDisplay && typeof opts.needDisplay === "object") || (opts.needRawBase && typeof opts.needRawBase === "object") || (opts.previousNeeds && typeof opts.previousNeeds === "object"));
+      if (!hasExplicitNeedState) {
+        this.needs = { ...acquiredNeeds };
+        this.needDisplay = { ...acquiredNeeds };
+        this.needRaw = { ...acquiredNeeds };
+        this.needRawBase = { ...acquiredNeeds };
+        this.previousNeeds = { ...acquiredNeeds };
+      }
+      if (!Object.prototype.hasOwnProperty.call(opts, "loneliness")) this.loneliness = Math.max(Number(this.loneliness) || 0, 90);
+      if (!Object.prototype.hasOwnProperty.call(opts, "hunger")) this.hunger = Math.max(Number(this.hunger) || 0, 22);
+      if (!Object.prototype.hasOwnProperty.call(opts, "energy")) this.energy = Math.min(Number(this.energy) || 0, 45);
+      if (!Object.prototype.hasOwnProperty.call(opts, "goodMode") && Array.isArray(SPRITES) && SPRITES.some(s => s.id === "jito")) this.goodMode = "jito";
+      this.stress = typeof calculateStressFromNeeds === "function" ? calculateStressFromNeeds(this.needRaw || this.needs) : this.stress;
+      this.acquiredStressSpeechAt = Number.isFinite(opts.acquiredStressSpeechAt) ? opts.acquiredStressSpeechAt : ((this.world?.time || 0) + rand(2.8, 6.5));
+      this.acquiredStressSpeechCooldownUntil = Number.isFinite(opts.acquiredStressSpeechCooldownUntil) ? opts.acquiredStressSpeechCooldownUntil : 0;
+    }
     this.facing = opts.facing ?? (stableUnit(this.familyKey, "facing") < 0.5 ? -1 : 1);
     this.visualFacing = opts.visualFacing ?? this.facing;
     this.facingLockUntil = opts.facingLockUntil ?? 0;
@@ -163,6 +199,9 @@ class Tarinai {  constructor(world, opts = {}) {
     this.explosionDisease = Boolean(opts.explosionDisease);
     this.explosionDiseaseTimer = opts.explosionDiseaseTimer ?? (this.explosionDisease ? 60 : 0);
     this.fightDisease = Boolean(opts.fightDisease);
+    this.mamekusaredakeDisease = Boolean(opts.mamekusaredakeDisease);
+    this.mamekusaredakeGrowth = Number.isFinite(opts.mamekusaredakeGrowth) ? opts.mamekusaredakeGrowth : 0;
+    this.mamekusaredakeSpeechAt = Number.isFinite(opts.mamekusaredakeSpeechAt) ? opts.mamekusaredakeSpeechAt : 0;
     this.fightDiseaseCooldown = opts.fightDiseaseCooldown ?? 0;
     this.lastBleedAt = opts.lastBleedAt ?? -999;
     this.favorite = Boolean(opts.favorite);
diff --git a/js/tarinai_action_definitions.js b/js/tarinai_action_definitions.js
index 154b8a7..2e9726e 100644
--- a/js/tarinai_action_definitions.js
+++ b/js/tarinai_action_definitions.js
@@ -423,7 +423,7 @@ function createApproachMateActionSpec() {
     phrase: "\u7e41\u6b96\u3067\u304d\u308b\u76f8\u624b\u306b\u8fd1\u3065\u3044\u3066\u3044\u308b",
     weight: 48,
     selectTarget(t, world) { return selectMateTarget(t, world, 520); },
-    canStart(t, world, ctx = {}) { return (t.reproductionTimer || 0) <= 12 && (world?.canAddTarinai?.(1) ?? true) && !!(ctx.target ?? this.selectTarget(t, world, ctx)); },
+    canStart(t, world, ctx = {}) { return !t.juvenile && (t.reproductionTimer || 0) <= 12 && (world?.canAddTarinai?.(1) ?? true) && !!(ctx.target ?? this.selectTarget(t, world, ctx)); },
     start(t, world, ctx = {}) {
       const other = ctx.target ?? this.selectTarget(t, world, ctx);
       if (!other) return false;
diff --git a/js/tarinai_action_state.js b/js/tarinai_action_state.js
index 83ed75a..79992da 100644
--- a/js/tarinai_action_state.js
+++ b/js/tarinai_action_state.js
@@ -4,12 +4,34 @@
   const Tarinai = global.Tarinai;
   if (!Tarinai) throw new Error("Tarinai is not available for mixin: tarinai_action_state.js");
 
+  function prepareTarinaiIntimidatePresentation(tarinai) {
+    if (!tarinai || tarinai.dead) return "intimidate";
+    if (!tarinai.intimidateSpriteVariant) {
+      tarinai.intimidateSpriteVariant = tarinai.isAcquiredTarinai ? "intimidate_alt" : (Math.random() < 0.5 ? "intimidate_alt" : "intimidate");
+    }
+    if (tarinai.intimidateSpriteVariant === "intimidate_alt" && !tarinai._intimidateAltAnnounced) {
+      tarinai._intimidateAltAnnounced = true;
+      tarinai.bubble?.("ぷきゅー！", 1.0, "rgba(92,62,34,0.82)", { force: true });
+      const audio = global.TarinaiAudio;
+      if (audio?.playSample) audio.playSample("voice_intimidate_alt", 0.9, "voice") || audio.play?.("voice_intimidate_alt", { category: "voice", minGap: 0.9 });
+      else audio?.play?.("voice_intimidate_alt", { category: "voice", minGap: 0.9 });
+    }
+    return tarinai.intimidateSpriteVariant;
+  }
+  global.prepareTarinaiIntimidatePresentation = prepareTarinaiIntimidatePresentation;
+
   Object.defineProperties(Tarinai.prototype, Object.getOwnPropertyDescriptors({
     setActionState(state, opts = {}) {
       if (this.dead) return false;
       const wasSleeping = this.state === "sleep" || this.sleeping;
+      const previousState = this.state;
       const nextState = state || "idle";
       this.state = nextState;
+      if (nextState === "intimidate" || nextState === "ant_intimidate") prepareTarinaiIntimidatePresentation(this);
+      else if ((previousState === "intimidate" || previousState === "ant_intimidate") && nextState !== previousState) {
+        this.intimidateSpriteVariant = "";
+        this._intimidateAltAnnounced = false;
+      }
       if ("target" in opts) this.target = opts.target;
       if (opts.reason != null) this.thought = String(opts.reason || "");
       if (opts.clearTarget) this.target = null;
@@ -204,7 +226,17 @@
         this.fallTimer = Math.max(this.fallTimer || 0, opts.fallTimer);
         this.fallMax = Math.max(this.fallMax || 0, this.fallTimer);
       }
-      if (opts.bubble) this.bubble?.(opts.bubble, opts.bubbleCooldown ?? 0.9, opts.bubbleColor || "rgba(84,66,86,0.80)");
+      if (opts.bubble && !this.isAcquiredTarinai) this.bubble?.(opts.bubble, opts.bubbleCooldown ?? 0.9, opts.bubbleColor || "rgba(84,66,86,0.80)");
+      if (this.isAcquiredTarinai) {
+        const now = Number(this.world?.time || 0) || 0;
+        if (now >= Number(this.ochibiPanicVoiceAt || 0)) {
+          this.ochibiPanicVoiceAt = now + 2.4;
+          if (this.bubble?.("きょわいのだ...", 1.8, "rgba(84,66,86,0.80)", { force: true })) {
+            const a = global.TarinaiAudio;
+            if (a?.playSample) a.playSample("voice_ochibi_panic_005", 1.0, "voice") || a.play?.("voice_ochibi_panic_005", { category: "voice", minGap: 1.0 });
+          }
+        }
+      }
       this.lastPanicCause = opts.cause || opts.reason || this.thought || "panic";
       this.lastPanicAt = this.world?.time || 0;
       if (this.state === "panic" && !Number.isFinite(this.panicStartedAt)) this.panicStartedAt = this.lastPanicAt;
diff --git a/js/tarinai_behavior_text.js b/js/tarinai_behavior_text.js
index 3ef6eec..723227e 100644
--- a/js/tarinai_behavior_text.js
+++ b/js/tarinai_behavior_text.js
@@ -64,8 +64,7 @@ function actionTextForReason(action = null, tarinai = null) {
 }
 
 function isEffectCauseText(text = "") {
-  return Boolean(globalThis.TarinaiCoreHelpers?.isEffectCauseText?.(text)
-    ?? globalThis.isTarinaiEffectCauseText?.(text));
+  return Boolean(globalThis.TarinaiCoreHelpers?.isEffectCauseText?.(text));
 }
 
 function forcedCausePhrase(source = "", fallback = "") {
diff --git a/js/tarinai_building_behavior.js b/js/tarinai_building_behavior.js
index ab75305..f44d99e 100644
--- a/js/tarinai_building_behavior.js
+++ b/js/tarinai_building_behavior.js
@@ -230,6 +230,7 @@ function continueBuildPlan(t, world, dt) {
   structure.use?.(t, world);
   forceBuiltStructureVisualRefresh(world, structure, `build:${plan.type}:visual-refresh`);
   t.setActionState?.("idle", { target: structure, reason: `${label}\u3092\u4f5c\u3063\u305f`, sleeping: false });
+  world.log?.(`${t.name}\u304c${label}\u3092\u4f5c\u3063\u305f\u3002`, "event", { participants: [t] });
   applyNeedSatisfaction(t, { fulfill: plan.type === "plushie" ? 50 : 36, safety: plan.type === "plushie" ? 4 : 8 }, plan.type);
   t.buildPlan = null;
   return true;
diff --git a/js/tarinai_consumable_behavior.js b/js/tarinai_consumable_behavior.js
index b4a15b3..62af173 100644
--- a/js/tarinai_consumable_behavior.js
+++ b/js/tarinai_consumable_behavior.js
@@ -26,6 +26,7 @@ function finishBehaviorConsumption(t, item, foodType, eating, dt, label, color =
 function consumeBehaviorTarget(t, world, target, role = "food", dt = 0.12) {
   if (!t || !world || !target || target.dead) return false;
   const foodType = effectiveFoodTypeForItem(target);
+  if (t.isZunchiSlave && foodType === "sweet") return false;
   const labelFor = type => typeof toolLabel === "function" ? toolLabel(type || target.type) : "\u98df\u3079\u7269";
   const effectiveDt = Math.max(0.10, Number(dt) || 0.12);
   if (isDuplicatorFoodSource(target) && (t.eatCooldown || 0) > 0.04) {
diff --git a/js/tarinai_contact_item_system.js b/js/tarinai_contact_item_system.js
index 6f94821..4118c62 100644
--- a/js/tarinai_contact_item_system.js
+++ b/js/tarinai_contact_item_system.js
@@ -22,11 +22,9 @@ const d = contact.distance;
         tarinai.tarinaiChampionSince = 0;
         tarinai.becomeZunchiSlave?.({ locked: true, forcedItem: true });
         tarinai.world?.syncTarinaiCountEntry?.(tarinai);
-        tarinai.bubble("\u9396", 2.4, "rgba(74,64,56,0.82)");
         tarinai.world?.log?.(`${tarinai.name}\u306F${itemLabel}\u306B\u89E6\u308C\u3066\u305A\u3093\u3061\u3069\u308C\u3044\u306B\u306A\u3063\u305F\u3002`, "event", { participants: [tarinai], sound: false });
       } else {
         tarinai.becomeTarinaiChampion?.({ force: true, forcePersonality: true, forcedItem: true });
-        tarinai.bubble("\u738B", 2.4, "rgba(166,112,22,0.84)");
         tarinai.world?.log?.(`${tarinai.name}\u306F${itemLabel}\u306B\u89E6\u308C\u3066\u305F\u308A\u306A\u3044\u738B\u306B\u306A\u3063\u305F\u3002`, "event", { participants: [tarinai], sound: false });
       }
       global.TarinaiAchievements?.recordConsumableUse?.({ world: tarinai.world, tarinai, item: it, type: it.type, source: "contact" });
@@ -107,7 +105,31 @@ const d = contact.distance;
   }
 
 
+  function updateResidues(tarinai, dt) {
+    const worldRef = tarinai?.world;
+    if (!worldRef?.nearbyResidues) return false;
+    let touched = false;
+    for (const residue of worldRef.nearbyResidues(tarinai.x, tarinai.y, (tarinai.radius || 22) + 58) || []) {
+      if (!residue || residue.dead) continue;
+      const d = distXY(tarinai.x, tarinai.y, residue.x, residue.y);
+      if (residue.type === "splat") {
+        const touch = clamp(1 - d / ((tarinai.radius || 22) + (residue.r || 26) + 16), 0, 1);
+        if (touch > 0) {
+          applyNeedShock(tarinai, { safety: touch * dt * 5, health: touch * dt * 3 });
+          if (touch > 0.06) tarinai.adjustPersonality("neuroticism", -dt * touch * 0.0042, "after repeated contact with corpses");
+          touched = true;
+        }
+      } else if (residue.type === "trace" && d <= (tarinai.radius || 22) + (residue.r || 16) + 14) {
+        tarinai.loneliness -= dt * 0.25;
+        applyNeedShock(tarinai, { social: -dt * 1, safety: dt * 0.8 });
+        touched = true;
+      }
+    }
+    return touched;
+  }
+
   global.TarinaiContactItemSystem = Object.freeze({
     updateCandidate,
+    updateResidues,
   });
 })(typeof window !== "undefined" ? window : globalThis);
diff --git a/js/tarinai_cursor_care_system.js b/js/tarinai_cursor_care_system.js
index f0513d7..b1bf01c 100644
--- a/js/tarinai_cursor_care_system.js
+++ b/js/tarinai_cursor_care_system.js
@@ -18,10 +18,12 @@
     this.goodMode = "smile";
     if ((this.world.time || 0) >= (this.nextCursorHeartAt || 0)) {
       this.nextCursorHeartAt = (this.world.time || 0) + Math.max(0.08, 0.22 - p * 0.10);
-      for (let i = 0; i < (p > 0.62 ? 3 : 2); i++) {
-        this.world.effects?.push(new Effect("heart", this.x + rand(-this.radius * 0.58, this.radius * 0.58), this.y - this.radius * rand(0.68, 1.58), {
-          vx: rand(-16, 16), vy: rand(-44, -20), size: rand(7, 13) * (0.8 + p * 0.45), life: rand(0.62, 0.95), color: "rgba(240,91,135,0.92)"
-        }));
+      if (typeof this.world?.queueEffect === "function") {
+        for (let i = 0; i < (p > 0.62 ? 3 : 2); i++) {
+          this.world.queueEffect("heart", this.x + rand(-this.radius * 0.58, this.radius * 0.58), this.y - this.radius * rand(0.68, 1.58), {
+            vx: rand(-16, 16), vy: rand(-44, -20), size: rand(7, 13) * (0.8 + p * 0.45), life: rand(0.62, 0.95), color: "rgba(240,91,135,0.92)"
+          });
+        }
       }
     }
   
diff --git a/js/tarinai_direct_feeding_system.js b/js/tarinai_direct_feeding_system.js
index d7c606f..3a73adb 100644
--- a/js/tarinai_direct_feeding_system.js
+++ b/js/tarinai_direct_feeding_system.js
@@ -53,6 +53,10 @@
     return "food";
   }
 
+  function randomRange(min, max) {
+    return min + Math.random() * (max - min);
+  }
+
   function spawnFoodGiftHearts(tarinai, nutrition = 0) {
     const worldRef = tarinai?.world;
     if (!worldRef?.effects || typeof global.TarinaiEffect !== "function") return false;
@@ -60,19 +64,19 @@
     const radius = Math.max(18, Number(tarinai.radius || 22) || 22);
     for (let i = 0; i < count; i += 1) {
       const side = i % 2 ? 1 : -1;
-      worldRef.effects.push(new global.TarinaiEffect("heart",
-        tarinai.x + side * global.rand(radius * 0.06, radius * 0.82),
-        tarinai.y - global.rand(radius * 0.38, radius * 1.72), {
-          vx: side * global.rand(9, 30) + global.rand(-9, 9),
-          vy: global.rand(-76, -30),
-          size: global.rand(9, 17),
-          life: global.rand(0.82, 1.36),
+      worldRef.queueEffect?.("heart",
+        tarinai.x + side * randomRange(radius * 0.06, radius * 0.82),
+        tarinai.y - randomRange(radius * 0.38, radius * 1.72), {
+          vx: side * randomRange(9, 30) + randomRange(-9, 9),
+          vy: randomRange(-76, -30),
+          size: randomRange(9, 17),
+          life: randomRange(0.82, 1.36),
           color: "rgba(240,91,135,0.94)",
-        }));
+        });
     }
-    worldRef.effects.push(new global.TarinaiEffect("ring", tarinai.x, tarinai.y, {
+    worldRef.queueEffect?.("ring", tarinai.x, tarinai.y, {
       size: Math.max(24, radius * 1.35), life: 0.28, color: "rgba(240,91,135,0.42)",
-    }));
+    });
     return true;
   }
 
@@ -109,6 +113,7 @@
     if (!worldRef || !tarinai || tarinai.dead || !hasConsumableAmount(item)) return null;
     if (typeof global.consumeBehaviorTarget !== "function") return null;
     const type = itemType(item);
+    if (tarinai.isZunchiSlave && type === "sweet") return null;
     const label = typeof global.toolLabel === "function" ? global.toolLabel(type) : type;
     const healthNeedBefore = Number(tarinai.needs?.health);
     const consumed = global.consumeBehaviorTarget(tarinai, worldRef, item, roleFor(item), 0.18);
@@ -128,8 +133,9 @@
     if (foodGift) {
       tarinai.affection = Number(tarinai.affection || 0) + 1.8 + Math.max(0, Number(nutrition) || 0) * 0.035;
       applyFoodGiftPersonality(tarinai, nutrition);
-      spawnFoodGiftHearts(tarinai, nutrition);
-      tarinai.bubble?.("\u2661", 2.2, "rgba(190,82,132,0.80)");
+      // Cosmetic feedback must never interrupt consumption, removal, or achievement recording.
+      try { spawnFoodGiftHearts(tarinai, nutrition); } catch (_) {}
+      try { tarinai.bubble?.("\u2661", 2.2, "rgba(190,82,132,0.80)"); } catch (_) {}
       global.TarinaiAchievements?.recordDirectFeed?.({ world: worldRef, tarinai, item, type, source: options.source || "direct" });
     } else {
       tarinai.focusPulseTimer = Math.max(Number(tarinai.focusPulseTimer || 0) || 0, 0.72);
@@ -138,10 +144,7 @@
       global.TarinaiAchievements?.recordDirectCare?.({ world: worldRef, tarinai, item, type, beneficialRecovery, source: options.source || "direct" });
     }
 
-    const sourceLabel = options.source === "pinch" ? "\u624b\u6e21\u3057\u3067" : "\u76f4\u63a5";
-    worldRef.log?.(`${tarinai.name}\u306b${label}\u3092${sourceLabel}\u4e0e\u3048\u305f\u3002`, "food", {
-      participants: [tarinai], eventType: "direct_feed", sound: false,
-    });
+    // Direct feeding is a player operation and is intentionally not logged.
 
     const removed = options.removeItem !== false ? removeGivenWorldItem(worldRef, item, label) : false;
     if (!removed && (worldRef.items || []).includes(item)) {
diff --git a/js/tarinai_disease_nest.js b/js/tarinai_disease_nest.js
index a8b51a1..2efbcdc 100644
--- a/js/tarinai_disease_nest.js
+++ b/js/tarinai_disease_nest.js
@@ -290,19 +290,16 @@
     let occupants = this.world?.nestBoxOccupants ? this.world.nestBoxOccupants(box, Infinity) : [];
     const now = this.world?.time || 0;
     if (!alreadyInside && occupants.length >= capacity) {
-      const kingSleepDisplace = Boolean(this.isTarinaiChampion && box.type === "nest_box" && (this.state === "seek_bed" || this.state === "sleep" || this.sleeping));
-      if (options?.forceDisplace || kingSleepDisplace) {
-        const victim = occupants.find(t => t && t !== this && !t.dead && !t.isTarinaiChampion)
-          || occupants.find(t => t && t !== this && !t.dead);
-        if (victim) {
-          victim.leaveNestBox?.(box);
-          victim.awakeLockTimer = Math.max(victim.awakeLockTimer || 0, 0.8);
-          victim.fearTimer = Math.max(victim.fearTimer || 0, 0.22);
-          victim.thought = `${containerLabel(box)}\u304b\u3089\u62bc\u3057\u51fa\u3055\u308c\u305f`;
-          victim.pinchThoughtTimer = Math.max(victim.pinchThoughtTimer || 0, 0.65);
-          victim.goIdle?.(`${containerLabel(box)}\u304b\u3089\u62bc\u3057\u51fa\u3055\u308c\u305f`);
-          occupants = this.world?.nestBoxOccupants ? this.world.nestBoxOccupants(box, Infinity) : occupants.filter(t => t !== victim);
-        }
+      const victim = globalThis.TarinaiNestSleepSystem?.lowerPriorityNestOccupant?.(this.world, box, this, occupants) || null;
+      if (victim) {
+        victim.leaveNestBox?.(box);
+        victim.awakeLockTimer = Math.max(victim.awakeLockTimer || 0, 0.8);
+        victim.fearTimer = Math.max(victim.fearTimer || 0, 0.22);
+        victim.thought = `${containerLabel(box)}\u304b\u3089\u62bc\u3057\u51fa\u3055\u308c\u305f`;
+        victim.pinchThoughtTimer = Math.max(victim.pinchThoughtTimer || 0, 0.65);
+        victim.goIdle?.(`${containerLabel(box)}\u304b\u3089\u62bc\u3057\u51fa\u3055\u308c\u305f`);
+        this.world?.log?.(`${this.name}\u304c${containerLabel(box)}\u306b\u5165\u308a\u3001${victim.name}\u3092\u62bc\u3057\u51fa\u3057\u305f\u3002`, "event", { participants: [this, victim] });
+        occupants = this.world?.nestBoxOccupants ? this.world.nestBoxOccupants(box, Infinity) : occupants.filter(t => t !== victim);
       }
       if (occupants.length >= capacity) return this.abortNestBoxEntry?.(box, containerFullText(box)) || false;
     }
@@ -595,13 +592,14 @@
     this.burnWanderAngle = Number.isFinite(this.burnWanderAngle) ? this.burnWanderAngle : deterministicAngle(this.world, "tarinai-burn-angle", this, source || null);
     if (typeof this.enterPanic === "function") this.enterPanic({ threat: source, target: null, reason: text, fear: 2.2, wake: true, cause: "burning", surpriseTimer: 0.65, awakeLockTimer: 0.8 });
     else this.setActionState?.("panic", { target: null, reason: text, wake: true });
-    this.world?.effects?.push(new Effect("ring", this.x, this.y, { size: Math.max(26, this.radius * 1.35), life: 0.26, color: "rgba(255,110,36,0.58)" }));
+    this.world?.queueEffect?.("ring", this.x, this.y, { size: Math.max(26, this.radius * 1.35), life: 0.26, color: "rgba(255,110,36,0.58)" });
     const now = Number(this.world?.time || 0);
     if (force || !already || now >= Number(this.nextBurnVoiceAt || -999)) {
       this.nextBurnVoiceAt = now + 2.6;
       this.bubble?.("\u3042\u3061\u3085\u3044\uff01", 1.35, "rgba(214,82,38,0.90)", { force: true });
     }
     this.recordChangeCause?.("\u708e\u4e0a", "\u708e\u4e0a");
+    if (!already) this.world?.log?.(`${this.name}\u306b\u706b\u304c\u71c3\u3048\u79fb\u3063\u305f\u3002`, "accident", { participants: [this] });
     if (ignitedDuringBirthRitual) globalThis.TarinaiAchievements?.recordIgnition?.({ world: this.world, tarinai: this, source });
     return true;
   },
@@ -614,7 +612,8 @@
     this.firePanicTimer = Math.max(this.firePanicTimer || 0, 0.25);
     this.hurtTimer = Math.max(this.hurtTimer || 0, 0.35);
     if (reason) this.thought = reason;
-    this.world?.effects?.push(new Effect("ring", this.x, this.y, { size: Math.max(22, this.radius * 1.2), life: 0.22, color: "rgba(108,192,236,0.60)" }));
+    this.world?.queueEffect?.("ring", this.x, this.y, { size: Math.max(22, this.radius * 1.2), life: 0.22, color: "rgba(108,192,236,0.60)" });
+    this.world?.log?.(`${this.name}\u306e\u706b\u304c\u6d88\u3048\u305f\u3002`, "accident", { participants: [this] });
     return true;
   },
 
@@ -689,9 +688,9 @@
       if (this.addStress) this.addStress(dt * 0.22, { threshold: 9, duration: 3.6 });
       if (deterministicChance(this.world, "explosion-disease-spark", dt * 2.1, this)) {
         const a = deterministicAngle(this.world, "explosion-disease-spark-angle", this);
-        this.world?.effects?.push(new Effect("explosion", this.x + Math.cos(a) * this.radius * deterministicRange(this.world, "explosion-disease-spark-rx", 0.2, 0.9, this), this.y + Math.sin(a) * this.radius * deterministicRange(this.world, "explosion-disease-spark-ry", 0.1, 0.8, this), {
+        this.world?.queueEffect?.("explosion", this.x + Math.cos(a) * this.radius * deterministicRange(this.world, "explosion-disease-spark-rx", 0.2, 0.9, this), this.y + Math.sin(a) * this.radius * deterministicRange(this.world, "explosion-disease-spark-ry", 0.1, 0.8, this), {
           vx: Math.cos(a) * deterministicRange(this.world, "explosion-disease-spark-vx", 10, 38, this), vy: Math.sin(a) * deterministicRange(this.world, "explosion-disease-spark-vy", 10, 38, this) - deterministicRange(this.world, "explosion-disease-spark-up", 8, 22, this), size: deterministicRange(this.world, "explosion-disease-spark-size", 5, 12, this), life: deterministicRange(this.world, "explosion-disease-spark-life", 0.18, 0.42, this), color: "rgba(255,64,48,0.86)"
-        }));
+        });
       }
       if (this.explosionDiseaseTimer <= 0.01) {
         this.world?.explodeDiseaseTarinai?.(this);
diff --git a/js/tarinai_food_interaction_system.js b/js/tarinai_food_interaction_system.js
index 724f04a..046142d 100644
--- a/js/tarinai_food_interaction_system.js
+++ b/js/tarinai_food_interaction_system.js
@@ -3,6 +3,34 @@
 // Food, medicine, grass, ant-corpse, and zunchi eating branch for Tarinai item interaction.
 
 (function (global) {
+  const OCHIBI_DIRTY_SPEECHES = [
+    { id: "voice_ochibi_dirty_001", text: "くちゃいのだ" },
+    { id: "voice_ochibi_dirty_002", text: "ずんちがめだまについたのだ！" },
+    { id: "voice_ochibi_dirty_003", text: "おえええ！" },
+    { id: "voice_ochibi_dirty_004", text: "ずんちがおくちについたのだ！" }
+  ];
+
+  function maybePlayOchibiDirtySpeech(tarinai, delta = 0) {
+    if (!tarinai || !tarinai.isAcquiredTarinai || tarinai.dead) return false;
+    if (!(delta > 0.01)) return false;
+    const now = Number(tarinai.world?.time || 0) || 0;
+    const nextAllowed = Number(tarinai.ochibiDirtySpeechCooldownUntil || 0) || 0;
+    const lastLevel = Number(tarinai.ochibiDirtySpeechLastLevel || 0) || 0;
+    const currentLevel = Number(tarinai.zunchiStain || 0) || 0;
+    if (now < nextAllowed && currentLevel < lastLevel + 5) return false;
+    if ((tarinai.nextBubbleAt || 0) > now) return false;
+    const idx = Math.floor(Math.random() * OCHIBI_DIRTY_SPEECHES.length) % OCHIBI_DIRTY_SPEECHES.length;
+    const line = OCHIBI_DIRTY_SPEECHES[idx];
+    if (!line) return false;
+    const bubbled = tarinai.bubble?.(line.text, 4.8, "rgba(82,66,42,0.84)");
+    if (!bubbled) return false;
+    const audio = global.TarinaiAudio;
+    if (audio?.playSample) audio.playSample(line.id, 1.5, "voice") || audio.play?.(line.id, { category: "voice", minGap: 1.5 });
+    else if (audio?.play) audio.play(line.id, { category: "voice", minGap: 1.5 });
+    tarinai.ochibiDirtySpeechCooldownUntil = now + 3.2;
+    tarinai.ochibiDirtySpeechLastLevel = currentLevel;
+    return true;
+  }
   function updateCandidate(tarinai, ctx, it, dt = 0) {
     if (!tarinai || tarinai.dead || !ctx || !it || it.dead) return false;
     if (it.type === "duplicator" && global.TarinaiSignalSystem?.powerOverride?.(it) === false) return false;
@@ -12,6 +40,7 @@ const contact = global.TarinaiItemInteractionContext.contactForCandidate(tarinai
 if (!contact) return false;
 const d = contact.distance;
 const foodType = it.type === "duplicator" ? (it.storedFoodType || "") : it.type;
+if (tarinai.isZunchiSlave && foodType === "sweet") return false;
 const duplicatorConsumable = it.type === "duplicator" && foodType && (foodType === "sweet" ? canSweetBite : (canBite || foodActionActive)) && !(isParamEffectItemType(foodType)) && foodType !== "sleep_drug" && foodType !== "love_mochi" && foodType !== "fight_mochi";
     
 if (((foodType === "sweet" && canSweetBite) || (foodType === "food" && (canBite || foodActionActive)) || duplicatorConsumable) && tarinai.foodItemHasServingLeft(it)) {
@@ -156,7 +185,7 @@ if (it.type === "zunchi") {
     applyNeedShock(tarinai, { health: touch * dt * 7, safety: touch * dt * 4 });
     if (touch > 0.08) tarinai.adjustPersonality("neuroticism", -dt * touch * 0.0045, "after repeated contact with poop.");
   }
-  tarinai.zunchiStain = clamp((tarinai.zunchiStain || 0) + touch * dt * (tarinai.isZunchiSlave ? 5.2 : 9.5), 0, 100);
+  { const __prev = Number(tarinai.zunchiStain || 0) || 0; tarinai.zunchiStain = clamp((tarinai.zunchiStain || 0) + touch * dt * (tarinai.isZunchiSlave ? 5.2 : 9.5), 0, 100); maybePlayOchibiDirtySpeech(tarinai, (Number(tarinai.zunchiStain || 0) || 0) - __prev); }
   const emergencyHunger = (tarinai.hunger || 0) >= 104 || foodNeed >= 94;
   const zunchiTooFresh = zunchiEatingBlocked(tarinai, it, tarinai.world) || (!emergencyHunger && !tarinai.isZunchiSlave && it.stage === "fresh" && (it.age || 0) < 150 && foodNeed < 94 && (tarinai.hunger || 0) < 104);
   if (canZunchiBite && !zunchiTooFresh) {
@@ -170,7 +199,7 @@ if (it.type === "zunchi") {
     tarinai.recoverHealth(bite * (tarinai.isZunchiSlave ? 0.10 : 0.02));
     applyNeedShock(tarinai, { health: bite * (tarinai.isZunchiSlave ? 0.2 : 1.2), safety: bite * (tarinai.isZunchiSlave ? 0.1 : 0.6) });
     if (!tarinai.isZunchiSlave) tarinai.adjustPersonality("neuroticism", -bite * 0.0015, "after repeated contact with poop.");
-    tarinai.zunchiStain = clamp((tarinai.zunchiStain || 0) + bite * (tarinai.isZunchiSlave ? 0.75 : 1.75), 0, 100);
+    { const __prev = Number(tarinai.zunchiStain || 0) || 0; tarinai.zunchiStain = clamp((tarinai.zunchiStain || 0) + bite * (tarinai.isZunchiSlave ? 0.75 : 1.75), 0, 100); maybePlayOchibiDirtySpeech(tarinai, (Number(tarinai.zunchiStain || 0) || 0) - __prev); }
     tarinai.lastMealColor = "#6b8d3f";
     tarinai.eatTimer = Math.max(tarinai.eatTimer, 1.0);
     tarinai.eatCooldown = rand(1.0, 1.22);
diff --git a/js/tarinai_forced_behavior.js b/js/tarinai_forced_behavior.js
index 19e80b8..c0c55e1 100644
--- a/js/tarinai_forced_behavior.js
+++ b/js/tarinai_forced_behavior.js
@@ -145,6 +145,9 @@ function clearForcedBehaviorQueue(tarinai, predicate = null) {
 }
 
 function behaviorText(tarinai) {
+  if (tarinai?.state === "build_memorial") return "親しいたりないの墓を作っている。";
+  if (tarinai?.state === "mourn_grave") return "親しいたりないの墓が壊されて泣いている。";
+  if (tarinai?.state === "bell_call") return "呼び鈴の鳴った場所に集まっている。";
   const b = currentTarinaiBehavior(tarinai);
   if (!b) return "";
   const state = String(tarinai.state || "");
diff --git a/js/tarinai_identity_social.js b/js/tarinai_identity_social.js
index 0734130..7a0757c 100644
--- a/js/tarinai_identity_social.js
+++ b/js/tarinai_identity_social.js
@@ -78,11 +78,19 @@
 
   syncGrowthScale() {
     if (!Number.isFinite(this.adultScale)) this.adultScale = adultScaleFromGenetics(this.familyKey || this.id, this.genetics);
-    const nextScale = this.generation > 1 ? scaleForGrowth(this.adultScale, this.growth) : this.adultScale;
+    const currentGrowth = this.growth;
+    const isJuvenileNow = this.generation > 1 && currentGrowth < 1;
+    if (this.generation > 1) {
+      if (this._growthWasJuvenile === true && !isJuvenileNow) {
+        this.world?.log?.(`${this.name}\u304c\u6210\u9577\u3057\u3066\u6210\u4f53\u306b\u306a\u3063\u305f\u3002`, "birth", { participants: [this] });
+      }
+      this._growthWasJuvenile = isJuvenileNow;
+    }
+    const nextScale = this.generation > 1 ? scaleForGrowth(this.adultScale, currentGrowth) : this.adultScale;
     this.scale = clamp(nextScale, 0.10, 0.42);
     if (this.refreshEffectiveSize) this.refreshEffectiveSize();
     else this.radius = 56 * this.scale;
-    const growthBucket = Math.floor(clamp(this.growth || 0, 0, 1) * 20);
+    const growthBucket = Math.floor(clamp(currentGrowth || 0, 0, 1) * 20);
     if (this.generation > 1 && this.world?.recordFamily && this.familyJoined?.() && this.familyGrowthBucket !== growthBucket) {
       this.familyGrowthBucket = growthBucket;
       this.world.recordFamily(this);
@@ -257,13 +265,15 @@
   adjustRelation(other, affinityDelta = 0, fearDelta = 0, event = "") {
     if (!other || !other.id || other === this) return;
     const rel = this.relationTo(other.id);
+    const threshold = typeof FRIEND_AFFINITY_THRESHOLD === "number" ? FRIEND_AFFINITY_THRESHOLD : 14;
+    const reverseBefore = other.relationships?.[this.id] || null;
+    const wasFriend = Math.max(rel.affinity || 0, reverseBefore?.affinity || 0) >= threshold;
     rel.affinity = clamp((rel.affinity || 0) + affinityDelta, -24, 40);
     rel.fear = clamp((rel.fear || 0) + fearDelta, 0, 40);
     rel.fightsWon = rel.fightsWon || 0;
     rel.fightsLost = rel.fightsLost || 0;
     if (event) { rel.lastEvent = event; rel.lastTime = this.world.time; }
     this.relationCache = null;
-    const threshold = typeof FRIEND_AFFINITY_THRESHOLD === "number" ? FRIEND_AFFINITY_THRESHOLD : 14;
     if (affinityDelta > 0 && rel.affinity >= threshold && other.relationTo) {
       const reverse = other.relationTo(this.id);
       const mirrored = Math.max(reverse.affinity || 0, threshold + 0.25, Math.min(rel.affinity, rel.affinity * 0.78));
@@ -272,6 +282,11 @@
       if (event && !reverse.lastEvent) { reverse.lastEvent = event; reverse.lastTime = this.world?.time || other.world?.time || 0; }
       other.relationCache = null;
     }
+    const reverseAfter = other.relationships?.[this.id] || null;
+    const isFriend = Math.max(rel.affinity || 0, reverseAfter?.affinity || 0) >= threshold;
+    if (!wasFriend && isFriend) {
+      this.world?.log?.(`${this.name}\u3068${other.name}\u306f\u53cb\u9054\u306b\u306a\u3063\u305f\u3002`, "relation", { participants: [this, other] });
+    }
   },
 
   strongestRelation(kind = "friend", liveOnly = true) {
diff --git a/js/tarinai_item_effects.js b/js/tarinai_item_effects.js
index 8e3fd77..570057f 100644
--- a/js/tarinai_item_effects.js
+++ b/js/tarinai_item_effects.js
@@ -295,7 +295,7 @@
       const x = this.x - side * this.radius * rand(0.72, 0.96);
       const y = this.y + this.radius * rand(0.25, 0.48);
       this.poopCount = (this.poopCount || 0) + 1;
-      this.world.spawnZunchi?.(x, y);
+      this.world.spawnZunchi?.(x, y, this);
       this.digest = Math.max(0, (this.digest || 0) - 3.0);
       const now = this.world?.time || 0;
       this.bubble("\u3076\u308a\u3085\u3063", 1.2, effectColor("laxative"), { force: true });
diff --git a/js/tarinai_item_interaction_system.js b/js/tarinai_item_interaction_system.js
index d63a73e..d5585b3 100644
--- a/js/tarinai_item_interaction_system.js
+++ b/js/tarinai_item_interaction_system.js
@@ -18,6 +18,7 @@
       }
       global.TarinaiContactItemSystem.updateCandidate(this, ctx, item, dt);
     }
+    global.TarinaiContactItemSystem.updateResidues?.(this, dt);
     global.TarinaiItemInteractionContext.finalize(this);
     return true;
   }
diff --git a/js/tarinai_item_targeting.js b/js/tarinai_item_targeting.js
index 33ef48a..abfc987 100644
--- a/js/tarinai_item_targeting.js
+++ b/js/tarinai_item_targeting.js
@@ -73,6 +73,8 @@ function foodPriorityRank(tarinai, item) {
   const need = getTarinaiBehaviorNeed(tarinai);
   const socialNeed = Number(tarinai?.needRaw?.social ?? tarinai?.needs?.social ?? 0) || 0;
   const healthNeed = Number(tarinai?.needRaw?.health ?? tarinai?.needs?.health ?? 0) || 0;
+  if (tarinai?.isZunchiSlave && type === "sweet") return -1;
+  if (tarinai?.isZunchiSlave && type === "zunchi") return 6200;
   if (type === "sweet") return 4300 + Math.min(120, Math.max(0, healthNeed - 40) * 3);
   if (type === "water") return 3650 + Math.max(0, healthNeed - 42) * 7;
   if (type === "zunda_juice") return 3720 + Math.max(0, healthNeed - 42) * 6;
@@ -106,6 +108,7 @@ function foodPriorityScore(tarinai, item, distance = 0) {
 
 function hasBetterFoodThanZunchiNearby(tarinai, world, maxDist = 180) {
   if (!tarinai || !world) return false;
+  if (tarinai.isZunchiSlave) return false;
   const source = world.nearbyFood?.(tarinai.x, tarinai.y, maxDist, true) || world.nearbyItems?.(tarinai.x, tarinai.y, maxDist, true) || world.items || [];
   for (const it of source) {
     if (!it || it.dead) continue;
diff --git a/js/tarinai_needs_items.js b/js/tarinai_needs_items.js
index b5aaac7..6acd114 100644
--- a/js/tarinai_needs_items.js
+++ b/js/tarinai_needs_items.js
@@ -115,7 +115,13 @@ function updateNeeds(tarinai, world, dt = 0) {
     ? (world?.nearestOther?.(tarinai, 780, other => other && other !== tarinai && !other.dead && other.isTarinaiChampion && !world.areParentChild?.(tarinai, other) && !!tarinai.isZunchiSlave === !!other.isZunchiSlave && !other.sleepDisease && !other.fightDisease && (other.reproductionTimer || 0) <= 10) || null)
     : null;
   if (championMate) { socialParts.mate += 48; socialParts.championMate = 1; raw.social += 48; }
-  else if ((tarinai.reproductionTimer || 0) <= 8 && !tarinai.hasPaired) { socialParts.mate += 16 + ((tarinai.loveMochiTimer || 0) > 0.04 ? 42 : 0); raw.social += socialParts.mate; }
+  else if (!tarinai.juvenile && (tarinai.reproductionTimer || 0) <= 8 && !tarinai.hasPaired && (world?.canAddTarinai?.(1) ?? true)) {
+    // Mating is its own relationship sub-need.  It must remain actionable even
+    // after ordinary loneliness has been relieved by a larger colony; otherwise
+    // only the initial lonely generation ever seeks a partner.
+    socialParts.mate += 28 + ((tarinai.loveMochiTimer || 0) > 0.04 ? 42 : 0);
+    raw.social += socialParts.mate;
+  }
   const enemy = tarinai.strongestRelation?.("fear");
   if (enemy?.score > 12) { socialParts.fearSocial += 10; raw.social += 10; }
   const conflict = evaluateConflictUrge(tarinai, world, 112);
@@ -176,6 +182,15 @@ function updateNeeds(tarinai, world, dt = 0) {
   raw.health *= clamp(1 + Math.max(0, neuroticism) * 0.14, 0.9, 1.22);
   raw.fulfill *= clamp(1 + Math.max(0, openness) * 0.14, 0.9, 1.24);
 
+  // おちびは、通常個体よりも精神的な負荷が高い状態を基準にする。
+  // ここで加算することで、初回の needs 再計算で初期ストレスが消えない。
+  if (tarinai.isAcquiredTarinai) {
+    raw.health += 44;
+    raw.safety += 84;
+    raw.social += 20;
+    raw.fulfill += 34;
+  }
+
   decayNeedSatisfaction(tarinai, dt);
   const effective = createDefaultNeeds();
   const display = createDefaultNeeds();
@@ -334,9 +349,17 @@ function shouldStartActionBySubNeed(tarinai, action, needs) {
     if (subValue >= threshold) return true;
     return isContinuingSameAction && subValue >= threshold * 0.55;
   }
-  if (subNeed === "mate" || subNeed === "conflict") {
-    const relationDrive = Math.max(Number(parts.mate || 0) || 0, Number(parts.conflict || 0) || 0, compatibleSocialTotal * 0.36);
-    const drugBoosted = (tarinai?.loveMochiTimer || 0) > 0.04 || (tarinai?.fightMochiTimer || 0) > 0.04;
+  if (subNeed === "mate") {
+    // A ready mating drive is not the same thing as loneliness.  Requiring the
+    // aggregate social need to exceed 52 made reproduction disappear once a
+    // colony became socially dense, even though new unpaired adults were ready.
+    if (subValue >= threshold) return true;
+    if (isContinuingSameAction && subValue >= threshold * 0.55) return true;
+    return (tarinai?.loveMochiTimer || 0) > 0.04 && subValue > 0;
+  }
+  if (subNeed === "conflict") {
+    const relationDrive = Math.max(Number(parts.conflict || 0) || 0, compatibleSocialTotal * 0.36);
+    const drugBoosted = (tarinai?.fightMochiTimer || 0) > 0.04;
     return compatibleSocialTotal >= needThreshold("social", "start") && (drugBoosted || relationDrive >= Math.min(socialSubNeedStartThreshold("mate"), socialSubNeedStartThreshold("conflict")) * 0.48);
   }
   if (subValue >= threshold) return true;
@@ -637,7 +660,17 @@ function protectSleepSession(tarinai, world, needs) {
     const now = world?.time || 0;
     if (now >= (tarinai.nextSleepBubbleAt || 0)) {
       tarinai.nextSleepBubbleAt = now + rand(3.6, 5.6);
-      world?.spawnBubble?.(tarinai.x, tarinai.y - (tarinai.radius || 20) * 1.18, "Zzz...", "rgba(65,70,92,0.72)");
+      if (tarinai.isAcquiredTarinai && Math.random() < 0.42) {
+        const sleepLine = Math.random() < 0.5
+          ? { id: "voice_ochibi_sleep_002", text: "おててしゃん..." }
+          : { id: "voice_ochibi_sleep_003", text: "あんよしゃん..." };
+        if (tarinai.bubble?.(sleepLine.text, 2.8, "rgba(65,70,92,0.72)", { force: true })) {
+          const a = globalThis.TarinaiAudio;
+          if (a?.playSample) a.playSample(sleepLine.id, 1.0, "voice") || a.play?.(sleepLine.id, { category: "voice", minGap: 1.0 });
+        }
+      } else {
+        world?.spawnBubble?.(tarinai.x, tarinai.y - (tarinai.radius || 20) * 1.18, "Zzz...", "rgba(65,70,92,0.72)");
+      }
     }
     return true;
   }
@@ -880,10 +913,11 @@ function resolveNeedsCore(dt) {
     if (this.dead) return this.variantSprite("fear");
     if (this.state === "sunbath" || (this.sunbathTimer || 0) > 0.04) return this.sunbathSpriteId ? this.sunbathSpriteId() : "sunbath_1";
     if (this.sleepDisease) return this.variantSprite("sleep");
+    if (Number(this._bearTrapHoldUntil || 0) > Number(this.world?.time || 0)) return this.variantSprite("hurt");
     if (this.isZunchiSlave) return this.zunchiSlaveSpriteId();
     const low = this.lowHealthSprite();
     if (low) return low;
-    if ((this.state === "seek_food" || this.state === "idle" || this.state === "follow_parent") && (this.vy < -18 || (this.target && this.target.y < this.y - 36 && Math.abs(this.target.y - this.y) > Math.abs(this.target.x - this.x) * 0.55))) return "back";
+    if (!this.isAcquiredTarinai && (this.state === "seek_food" || this.state === "idle" || this.state === "follow_parent") && (this.vy < -18 || (this.target && this.target.y < this.y - 36 && Math.abs(this.target.y - this.y) > Math.abs(this.target.x - this.x) * 0.55))) return "back";
     if (this.explosionDisease && Math.sin((this.world?.time || 0) * 8) > 0.15) return "pokan";
     if (this.fightDisease) return "stress_dizzy";
     if ((this.oshiriByoZunchiStock || 0) >= 6) return this.variantSprite ? this.variantSprite("hurt") : "weak";
@@ -897,7 +931,9 @@ function resolveNeedsCore(dt) {
     if (this.birthRitualTimer > 0.04 || this.state === "birth_ritual") return "birth_ritual";
     if (foodNeedForSprite >= 72) return "hungry_70";
     if (this.defeatedTimer > 0.04) return this.variantSprite("flee");
-    if (this.state === "intimidate" || this.state === "ant_intimidate" || this.intimidateTimer > 0.04) return this.variantSprite("intimidate");
+    if (this.state === "intimidate" || this.state === "ant_intimidate" || this.intimidateTimer > 0.04) {
+      return globalThis.prepareTarinaiIntimidatePresentation?.(this) || this.intimidateSpriteVariant || "intimidate";
+    }
     if (this.state === "panic" || this.state === "cursor_enemy" || this.fearTimer > 0.08 || this.intimidatedTimer > 0.08) return this.variantSprite("fear");
     if (this.state === "fight" || this.state === "seek_enemy" || this.fightTimer > 0.04) return "angry";
     if (this.stress > 62) return this.variantSprite("stress");
@@ -931,7 +967,8 @@ function resolveNeedsCore(dt) {
     const next = this.rawSpriteId();
     const isCurrentIntimidator = this.state === "intimidate" || this.state === "ant_intimidate" || this.intimidateTimer > 0.04;
     const isCurrentIntimidated = !isCurrentIntimidator && this.intimidatedTimer > 0.04;
-    const forceImmediate = String(next || "").startsWith("zunchi_slave") || next === "birth_ritual" || next === "intimidate" || isCurrentIntimidator || isCurrentIntimidated || (this.visibleSpriteId === "intimidate" && next !== "intimidate");
+    const trappedNow = Number(this._bearTrapHoldUntil || 0) > now;
+    const forceImmediate = trappedNow || String(next || "").startsWith("zunchi_slave") || next === "birth_ritual" || String(next || "").startsWith("intimidate") || isCurrentIntimidator || isCurrentIntimidated || (String(this.visibleSpriteId || "").startsWith("intimidate") && !String(next || "").startsWith("intimidate"));
     if (!this.visibleSpriteId || forceImmediate) {
       this.visibleSpriteId = next;
       this.spriteLockUntil = forceImmediate ? now : now + 1.0;
@@ -1027,6 +1064,7 @@ function resolveNeedsCore(dt) {
   },
 
   canStartSunbath(options = {}) {
+    if (this.isAcquiredTarinai || this.mamekusaredakeDisease) return false;
     if (this.dead || this.sleeping) return false;
     if (!Number.isFinite(this.x) || !Number.isFinite(this.y)) return false;
     if (!Number.isFinite(this.world?.w) || !Number.isFinite(this.world?.h)) return false;
@@ -1109,9 +1147,26 @@ function resolveNeedsCore(dt) {
   },
 
   bubble(text, cooldown = 2.4, color = "rgba(42,36,29,0.78)", options = {}) {
+    const bubbleText = String(text || "");
+    if (this.isAcquiredTarinai) {
+      const allowSubstring = ["Zzz", "あちゅい", "もぐ", "ぶるぶる"];
+      const allowExact = new Set([
+        "パパずんはどこなのだ？", "ママずんはどこなのだ？", "こんなはずじゃなかったのだ", "どうして", "おまえをゆるさないのだ", "のろってやるのだ",
+        "てあしをかえせなのだ", "すべすべしっぽしゃんが", "くちょにんげん",
+        "ぼくはゆうしゅうなのだ", "しあわせなのだ", "てあしがなくてもげんきなのだ", "へこへこしたいのだ", "のだのだのだ",
+        "くちょおやがいなくてもぼくはたたかえるのだ", "ぼくはげんきいっぱいなのだ", "かっきにみちみちしているのだ", "ずんちでそう",
+        "くちゃいのだ", "ずんちがめだまについたのだ！", "おえええ！", "ずんちがおくちについたのだ！",
+        "いちゃい！", "ごふっ", "ああああああああ",
+        "ぷきゅー！", "くるち、くるち", "おててしゃん...", "あんよしゃん...", "ちね！", "きょわいのだ...", "びりびりちゃ！", "おみじゅ...", "なんでぼくがこんなめに..."
+      ]);
+      const plainPunct = /^[!?！？…\.。ー〜～]+$/.test(bubbleText);
+      const allowed = plainPunct || allowExact.has(bubbleText) || allowSubstring.some(part => bubbleText.includes(part));
+      if (!allowed) return false;
+    }
     if (!options.force && this.world.time < this.nextBubbleAt) return false;
+    const spawned = this.world.spawnBubble(this.x, this.y - this.radius * 1.35, bubbleText, color);
+    if (!spawned) return false;
     this.nextBubbleAt = this.world.time + cooldown;
-    this.world.spawnBubble(this.x, this.y - this.radius * 1.35, text, color);
     return true;
   },
 
diff --git a/js/tarinai_nest_sleep_system.js b/js/tarinai_nest_sleep_system.js
index 4fb5cdd..c153ff4 100644
--- a/js/tarinai_nest_sleep_system.js
+++ b/js/tarinai_nest_sleep_system.js
@@ -35,15 +35,16 @@
 
   function nestBoxCapacity(worldRef, box = null) {
     if (typeof worldRef?.nestBoxCapacity === "function") return worldRef.nestBoxCapacity(box);
-    if (box?.type === "pipe") return Math.max(3, pipeItems(worldRef).length * 3);
+    if (box?.type === "pipe") return 3;
     return 5;
   }
 
   function nestBoxOccupants(worldRef, box, limit = 5) {
     if (!worldRef || !box || box.dead || !isNestContainer(box)) return [];
-    const occupants = box.type === "pipe"
-      ? (worldRef.tarinai || []).filter(t => tarinaiInsidePipeNetwork(worldRef, t))
-      : (worldRef.tarinai || []).filter(t => t && !t.dead && t.insideNestBoxId === box.id);
+    // Each pipe mouth has its own local sleeping capacity. The underground
+    // network is still shared for exits, but occupancy/reservations must stay
+    // attached to the entrance pipe or every tarinai piles into the nearest one.
+    const occupants = (worldRef.tarinai || []).filter(t => t && !t.dead && t.insideNestBoxId === box.id);
     return Number.isFinite(limit) ? occupants.slice(0, Math.max(0, limit)) : occupants;
   }
 
@@ -65,15 +66,57 @@
     if (box.type === "pipe" && t.insideNestBoxId && tarinaiInsidePipeNetwork(t.world || null, t)) return false;
     if (box.type !== "pipe" && t.insideNestBoxId === box.id) return false;
     const target = tarinaiTargetContainer(t);
-    if (box.type === "pipe") {
-      if (target?.type !== "pipe") return false;
-    } else if (target !== box) return false;
+    if (target !== box) return false;
     if (t._nestBoxAvoidId === box.id && now < (t._nestBoxAvoidUntil || -Infinity)) return false;
     const seekingNest = t.state === "seek_bed" || t.state === "sleep" || t.sleeping || t.state === "seek_temperature" || t.behavior?.actionId === "sleep_in_bed";
     if (!seekingNest) return false;
     return true;
   }
 
+
+  function nestOccupantPriority(tarinai) {
+    if (!tarinai) return -1;
+    if (tarinai.isTarinaiChampion) return 2;
+    if (tarinai.isZunchiSlave) return 0;
+    return 1;
+  }
+
+  function lowerPriorityNestOccupant(worldRef, box, entrant, occupants = null) {
+    const entrantPriority = nestOccupantPriority(entrant);
+    const list = Array.isArray(occupants) ? occupants : nestBoxOccupants(worldRef, box, Infinity);
+    let best = null;
+    let bestPriority = Infinity;
+    for (const occupant of list || []) {
+      if (!occupant || occupant.dead || occupant === entrant) continue;
+      const priority = nestOccupantPriority(occupant);
+      if (priority >= entrantPriority) continue;
+      if (priority < bestPriority) {
+        best = occupant;
+        bestPriority = priority;
+      }
+    }
+    return best;
+  }
+
+  function lowerPriorityNestReservation(worldRef, box, entrant) {
+    if (!worldRef || !box || !entrant) return null;
+    const now = Number(worldRef.time || 0) || 0;
+    const entrantPriority = nestOccupantPriority(entrant);
+    let best = null;
+    let bestPriority = Infinity;
+    for (const candidate of worldRef.tarinai || []) {
+      if (!candidate || candidate.dead || candidate === entrant) continue;
+      if (!tarinaiIsReservingNest(candidate, box, now)) continue;
+      const priority = nestOccupantPriority(candidate);
+      if (priority >= entrantPriority) continue;
+      if (priority < bestPriority) {
+        best = candidate;
+        bestPriority = priority;
+      }
+    }
+    return best;
+  }
+
   function nestBoxReservationCount(worldRef, box) {
     if (!worldRef || !box || box.dead || !isNestContainer(box)) return 0;
     const now = Number(worldRef.time || 0) || 0;
@@ -114,8 +157,11 @@
     if (sleepTargetBlocked(worldRef, tarinai, item)) return false;
     const capacity = isNestContainer(item) ? nestBoxCapacity(worldRef, item) : 1;
     const occupancy = bedOccupancy(worldRef, item);
-    if (tarinai?.isTarinaiChampion && item.type === "nest_box") return true;
-    return occupancy < capacity || tarinai.target === item || (tarinai.insideNestBoxId && tarinai.insideNestBoxId === item.id);
+    if (tarinai.target === item || (tarinai.insideNestBoxId && tarinai.insideNestBoxId === item.id)) return true;
+    if (occupancy < capacity) return true;
+    if (!isNestContainer(item)) return false;
+    const occupants = nestBoxOccupants(worldRef, item, Infinity);
+    return Boolean(lowerPriorityNestOccupant(worldRef, item, tarinai, occupants) || lowerPriorityNestReservation(worldRef, item, tarinai));
   }
 
   function findStructure(worldRef, tarinai, opts = {}) {
@@ -159,7 +205,12 @@
       const d = distFn(tarinai, item);
       if (d > maxDist) continue;
       const comfort = bedComfort(worldRef, item);
-      const score = d - comfort * 18;
+      const occupancy = bedOccupancy(worldRef, item);
+      const pipeLoadPenalty = type === "pipe" ? occupancy * 44 : 0;
+      const spread = type === "pipe" && typeof global.stableUnit === "function"
+        ? global.stableUnit(tarinai?.id || tarinai?.familyKey || "tarinai", `pipe-choice:${item.id || "pipe"}`) * 14
+        : 0;
+      const score = d - comfort * 18 + pipeLoadPenalty + spread;
       if (score < bestScore) { best = item; bestScore = score; }
     }
     return best;
@@ -191,5 +242,7 @@
     nearestSleepPlaceOfType,
     findPrioritySleepPlaceBeforeGrassBedBuild,
     findNearestSleepPlace,
+    nestOccupantPriority,
+    lowerPriorityNestOccupant,
   });
 })(typeof window !== "undefined" ? window : globalThis);
diff --git a/js/tarinai_render.js b/js/tarinai_render.js
index c37bf6e..dc3e1e5 100644
--- a/js/tarinai_render.js
+++ b/js/tarinai_render.js
@@ -1,5 +1,13 @@
 "use strict";
 
+function drawAcquiredTarinaiOverlay(ctx, tarinai, drawW, drawH) {
+  if (!tarinai?.isAcquiredTarinai) return false;
+  const overlay = getRenderableImage("acquired_tarinai_overlay", "");
+  if (!overlay) return false;
+  ctx.drawImage(overlay, -drawW / 2, -drawH / 2, drawW, drawH);
+  return true;
+}
+
 function tarinaiSpriteReversesFacing(sprite) {
   const id = String(sprite || "");
   return id === "back" || id === "tarinai12_back" || /(^|_)12_back$/i.test(id);
@@ -170,6 +178,7 @@ function tarinaiSpriteReversesFacing(sprite) {
       ctx.fill();
       ctx.stroke();
     }
+    drawAcquiredTarinaiOverlay(ctx, this, drawW, drawH);
     ctx.restore();
 
     if (showDecor) {
@@ -200,6 +209,11 @@ function tarinaiSpriteReversesFacing(sprite) {
     const showDecor = shouldShowTarinaiDecor(this);
     if (sunbathActive) this.preloadSunbathSprites?.();
     let sprite = this.spriteId();
+    if (this.isAcquiredTarinai && tarinaiSpriteReversesFacing(sprite)) {
+      const fallbackOchibiSprite = this.applyTemperatureSprite?.(this.goodMode || this.type || "smile") || this.goodMode || this.type || "smile";
+      this.visibleSpriteId = "";
+      sprite = fallbackOchibiSprite;
+    }
     if (!sunbathActive && String(sprite || "").startsWith("sunbath")) {
       this.visibleSpriteId = "";
       this.spriteLockUntil = 0;
@@ -249,10 +263,13 @@ function tarinaiSpriteReversesFacing(sprite) {
     const fearShakeY = this.intimidatedTimer > 0.04 ? Math.sin(t * 52 + this.age * 0.7) * this.radius * 0.11 : 0;
     const birthShake = this.birthRitualTimer > 0.04 ? Math.sin(t * 34 + this.age) * this.radius * 0.07 : 0;
     const coldStatus = this.temperatureStatus || this.world?.temperatureStatusFor?.(this.feltTemperature ?? this.tempComfort ?? (CONFIG.standardTemperature ?? 15), this) || null;
+    const trappedShakeActive = Number(this._bearTrapHoldUntil || 0) > Number(this.world?.time || 0);
     const coldShakeActive = Boolean(coldStatus && coldStatus.direction === "cold" && (coldStatus.discomfort || 0) > 0.5 && this.state !== "sunbath");
     const coldShakeStrength = coldShakeActive ? clamp((coldStatus.discomfort || 0) / 12, 0.25, 1.25) : 0;
-    const coldShakeX = coldShakeActive ? (Math.sin(t * 46 + this.age * 0.9) + Math.sin(t * 71 + this.age * 0.31) * 0.55) * this.radius * 0.035 * coldShakeStrength : 0;
-    const coldShakeY = coldShakeActive ? Math.sin(t * 58 + this.age * 0.47) * this.radius * 0.012 * coldShakeStrength : 0;
+    const trapShakeStrength = trappedShakeActive ? 1.05 : 0;
+    const shakeStrength = Math.max(coldShakeStrength, trapShakeStrength);
+    const coldShakeX = (coldShakeActive || trappedShakeActive) ? (Math.sin(t * 46 + this.age * 0.9) + Math.sin(t * 71 + this.age * 0.31) * 0.55) * this.radius * 0.035 * shakeStrength : 0;
+    const coldShakeY = (coldShakeActive || trappedShakeActive) ? Math.sin(t * 58 + this.age * 0.47) * this.radius * 0.012 * shakeStrength : 0;
     const bob = breathing * (this.state === "sleep" ? 0.9 : 1.2 + gait * 1.6) + headbuttPulse * 0.9 + fallLift + birthShake * 0.25;
     const blastSpin = this.blastSpinTimer > 0.04 ? this.fallDir * ((this.blastSpinMax || 1) - this.blastSpinTimer) * Math.PI * 70.0 : 0;
     const fallSpin = this.blastSpinTimer > 0.04 ? blastSpin : (fallPose > 0 ? this.fallDir * (1 - fallPose) * Math.PI * 2 : 0);
@@ -270,13 +287,17 @@ function tarinaiSpriteReversesFacing(sprite) {
       drawW *= 1.16;
       drawH *= 1.24;
     }
-    if (sprite === "intimidate") {
+    if (String(sprite || "").startsWith("intimidate")) {
       drawW *= 1.32;
       drawH *= 1.32;
     }
     if (sprite === "birth_ritual") {
-      drawW *= 0.64;
-      drawH *= 0.64;
+      // The ritual source image has a larger source canvas than ordinary tarinai
+      // sprites. Normalize its displayed bounds to the regular smile sprite so
+      // entering the ritual does not make the actor visibly grow.
+      const normalMetrics = getImageMetrics("smile") || { w: 512, h: 468 };
+      drawW = (normalMetrics.w || 512) * visualScale * 0.30;
+      drawH = (normalMetrics.h || 468) * visualScale * 0.30;
     }
     if (fallPose > 0) {
       drawW *= 1 + fallPose * 0.08;
@@ -463,17 +484,19 @@ function tarinaiSpriteReversesFacing(sprite) {
       ctx.restore();
     }
   
-    if (showDecor && (this.goodMode === "smile" || this.state === "cursor_friend") && this.mood > 58 && this.stress < 44 && this.state !== "sleep") {
+    const cursorLove = Math.max(0, this.cursorPetting || 0);
+    const cursorPettingActive = cursorLove > 0.035;
+    if (showDecor && this.state !== "sleep" && (cursorPettingActive || ((this.goodMode === "smile" || this.state === "cursor_friend") && this.mood > 58 && this.stress < 44))) {
       ctx.save();
-      const cursorLove = this.state === "cursor_friend" ? Math.max(0, this.cursorPetting || 0) : 0;
-      ctx.globalAlpha = this.state === "cursor_friend" ? clamp(0.82 + cursorLove * 0.16, 0.82, 1) : 0.34;
-      ctx.fillStyle = this.state === "cursor_friend" ? "#f05b87" : (lightState.nightStrength > 0.20 ? "#eef5ff" : (lightState.goldenStrength > 0.35 ? "#ffe398" : "#d6f5a9"));
-      const count = this.state === "cursor_friend" ? (cursorLove > 1.0 ? 10 : (cursorLove > 0.45 ? 8 : (cursorLove > 0.18 ? 6 : 4))) : 2;
+      const showPettingHearts = cursorPettingActive || this.state === "cursor_friend";
+      ctx.globalAlpha = showPettingHearts ? clamp(0.82 + cursorLove * 0.16, 0.82, 1) : 0.34;
+      ctx.fillStyle = showPettingHearts ? "#f05b87" : (lightState.nightStrength > 0.20 ? "#eef5ff" : (lightState.goldenStrength > 0.35 ? "#ffe398" : "#d6f5a9"));
+      const count = showPettingHearts ? (cursorLove > 1.0 ? 10 : (cursorLove > 0.45 ? 8 : (cursorLove > 0.18 ? 6 : 4))) : 2;
       for (let i = 0; i < count; i++) {
         const orbit = 0.24 + (i % 3) * 0.08 + cursorLove * 0.05;
         const px = Math.cos(t * 2.2 + this.age + i * 1.42) * drawW * orbit;
         const py = -drawH * (0.22 + (i % 2) * 0.06) + Math.sin(t * 2.9 + this.age * 0.2 + i) * drawH * (0.08 + cursorLove * 0.02);
-        if (this.state === "cursor_friend") {
+        if (showPettingHearts) {
           const s = Math.max(5, drawW * (0.070 + (i % 3) * 0.012 + cursorLove * 0.01));
           drawHeartShape(ctx, px, py, s, { fill: "rgba(240,91,135,0.90)", stroke: "rgba(255,252,246,0.92)", alpha: 1, rotation: Math.sin(t * 3 + i) * 0.18 });
         } else {
@@ -517,6 +540,12 @@ function tarinaiSpriteReversesFacing(sprite) {
       ctx.stroke();
       ctx.restore();
     }
+    drawAcquiredTarinaiOverlay(ctx, this, dw, dh);
+    globalThis.TarinaiMamekusaredakeSystem?.drawOnTarinai?.(ctx, this, dw, dh, faceRight, img, {
+      originX: this.x + intimidateShake + coldShakeX,
+      originY: this.y + bob + fearShakeY + coldShakeY,
+      angle
+    });
     if (img && (this.zunchiStain || 0) > 3) {
       const stainCanvas = getCachedStainOverlayCanvas(renderSprite || sprite, img, cacheW, cacheH, clamp((this.zunchiStain || 0) / 100, 0, 1), this.zunchiStainSeed || 0.5);
       if (stainCanvas) {
diff --git a/js/tarinai_social_action_runtime.js b/js/tarinai_social_action_runtime.js
index bc1a455..c05b72a 100644
--- a/js/tarinai_social_action_runtime.js
+++ b/js/tarinai_social_action_runtime.js
@@ -6,7 +6,7 @@
 function mateTargetFor(t, world, maxDist = 520) {
   if (!t || !world) return null;
   const current = currentBehaviorTarget(t) || t.target;
-  const ok = o => o && o !== t && !o.dead && !world.areParentChild?.(t, o) && !!t.isZunchiSlave === !!o.isZunchiSlave && !o.sleepDisease && !o.fightDisease && (o.reproductionTimer || 0) <= 10 && (o.fightTimer || 0) <= 0.04 && (o.birthRitualTimer || 0) <= 0.04;
+  const ok = o => o && o !== t && !o.dead && !t.juvenile && !o.juvenile && !world.areParentChild?.(t, o) && !!t.isZunchiSlave === !!o.isZunchiSlave && !o.sleepDisease && !o.fightDisease && (o.reproductionTimer || 0) <= 10 && (o.fightTimer || 0) <= 0.04 && (o.birthRitualTimer || 0) <= 0.04;
   const championOk = o => ok(o) && !!t.isTarinaiChampion && !!o.isTarinaiChampion;
   if (championOk(current) && dist(t, current) <= maxDist + 260) return current;
   if (t.isTarinaiChampion) {
@@ -61,6 +61,7 @@ function socialFightMateWeights(t, other, world, options = {}) {
     : (loveMochi ? ((t.hunger || 0) < 90 && (other.hunger || 0) < 92 && (t.energy || 0) > 18 && (other.energy || 0) > 18) : ((t.hunger || 0) < 55 && (other.hunger || 0) < 60 && (t.energy || 0) > 44 && (other.energy || 0) > 44));
   const lonelyBond = championPair || (loveMochi ? ((t.loneliness || 0) > 4 || (other.loneliness || 0) > 4 || (t.affection || 0) > 0 || (other.affection || 0) > 0) : ((t.loneliness || 0) > 24 || (other.loneliness || 0) > 24));
   const mateEligible = sameStatus
+    && !t.juvenile && !other.juvenile
     && timerOk
     && mateDistanceOk
     && !world.areParentChild?.(t, other)
diff --git a/js/tarinai_social_move_life.js b/js/tarinai_social_move_life.js
index 835cd05..6c32761 100644
--- a/js/tarinai_social_move_life.js
+++ b/js/tarinai_social_move_life.js
@@ -25,6 +25,7 @@
   const ROUTE_STATES = new Set([
     "seek_food", "seek_water", "seek_bed", "seek_material", "build", "follow_parent",
     "seek_friend", "seek_enemy", "fight", "play_ball", "play_seesaw", "ant_attack", "seek_temperature",
+    "wander", "panic", "bell_call", "build_memorial", "visit_grave",
   ]);
 
   function isNestContainerItem(item) {
@@ -199,19 +200,24 @@
     const scanLimit = (this.fightTimer > 0.04 || this.birthRitualTimer > 0.04) ? 12 : 8;
     const selfRadius = Math.max(12, Number(this.radius || 22) || 22);
     const scanRadius = Math.max(92, selfRadius * 2.0 + 52);
+    const candidateBudget = Math.max(20, scanLimit + 8);
     const selfProfile = this.personalityProfile();
     const detailed = [];
-    // nearbyTarinai() has already paid the spatial lookup cost and returns only
-    // candidates inside the requested radius when precise=true.  Do not stop at
-    // an arbitrary iteration count here: the incremental grid intentionally does
-    // not preserve bucket insertion order, so an early break can miss the actual
-    // nearest mate/contact candidates after enough cell crossings.  Keep only the
-    // nearest scanLimit entries with a tiny bounded insertion list instead.
+    let inspected = 0;
+    const currentBehavior = typeof currentTarinaiBehavior === "function" ? currentTarinaiBehavior(this) : null;
+    const currentMateTarget = (currentBehavior?.actionId === "approach_mate" || this.actionId === "approach_mate")
+      ? (currentBehavior?.target || this.target || null)
+      : null;
+    // Contact physics/social work must stay bounded in dense colonies.  Scan a
+    // small candidate budget, retain the nearest entries, and explicitly add the
+    // already-selected mate target so reproduction does not depend on spatial
+    // bucket insertion order.
     for (const o of this.world.nearbyTarinai(this.x, this.y, scanRadius, true)) {
       if (o === this || o.dead) continue;
       const dx = o.x - this.x, dy = o.y - this.y;
       const d2 = dx * dx + dy * dy;
       if (d2 > scanRadius * scanRadius || d2 < 0.0001) continue;
+      inspected += 1;
       const entry = { o, dx, dy, d2 };
       let pos = detailed.length;
       while (pos > 0 && detailed[pos - 1].d2 > d2) pos--;
@@ -219,6 +225,19 @@
         detailed.splice(pos, 0, entry);
         if (detailed.length > scanLimit) detailed.pop();
       }
+      if (inspected >= candidateBudget) break;
+    }
+    if (currentMateTarget && currentMateTarget !== this && !currentMateTarget.dead) {
+      let alreadyIncluded = false;
+      for (const entry of detailed) {
+        if (entry.o === currentMateTarget) { alreadyIncluded = true; break; }
+      }
+      if (!alreadyIncluded) {
+        const dx = currentMateTarget.x - this.x;
+        const dy = currentMateTarget.y - this.y;
+        const d2 = dx * dx + dy * dy;
+        if (d2 > 0.0001 && d2 <= scanRadius * scanRadius) detailed.push({ o: currentMateTarget, dx, dy, d2 });
+      }
     }
     for (const entry of detailed) {
       const o = entry.o;
@@ -251,9 +270,6 @@
             avoider.surpriseTimer = Math.max(avoider.surpriseTimer || 0, 0.20);
             avoider.fearTimer = Math.max(avoider.fearTimer || 0, 0.32 * avoider.personalityProfile().fear);
             if (typeof applyNeedShock === "function") applyNeedShock(avoider, { safety: dt * 26, social: dt * 5 }, champion);
-            if (this.world.relationNotice?.(avoider.id, champion.id, "tarinai-champion-avoid", 18)) {
-              this.world.log(`${avoider.name}\u306F\u305F\u308A\u306A\u3044\u738B\u8005\u306E${champion.name}\u306B\u3076\u3064\u304B\u308A\u305D\u3046\u306B\u306A\u3063\u3066\u907F\u3051\u305F\u3002`, "relation", { participants: [avoider, champion], eventType: "avoid_relationship", sound: false });
-            }
           }
           forceKingFlee(avoider, champion, dt);
           avoider.adjustRelation?.(champion, -dt * 0.025, dt * 0.18, "tarinai_champion_avoid");
@@ -360,6 +376,17 @@
           o._achievementLastFightDamageAt = this.world.time || 0;
           this.damage(damageToThis, "\u55a7\u5629");
           o.damage(damageToOther, "\u55a7\u5629");
+          const nowFightVoice = Number(this.world?.time || 0) || 0;
+          const ochibiAttackVoice = attacker => {
+            if (!attacker?.isAcquiredTarinai || nowFightVoice < Number(attacker.ochibiFightHitVoiceAt || 0)) return;
+            attacker.ochibiFightHitVoiceAt = nowFightVoice + 1.25;
+            if (attacker.bubble?.("ちね！", 1.0, "rgba(120,54,44,0.84)", { force: true })) {
+              const a = globalThis.TarinaiAudio;
+              if (a?.playSample) a.playSample("voice_ochibi_fight_hit_004", 0.8, "voice") || a.play?.("voice_ochibi_fight_hit_004", { category: "voice", minGap: 0.8 });
+            }
+          };
+          if (damageToOther > 0.01) ochibiAttackVoice(this);
+          if (damageToThis > 0.01) ochibiAttackVoice(o);
           this.world.maybeDefeatFromFightDamage?.(this, o, damageToThis);
           this.world.maybeDefeatFromFightDamage?.(o, this, damageToOther);
           this.hurtTimer = Math.max(this.hurtTimer, 1.4);
@@ -413,6 +440,8 @@
 
   move(dt) {
     if (!(this.burning || (this.burnTimer || 0) > 0.02) && this.freezeSleepDiseaseMotion(dt)) return;
+    const specialMotion = global.TarinaiMemorialBellSystem?.updateMotion?.(this, dt);
+    if (specialMotion?.handled) return;
     let ax = 0, ay = 0;
     const itemSpeedMul = this.itemSpeedMultiplier ? this.itemSpeedMultiplier() : 1;
     const baseSpeed = 46.5 * 1.5 * this.trait.speed * itemSpeedMul * (this.zunchiDisease ? 0.5 : 1) * (this.energy < 20 ? 0.42 : 1) * (this.fallTimer > 0 ? 0.35 : 1);
@@ -797,6 +826,7 @@
       if (this.sleepDisease) return "\u306d\u3080\u308a\u75c5";
       if (this.explosionDisease) return "\u7206\u767a\u75c5";
       if (this.fightDisease) return "\u304d\u305a\u3064\u304d\u75c5";
+      if (this.mamekusaredakeDisease) return "マメクサレダケ病";
       return "";
     };
     if (this.energy <= 0) {
@@ -815,6 +845,8 @@
     const finalReason = this.normalizeDeathReason ? this.normalizeDeathReason(reason, opts) : (reason || "\u4e8b\u6545");
     this.dead = true;
     this.deathReason = finalReason;
+    this.deathTime = Number(this.world?.time || 0) || 0;
+    if (this.mamekusaredakeDisease) globalThis.TarinaiMamekusaredakeSystem?.plantFromHost?.(this);
     this.world.syncTarinaiCountEntry?.(this);
     this.world.deadCount += 1;
     globalThis.TarinaiAchievements?.evaluateEvent?.(this.world, "population", { tarinai: this, delta: -1, reason: finalReason });
@@ -834,8 +866,11 @@
     this.world.drawListDirty = true;
     this.world.markItemBucketsDirty?.("tarinai-death-plushie-cleanup");
     this.world.markSpatialDirty?.("tarinai-death-plushie-cleanup");
-    this.world.addItem?.(new Item("trace", this.x, this.y), "tarinai-death-trace");
-    this.world.addItem?.(new Item("splat", this.x, this.y), "tarinai-death-splat");
+    this.world.addResidue?.("trace", this.x, this.y, { reason: "tarinai-death-trace" });
+    // Favorite Tarinai are memorialized immediately and therefore do not leave
+    // the splat resource that normal graves are built from.
+    if (!this.favorite) this.world.addResidue?.("splat", this.x, this.y, { reason: "tarinai-death-splat" });
+    this.world.markTerrainDirtyAt?.(this.x, this.y, Math.max(42, (this.radius || 22) * 2.1), "tarinai-death-remains");
     if (deterministicChance(this.world, "death-grass-spawn", 0.55, this, finalReason)) {
       const spot = this.world.findGrassPlantingSpot(this.x, this.y, { allowOriginal: false, minRadius: 26, maxRadius: 76 });
       if (spot) {
diff --git a/js/tarinai_update_policy.js b/js/tarinai_update_policy.js
index 7672eca..16c4cb6 100644
--- a/js/tarinai_update_policy.js
+++ b/js/tarinai_update_policy.js
@@ -80,9 +80,6 @@
     const isNear = isVisible || Boolean(Geometry.pointInRect(tarinai.x || 0, tarinai.y || 0, farRect));
     const motionNeed = hasMotionNeed(tarinai);
     const perfProfile = global.TarinaiPerf?.performanceProfile?.();
-    if (perfProfile?.simulationThrottled === false) {
-      return { interval: 0, lane: "quality-high", smoothMotion: false, visible: isVisible, near: isNear, urgent: false };
-    }
 
     const nestEntryActive = Boolean(tarinai.insideNestBoxId && (typeof tarinai.nestBoxEntryActive === "function" ? tarinai.nestBoxEntryActive() : ((worldRef.time || 0) < (tarinai._nestBoxEntrySmoothUntil || -Infinity) || ((tarinai.nestFade || 0) > 0.01 && (tarinai.nestFade || 0) < 0.985))));
     if (nestEntryActive) return { interval: 0, lane: "nest-entry", smoothMotion: false, visible: true, urgent: true };
@@ -92,9 +89,38 @@
       (tarinai.pokeFlashTimer || 0) > 0.03 ||
       (tarinai.entryTimer || 0) > 0.01 ||
       (tarinai.fallTimer || 0) > 0.01 ||
-      /fight|knockback|danger|hurt|ant_attack|cursor_enemy|explosion/i.test(id);
+      /knockback|danger|hurt|ant_attack|cursor_enemy|explosion/i.test(id);
     if (hardRealtimeUrgent) return { interval: 0, lane: "urgent", smoothMotion: false, visible: isVisible, urgent: true };
 
+    // Fighting used to run the complete AI/environment/health pipeline for every
+    // participant on every rendered frame. Dense conflict presets then formed a
+    // positive feedback loop of fights, effects and collision work. Keep motion
+    // smooth, but quantize the expensive full pipeline to a bounded cadence.
+    const fightUrgent = state === "fight" || (tarinai.fightTimer || 0) > 0.04 || /fight/i.test(id);
+    if (fightUrgent) {
+      // Even the full-quality profile must not execute the entire dense-fight
+      // pipeline once per rendered frame. It gets a tighter cadence than the
+      // throttled profiles, while visible motion remains interpolated.
+      const highQuality = perfProfile?.simulationThrottled === false;
+      const baseInterval = highQuality
+        ? (isVisible ? 0.035 : (isNear ? 0.07 : 0.14))
+        : (isVisible ? 0.06 : (isNear ? 0.12 : 0.24));
+      const interval = baseInterval
+        * Math.max(1, Number(perfProfile?.creatureCadenceScale || 1));
+      return {
+        interval,
+        lane: highQuality ? "fight-quality-high" : "fight",
+        smoothMotion: Boolean(isVisible && !worldRef.isTarinaiHiddenInNestBox?.(tarinai)),
+        visible: isVisible,
+        near: isNear,
+        urgent: true,
+      };
+    }
+
+    if (perfProfile?.simulationThrottled === false) {
+      return { interval: 0, lane: "quality-high", smoothMotion: false, visible: isVisible, near: isNear, urgent: false };
+    }
+
     // Panic movement must stay visually continuous, but the full creature
     // pipeline does not need to run every rendered frame. Treat panic as
     // a high-priority motion lane: AI/timers are quantized, motion-only still
diff --git a/js/tarinai_update_step_ai.js b/js/tarinai_update_step_ai.js
index 446d60d..c63d972 100644
--- a/js/tarinai_update_step_ai.js
+++ b/js/tarinai_update_step_ai.js
@@ -29,6 +29,10 @@
       // and can over-amplify safety/fear transitions when updates are sparse.
       const needStepDt = urgentAi ? 0.50 : 1.00;
       t.resolveNeeds(needStepDt);
+      if (global.TarinaiMemorialBellSystem?.updateAi?.(t, scanDt)) {
+        t.updateFacing();
+        return { done: false, special: true };
+      }
       const sleepingNow = t.state === "sleep";
       if (!sleepingNow) {
         t.reactToFreshZunchi(scanDt);
diff --git a/js/tarinai_update_step_frame.js b/js/tarinai_update_step_frame.js
index d66bbf1..006d171 100644
--- a/js/tarinai_update_step_frame.js
+++ b/js/tarinai_update_step_frame.js
@@ -18,14 +18,69 @@
     return global.deterministicChance(worldRef, salt, chance, ...parts);
   }
 
+  const OCHIBI_HIGH_STRESS_SPEECHES = [
+    { id: "voice_acquired_stress_001", text: "パパずんはどこなのだ？" },
+    { id: "voice_acquired_stress_002", text: "ママずんはどこなのだ？" },
+    { id: "voice_acquired_stress_003", text: "こんなはずじゃなかったのだ" },
+    { id: "voice_acquired_stress_004", text: "どうして" },
+    { id: "voice_acquired_stress_005", text: "おまえをゆるさないのだ" },
+    { id: "voice_acquired_stress_006", text: "のろってやるのだ" },
+    { id: "voice_acquired_stress_007", text: "てあしをかえせなのだ" },
+    { id: "voice_acquired_stress_008", text: "すべすべしっぽしゃんが" },
+    { id: "voice_acquired_stress_009", text: "くちょにんげん" },
+    { id: "voice_ochibi_stress_008", text: "なんでぼくがこんなめに..." }
+  ];
+  const OCHIBI_LOW_STRESS_SPEECHES = [
+    { id: "voice_ochibi_calm_001", text: "ぼくはゆうしゅうなのだ" },
+    { id: "voice_ochibi_calm_002", text: "しあわせなのだ" },
+    { id: "voice_ochibi_calm_003", text: "てあしがなくてもげんきなのだ" },
+    { id: "voice_ochibi_calm_004", text: "へこへこしたいのだ" },
+    { id: "voice_ochibi_calm_005", text: "のだのだのだ" },
+    { id: "voice_ochibi_calm_006", text: "くちょおやがいなくてもぼくはたたかえるのだ" },
+    { id: "voice_ochibi_calm_007", text: "ぼくはげんきいっぱいなのだ" },
+    { id: "voice_ochibi_calm_008", text: "かっきにみちみちしているのだ" },
+    { id: "voice_ochibi_calm_009", text: "ずんちでそう" }
+  ];
+
+  function maybePlayOchibiIdleSpeech(t) {
+    if (!t || t.dead || !t.isAcquiredTarinai || String(t.state || "") !== "idle") return false;
+    const now = Number(t.world?.time || 0) || 0;
+    const stress = Number(t.stress || 0) || 0;
+    const highStress = stress >= 68;
+    const pool = highStress ? OCHIBI_HIGH_STRESS_SPEECHES : OCHIBI_LOW_STRESS_SPEECHES;
+    if (!pool.length) return false;
+    if (!Number.isFinite(t.acquiredStressSpeechAt)) t.acquiredStressSpeechAt = now + detRange(t.world, "ochibi-idle-speech-init", 2.8, 6.5, t);
+    if ((t.acquiredStressSpeechCooldownUntil || 0) > now || (t.nextBubbleAt || 0) > now || now < t.acquiredStressSpeechAt) return false;
+    const idx = Math.max(0, Math.min(pool.length - 1, Math.floor(detRange(t.world, highStress ? "ochibi-high-line" : "ochibi-low-line", 0, pool.length, t, Math.floor(now * 10)))));
+    const line = pool[idx] || pool[0];
+    if (!line) return false;
+    const color = highStress ? "rgba(58,48,63,0.82)" : "rgba(62,84,45,0.78)";
+    const bubbled = typeof t.bubble === "function" ? t.bubble(line.text, 5.8, color) : false;
+    if (!bubbled) return false;
+    const audio = global.TarinaiAudio;
+    if (audio?.playSample) audio.playSample(line.id, 1.5, "voice") || audio.play(line.id, { category: "voice", minGap: 1.5 });
+    else if (audio?.play) audio.play(line.id, { category: "voice", minGap: 1.5 });
+    t.acquiredStressSpeechCooldownUntil = now + 1.5;
+    t.acquiredStressSpeechAt = now + detRange(t.world, highStress ? "ochibi-high-next" : "ochibi-low-next", highStress ? 6.5 : 7.0, highStress ? 12.0 : 13.0, t, line.id, Math.floor(now));
+    return true;
+  }
+
   function update(t, dt, context = {}) {
     if (!t || t.dead) return { done: true };
+    if (t.isAcquiredTarinai && (t.state === "sunbath" || (t.sunbathTimer || 0) > 0.04)) {
+      t.sunbathTimer = 0;
+      t.sunbathLeisure = false;
+      t.sunbathCooldown = Math.max(t.sunbathCooldown || 0, 18);
+      t.visibleSpriteId = "";
+      t.setActionState?.("idle", { target: null, reason: "おちびは日光浴をしない", sleeping: false, clearTarget: true }); // acquired-sunbath-cancel
+    }
     t.prevX = t.x;
     t.prevY = t.y;
 
     const minute = dt / 60;
     t.age += dt;
-    t.reproductionTimer -= dt;
+    // reproductionTimer is advanced in the outer creature pass so low-frequency
+    // AI updates do not stretch the cooldown as population grows.
     t.eatTimer = Math.max(0, t.eatTimer - dt);
     if (t.state === "eat" && t.eatTimer <= 0.02) {
       t.setActionState?.("idle", { target: null, reason: "\u98df\u3079\u7d42\u3048\u305f", sleeping: false, clearTarget: true });
@@ -46,6 +101,7 @@
     t._achievementLaxativeActiveThisFrame = Boolean(t.hasItemEffect?.("laxative"));
     if (t.updateBurning) t.updateBurning(dt);
     if (t.updateItemEffects) t.updateItemEffects(dt);
+    global.TarinaiMamekusaredakeSystem?.updateTarinai?.(t, dt);
     if (t.hasItemEffect?.("sedative")) {
       t.fearTimer = Math.max(0, (t.fearTimer || 0) - dt * 1.8);
       t.intimidatedTimer = Math.max(0, (t.intimidatedTimer || 0) - dt * 1.4);
@@ -85,7 +141,6 @@
       if (!t.dead) t._achievementLaxativeActiveThisFrame = false;
       return { done: true };
     }
-    global.TarinaiCursorCareSystem.updateOne(t, dt);
     const wasFighting = t.fightTimer > 0.04;
     const endingFightTargetIds = wasFighting ? [...new Set([t.fightTargetId, ...(Array.isArray(t.fightTargetIds) ? t.fightTargetIds : [])].filter(Boolean))] : [];
     t.fightTimer = Math.max(0, t.fightTimer - dt);
@@ -139,10 +194,11 @@
       t.setActionState?.("idle", { target: null, reason: "\u8db3\u3064\u307c\u306e\u7a81\u8d77\u306b\u3064\u307e\u3065\u3044\u305f\u3002", sleeping: false, clearTarget: false });
       if ((t.world?.time || 0) >= (t.nextBubbleAt || 0)) t.bubble?.("\u3046\u3063", 1.6, "rgba(86,70,96,0.78)");
     }
-    if (t.stress > 92 && t.state !== "sleep" && t.state !== "fight" && t.state !== "eat" && detChance(t.world, "stress-breath-bubble", dt * 0.050, t)) {
+    maybePlayOchibiIdleSpeech(t);
+    if (!t.isAcquiredTarinai && t.stress > 92 && t.state !== "sleep" && t.state !== "fight" && t.state !== "eat" && detChance(t.world, "stress-breath-bubble", dt * 0.050, t)) {
       t.bubble("\u306f\u3063...\u306f\u3063...", 3.4, "rgba(58,48,63,0.80)");
     }
-    if (t.state === "idle" && t.stress < 78 && detChance(t.world, "idle-bubble", dt * 0.018, t)) {
+    if (!t.isAcquiredTarinai && t.state === "idle" && t.stress < 78 && detChance(t.world, "idle-bubble", dt * 0.018, t)) {
       t.bubble(pick(["\u306f\u3046", "\u306f\u3046\u3045", "\u306f\u3046\u3063", "\u306f\u3045"]), 4.2, "rgba(62,84,45,0.76)");
     }
     if (t.hurtTimer > 0 && detChance(t.world, "hurt-bleed-effect", dt * 5.2, t)) {
@@ -176,7 +232,14 @@
       const stressRate = excess * (0.66 + Math.min(20, excess) * 0.035);
       applyNeedShock(t, { safety: stressRate * dt, health: stressRate * dt * 0.42 });
       if ((t.world?.time || 0) >= (t.nextBubbleAt || 0) && detChance(t.world, "temperature-stress-bubble", dt * 0.18, t)) {
-        t.bubble(tempStatus.direction === "cold" ? "\u3076\u308B\u3076\u308B" : "\u3042\u3061\u3085\u3044", 2.4, "rgba(76,62,72,0.78)");
+        if (t.isAcquiredTarinai && tempStatus.direction === "hot" && Math.random() < 0.68) {
+          if (t.bubble("おみじゅ...", 2.4, "rgba(76,62,72,0.78)")) {
+            const a = global.TarinaiAudio;
+            if (a?.playSample) a.playSample("voice_ochibi_hot_007", 1.2, "voice") || a.play?.("voice_ochibi_hot_007", { category: "voice", minGap: 1.2 });
+          }
+        } else {
+          t.bubble(tempStatus.direction === "cold" ? "ぶるぶる" : "あちゅい", 2.4, "rgba(76,62,72,0.78)");
+        }
       }
     }
     if ((tempStatus.harmExcess || 0) > 0) {
diff --git a/js/tarinai_update_step_movement.js b/js/tarinai_update_step_movement.js
index 579e649..eef906a 100644
--- a/js/tarinai_update_step_movement.js
+++ b/js/tarinai_update_step_movement.js
@@ -236,7 +236,8 @@
       t._lastPhysicalVelocityY = 0;
       return { done: false, held: true };
     }
-    const motionDt = Math.max(0.001, Math.min(0.05, Number(context.motionDt ?? dt) || 0.016));
+    const motionDtCap = context.offscreenCatchup ? 2.4 : 0.05;
+    const motionDt = Math.max(0.001, Math.min(motionDtCap, Number(context.motionDt ?? dt) || 0.016));
     if (context.motionOnly && /^(sleep|eat|sunbath|birth_ritual|breed|reproduction|intimidate|ant_intimidate)$/.test(String(t.state || ""))) {
       return passivePhysicalMotion(t, motionDt, context);
     }
@@ -249,11 +250,12 @@
     global.TarinaiSunbathSystem.updateOne(t, motionDt);
     t.maintainTargetProgress(motionDt);
     const prevMotionOnlyFlag = t._motionOnlyPhysicsPass;
-    if (context.motionOnly) t._motionOnlyPhysicsPass = true;
+    const useLightMotion = Boolean(context.motionOnly || context.offscreenCatchup);
+    if (useLightMotion) t._motionOnlyPhysicsPass = true;
     try {
       t.move(motionDt);
     } finally {
-      if (context.motionOnly) t._motionOnlyPhysicsPass = prevMotionOnlyFlag;
+      if (useLightMotion) t._motionOnlyPhysicsPass = prevMotionOnlyFlag;
     }
     if (t.ammoCollisionKnockback) t.ammoCollisionKnockback(motionDt);
     applyVelocityShockDamage(t, before, motionDt);
diff --git a/js/text_catalog.js b/js/text_catalog.js
index 382b3bb..dccb259 100644
--- a/js/text_catalog.js
+++ b/js/text_catalog.js
@@ -69,6 +69,10 @@ TEXT_CATALOG.stateLabels = Object.freeze({
   ant_attack: "\u30a2\u30ea\u653b\u6483\u4e2d",
   ant_intimidate: "\u30a2\u30ea\u5a01\u5687\u4e2d",
   frozen: "\u51b7\u51cd\u4e2d",
+  bell_call: "呼び鈴へ移動中",
+  build_memorial: "墓を作っている",
+  visit_grave: "墓参りをしている",
+  mourn_grave: "墓が壊されて泣いている",
 });
 
 
diff --git a/js/ui.js b/js/ui.js
index 48b9fce..11a565c 100644
--- a/js/ui.js
+++ b/js/ui.js
@@ -4,7 +4,10 @@ const canvas = document.getElementById("gameCanvas");
 const ctx = canvas.getContext("2d");
 const ui = {
   pauseBtn: document.getElementById("pauseBtn"),
-  speedBtn: document.getElementById("speedBtn"),
+  speedSelect: document.getElementById("speedSelect"),
+  speedMenu: document.getElementById("speedMenu"),
+  speedMenuBtn: document.getElementById("speedMenuBtn"),
+  speedMenuPanel: document.getElementById("speedMenuPanel"),
   topMenu: document.getElementById("topMenu"),
   topMenuBtn: document.getElementById("topMenuBtn"),
   topMenuPanel: document.getElementById("topMenuPanel"),
@@ -28,6 +31,7 @@ const ui = {
   selectedCard: document.getElementById("selectedCard"),
   selectedCloseBtn: document.getElementById("selectedCloseBtn"),
   colonyChartTabs: document.getElementById("colonyChartTabs"),
+  colonyChartRangeTabs: document.getElementById("colonyChartRangeTabs"),
   selectedInfo: document.getElementById("selectedInfo"),
   log: document.getElementById("log"),
   logPushControls: document.getElementById("logPushControls"),
@@ -75,8 +79,11 @@ const uiCache = {
   showSelectedEmpty: false,
   selectedCollapsedCategories: new Set(),
   logPushEnabled: false,
-  logPushKinds: new Set(["death", "accident", "birth"]),
+  logEventCategories: new Set(["life", "danger", "social", "living", "environment", "observe"]),
   archiveUpdateEnabled: false,
+  activePanelTab: "",
+  archiveViewActivated: false,
+  panelTabScrollRaf: 0,
   resetFieldType: "garden",
   resetPreset: "default",
   toolButtons: [],
@@ -96,10 +103,12 @@ const uiCache = {
   chartBucketStart: -Infinity,
   chartBucketEnd: -Infinity,
   chartBucketAccum: null,
+  chartNextSampleAt: 0,
   chartBirthEventSeen: null,
   chartDeathEventSeen: null,
   lastChartDraw: "",
   chartMode: "population",
+  chartRange: "season",
   chartHiddenSeries: new Set(["ants"]),
   canvasDpr: 0,
   panning: false,
diff --git a/js/ui_bind.js b/js/ui_bind.js
index 40ab925..3fabd80 100644
--- a/js/ui_bind.js
+++ b/js/ui_bind.js
@@ -37,9 +37,12 @@ function bindUI() {
   }
 
   function setActivePanelTab(tab = "") {
+    const previous = uiCache.activePanelTab || "";
+    uiCache.activePanelTab = tab;
     for (const btn of ui.panelQuickTabs?.querySelectorAll("[data-panel-tab]") || []) {
       btn.classList.toggle("active", btn.dataset.panelTab === tab);
     }
+    if (previous === "family" && tab !== "family") window.cancelArchiveBackgroundRender?.();
   }
 
   function isTouchMobileLayout() {
@@ -109,6 +112,10 @@ function bindUI() {
   function scrollPanelToTab(tab = "") {
     const panel = ui.panel;
     if (!panel) return false;
+    // Explicit tab selection wins immediately. In particular, family rendering is
+    // asynchronous and must not be cancelled by a scroll-sync pass fired by the
+    // navigation scroll itself before the selected tab has been recorded.
+    setActivePanelTab(tab);
     window.TarinaiTooltips.hide();
     if (tab === "selected" && (!world.selected || world.selected.dead || !world.tarinai.includes(world.selected))) {
       uiCache.showSelectedEmpty = true;
@@ -119,9 +126,10 @@ function bindUI() {
     if (!target) return false;
     target.classList?.remove?.("hidden");
     if (tab === "family") {
-      // \u66F4\u65B0OFF\u3067\u3082\u3001\u30E6\u30FC\u30B6\u30FC\u304C\u5BB6\u7CFB\u56F3\u3078\u79FB\u52D5\u3057\u305F\u6642\u3060\u3051\u73FE\u5728\u30B9\u30CA\u30C3\u30D7\u30B7\u30E7\u30C3\u30C8\u3092\u63CF\u753B\u3059\u308B\u3002
-      window.resetArchiveRenderState?.();
-      renderArchive?.();
+      // Family data is expensive to lay out. Build it only after the user
+      // actually opens the family section, and keep the cache across tab switches.
+      uiCache.archiveViewActivated = true;
+      renderArchive?.({ userRequested: true });
     }
     const isDesktop = window.matchMedia?.("(min-width: 981px)")?.matches ?? window.innerWidth >= 981;
     if (isDesktop && tab !== "game" && tab !== "family") {
@@ -132,10 +140,14 @@ function bindUI() {
       // \u30B9\u30DE\u30DB\u306F\u30DA\u30FC\u30B8\u5168\u4F53\u30B9\u30AF\u30ED\u30FC\u30EB\u3002\u76EE\u7684\u5730UI\u306E\u4E0A\u7AEF\u3092\u753B\u9762\u4E0A\u7AEF\u3078\u5408\u308F\u305B\u308B\u3002
       scrollWindowToElement(target, 0, "auto");
     }
-    setActivePanelTab(tab);
     return true;
   }
 
+  window.scrollToSelectedDataPanel = () => {
+    renderSelected?.();
+    return scrollPanelToTab("selected");
+  };
+
   const activatePanelQuickTab = (e) => {
     const btn = e.target.closest("[data-panel-tab]");
     if (!btn) return;
@@ -147,9 +159,9 @@ function bindUI() {
     scrollPanelToTab(btn.dataset.panelTab || "");
   };
 
+  // One physical tap should execute one switch. Click already covers mouse, pen,
+  // and synthesized touch activation, so parallel pointer/touch handlers are avoided.
   ui.panelQuickTabs?.addEventListener("click", activatePanelQuickTab);
-  ui.panelQuickTabs?.addEventListener("pointerup", activatePanelQuickTab, { passive: false });
-  ui.panelQuickTabs?.addEventListener("touchend", activatePanelQuickTab, { passive: false });
 
   const applyTemperatureSlider = () => {
     if (!world || !ui.temperatureSlider) return;
@@ -207,7 +219,8 @@ function bindUI() {
   ui.tarinaiPopulationLimitInput?.addEventListener("change", () => applyColonyLimit("tarinai", "number"));
   ui.objectLimitInput?.addEventListener("change", () => applyColonyLimit("object", "number"));
 
-  ui.panel?.addEventListener("scroll", () => {
+  const updateActivePanelTabFromScroll = () => {
+    uiCache.panelTabScrollRaf = 0;
     const panel = ui.panel;
     if (!panel || !ui.panelQuickTabs) return;
     const tabsH = ui.panelQuickTabs.offsetHeight || 0;
@@ -220,12 +233,29 @@ function bindUI() {
       ["family", document.querySelector(".lineage-main-card")],
     ].filter(([, el]) => el && !el.classList.contains("hidden"));
     let active = entries[0]?.[0] || "";
-    const y = panel.scrollTop + tabsH + 18;
-    for (const [key, el] of entries) {
-      if (el.offsetTop <= y) active = key;
+    const threshold = Math.max(8, tabsH + 18);
+    const familyEl = entries.find(([key]) => key === "family")?.[1] || null;
+    const familyRect = familyEl?.getBoundingClientRect?.() || null;
+    if (familyRect && familyRect.top <= threshold && familyRect.bottom > threshold) {
+      active = "family";
+    } else if (isTouchMobileLayout()) {
+      for (const [key, el] of entries) {
+        if ((el.getBoundingClientRect?.().top ?? Infinity) <= threshold) active = key;
+      }
+    } else {
+      const y = panel.scrollTop + tabsH + 18;
+      for (const [key, el] of entries) {
+        if (key !== "family" && el.offsetTop <= y) active = key;
+      }
     }
     setActivePanelTab(active);
-  }, { passive: true });
+  };
+  const scheduleActivePanelTabSync = () => {
+    if (uiCache.panelTabScrollRaf) return;
+    uiCache.panelTabScrollRaf = requestAnimationFrame(updateActivePanelTabFromScroll);
+  };
+  ui.panel?.addEventListener("scroll", scheduleActivePanelTabSync, { passive: true });
+  window.addEventListener("scroll", scheduleActivePanelTabSync, { passive: true });
 
   syncToolSizeBadges();
   setActivePanelTab(ui.selectedCard?.classList.contains("hidden") ? "tools" : "selected");
@@ -378,6 +408,16 @@ function bindUI() {
     uiCache.lastChartDraw = "";
     renderStats();
   });
+  ui.colonyChartRangeTabs?.addEventListener("click", (e) => {
+    const btn = e.target.closest("button[data-chart-range]");
+    if (!btn) return;
+    uiCache.chartRange = btn.dataset.chartRange || "season";
+    for (const b of ui.colonyChartRangeTabs.querySelectorAll("button")) b.classList.toggle("active", b === btn);
+    uiCache.lastChartDraw = "";
+    audio.uiClick?.();
+    renderStats({ force: true });
+  });
+  window.bindColonyChartHover?.();
   const toggleChartSeries = (target) => {
     const control = target?.closest?.("[data-series-key]");
     if (!control) return false;
@@ -401,13 +441,17 @@ function bindUI() {
     showToast(uiCache.logPushEnabled ? "\u30ed\u30b0\u306e\u30d7\u30c3\u30b7\u30e5\u901a\u77e5\u3092ON\u306b\u3057\u307e\u3057\u305f\u3002" : "\u30ed\u30b0\u306e\u30d7\u30c3\u30b7\u30e5\u901a\u77e5\u3092OFF\u306b\u3057\u307e\u3057\u305f\u3002");
   });
   ui.logPushControls?.addEventListener("change", (e) => {
-    const input = e.target.closest("[data-push-kind]");
+    const input = e.target.closest("[data-event-category]");
     if (!input) return;
-    const kind = input.dataset.pushKind || "";
+    const category = input.dataset.eventCategory || "";
     audio.uiClick?.();
-    if (input.checked) uiCache.logPushKinds.add(kind);
-    else uiCache.logPushKinds.delete(kind);
+    if (input.checked) uiCache.logEventCategories.add(category);
+    else uiCache.logEventCategories.delete(category);
     saveLogPushSettings();
+    renderLog(world.logs);
+    if (!input.checked) {
+      for (const toast of ui.logPushOverlay?.querySelectorAll?.(`[data-event-category="${category}"]`) || []) toast.remove();
+    }
   });
   ui.soundCategoryControls?.addEventListener("change", (e) => {
     const input = e.target.closest("[data-sound-category]");
@@ -435,6 +479,40 @@ function bindUI() {
     }, { passive: false });
   };
   bindArchiveHorizontal(ui.archiveContent);
+  const clearFamilyHoverHighlight = (tree) => {
+    if (!tree) return;
+    tree.classList.remove("family-hover-active");
+    for (const el of tree.querySelectorAll(".tree-node.family-hover-dim, .tree-node.family-hover-focus, .tree-node.family-hover-parent, .tree-node.family-hover-child")) {
+      el.classList.remove("family-hover-dim", "family-hover-focus", "family-hover-parent", "family-hover-child");
+    }
+  };
+  ui.archiveContent?.addEventListener("mouseover", (e) => {
+    const node = e.target.closest(".lineage-family-tree [data-family-tarinai-id]");
+    if (!node || node.contains(e.relatedTarget)) return;
+    const tree = node.closest(".lineage-family-tree");
+    if (!tree) return;
+    clearFamilyHoverHighlight(tree);
+    const id = String(node.getAttribute("data-family-tarinai-id") || "");
+    const familyNode = world.family?.[id] || null;
+    const parentIds = new Set((familyNode?.parents || []).map(String));
+    const childIds = new Set((familyNode?.children || []).map(String));
+    tree.classList.add("family-hover-active");
+    for (const el of tree.querySelectorAll(".tree-node[data-family-tarinai-id]")) {
+      const otherId = String(el.getAttribute("data-family-tarinai-id") || "");
+      el.classList.add("family-hover-dim");
+      if (otherId === id) el.classList.add("family-hover-focus");
+      else if (parentIds.has(otherId)) el.classList.add("family-hover-parent");
+      else if (childIds.has(otherId)) el.classList.add("family-hover-child");
+    }
+  });
+  ui.archiveContent?.addEventListener("mouseout", (e) => {
+    const node = e.target.closest(".lineage-family-tree [data-family-tarinai-id]");
+    if (!node || node.contains(e.relatedTarget)) return;
+    const tree = node.closest(".lineage-family-tree");
+    const enteringAnotherNode = e.relatedTarget?.closest?.(".lineage-family-tree [data-family-tarinai-id]");
+    if (enteringAnotherNode && enteringAnotherNode.closest(".lineage-family-tree") === tree) return;
+    clearFamilyHoverHighlight(tree);
+  });
   ui.archiveContent?.addEventListener("click", (e) => {
     const node = e.target.closest("[data-family-tarinai-id]");
     if (!node) return;
@@ -449,6 +527,7 @@ function bindUI() {
   if (!uiCache.archiveAutoRefreshTimer && typeof window !== "undefined") {
     uiCache.archiveAutoRefreshTimer = window.setInterval(() => {
       if (!ui.archiveContent || !archiveAutoUpdateEnabled()) return;
+      if (uiCache.activePanelTab !== "family") return;
       if (typeof lineageArchiveNeedsRender === "function" && !lineageArchiveNeedsRender()) return;
       scheduleArchiveWindowRender();
     }, 5000);
@@ -535,12 +614,37 @@ function bindUI() {
   });
   ui.topMenuPanel?.addEventListener("click", (e) => e.stopPropagation());
 
-  ui.speedBtn?.addEventListener("click", () => {
+  function closeSpeedMenu() {
+    ui.speedMenuPanel?.classList.add("hidden");
+    ui.speedMenuBtn?.setAttribute("aria-expanded", "false");
+  }
+  function toggleSpeedMenu() {
+    const opening = Boolean(ui.speedMenuPanel?.classList.contains("hidden"));
+    closeTopMenu();
+    ui.speedMenuPanel?.classList.toggle("hidden", !opening);
+    ui.speedMenuBtn?.setAttribute("aria-expanded", opening ? "true" : "false");
+  }
+  ui.speedMenuBtn?.addEventListener("click", (e) => {
+    e.preventDefault();
+    e.stopPropagation();
     audio.uiClick?.();
-    window.TarinaiCommands.dispatch(world, { type: "simulation.speed.cycle", speeds: [1, 2, 4] });
+    toggleSpeedMenu();
+  });
+  ui.speedMenuPanel?.addEventListener("click", (e) => {
+    e.stopPropagation();
+    const option = e.target.closest?.("[data-speed-value]");
+    if (!option) return;
+    const speed = Number(option.dataset.speedValue);
+    if (ui.speedSelect) ui.speedSelect.value = String(speed);
+    window.TarinaiCommands.dispatch(world, { type: "simulation.speed.set", speed, allowed: [0.5, 1, 2, 4, 8, 16] });
+    closeSpeedMenu();
     syncTopButtons();
   });
-  ui.ecologyBtn?.addEventListener("click", () => { audio.uiClick?.(); closeTopMenu(); openEcologyDialog(); });
+  ui.speedSelect?.addEventListener("change", () => {
+    window.TarinaiCommands.dispatch(world, { type: "simulation.speed.set", speed: Number(ui.speedSelect.value), allowed: [0.5, 1, 2, 4, 8, 16] });
+    syncTopButtons();
+  });
+  ui.ecologyBtn?.addEventListener("click", () => { audio.uiClick?.(); closeSpeedMenu(); closeTopMenu(); openEcologyDialog(); });
   ui.soundBtn?.addEventListener("click", (e) => {
     e.stopPropagation();
     closeVisualSettingsPanel();
@@ -560,16 +664,17 @@ function bindUI() {
       closeVisualSettingsPanel();
       if (!ui.topMenu?.contains(target)) closeTopMenu();
     }
+    if (!ui.speedMenu?.contains(target)) closeSpeedMenu();
     // Normal controls keep the selected tool. A blank UI click exits placement
     // mode; canvas clicks are still handled as tool actions.
     if (isActiveToolMode() && !canvas?.contains?.(target) && !isInteractiveUiTarget(target)) {
       clearSelectedToolSilently();
     }
   });
-  ui.creditsBtn?.addEventListener("click", () => { audio.uiClick?.(); closeTopMenu(); ui.creditsDialog?.classList.remove("hidden"); });
-  ui.creditsCloseBtn?.addEventListener("click", () => ui.creditsDialog?.classList.add("hidden"));
+  ui.creditsBtn?.addEventListener("click", () => { audio.uiClick?.(); closeTopMenu(); window.TarinaiManagedDialogs?.open?.(ui.creditsDialog, ui.topMenuBtn || document.activeElement); });
+  ui.creditsCloseBtn?.addEventListener("click", () => window.TarinaiManagedDialogs?.close?.(ui.creditsDialog));
   ui.creditsDialog?.addEventListener("click", (e) => {
-    if (e.target === ui.creditsDialog) ui.creditsDialog.classList.add("hidden");
+    if (e.target === ui.creditsDialog) window.TarinaiManagedDialogs?.close?.(ui.creditsDialog);
   });
   ui.visualSettingsBtn?.addEventListener("click", (e) => {
     e.stopPropagation();
@@ -624,6 +729,10 @@ function bindUI() {
   ui.archiveResetDialog?.addEventListener("click", (e) => {
     if (e.target === ui.archiveResetDialog) closeArchiveResetDialog();
   });
+  ui.fieldDialog?.addEventListener("tarinai:dialog-close-request", closeFieldDialog);
+  ui.ecologyDialog?.addEventListener("tarinai:dialog-close-request", closeEcologyDialog);
+  ui.archiveResetDialog?.addEventListener("tarinai:dialog-close-request", closeArchiveResetDialog);
+  ui.creditsDialog?.addEventListener("tarinai:dialog-close-request", () => window.TarinaiManagedDialogs?.close?.(ui.creditsDialog));
   ui.archiveResetConfirmBtn?.addEventListener("click", () => {
     world.resetFamilyTree?.();
     window.resetArchiveRenderState?.();
@@ -760,7 +869,7 @@ function bindUI() {
     if (e.key !== "Escape") return;
     closeFieldDialog();
     closeEcologyDialog();
-    closeVisualSettingsDialog();
+    closeVisualSettingsPanel();
     closeArchiveResetDialog();
     ui.creditsDialog?.classList.add("hidden");
   });
diff --git a/js/ui_charts.js b/js/ui_charts.js
index 0dc257c..22287ca 100644
--- a/js/ui_charts.js
+++ b/js/ui_charts.js
@@ -15,7 +15,7 @@ function bindColonyMoodTooltip() {
 }
 
 function colonyChartObjectKeys() {
-  return ["grass", "zunchi", "trace", "grass_bed", "water"];
+  return ["grass", "zunchi", "trace", "grave", "grass_bed", "water"];
 }
 
 function colonyStatsUiVisible() {
@@ -26,7 +26,15 @@ function colonyStatsUiVisible() {
   return true;
 }
 
-function collectDynamicColonyStats() {
+function collectDynamicColonyStats(options = {}) {
+  const now = typeof performance !== "undefined" && performance.now ? performance.now() : Date.now();
+  const cache = world._colonyStatsDynamicCache;
+  const cacheAge = now - (Number(world._colonyStatsDynamicCacheAt) || 0);
+  // Colony cards can ask for a refresh from many UI paths. Reuse one aggregate
+  // for a short real-time window instead of rescanning every Tarinai each time.
+  // Fixed history samples opt into force=true so their recorded values remain
+  // tied to the requested simulation timestamp.
+  if (options.force !== true && cache && cacheAge >= 0 && cacheAge < 800) return cache;
   const needKeys = typeof TARINAI_NEED_KEYS !== "undefined" ? TARINAI_NEED_KEYS : ["food", "sleep", "health", "safety", "social", "fulfill"];
   const needSums = Object.fromEntries(needKeys.map(key => [key, 0]));
   let liveCount = 0;
@@ -54,6 +62,7 @@ function collectDynamicColonyStats() {
     ...Object.fromEntries(needKeys.map(key => [`need_${key}`, liveCount ? needSums[key] / divisor : 0])),
   };
   world._colonyStatsDynamicCache = dynamic;
+  world._colonyStatsDynamicCacheAt = now;
   return dynamic;
 }
 
@@ -83,6 +92,13 @@ function renderStats(options = {}) {
     stress: dynamic.stress || 0,
     temperature: Number(temp) || 0,
     ants: dynamic.ants || 0,
+    graves: (() => {
+      const bucket = typeof world.itemsOfType === "function" ? world.itemsOfType("grave") : null;
+      if (bucket && typeof bucket.length === "number") return Math.max(0, bucket.length);
+      let count = 0;
+      for (const item of world.items || []) if (item && !item.dead && item.type === "grave") count += 1;
+      return count;
+    })(),
     ...dynamic,
     objects: world.itemCounts || {},
   };
@@ -113,126 +129,143 @@ function renderStats(options = {}) {
   bindColonyMoodTooltip();
   window.TarinaiTooltips.refresh(ui.statColonyMood?.closest?.(".stat") || ui.statColonyMood);
   window.TarinaiGroundUI.update(world);
-  updateColonyHistory(values);
   drawColonyChart(values);
   if (ui?.selectedCard && !ui.selectedCard.classList.contains("hidden")) renderSelected();
   if (world.familyTreeDirty) scheduleArchiveWindowRender();
 }
 
-function updateColonyHistory(values) {
-  const t = Math.max(0, world.time || 0);
+function updateColonyHistory(values, options = {}) {
+  const t = Math.max(0, Number(world.time || 0) || 0);
   const history = uiCache.chartHistory;
   const interval = Math.max(1, (CONFIG.dayLength || 120) / 12);
-  const maxPoints = 5 * 12;
-  const currentBirthEvents = Math.max(0, Number(values.birthEvents || 0) || 0);
-  const currentDeathEvents = Math.max(0, Number(values.deathEvents || 0) || 0);
-  const eventCountersRewound = (Number.isFinite(uiCache.chartBirthEventSeen) && currentBirthEvents < uiCache.chartBirthEventSeen)
-    || (Number.isFinite(uiCache.chartDeathEventSeen) && currentDeathEvents < uiCache.chartDeathEventSeen);
-  if ((history.length && t < history[history.length - 1].t) || (Number.isFinite(uiCache.chartBucketStart) && t < uiCache.chartBucketStart) || eventCountersRewound) {
+  const maxPoints = 20 * 12;
+  const birthsTotal = Math.max(0, Number(values.birthEvents || 0) || 0);
+  const deathsTotal = Math.max(0, Number(values.deathEvents || 0) || 0);
+  const lastT = history.length ? Number(history[history.length - 1]?.t || 0) : -Infinity;
+  const rewound = t + 1e-6 < lastT
+    || (Number.isFinite(uiCache.chartNextSampleAt) && t + interval < uiCache.chartNextSampleAt)
+    || (Number.isFinite(uiCache.chartBirthEventSeen) && birthsTotal < uiCache.chartBirthEventSeen)
+    || (Number.isFinite(uiCache.chartDeathEventSeen) && deathsTotal < uiCache.chartDeathEventSeen);
+  if (rewound) {
     history.length = 0;
-    uiCache.chartBucketStart = -Infinity;
-    uiCache.chartBucketEnd = -Infinity;
-    uiCache.chartBucketAccum = null;
+    uiCache.chartNextSampleAt = 0;
     uiCache.chartBirthEventSeen = null;
     uiCache.chartDeathEventSeen = null;
     uiCache.lastChartDraw = "";
   }
+  if (!Number.isFinite(uiCache.chartNextSampleAt)) uiCache.chartNextSampleAt = 0;
+  if (options.force !== true && t + 1e-6 < uiCache.chartNextSampleAt) return false;
+  if (!Number.isFinite(uiCache.chartBirthEventSeen)) uiCache.chartBirthEventSeen = birthsTotal;
+  if (!Number.isFinite(uiCache.chartDeathEventSeen)) uiCache.chartDeathEventSeen = deathsTotal;
+  const births = Math.max(0, birthsTotal - uiCache.chartBirthEventSeen);
+  const deaths = Math.max(0, deathsTotal - uiCache.chartDeathEventSeen);
+  uiCache.chartBirthEventSeen = birthsTotal;
+  uiCache.chartDeathEventSeen = deathsTotal;
   const objectKeys = colonyChartObjectKeys();
   const needKeys = typeof TARINAI_NEED_KEYS !== "undefined" ? TARINAI_NEED_KEYS : ["food", "sleep", "health", "safety", "social", "fulfill"];
-  const makeBucket = (start) => ({
-    start,
-    end: start + interval,
-    count: 0,
-    sums: {
-      pop: 0,
-      zunchiSlaves: 0,
-      tarinaiKings: 0,
-      sick: 0,
-      juvenile: 0,
-      elder: 0,
-      ants: 0,
-      stress: 0,
-      temperature: 0,
-      ...Object.fromEntries(needKeys.map(k => [`need_${k}`, 0])),
-    },
-    objects: Object.fromEntries(objectKeys.map(k => [k, 0])),
-    events: { births: 0, deaths: 0 },
-  });
-  if (!uiCache.chartBucketAccum) {
-    const start = Math.floor(t / interval) * interval;
-    uiCache.chartBucketStart = start;
-    uiCache.chartBucketEnd = start + interval;
-    uiCache.chartBucketAccum = makeBucket(start);
-  }
-  const pushBucket = (bucket) => {
-    if (!bucket || bucket.count <= 0) return;
-    const row = {
-      t: bucket.end,
-      pop: bucket.sums.pop / bucket.count,
-      zunchiSlaves: bucket.sums.zunchiSlaves / bucket.count,
-      tarinaiKings: bucket.sums.tarinaiKings / bucket.count,
-      sick: bucket.sums.sick / bucket.count,
-      juvenile: bucket.sums.juvenile / bucket.count,
-      elder: bucket.sums.elder / bucket.count,
-      ants: bucket.sums.ants / bucket.count,
-      stress: bucket.sums.stress / bucket.count,
-      temperature: bucket.sums.temperature / bucket.count,
-      ...Object.fromEntries(needKeys.map(k => [`need_${k}`, (bucket.sums[`need_${k}`] || 0) / bucket.count])),
-      ...Object.fromEntries(objectKeys.map(k => [`obj_${k}`, bucket.objects[k] / bucket.count])),
-      births: Math.max(0, Number(bucket.events?.births || 0) || 0),
-      deaths: Math.max(0, Number(bucket.events?.deaths || 0) || 0),
-    };
-    history.push(row);
-    if (history.length > maxPoints) history.splice(0, history.length - maxPoints);
+  const sampleT = Math.max(0, Math.floor(t / interval) * interval);
+  const row = {
+    t: sampleT,
+    pop: values.pop || 0,
+    zunchiSlaves: values.zunchiSlaves || 0,
+    tarinaiKings: values.tarinaiKings || 0,
+    sick: values.sick || 0,
+    juvenile: values.juvenile || 0,
+    elder: values.elder || 0,
+    ants: values.ants || 0,
+    stress: values.stress || 0,
+    temperature: Number(values.temperature || 0) || 0,
+    ...Object.fromEntries(needKeys.map(k => [`need_${k}`, values[`need_${k}`] || 0])),
+    ...Object.fromEntries(objectKeys.map(k => [`obj_${k}`, k === "grave" ? (values.graves || 0) : ((values.objects || {})[k] || 0)])),
+    births,
+    deaths,
   };
-  while (t >= uiCache.chartBucketEnd) {
-    const b = uiCache.chartBucketAccum;
-    pushBucket(b);
-    uiCache.chartBucketStart = uiCache.chartBucketEnd;
-    uiCache.chartBucketEnd = uiCache.chartBucketStart + interval;
-    uiCache.chartBucketAccum = makeBucket(uiCache.chartBucketStart);
+  if (history.length && Math.abs((Number(history[history.length - 1]?.t) || 0) - sampleT) < 1e-6) history[history.length - 1] = row;
+  else history.push(row);
+  if (history.length > maxPoints) history.splice(0, history.length - maxPoints);
+  uiCache.chartNextSampleAt = sampleT + interval;
+  return true;
+}
+
+function collectColonyHistorySampleValues() {
+  const counts = world.tarinaiCounts?.() || world.rebuildTarinaiCountCache?.("chart-sample") || { alive: 0, zunchiSlaves: 0, tarinaiKings: 0 };
+  const dynamic = collectDynamicColonyStats({ force: true });
+  const graveBucket = typeof world.itemsOfType === "function" ? world.itemsOfType("grave") : null;
+  let graves = 0;
+  if (graveBucket && typeof graveBucket.length === "number") graves = Math.max(0, graveBucket.length);
+  else for (const item of world.items || []) if (item && !item.dead && item.type === "grave") graves += 1;
+  return {
+    pop: Math.max(0, Number(counts.alive || 0) || 0),
+    zunchiSlaves: Math.max(0, Number(counts.zunchiSlaves || 0) || 0),
+    tarinaiKings: Math.max(0, Number(counts.tarinaiKings || 0) || 0),
+    sick: dynamic.sick || 0,
+    juvenile: dynamic.juvenile || 0,
+    elder: dynamic.elder || 0,
+    ants: dynamic.ants || 0,
+    stress: dynamic.stress || 0,
+    temperature: Number(world.currentTemperature ?? world.updateTemperature?.(0) ?? (CONFIG.standardTemperature ?? 15)) || 0,
+    birthEvents: Math.max(0, Number(world.birthEventCount || 0) || 0),
+    deathEvents: Math.max(0, Number(world.deadCount || 0) || 0),
+    graves,
+    ...dynamic,
+    objects: world.itemCounts || {},
+  };
+}
+
+function tickColonyHistorySampling() {
+  const t = Math.max(0, Number(world?.time || 0) || 0);
+  const interval = Math.max(1, (CONFIG.dayLength || 120) / 12);
+  if (!Number.isFinite(uiCache.chartNextSampleAt)) uiCache.chartNextSampleAt = 0;
+  if (t + 1e-6 < uiCache.chartNextSampleAt) return false;
+  return updateColonyHistory(collectColonyHistorySampleValues(), { force: true });
+}
+
+function chartRangeConfig() {
+  const dayLength = Math.max(1, Number(CONFIG.dayLength || 120) || 120);
+  const range = ["day", "season", "year"].includes(uiCache.chartRange) ? uiCache.chartRange : "season";
+  if (range === "day") return { id: range, duration: dayLength, footer: "\u0032\u6642\u9593\u3054\u3068 / 1\u65e5" };
+  if (range === "year") return { id: range, duration: dayLength * 20, footer: "1\u65e51\u70b9 / 20\u65e5\u9593" };
+  return { id: "season", duration: dayLength * 5, footer: "\u0032\u6642\u9593\u3054\u3068 / 5\u65e5\u9593" };
+}
+
+function yearRepresentativeRows(rows, minT, maxT) {
+  const dayLength = Math.max(1, Number(CONFIG.dayLength || 120) || 120);
+  const grouped = new Map();
+  for (const row of rows || []) {
+    const t = Math.max(0, Number(row?.t || 0) || 0);
+    if (t < minT - 1e-6 || t > maxT + 1e-6) continue;
+    const day = Math.floor(t / dayLength);
+    const noon = day * dayLength + dayLength * 0.5;
+    const prev = grouped.get(day);
+    if (!prev || Math.abs(t - noon) < Math.abs((Number(prev.t || 0) || 0) - noon)) grouped.set(day, row);
   }
-  const bucket = uiCache.chartBucketAccum;
-  if (!Number.isFinite(uiCache.chartBirthEventSeen)) uiCache.chartBirthEventSeen = currentBirthEvents;
-  if (!Number.isFinite(uiCache.chartDeathEventSeen)) uiCache.chartDeathEventSeen = currentDeathEvents;
-  bucket.events.births += Math.max(0, currentBirthEvents - uiCache.chartBirthEventSeen);
-  bucket.events.deaths += Math.max(0, currentDeathEvents - uiCache.chartDeathEventSeen);
-  uiCache.chartBirthEventSeen = currentBirthEvents;
-  uiCache.chartDeathEventSeen = currentDeathEvents;
-  bucket.count += 1;
-  bucket.sums.pop += values.pop || 0;
-  bucket.sums.zunchiSlaves += values.zunchiSlaves || 0;
-  bucket.sums.tarinaiKings += values.tarinaiKings || 0;
-  bucket.sums.sick += values.sick || 0;
-  bucket.sums.juvenile += values.juvenile || 0;
-  bucket.sums.elder += values.elder || 0;
-  bucket.sums.ants += values.ants || 0;
-  bucket.sums.stress += values.stress || 0;
-  bucket.sums.temperature += Number(values.temperature || 0) || 0;
-  for (const k of needKeys) bucket.sums[`need_${k}`] += values[`need_${k}`] || 0;
-  for (const k of objectKeys) bucket.objects[k] += (values.objects || {})[k] || 0;
+  return Array.from(grouped.entries()).sort((a, b) => a[0] - b[0]).map(([, row]) => row);
 }
 
 function chartRows(values) {
-  // The colony chart is sampled in two-hour buckets.  Do not append a live
-  // preview row here; it makes the graph redraw every frame even though the
-  // recorded statistics have not advanced yet.
-  if (uiCache.chartHistory.length) return uiCache.chartHistory.slice();
+  const allRows = uiCache.chartHistory.length ? uiCache.chartHistory.slice() : [];
+  const now = Math.max(0, Number(world.time || 0) || 0);
+  const interval = Math.max(1, (CONFIG.dayLength || 120) / 12);
+  // Keep the visible time window anchored to the newest recorded sample rather
+  // than the continuously advancing world clock. The graph now shifts left at
+  // exactly the same moment a new data point is appended.
+  const maxT = allRows.length
+    ? Math.max(0, Number(allRows[allRows.length - 1]?.t || 0) || 0)
+    : Math.max(0, Math.floor(now / interval) * interval);
+  const config = chartRangeConfig();
+  const minT = Math.max(0, maxT - config.duration);
+  let rows = allRows.filter(row => {
+    const t = Math.max(0, Number(row?.t || 0) || 0);
+    return t >= minT - 1e-6 && t <= maxT + 1e-6;
+  });
+  if (config.id === "year") rows = yearRepresentativeRows(rows, minT, maxT);
+  if (rows.length) return rows;
   const objectKeys = colonyChartObjectKeys();
   const needKeys = typeof TARINAI_NEED_KEYS !== "undefined" ? TARINAI_NEED_KEYS : ["food", "sleep", "health", "safety", "social", "fulfill"];
   return [{
-    t: Math.max(0, Number(uiCache.chartBucketStart || 0) || 0),
-    pop: 0,
-    zunchiSlaves: 0,
-    tarinaiKings: 0,
-    sick: 0,
-    juvenile: 0,
-    elder: 0,
-    ants: 0,
-    stress: 0,
-    temperature: 0,
-    births: 0,
-    deaths: 0,
+    t: now,
+    pop: 0, zunchiSlaves: 0, tarinaiKings: 0, sick: 0, juvenile: 0, elder: 0, ants: 0,
+    stress: 0, temperature: 0, births: 0, deaths: 0,
     ...Object.fromEntries(needKeys.map(k => [`need_${k}`, 0])),
     ...Object.fromEntries(objectKeys.map(k => [`obj_${k}`, 0])),
   }];
@@ -247,6 +280,119 @@ function chartSeasonDayLabelForTime(t = 0) {
   return `${season}${seasonDay}\u65e5`;
 }
 
+function chartDateTimeLabelForTime(t = 0) {
+  const dayLength = Math.max(1, Number(CONFIG.dayLength || 120) || 120);
+  const safe = Math.max(0, Number(t || 0) || 0);
+  const dayStart = Math.floor(safe / dayLength) * dayLength;
+  const dayRatio = Math.max(0, Math.min(0.999999, (safe - dayStart) / dayLength));
+  const totalMinutes = Math.floor(dayRatio * 24 * 60);
+  const hh = String(Math.floor(totalMinutes / 60)).padStart(2, "0");
+  const mm = String(totalMinutes % 60).padStart(2, "0");
+  return `${chartSeasonDayLabelForTime(safe)} ${hh}:${mm}`;
+}
+
+function bindColonyChartHover() {
+  const chart = ui?.colonyChart;
+  if (!chart || chart.dataset.historyHoverBound === "1") return;
+  chart.dataset.historyHoverBound = "1";
+  let tooltip = document.getElementById("colonyChartFloatingTooltip");
+  if (!tooltip) {
+    tooltip = document.createElement("div");
+    tooltip.id = "colonyChartFloatingTooltip";
+    tooltip.className = "colony-chart-tooltip hidden";
+    document.body.appendChild(tooltip);
+  }
+  const hoverMarker = () => {
+    let marker = chart.querySelector(".colony-chart-hover-point");
+    if (!marker) {
+      marker = document.createElement("div");
+      marker.className = "colony-chart-hover-point hidden";
+      chart.appendChild(marker);
+    }
+    return marker;
+  };
+  const hide = () => {
+    tooltip.classList.add("hidden");
+    hoverMarker().classList.add("hidden");
+  };
+  chart.addEventListener("mouseleave", hide);
+  chart.addEventListener("mousemove", (event) => {
+    const state = uiCache.chartHoverState;
+    if (!state?.rows?.length) return hide();
+    const rect = chart.getBoundingClientRect();
+    if (!rect.width || !rect.height) return hide();
+    const px = Math.max(0, Math.min(state.cssW, (event.clientX - rect.left) * state.cssW / rect.width));
+    const py = Math.max(0, Math.min(state.cssH, (event.clientY - rect.top) * state.cssH / rect.height));
+    const plotX = Math.max(state.pad.l, Math.min(state.pad.l + state.w, px));
+    const ratio = (plotX - state.pad.l) / Math.max(1, state.w);
+    const targetT = state.minT + ratio * Math.max(1, state.maxT - state.minT);
+    let nearest = state.rows[0];
+    let best = Infinity;
+    for (const row of state.rows) {
+      const d = Math.abs((Number(row?.t || 0) || 0) - targetT);
+      if (d < best) { best = d; nearest = row; }
+    }
+    if (!nearest) return hide();
+
+    const snappedX = state.pad.l + clamp(((Number(nearest.t || 0) || 0) - state.minT) / Math.max(1, state.maxT - state.minT), 0, 1) * state.w;
+    const scale = state.scale || { min: 0, max: 100, percent: false };
+    const yForSeries = (seriesDef) => {
+      const raw = Number(nearest?.[seriesDef.key] || 0);
+      if (scale.percent) return state.pad.t + state.h - state.h * clamp(raw / 100, 0, 1);
+      const denom = Math.max(1, scale.max - scale.min);
+      return state.pad.t + state.h - state.h * clamp((raw - scale.min) / denom, 0, 1);
+    };
+    let snapSeries = state.series[0] || null;
+    let snappedY = snapSeries ? yForSeries(snapSeries) : state.pad.t + state.h * 0.5;
+    let bestY = Math.abs(snappedY - py);
+    for (const seriesDef of state.series.slice(1)) {
+      const candidateY = yForSeries(seriesDef);
+      const distance = Math.abs(candidateY - py);
+      if (distance < bestY) {
+        bestY = distance;
+        snapSeries = seriesDef;
+        snappedY = candidateY;
+      }
+    }
+
+    const marker = hoverMarker();
+    marker.style.left = `${snappedX * rect.width / state.cssW}px`;
+    marker.style.top = `${snappedY * rect.height / state.cssH}px`;
+    if (snapSeries?.color) marker.style.borderColor = snapSeries.color;
+    marker.classList.remove("hidden");
+
+    const lines = state.series.map(series => `<div class="colony-chart-tooltip-row"><span>${series.label}</span><b>${formatChartValue(series.key, nearest)}</b></div>`).join("");
+    tooltip.innerHTML = `<strong>${chartDateTimeLabelForTime(nearest.t)}</strong>${lines}`;
+    tooltip.classList.remove("hidden");
+    tooltip.style.visibility = "hidden";
+    tooltip.style.left = "0px";
+    tooltip.style.top = "0px";
+
+    const tipW = Math.max(1, tooltip.offsetWidth || 160);
+    const tipH = Math.max(1, tooltip.offsetHeight || 80);
+    const viewportW = Math.max(1, window.innerWidth || document.documentElement.clientWidth || rect.right + tipW);
+    const viewportH = Math.max(1, window.innerHeight || document.documentElement.clientHeight || rect.bottom + tipH);
+    const gap = 10;
+    const anchorX = rect.left + snappedX * rect.width / state.cssW;
+    const anchorY = rect.top + snappedY * rect.height / state.cssH;
+    const placements = [
+      { side: "right", left: rect.right + gap, top: anchorY - tipH / 2, fits: viewportW - rect.right >= tipW + gap },
+      { side: "left", left: rect.left - tipW - gap, top: anchorY - tipH / 2, fits: rect.left >= tipW + gap },
+      { side: "top", left: anchorX - tipW / 2, top: rect.top - tipH - gap, fits: rect.top >= tipH + gap },
+      { side: "bottom", left: anchorX - tipW / 2, top: rect.bottom + gap, fits: viewportH - rect.bottom >= tipH + gap },
+    ];
+    const placement = placements.find(item => item.fits) || placements[0];
+    const left = Math.max(gap, Math.min(viewportW - tipW - gap, placement.left));
+    const top = Math.max(gap, Math.min(viewportH - tipH - gap, placement.top));
+    tooltip.dataset.side = placement.side;
+    tooltip.style.left = `${Math.round(left)}px`;
+    tooltip.style.top = `${Math.round(top)}px`;
+    tooltip.style.visibility = "visible";
+  });
+}
+
+window.bindColonyChartHover = bindColonyChartHover;
+
 function niceChartMax(raw = 0) {
   const value = Math.max(1, Number(raw) || 0);
   const pow = Math.pow(10, Math.floor(Math.log10(value)));
@@ -278,12 +424,14 @@ function chartAxisLabel(value, scale) {
 function drawColonyChart(values) {
   const chart = ui.colonyChart;
   if (!chart) return;
+  bindColonyChartHover();
   let mode = uiCache.chartMode || "population";
   if (!["population", "life", "objects"].includes(mode)) {
     mode = "population";
     uiCache.chartMode = "population";
     for (const b of ui.colonyChartTabs?.querySelectorAll("button[data-chart]") || []) b.classList.toggle("active", b.dataset.chart === "population");
   }
+  const rangeConfig = chartRangeConfig();
   const rows = chartRows(values);
   const last = rows[rows.length - 1] || values;
   const allSeries = chartSeries(mode);
@@ -291,8 +439,10 @@ function drawColonyChart(values) {
   const series = allSeries.filter(s => !hiddenSeries.has(s.key));
   const seriesSnapshot = allSeries.map(s => `${s.key}:${hiddenSeries.has(s.key) ? 0 : 1}:${Math.round(Number(last[s.key] || 0) * 10)}`).join(",");
   const dayLength = Math.max(1, Number(CONFIG.dayLength || 120) || 120);
-  const visibleDay = Math.floor(Math.max(0, Number(world.time || 0) || 0) / dayLength);
-  const snapshot = `${mode}:${rows.length}:${visibleDay}:${seriesSnapshot}:${chart.clientWidth}x${chart.clientHeight}`;
+  const maxT = Math.max(0, Number(last?.t ?? world.time ?? 0) || 0);
+  const visibleDay = Math.floor(maxT / dayLength);
+  const lastRowT = Math.round(maxT * 10);
+  const snapshot = `${mode}:${rangeConfig.id}:${rows.length}:${lastRowT}:${visibleDay}:${seriesSnapshot}:${chart.clientWidth}x${chart.clientHeight}`;
   if (uiCache.lastChartDraw === snapshot) return;
   uiCache.lastChartDraw = snapshot;
   const cssW = Math.max(280, Math.floor(chart.clientWidth || chart.offsetWidth || 320));
@@ -301,20 +451,15 @@ function drawColonyChart(values) {
   const w = cssW - pad.l - pad.r;
   const h = cssH - pad.t - pad.b;
   const scale = chartScaleForRows(mode, rows, series);
-  const times = rows.map(r => Math.max(0, Number(r.t || 0) || 0));
-  const minT = Math.min(...times, Math.max(0, Number(world.time || 0) || 0));
-  const maxT = Math.max(...times, Math.max(0, Number(world.time || 0) || 0), minT + 1);
-  const xForTime = (t) => pad.l + clamp((Number(t || 0) - minT) / Math.max(1, maxT - minT), 0, 1) * w;
-  const xFor = (i) => xForTime(rows[i]?.t ?? maxT);
-  const yFor = (row, s) => {
-    const raw = Number(row[s.key] || 0);
-    if (scale.percent) {
-      const v = clamp(raw / 100, 0, 1);
-      return pad.t + h - h * v;
-    }
+  const chartMaxT = Math.max(1, maxT);
+  const minT = Math.max(0, chartMaxT - rangeConfig.duration);
+  const xForTime = (t) => pad.l + clamp((Number(t || 0) - minT) / Math.max(1, chartMaxT - minT), 0, 1) * w;
+  const xFor = (i) => xForTime(rows[i]?.t ?? chartMaxT);
+  const yFor = (row, seriesDef) => {
+    const raw = Number(row[seriesDef.key] || 0);
+    if (scale.percent) return pad.t + h - h * clamp(raw / 100, 0, 1);
     const denom = Math.max(1, scale.max - scale.min);
-    const v = clamp((raw - scale.min) / denom, 0, 1);
-    return pad.t + h - h * v;
+    return pad.t + h - h * clamp((raw - scale.min) / denom, 0, 1);
   };
   const grid = [0, 25, 50, 75, 100].map(yv => {
     const y = pad.t + h - h * yv / 100;
@@ -322,23 +467,25 @@ function drawColonyChart(values) {
     return `<line x1="${pad.l}" y1="${y.toFixed(1)}" x2="${(pad.l + w).toFixed(1)}" y2="${y.toFixed(1)}" stroke="rgba(84,68,48,0.13)" stroke-width="1"/><text x="${pad.l - 6}" y="${(y + 3).toFixed(1)}" text-anchor="end" font-size="10" fill="rgba(117,106,94,0.78)">${chartAxisLabel(rawLabel, scale)}</text>`;
   }).join("");
   const firstDay = Math.ceil(minT / dayLength);
-  const lastDay = Math.floor(maxT / dayLength);
+  const lastDay = Math.floor(chartMaxT / dayLength);
   const dayMarkers = [];
   for (let d = firstDay; d <= lastDay; d += 1) {
     const t = d * dayLength;
-    if (t < minT - 0.001 || t > maxT + 0.001) continue;
+    if (t < minT - 0.001 || t > chartMaxT + 0.001) continue;
     const x = xForTime(t);
     const label = chartSeasonDayLabelForTime(t);
-    dayMarkers.push(`<line x1="${x.toFixed(1)}" y1="${pad.t}" x2="${x.toFixed(1)}" y2="${(pad.t + h).toFixed(1)}" stroke="rgba(104,104,104,0.38)" stroke-width="1" stroke-dasharray="4 5"/><text x="${(x + 3).toFixed(1)}" y="${(pad.t + 11).toFixed(1)}" font-size="10" fill="rgba(92,92,92,0.76)">${label}</text>`);
+    const showLabel = rangeConfig.id !== "year" || ((d - firstDay) % 2 === 0);
+    dayMarkers.push(`<line x1="${x.toFixed(1)}" y1="${pad.t}" x2="${x.toFixed(1)}" y2="${(pad.t + h).toFixed(1)}" stroke="rgba(104,104,104,0.38)" stroke-width="1" stroke-dasharray="4 5"/>${showLabel ? `<text x="${(x + 3).toFixed(1)}" y="${(pad.t + 11).toFixed(1)}" font-size="10" fill="rgba(92,92,92,0.76)">${label}</text>` : ""}`);
   }
-  const lines = series.map(s => {
-    const pts = rows.map((row, i) => `${xFor(i).toFixed(1)},${yFor(row, s).toFixed(1)}`).join(" ");
-    const last = rows[rows.length - 1];
+  const lines = series.map(seriesDef => {
+    const pts = rows.map((row, i) => `${xFor(i).toFixed(1)},${yFor(row, seriesDef).toFixed(1)}`).join(" ");
+    const latest = rows[rows.length - 1];
     const cx = xFor(rows.length - 1).toFixed(1);
-    const cy = yFor(last, s).toFixed(1);
-    return `<polyline points="${pts}" fill="none" stroke="${s.color}" stroke-width="${s.key === "pop" ? 2.4 : 1.8}" stroke-linecap="round" stroke-linejoin="round"/><circle cx="${cx}" cy="${cy}" r="2.7" fill="${s.color}"/>`;
+    const cy = yFor(latest, seriesDef).toFixed(1);
+    return `<polyline points="${pts}" fill="none" stroke="${seriesDef.color}" stroke-width="${seriesDef.key === "pop" ? 2.4 : 1.8}" stroke-linecap="round" stroke-linejoin="round"/><circle cx="${cx}" cy="${cy}" r="2.7" fill="${seriesDef.color}"/>`;
   }).join("");
-  chart.innerHTML = `<svg viewBox="0 0 ${cssW} ${cssH}" preserveAspectRatio="none" aria-hidden="true"><rect x="0" y="0" width="${cssW}" height="${cssH}" rx="14" fill="rgba(255,255,255,0.18)"/>${grid}${dayMarkers.join("")}${lines}<text x="${pad.l}" y="${cssH - 8}" font-size="10" fill="rgba(117,106,94,0.76)">2\u6642\u9593\u3054\u3068 / 1\u9031\u9593</text></svg>`;
+  chart.innerHTML = `<svg viewBox="0 0 ${cssW} ${cssH}" preserveAspectRatio="none" aria-hidden="true"><rect x="0" y="0" width="${cssW}" height="${cssH}" rx="14" fill="rgba(255,255,255,0.18)"/>${grid}${dayMarkers.join("")}${lines}<text x="${pad.l}" y="${cssH - 8}" font-size="10" fill="rgba(117,106,94,0.76)">${rangeConfig.footer}</text></svg>`;
+  uiCache.chartHoverState = { rows, series, minT, maxT: chartMaxT, pad, w, h, cssW, cssH, mode, range: rangeConfig.id, scale };
   if (ui.colonyChartLegend) ui.colonyChartLegend.innerHTML = allSeries.map(s => {
     const hidden = hiddenSeries.has(s.key);
     return `<button type="button" class="chart-series-toggle ${hidden ? "series-hidden" : ""}" data-series-key="${s.key}" aria-pressed="${hidden ? "false" : "true"}" title="${hidden ? "\u8868\u793a\u3059\u308b" : "\u975e\u8868\u793a\u306b\u3059\u308b"}"><i aria-hidden="true" style="background:${s.color}"></i><span>${s.label} ${formatChartValue(s.key, rows[rows.length - 1] || values)}</span></button>`;
@@ -359,6 +506,7 @@ function chartSeries(mode = "population") {
     { key: "obj_grass", label: "\u8349", color: "#5b9d61" },
     { key: "obj_zunchi", label: "\u305a\u3093\u3061", color: "#6f5a2f" },
     { key: "obj_trace", label: "\u6b7b\u9ab8", color: "#8a7054" },
+    { key: "obj_grave", label: "\u5893", color: "#77716a" },
     { key: "obj_grass_bed", label: "\u304b\u3093\u305f\u3093\u30d9\u30c3\u30c9", color: "#78ff45" },
     { key: "obj_water", label: "\u96e8\u6ef4", color: "#5aa8d6" },
     { key: "temperature", label: "\u6c17\u6e29", color: "#c46f3c" },
diff --git a/js/ui_family_layout.js b/js/ui_family_layout.js
index d182e81..19dcbef 100644
--- a/js/ui_family_layout.js
+++ b/js/ui_family_layout.js
@@ -1,7 +1,5 @@
 "use strict";
 
-function escapeHtml(value) { return window.TarinaiUIHelpers.htmlEscape(value); }
-
 function lineageNodeSort(a, b) {
   return (a.generation || 1) - (b.generation || 1) ||
     (a.birthTime || 0) - (b.birthTime || 0) ||
@@ -12,6 +10,10 @@ function lineageNodeSort(a, b) {
 function lineageGeneticPercentFromNode(n, key = "") {
   const entity = n?.id ? world.tarinai.find(t => (t.familyKey || t.id) === n.id) : null;
   if (entity?.geneticStatRatio) return Math.round((entity.geneticStatRatio(key) - 1) * 100);
+  if (Array.isArray(n?.geneticSummary)) {
+    const index = { life: 0, size: 1, attack: 2, speed: 3 }[key];
+    if (Number.isInteger(index) && Number.isFinite(Number(n.geneticSummary[index]))) return Math.round(Number(n.geneticSummary[index]));
+  }
   const g = typeof normalizeGenetics === "function" ? normalizeGenetics(n?.genetics, n?.id || "") : (n?.genetics || {});
   const map = { life: "lifeSpanMul", attack: "attackMul", speed: "speedMul", size: "sizeMul" };
   const ratio = Number(g?.[map[key] || key]) || 1;
@@ -24,11 +26,15 @@ function lineageSignedPercentText(value = 0) {
 }
 
 
+function familyDeathTimeText(value) {
+  return globalThis.TarinaiMemorialBellSystem?.formatWorldTime?.(value) || "";
+}
+
 function lineageTreeNodeHtml(n, x, y) {
   const entity = n?.id ? world.tarinai.find(t => (t.familyKey || t.id) === n.id) : null;
   const live = entity && !entity.dead ? entity : null;
   const img = n ? tarinaiSpritePathForId(n.id) : SPRITES[0].path;
-  const name = escapeHtml(n?.name || "\u4e0d\u660e");
+  const name = window.TarinaiUIHelpers.htmlEscape(n?.name || "\u4e0d\u660e");
   const gen = n?.generation ? `G${n.generation}` : "G?";
   const rawReason = !n?.alive && n?.deathReason ? String(n.deathReason) : "";
   const briefReason = familyDeathReasonLabel(rawReason, entity);
@@ -38,15 +44,16 @@ function lineageTreeNodeHtml(n, x, y) {
   const tags = rawTags.slice();
   const displayTags = tags.slice(0, 4);
   const tagText = tags.length ? ` / ${tags.join(" ")}` : "";
-  const title = escapeHtml(`${n?.name || "\u4e0d\u660e"} / \u4e16\u4ee3 ${n?.generation || "?"} / ${status}${reason}${tagText}`);
-  const deathLine = "";
-  const tagLine = displayTags.length ? `<span class="family-personality-tags">${displayTags.map(tag => `<em>${escapeHtml(tag)}</em>`).join("")}</span>` : "";
+  const title = window.TarinaiUIHelpers.htmlEscape(`${n?.name || "\u4e0d\u660e"} / \u4e16\u4ee3 ${n?.generation || "?"} / ${status}${reason}${tagText}`);
+  const deathTimeText = !n?.alive ? familyDeathTimeText(n?.deathTime) : "";
+  const deathLine = deathTimeText ? `<span class="family-death-time">${window.TarinaiUIHelpers.htmlEscape(deathTimeText)}</span>` : "";
+  const tagLine = displayTags.length ? `<span class="family-personality-tags">${displayTags.map(tag => `<em>${window.TarinaiUIHelpers.htmlEscape(tag)}</em>`).join("")}</span>` : "";
   const champion = !!(live?.isTarinaiChampion || n?.isTarinaiChampion);
   const statLine = n ? `<span class="family-genetic-stats" title="\u5BFF\u547D / \u4F53\u683C / \u653B\u6483 / \u901F\u5EA6">
-        <span><b>\u5BFF</b>${escapeHtml(lineageSignedPercentText(lineageGeneticPercentFromNode(n, "life")))}</span>
-        <span><b>\u4F53</b>${escapeHtml(lineageSignedPercentText(lineageGeneticPercentFromNode(n, "size")))}</span>
-        <span><b>\u653B</b>${escapeHtml(lineageSignedPercentText(lineageGeneticPercentFromNode(n, "attack")))}</span>
-        <span><b>\u901F</b>${escapeHtml(lineageSignedPercentText(lineageGeneticPercentFromNode(n, "speed")))}</span>
+        <span><b>\u5BFF</b>${window.TarinaiUIHelpers.htmlEscape(lineageSignedPercentText(lineageGeneticPercentFromNode(n, "life")))}</span>
+        <span><b>\u4F53</b>${window.TarinaiUIHelpers.htmlEscape(lineageSignedPercentText(lineageGeneticPercentFromNode(n, "size")))}</span>
+        <span><b>\u653B</b>${window.TarinaiUIHelpers.htmlEscape(lineageSignedPercentText(lineageGeneticPercentFromNode(n, "attack")))}</span>
+        <span><b>\u901F</b>${window.TarinaiUIHelpers.htmlEscape(lineageSignedPercentText(lineageGeneticPercentFromNode(n, "speed")))}</span>
       </span>` : "";
   const cls = n ? ((live || n.alive) ? "alive" : "dead") : "missing";
   const childCls = (n?.parents || []).length ? " child" : "";
@@ -54,12 +61,12 @@ function lineageTreeNodeHtml(n, x, y) {
     ? (live.effectiveScale ? live.effectiveScale() : (Number.isFinite(live.scale) ? live.scale : (Number.isFinite(live.adultScale) ? live.adultScale : 0.28)))
     : (Number.isFinite(n?.scale) ? n.scale : (Number.isFinite(n?.adultScale) ? n.adultScale : 0.28));
   const iconScale = clamp((Number(iconBaseScale) || 0.28) / 0.28, 0.64, 1.42).toFixed(2);
-  const data = n?.id ? ` data-family-tarinai-id="${escapeHtml(n.id)}"` : "";
+  const data = n?.id ? ` data-family-tarinai-id="${window.TarinaiUIHelpers.htmlEscape(n.id)}"` : "";
   return `<div class="family-node tree-node ${cls}${childCls}${champion ? " champion" : ""}"${data} title="${title}" style="left:${Math.round(x)}px;top:${Math.round(y)}px;--family-icon-scale:${iconScale}">
     <div class="family-portrait" aria-hidden="true"><img src="${img}" loading="lazy" decoding="async" alt=""></div>
     <div class="family-copy">
       <strong>${champion ? "\u265B " : ""}${name}</strong>
-      <span>${escapeHtml(gen)} / ${escapeHtml(status)}${champion ? " / \u738B\u8005" : ""}</span>
+      <span>${window.TarinaiUIHelpers.htmlEscape(gen)} / ${window.TarinaiUIHelpers.htmlEscape(status)}${champion ? " / \u738B\u8005" : ""}</span>
       ${statLine}
       ${deathLine}
       ${tagLine}
@@ -378,7 +385,7 @@ function lineageBuildRowGroups(row, idSet) {
 
 function lineageLayoutRows(rows, idSet) {
   const NODE_W = 150;
-  const NODE_H = 104;
+  const NODE_H = 112;
   const SIBLING_GAP = 24;
   const GROUP_GAP = 42;
   const PARTNER_GROUP_GAP = 18;
diff --git a/js/ui_family_render.js b/js/ui_family_render.js
index 6b54f19..a349c31 100644
--- a/js/ui_family_render.js
+++ b/js/ui_family_render.js
@@ -1,7 +1,5 @@
 "use strict";
 
-function escapeHtml(value) { return window.TarinaiUIHelpers.htmlEscape(value); }
-
 function lineageSplitByActualEdges(component) {
   const family = lineageEdgeFamily(world.family || {});
   const nodes = Array.from(new Map(lineageCleanComponent(component, family).filter(Boolean).map(n => [n.id, n])).values());
@@ -116,7 +114,7 @@ function lineageFamilyHtml(component, index, family, signature = "") {
   const nodeHtml = layout.nodes.map(p => lineageTreeNodeHtml(p.node, p.x, p.y)).join("");
   const empty = !layout.childLinks.length ? `<div class="lineage-empty-family">\u89aa\u5b50\u95a2\u4fc2\u306e\u7dda\u306f\u307e\u3060\u3042\u308a\u307e\u305b\u3093\u3002</div>` : "";
 
-  const html = `<section class="lineage-family lineage-family-tree" data-lineage-key="${escapeHtml(cacheKey)}">
+  const html = `<section class="lineage-family lineage-family-tree" data-lineage-key="${window.TarinaiUIHelpers.htmlEscape(cacheKey)}">
     <h3>\u5bb6\u7cfb {{LINEAGE_INDEX}} / ${uniqueComponent.length}\u5339 / \u751f\u5b58 ${aliveCount}</h3>
     <div class="lineage-tree-panel" style="width:${Math.ceil(layout.width)}px;height:${Math.ceil(layout.height)}px">
       <svg class="lineage-links" viewBox="0 0 ${Math.ceil(layout.width)} ${Math.ceil(layout.height)}" aria-hidden="true">
@@ -134,7 +132,11 @@ function lineageFamilyHtml(component, index, family, signature = "") {
 function lineageArchiveNeedsRender() {
   const familyVersion = world.familyVersion || 0;
   const familyDirty = Boolean(world.familyTreeDirty);
-  return !uiCache.archiveVersion || uiCache.archiveFamilyVersion !== familyVersion || familyDirty;
+  // Only a completed tree or completed empty-state counts as a usable snapshot.
+  // A preparation/status shell left by an interrupted async render must be rebuilt.
+  const hasCompletedSnapshot = Boolean(ui.archiveContent?.querySelector?.(".lineage-family-tree, .selected-info.empty"));
+  const renderingNow = Boolean(uiCache.archiveRenderRunning && ui.archiveContent?.querySelector?.(".lineage-render-status"));
+  return (!hasCompletedSnapshot && !renderingNow) || !uiCache.archiveVersion || uiCache.archiveFamilyVersion !== familyVersion || familyDirty;
 }
 
 function lineageDeferArchiveIfOffscreen(hiddenInterval = 30000) {
@@ -156,12 +158,18 @@ function lineageScheduleArchiveIdle(timeout = 1200) {
   return true;
 }
 
-function renderArchive() {
+function renderArchive(options = {}) {
   if (!ui.archiveContent) return;
+  const userRequested = Boolean(options?.userRequested);
+  if (!userRequested && uiCache.activePanelTab !== "family") {
+    uiCache.archiveScheduled = false;
+    return;
+  }
+  if (userRequested) uiCache.archiveViewActivated = true;
   // Auto update OFF now means "do not keep refreshing", not "hide the tree".
   // Draw the current snapshot once so the family tree is always available under
   // the event UI, then mark it stale when the family data changes.
-  if (typeof archiveAutoUpdateEnabled === "function" && !archiveAutoUpdateEnabled()) {
+  if (!userRequested && typeof archiveAutoUpdateEnabled === "function" && !archiveAutoUpdateEnabled()) {
     uiCache.archiveScheduled = false;
     if (uiCache.archiveVersion && world.familyTreeDirty) {
       const hasRenderedGraph = Boolean(ui.archiveContent.querySelector(".lineage-family-tree, [data-family-tarinai-id]"));
@@ -187,10 +195,10 @@ function renderArchive() {
     return;
   }
   if (!lineageArchiveNeedsRender()) return;
-  if (lineageDeferArchiveIfOffscreen()) return;
+  if (!userRequested && lineageDeferArchiveIfOffscreen()) return;
   const now = performance.now();
   const minUpdateGap = 4800;
-  if (uiCache.archiveVersion && !uiCache.archiveRenderForce && now - (uiCache.archiveLastRenderedAt || 0) < minUpdateGap) {
+  if (!userRequested && uiCache.archiveVersion && !uiCache.archiveRenderForce && now - (uiCache.archiveLastRenderedAt || 0) < minUpdateGap) {
     if (!uiCache.archiveRenderTimer) {
       uiCache.archiveRenderTimer = setTimeout(() => {
         uiCache.archiveRenderTimer = 0;
@@ -207,7 +215,8 @@ function renderArchive() {
   }
   const family = world.family || {};
   const version = String(world.familyVersion || 0);
-  if (uiCache.archiveVersion === version) {
+  const hasArchiveSnapshot = Boolean(ui.archiveContent?.querySelector?.(".lineage-family-tree, .selected-info.empty"));
+  if (uiCache.archiveVersion === version && hasArchiveSnapshot && !familyDirty) {
     world.familyTreeDirty = false;
     uiCache.archivePendingDirtyAfterRun = false;
     return;
@@ -315,6 +324,10 @@ function resetArchiveRenderState() {
 }
 
 function scheduleArchiveWindowRender() {
+  if (!uiCache.archiveViewActivated || uiCache.activePanelTab !== "family") {
+    uiCache.archiveScheduled = false;
+    return;
+  }
   if (typeof archiveAutoUpdateEnabled === "function" && !archiveAutoUpdateEnabled()) {
     uiCache.archiveScheduled = false;
     if (world.familyTreeDirty) lineageSetArchiveStaleStatus(true);
@@ -331,6 +344,7 @@ function scheduleArchiveWindowRender() {
 }
 
 function schedulePendingArchiveRender() {
+  if (!uiCache.archiveViewActivated || uiCache.activePanelTab !== "family") return;
   if (typeof archiveAutoUpdateEnabled === "function" && !archiveAutoUpdateEnabled()) return;
   if (!uiCache.archivePendingOffscreen) return;
   if (!lineageArchiveNearViewport()) return;
@@ -338,4 +352,27 @@ function schedulePendingArchiveRender() {
   if (lineageArchiveNeedsRender()) scheduleArchiveWindowRender();
 }
 
+function cancelArchiveBackgroundRender() {
+  const wasRunning = Boolean(uiCache.archiveRenderRunning);
+  if (uiCache.archiveRenderTimer) {
+    clearTimeout(uiCache.archiveRenderTimer);
+    uiCache.archiveRenderTimer = 0;
+  }
+  // All asynchronous family-layout pumps validate this token before doing work.
+  // Invalidating it stops an in-progress offscreen build without discarding the
+  // reusable component HTML cache. An interrupted render is marked incomplete so
+  // the next explicit visit resumes with a clean render pass.
+  uiCache.archiveRenderToken = `paused:${performance.now()}`;
+  uiCache.archiveRenderRunning = false;
+  uiCache.archiveScheduled = false;
+  uiCache.archivePendingOffscreen = false;
+  uiCache.archivePendingDirtyAfterRun = false;
+  if (wasRunning) {
+    uiCache.archiveVersion = "";
+    uiCache.archiveFamilyVersion = null;
+    if (world) world.familyTreeDirty = true;
+  }
+}
+
 window.resetArchiveRenderState = resetArchiveRenderState;
+window.cancelArchiveBackgroundRender = cancelArchiveBackgroundRender;
diff --git a/js/ui_ground.js b/js/ui_ground.js
index 27005a9..b160b06 100644
--- a/js/ui_ground.js
+++ b/js/ui_ground.js
@@ -52,7 +52,7 @@
       if (typeof showToast === "function") showToast("\u5730\u9762\u3092\u307e\u3060\u5207\u308a\u66ff\u3048\u3089\u308c\u307e\u305b\u3093\u3002");
       return;
     }
-    global.audio?.uiClick?.();
+    global.TarinaiAudio?.uiClick?.();
     currentWorld.cycleGroundType();
     global.TarinaiRender.invalidateRenderCaches("ground-cycle");
     if (global.uiCache) {
diff --git a/js/ui_input_shared.js b/js/ui_input_shared.js
index 4250767..76f3480 100644
--- a/js/ui_input_shared.js
+++ b/js/ui_input_shared.js
@@ -195,6 +195,25 @@
     }
 
     function beginGrab(p, clientX, clientY, options = {}) {
+      // マメクサレダケ病の除去判定は、キノコ自体の小さな見た目ではなく
+      // 通常のたりないをつまむ時と同じ個体当たり判定を使う。
+      // 一度命中すれば recover() が病気フラグを解除するため、表示中の全キノコが一括で抜ける。
+      let infectedTarinai = null;
+      for (let i = (world.tarinai?.length || 0) - 1; i >= 0; i--) {
+        const candidate = world.tarinai[i];
+        if (!candidate || candidate.dead || !candidate.mamekusaredakeDisease || world.isTarinaiHiddenInNestBox?.(candidate)) continue;
+        const hit = candidate.contains
+          ? candidate.contains(p.x, p.y)
+          : distXY(p.x, p.y, candidate.x, candidate.y) <= (candidate.radius || 22) * 1.4;
+        if (hit) { infectedTarinai = candidate; break; }
+      }
+      if (infectedTarinai) {
+        global.TarinaiHistory.capture(world, "pinch-mamekusaredake");
+        global.TarinaiMamekusaredakeSystem?.recover?.(infectedTarinai, "つまんで取れた");
+        audio.grab?.();
+        world.drawListDirty = true;
+        return true;
+      }
       const target = world.findGrabTargetAt ? world.findGrabTargetAt(p.x, p.y) : null;
       if (!target) {
         if (options.notifyNoTarget) showToast("\u3064\u307e\u3081\u308b\u5bfe\u8c61\u304c\u3042\u308a\u307e\u305b\u3093\u3002");
@@ -525,7 +544,6 @@
       world.rebuildSpatial?.();
       renderStats();
       if (removed > 0) {
-        world.log?.(`\u7bc4\u56f2\u524a\u9664\u3067${removed}\u500b\u6d88\u3057\u305f\u3002`, "observe");
         showToast(`${removed}\u500b\u6d88\u3057\u307e\u3057\u305f\u3002`);
       }
       return true;
diff --git a/js/ui_layout_dialogs.js b/js/ui_layout_dialogs.js
index 4cea4dc..f9e71e1 100644
--- a/js/ui_layout_dialogs.js
+++ b/js/ui_layout_dialogs.js
@@ -1,6 +1,76 @@
 "use strict";
 
-function escapeHtml(value) { return window.TarinaiUIHelpers.htmlEscape(value); }
+const managedDialogOrigins = new WeakMap();
+
+function managedDialogFocusable(dialog) {
+  if (!dialog) return [];
+  return [...dialog.querySelectorAll('button:not([disabled]), [href], input:not([disabled]), select:not([disabled]), textarea:not([disabled]), [tabindex]:not([tabindex="-1"])')]
+    .filter(el => !el.hidden && el.getClientRects().length > 0);
+}
+
+function openManagedDialog(dialog, opener = document.activeElement) {
+  if (!dialog) return;
+  if (opener instanceof HTMLElement && !dialog.contains(opener)) managedDialogOrigins.set(dialog, opener);
+  if (!dialog.hasAttribute("tabindex")) dialog.tabIndex = -1;
+  dialog.classList.remove("hidden");
+  dialog.setAttribute("aria-hidden", "false");
+  requestAnimationFrame(() => {
+    const focusables = managedDialogFocusable(dialog);
+    (focusables[0] || dialog).focus?.({ preventScroll: true });
+  });
+}
+
+function closeManagedDialog(dialog) {
+  if (!dialog) return;
+  dialog.classList.add("hidden");
+  dialog.setAttribute("aria-hidden", "true");
+  const origin = managedDialogOrigins.get(dialog);
+  managedDialogOrigins.delete(dialog);
+  if (origin?.isConnected) requestAnimationFrame(() => origin.focus?.({ preventScroll: true }));
+}
+
+function managedDialogVisible(dialog) {
+  if (!dialog || dialog.hidden || dialog.getAttribute("aria-hidden") === "true") return false;
+  if (dialog.classList.contains("hidden") || dialog.closest(".hidden")) return false;
+  return dialog.getClientRects().length > 0;
+}
+
+function topVisibleDialog() {
+  const dialogs = [...document.querySelectorAll('[role="dialog"], [role="alertdialog"]')].filter(managedDialogVisible);
+  return dialogs[dialogs.length - 1] || null;
+}
+
+document.addEventListener("keydown", (event) => {
+  const dialog = topVisibleDialog();
+  if (!dialog) return;
+  if (event.key === "Escape") {
+    event.preventDefault();
+    event.stopPropagation();
+    dialog.dispatchEvent(new CustomEvent("tarinai:dialog-close-request"));
+    return;
+  }
+  if (event.key !== "Tab") return;
+  const focusables = managedDialogFocusable(dialog);
+  if (!focusables.length) {
+    event.preventDefault();
+    dialog.focus?.();
+    return;
+  }
+  const first = focusables[0];
+  const last = focusables[focusables.length - 1];
+  if (event.shiftKey && document.activeElement === first) {
+    event.preventDefault();
+    last.focus();
+  } else if (!event.shiftKey && document.activeElement === last) {
+    event.preventDefault();
+    first.focus();
+  } else if (!dialog.contains(document.activeElement)) {
+    event.preventDefault();
+    first.focus();
+  }
+}, true);
+
+window.TarinaiManagedDialogs = Object.freeze({ open: openManagedDialog, close: closeManagedDialog });
 
 function resizeCanvas() {
   const rect = canvas.getBoundingClientRect();
@@ -15,7 +85,7 @@ function resizeCanvas() {
   ctx.setTransform(dpr, 0, 0, dpr, 0, 0);
   ctx.fillStyle = "#cfe3d3";
   ctx.fillRect(0, 0, Math.max(1, rect.width), Math.max(1, rect.height));
-  world.setViewportSize(Math.max(1, rect.width), Math.max(1, rect.height));
+  world.setViewportSize(Math.max(1, rect.width), Math.max(1, rect.height), { resizeWorld: true, scaleContents: true });
   uiCache.lastChartDraw = "";
   if (typeof render === "function") render();
 }
@@ -30,7 +100,7 @@ function applyFieldLayout(fieldType = world.fieldType || "garden") {
   root.style.setProperty("--field-mobile-min-height", layout.mobileMinHeight);
   world.fieldType = field.id;
   const rect = canvas.getBoundingClientRect();
-  world.setViewportSize(rect.width, rect.height);
+  world.setViewportSize(rect.width, rect.height, { resizeWorld: true, scaleContents: true });
   resizeCanvas();
 }
 
@@ -70,11 +140,11 @@ function openFieldDialog() {
   uiCache.resetFieldType = FIELD_TYPES?.[world?.fieldType]?.id || uiCache.resetFieldType || "garden";
   uiCache.resetPreset = normalizeResetPresetId(uiCache.resetPreset || "default");
   syncFieldDialogChoices();
-  ui.fieldDialog?.classList.remove("hidden");
+  openManagedDialog(ui.fieldDialog);
 }
 
 function closeFieldDialog() {
-  ui.fieldDialog?.classList.add("hidden");
+  closeManagedDialog(ui.fieldDialog);
 }
 
 function hydrateLazyImages(root) {
@@ -89,8 +159,8 @@ function renderEcologyCards() {
   const cards = window.TEXT_CATALOG?.ecologyCards || [];
   ui.ecologyGrid.innerHTML = cards.map(card => `
         <section class="ecology-card">
-          <img data-src="${escapeHtml(card.image || "assets/sprites/tarinai_01_smile.webp")}" loading="lazy" decoding="async" alt="">
-          <div><strong>${escapeHtml(card.title || "")}</strong><p>${escapeHtml(card.text || "")}</p></div>
+          <img data-src="${window.TarinaiUIHelpers.htmlEscape(card.image || "assets/sprites/tarinai_01_smile.webp")}" loading="lazy" decoding="async" alt="">
+          <div><strong>${window.TarinaiUIHelpers.htmlEscape(card.title || "")}</strong><p>${window.TarinaiUIHelpers.htmlEscape(card.text || "")}</p></div>
         </section>`).join("");
   ui.ecologyGrid.dataset.ready = "1";
 }
@@ -98,19 +168,19 @@ function renderEcologyCards() {
 function openEcologyDialog() {
   renderEcologyCards();
   hydrateLazyImages(ui.ecologyDialog);
-  ui.ecologyDialog?.classList.remove("hidden");
+  openManagedDialog(ui.ecologyDialog);
 }
 
 function closeEcologyDialog() {
-  ui.ecologyDialog?.classList.add("hidden");
+  closeManagedDialog(ui.ecologyDialog);
 }
 
 function openArchiveResetDialog() {
-  ui.archiveResetDialog?.classList.remove("hidden");
+  openManagedDialog(ui.archiveResetDialog);
 }
 
 function closeArchiveResetDialog() {
-  ui.archiveResetDialog?.classList.add("hidden");
+  closeManagedDialog(ui.archiveResetDialog);
 }
 
 function resetWithField(fieldType, presetId = uiCache.resetPreset || "default") {
@@ -158,6 +228,11 @@ function selectTool(tool) {
   const wasCopyArmed = world.tool === "copy" && tool === "copy" && Boolean(world.copyBuffer);
   const result = window.TarinaiCommands.dispatch(world, { type: "tool.select", toolId: tool });
   const activeTool = result?.toolId || world.tool || tool;
+  // A freshly selected tool must not inherit drag/click-suppression state from
+  // the previous tool.  Reset these transients for every tool, not for one item.
+  if (typeof uiCache === "object" && uiCache) {
+    for (const key of ["areaDeleteMoved", "hoseMoved", "grabMoved", "shootSuppressClick", "panMoved"]) uiCache[key] = false;
+  }
   if (!["rope", "rod", "spring", "wire", "insulated_wire"].includes(activeTool)) world.pendingLinkEndpoint = null;
   if (activeTool !== "copy") world.copyBuffer = null;
   else if (wasCopyArmed) {
@@ -180,7 +255,13 @@ function showToast(text) {
 
 function syncTopButtons() {
   ui.pauseBtn.textContent = world.paused ? "\u518d\u958b" : "\u4e00\u6642\u505c\u6b62";
-  ui.speedBtn.textContent = `\u901f\u5ea6 x${world.speed}`;
+  if (ui.speedSelect) ui.speedSelect.value = String(world.speed);
+  if (ui.speedMenuBtn) ui.speedMenuBtn.textContent = `速度 ×${world.speed}`;
+  for (const option of ui.speedMenuPanel?.querySelectorAll?.("[data-speed-value]") || []) {
+    const active = Number(option.dataset.speedValue) === Number(world.speed);
+    option.classList.toggle("active", active);
+    option.setAttribute("aria-checked", active ? "true" : "false");
+  }
   syncAudioControls();
   syncArchiveUpdateButton();
 }
@@ -204,8 +285,9 @@ function setArchiveUpdateEnabled(on) {
   if (uiCache.archiveUpdateEnabled) {
     uiCache.archiveVersion = "";
     uiCache.archiveFamilyVersion = null;
+    uiCache.archiveViewActivated = true;
     world.familyTreeDirty = true;
-    scheduleArchiveWindowRender?.();
+    renderArchive?.({ userRequested: true });
     showToast("\u5bb6\u7cfb\u56f3\u306e\u66f4\u65b0\u3092ON\u306b\u3057\u307e\u3057\u305f\u3002");
   } else {
     if (uiCache.archiveRenderTimer) { clearTimeout(uiCache.archiveRenderTimer); uiCache.archiveRenderTimer = 0; }
diff --git a/js/ui_log.js b/js/ui_log.js
index 38f6184..117c49b 100644
--- a/js/ui_log.js
+++ b/js/ui_log.js
@@ -1,30 +1,69 @@
 "use strict";
 
-function escapeHtml(value) { return window.TarinaiUIHelpers.htmlEscape(value); }
+const LOG_EVENT_CATEGORIES = Object.freeze(["life", "danger", "social", "living", "environment", "observe"]);
+const LOG_EVENT_CATEGORY_LABELS = Object.freeze({
+  life: "\u751f\u547d",
+  danger: "\u5371\u967a",
+  social: "\u4ea4\u6d41",
+  living: "\u751f\u6d3b",
+  environment: "\u74b0\u5883",
+  observe: "\u89b3\u5bdf",
+});
+const LOG_KIND_TO_EVENT_CATEGORY = Object.freeze({
+  birth: "life",
+  death: "life",
+  accident: "danger",
+  danger: "danger",
+  fight: "danger",
+  relation: "social",
+  food: "living",
+  event: "living",
+  weather: "environment",
+  grass: "environment",
+  observe: "observe",
+  note: "observe",
+});
+
+function logEventCategoryForKind(kind = "note") {
+  return LOG_KIND_TO_EVENT_CATEGORY[String(kind || "note")] || "observe";
+}
+
+function logEventCategoryLabel(category = "observe") {
+  return LOG_EVENT_CATEGORY_LABELS[String(category || "observe")] || LOG_EVENT_CATEGORY_LABELS.observe;
+}
+
+function allLogEventCategories() {
+  return new Set(LOG_EVENT_CATEGORIES);
+}
 
 function loadLogPushSettings() {
   try {
-    const raw = localStorage.getItem("tarinai_log_push_settings_v2");
-    if (!raw) return;
-    const parsed = JSON.parse(raw);
-    uiCache.logPushEnabled = Boolean(parsed.enabled);
-    if (Array.isArray(parsed.kinds)) uiCache.logPushKinds = new Set(parsed.kinds);
+    const raw = localStorage.getItem("tarinai_event_category_settings_v1");
+    if (raw) {
+      const parsed = JSON.parse(raw);
+      uiCache.logPushEnabled = Boolean(parsed.pushEnabled ?? parsed.enabled);
+      if (Array.isArray(parsed.categories)) {
+        const categories = parsed.categories.filter(category => LOG_EVENT_CATEGORIES.includes(category));
+        uiCache.logEventCategories = new Set(categories);
+      }
+      return;
+    }
   } catch (_) {}
 }
 
 function saveLogPushSettings() {
   try {
-    localStorage.setItem("tarinai_log_push_settings_v2", JSON.stringify({
-      enabled: Boolean(uiCache.logPushEnabled),
-      kinds: Array.from(uiCache.logPushKinds || []),
+    localStorage.setItem("tarinai_event_category_settings_v1", JSON.stringify({
+      pushEnabled: Boolean(uiCache.logPushEnabled),
+      categories: Array.from(uiCache.logEventCategories || []),
     }));
   } catch (_) {}
 }
 
 function syncLogPushControls() {
   if (ui.logPushEnabled) ui.logPushEnabled.checked = Boolean(uiCache.logPushEnabled);
-  for (const input of ui.logPushControls?.querySelectorAll("[data-push-kind]") || []) {
-    input.checked = uiCache.logPushKinds?.has(input.dataset.pushKind || "") ?? false;
+  for (const input of ui.logPushControls?.querySelectorAll("[data-event-category]") || []) {
+    input.checked = uiCache.logEventCategories?.has(input.dataset.eventCategory || "") ?? false;
   }
 }
 
@@ -57,15 +96,17 @@ function toggleSoundPanel() {
 function pushLogNotification(entry = {}) {
   if (!uiCache.logPushEnabled || !entry || entry.hiddenFromObservation) return;
   const kind = entry.kind || "note";
-  if (!uiCache.logPushKinds?.has(kind)) return;
+  const category = logEventCategoryForKind(kind);
+  if (!uiCache.logEventCategories?.has(category)) return;
   const overlay = ui.logPushOverlay;
   if (!overlay) return;
   audio.notify?.();
   const card = document.createElement("div");
-  card.className = `log-push-toast log-push-${kind}`;
+  card.className = `log-push-toast log-push-${category}`;
+  card.dataset.eventCategory = category;
   const tag = document.createElement("span");
   tag.className = "log-push-tag";
-  tag.textContent = logKindLabel(kind);
+  tag.textContent = logEventCategoryLabel(category);
   const time = document.createElement("span");
   time.className = "log-push-time";
   time.textContent = formatLogTime(entry.time || 0);
@@ -91,25 +132,28 @@ function shouldShowInEventLog(entry = {}) {
   const text = String(entry.text || "");
   if (type === "player_item_placement" || type.includes("player") || type.includes("tool") || type.includes("robot")) return false;
   if (/\u30ed\u30dc\u6383\u9664\u6a5f|\u6383\u9664\u6a5f/.test(text)) return false;
-  return true;
+  const category = logEventCategoryForKind(entry.kind || "note");
+  return uiCache.logEventCategories?.has(category) ?? true;
 }
 
 function renderLog(logs) {
   ui.log.innerHTML = "";
   const frag = document.createDocumentFragment();
   const touchFirst = Boolean(window.TarinaiInputMode.classification?.touchFirst || document.body.classList.contains("touch-mobile-ui") || window.innerWidth <= 980);
-  const limit = touchFirst ? 34 : 80;
+  const limit = touchFirst ? 34 : 40;
   const visibleLogs = Array.isArray(logs)
     ? logs.map(raw => typeof raw === "string" ? { time: world.time, text: raw, kind: "note" } : raw).filter(shouldShowInEventLog)
     : [];
   const rows = visibleLogs.slice(0, limit);
   for (const entry of rows) {
     const kind = entry.kind || "note";
+    const category = logEventCategoryForKind(kind);
     const div = document.createElement("div");
-    div.className = `log-entry log-${kind}`;
+    div.className = `log-entry log-${category}`;
+    div.dataset.eventCategory = category;
     const tag = document.createElement("span");
     tag.className = "log-tag";
-    tag.textContent = logKindLabel(kind);
+    tag.textContent = logEventCategoryLabel(category);
     const time = document.createElement("span");
     time.className = "time";
     time.textContent = formatLogTime(entry.time || 0);
@@ -132,10 +176,7 @@ function formatLogTime(timeValue) {
 }
 
 function logKindLabel(kind) {
-  return {
-    birth: "\u8a95\u751f", death: "\u6b7b\u4ea1", fight: "\u55a7\u5629", food: "\u98df\u4e8b", grass: "\u8349",
-    weather: "\u74b0\u5883", relation: "\u95a2\u4fc2", accident: "\u4e8b\u6545", observe: "\u89b3\u5bdf", event: "\u51fa\u6765\u4e8b", note: "\u8a18\u9332"
-  }[kind] || "\u8a18\u9332";
+  return logEventCategoryLabel(logEventCategoryForKind(kind));
 }
 
 function tarinaiSpritePathForId(id) {
@@ -177,9 +218,9 @@ function relationListHtml(t, kind = "friend") {
   if (!rows.length) return "\u306a\u3057";
   const sign = kind === "friend" ? "+" : "";
   return `<div class="relation-chip-list">${rows.map(r => `
-    <button type="button" class="relation-chip ${kind === "enemy" ? "enemy" : "friend"}" data-focus-tarinai-id="${escapeHtml(r.id)}" title="${escapeHtml(r.name)}\u3078\u79fb\u52d5">
+    <button type="button" class="relation-chip ${kind === "enemy" ? "enemy" : "friend"}" data-focus-tarinai-id="${window.TarinaiUIHelpers.htmlEscape(r.id)}" title="${window.TarinaiUIHelpers.htmlEscape(r.name)}\u3078\u79fb\u52d5">
       ${relationIconHtml(r.id)}
-      <span class="relation-chip-name">${escapeHtml(r.name)}</span>
+      <span class="relation-chip-name">${window.TarinaiUIHelpers.htmlEscape(r.name)}</span>
       <em>${sign}${fmt(r.score)}</em>
     </button>`).join("")}</div>`;
 }
diff --git a/js/ui_selected.js b/js/ui_selected.js
index 456166e..627f160 100644
--- a/js/ui_selected.js
+++ b/js/ui_selected.js
@@ -1,7 +1,5 @@
 "use strict";
 
-function escapeHtml(value) { return window.TarinaiUIHelpers.htmlEscape(value); }
-
 function quoteNameInRecordText(text, name) {
   const raw = String(text || "");
   const n = String(name || "").trim();
@@ -48,7 +46,7 @@ function personalityValueText(value) {
 
 function personalityRowsHtml(personality = {}) {
   const p = normalizePersonality(personality);
-  return PERSONALITY_KEYS.map(key => `<span>${escapeHtml(PERSONALITY_LABELS[key]?.label || key)}: ${personalityValueText(p[key])}</span>`).join("");
+  return PERSONALITY_KEYS.map(key => `<span>${window.TarinaiUIHelpers.htmlEscape(PERSONALITY_LABELS[key]?.label || key)}: ${personalityValueText(p[key])}</span>`).join("");
 }
 
 function personalityShortLabel(key) {
@@ -129,9 +127,9 @@ function personalityDailyChangeHtml(t) {
       if (up > 0.0001) parts.push(`${personalityShortLabel(key)} +${up.toFixed(3)}`);
       if (down > 0.0001) parts.push(`${personalityShortLabel(key)} -${down.toFixed(3)}`);
     }
-    if (parts.length) rows.push(`<li><span>${escapeHtml(cause)}</span><strong>${escapeHtml(parts.join(" / "))}</strong><em>${escapeHtml(dayLabel)}</em></li>`);
+    if (parts.length) rows.push(`<li><span>${window.TarinaiUIHelpers.htmlEscape(cause)}</span><strong>${window.TarinaiUIHelpers.htmlEscape(parts.join(" / "))}</strong><em>${window.TarinaiUIHelpers.htmlEscape(dayLabel)}</em></li>`);
   }
-  return rows.join("") || `<li><span>\u8981\u56e0</span><strong>\u5909\u5316\u306a\u3057</strong><em>${escapeHtml(dayLabel)}</em></li>`;
+  return rows.join("") || `<li><span>\u8981\u56e0</span><strong>\u5909\u5316\u306a\u3057</strong><em>${window.TarinaiUIHelpers.htmlEscape(dayLabel)}</em></li>`;
 }
 
 function personalityDailySnapshot(t) {
@@ -153,15 +151,15 @@ function personalityDailySnapshot(t) {
 function selectedDataCategoryHtml(id, label, bodyHtml) {
   if (!uiCache.selectedCollapsedCategories) uiCache.selectedCollapsedCategories = new Set();
   const collapsed = uiCache.selectedCollapsedCategories.has(id);
-  return `<section class="selected-category${collapsed ? " collapsed" : ""}" data-selected-category="${escapeHtml(id)}">
-    <button class="selected-category-toggle" type="button" aria-expanded="${collapsed ? "false" : "true"}">${escapeHtml(label)}</button>
+  return `<section class="selected-category${collapsed ? " collapsed" : ""}" data-selected-category="${window.TarinaiUIHelpers.htmlEscape(id)}">
+    <button class="selected-category-toggle" type="button" aria-expanded="${collapsed ? "false" : "true"}">${window.TarinaiUIHelpers.htmlEscape(label)}</button>
     <div class="selected-category-body">${bodyHtml}</div>
   </section>`;
 }
 
 function selectedInfoRowHtml(label, valueHtml, metric = "") {
-  const metricAttr = metric ? ` data-metric="${escapeHtml(metric)}"` : "";
-  return `<div class="info-row"${metricAttr}><span>${escapeHtml(label)}</span><strong>${valueHtml}</strong></div>`;
+  const metricAttr = metric ? ` data-metric="${window.TarinaiUIHelpers.htmlEscape(metric)}"` : "";
+  return `<div class="info-row"${metricAttr}><span>${window.TarinaiUIHelpers.htmlEscape(label)}</span><strong>${valueHtml}</strong></div>`;
 }
 
 
@@ -180,7 +178,7 @@ function selectedInventoryItems(t) {
 function selectedInventoryHtml(t) {
   const entries = selectedInventoryItems(t);
   if (!entries.length) return `<div class="info-row"><span>\u6240\u6301\u54c1</span><strong>\u306a\u3057</strong></div>`;
-  return `<div class="info-row"><span>\u6240\u6301\u54c1</span><strong>${entries.map(v => `<span class="personality-tag">${escapeHtml(v)}</span>`).join("")}</strong></div>`;
+  return `<div class="info-row"><span>\u6240\u6301\u54c1</span><strong>${entries.map(v => `<span class="personality-tag">${window.TarinaiUIHelpers.htmlEscape(v)}</span>`).join("")}</strong></div>`;
 }
 
 function renderSelected() {
@@ -224,7 +222,7 @@ function renderSelected() {
     relationEntries(t, "friend").map(r => `${r.id}:${fmt(r.score)}:${r.name}`).join(","), relationEntries(t, "enemy").map(r => `${r.id}:${fmt(r.score)}:${r.name}`).join(","), fightWinRateLabel(t),
     t.isZunchiSlave ? 1 : 0, t.isTarinaiChampion ? 1 : 0, fmt(t.totalFightWins || 0), fmt(t.totalFightLosses || 0), fmt(t.loveMochiTimer || 0), fmt(t.fightMochiTimer || 0),
     t.zunchiDisease ? 1 : 0, fmt(t.zunchiDiseaseSeverity || 0), fmt(t.zunchiStain || 0),
-    t.sleepDisease ? 1 : 0, t.explosionDisease ? 1 : 0, fmt(t.explosionDiseaseTimer || 0), t.fightDisease ? 1 : 0, t.favorite ? 1 : 0,
+    t.sleepDisease ? 1 : 0, t.explosionDisease ? 1 : 0, fmt(t.explosionDiseaseTimer || 0), t.fightDisease ? 1 : 0, t.mamekusaredakeDisease ? 1 : 0, fmt(t.mamekusaredakeGrowth || 0), t.favorite ? 1 : 0,
     personalitySnapshot, personalityDailySnapshot(t),
     ["life", "attack", "speed", "size"].map(key => geneticPercentText(t, key)).join(","), geneticComfortTemperatureText(t), fmt((t.growth || 0) * 100),
     itemEffectSummary.map(e => `${e.id}:${e.detail}`).join(","),
@@ -243,10 +241,11 @@ function renderSelected() {
   if (t.sleepDisease) effectBadges.push(`<span class="badge">\u306d\u3080\u308a\u75c5</span>`);
   if (t.explosionDisease) effectBadges.push(`<span class="badge">\u7206\u767a\u75c5 ${fmt(t.explosionDiseaseTimer || 0)}</span>`);
   if (t.fightDisease) effectBadges.push(`<span class="badge">\u304d\u305a\u3064\u304d\u75c5</span>`);
+  if (t.mamekusaredakeDisease) effectBadges.push(`<span class="badge">マメクサレダケ病 ${fmt((t.mamekusaredakeGrowth || 0) * 100)}%</span>`);
   if ((t.loveMochiTimer || 0) > 0.1) effectBadges.push(`<span class="badge">\u3078\u3053\u9905 ${fmt(t.loveMochiTimer)}</span>`);
   if ((t.fightMochiTimer || 0) > 0.1) effectBadges.push(`<span class="badge">\u3051\u3093\u304b\u9905 ${fmt(t.fightMochiTimer)}</span>`);
   const personalityTagHtml = personalityTags.length
-    ? personalityTags.map(tag => `<span class="personality-tag">${escapeHtml(tag)}</span>`).join("")
+    ? personalityTags.map(tag => `<span class="personality-tag">${window.TarinaiUIHelpers.htmlEscape(tag)}</span>`).join("")
     : `<span class="personality-tag neutral">\u4e2d\u7acb</span>`;
   const recentChangeHtml = personalityDailyChangeHtml(t);
   const personalityHtml = `
@@ -258,10 +257,10 @@ function renderSelected() {
   const recentMemoryHtml = (t.records || []).slice(0, 7).map(r => {
     const timeText = world.clockString ? (world.clockStringFromTime ? world.clockStringFromTime(r.time || 0) : formatRecordTime(r.time || 0)) : formatRecordTime(r.time || 0);
     const recordText = quoteNameInRecordText(r.text || "", t.name);
-    return `<li><span>${escapeHtml(timeText)}</span><strong>${escapeHtml(recordText)}</strong></li>`;
+    return `<li><span>${window.TarinaiUIHelpers.htmlEscape(timeText)}</span><strong>${window.TarinaiUIHelpers.htmlEscape(recordText)}</strong></li>`;
   }).join("") || `<li><span>-</span><strong>\u307e\u3060\u8a18\u61b6\u304c\u3042\u308a\u307e\u305b\u3093</strong></li>`;
   const basicHtml = `
-    <div class="info-row"><span>\u4e16\u4ee3</span><strong>${escapeHtml(generationDisplay || "\u4e0d\u660e")}</strong></div>
+    <div class="info-row"><span>\u4e16\u4ee3</span><strong>${window.TarinaiUIHelpers.htmlEscape(generationDisplay || "\u4e0d\u660e")}</strong></div>
     <div class="info-row"><span>\u5e74\u9f62</span><strong>${fmt(t.age)} / ${fmt(t.lifeSpan)}</strong></div>
     <div class="info-row"><span>\u6700\u5927\u5bff\u547d</span><strong>${geneticPercentText(t, "life")}</strong></div>
     <div class="info-row"><span>\u653b\u6483\u529b</span><strong>${geneticPercentText(t, "attack")}</strong></div>
@@ -273,10 +272,10 @@ function renderSelected() {
     const label = (typeof TARINAI_NEED_LABELS !== "undefined" && TARINAI_NEED_LABELS[key]) || key;
     const value = typeof getNeedDisplayValue === "function" ? getNeedDisplayValue(t.needs?.[key] || 0) : Math.round((t.needs?.[key] || 0) / 10);
     const chosen = behaviorState?.need === key ? ` data-chosen-need="true"` : "";
-    return `<div class="need-cell"${chosen}><span>${escapeHtml(label)}</span><strong>${escapeHtml(value)}</strong></div>`;
+    return `<div class="need-cell"${chosen}><span>${window.TarinaiUIHelpers.htmlEscape(label)}</span><strong>${window.TarinaiUIHelpers.htmlEscape(value)}</strong></div>`;
   }).join("");
   const healthHtml = [
-    `<div class="info-row action-reason-row"><span>\u884c\u52d5</span><strong>${escapeHtml(reasonLabel(t))}</strong></div>`,
+    `<div class="info-row action-reason-row"><span>\u884c\u52d5</span><strong>${window.TarinaiUIHelpers.htmlEscape(reasonLabel(t))}</strong></div>`,
     `<div class="need-grid">${needRowsHtml}</div>`,
     selectedInfoRowHtml("\u4f53\u529b", `${fmt(t.energy)} / ${fmt(typeof tarinaiMaxEnergy === "function" ? tarinaiMaxEnergy(t) : (Number(t.maxEnergy) || 100))}`, "energy"),
     selectedInfoRowHtml("\u30b9\u30c8\u30ec\u30b9", fmt(t.stress), "stress"),
@@ -284,19 +283,19 @@ function renderSelected() {
     selectedInfoRowHtml("\u6e80\u8179\u5ea6", fmt(Math.max(0, Math.min(100, 100 - (Number(t.hunger) || 0)))), "fullness"),
   ].join("");
   const itemEffectHtml = itemEffectSummary.length
-    ? itemEffectSummary.map(e => `<div class="info-row"><span>${escapeHtml(e.label)}</span><strong>${escapeHtml(e.detail)}</strong></div>`).join("")
+    ? itemEffectSummary.map(e => `<div class="info-row"><span>${window.TarinaiUIHelpers.htmlEscape(e.label)}</span><strong>${window.TarinaiUIHelpers.htmlEscape(e.detail)}</strong></div>`).join("")
     : `<div class="info-row"><span>\u30a2\u30a4\u30c6\u30e0\u52b9\u679c</span><strong>\u306a\u3057</strong></div>`;
   const relationHtml = `
     <div class="info-row relation-row relation-list-row"><span>\u53cb\u9054</span><strong>${relationListHtml(t, "friend")}</strong></div>
     <div class="info-row relation-row relation-list-row"><span>\u6575\u5bfe</span><strong>${relationListHtml(t, "enemy")}</strong></div>
-    <div class="info-row"><span>\u89aa</span><strong>${escapeHtml(t.parentNames?.length ? t.parentNames.join(" + ") : "\u4e0d\u660e")}</strong></div>
+    <div class="info-row"><span>\u89aa</span><strong>${window.TarinaiUIHelpers.htmlEscape(t.parentNames?.length ? t.parentNames.join(" + ") : "\u4e0d\u660e")}</strong></div>
     <div class="info-row"><span>\u5b50</span><strong>${t.children?.length || 0}</strong></div>
-    <div class="info-row"><span>\u3051\u3093\u304b\u52dd\u7387</span><strong>${escapeHtml(fightWinRateLabel(t))}</strong></div>
+    <div class="info-row"><span>\u3051\u3093\u304b\u52dd\u7387</span><strong>${window.TarinaiUIHelpers.htmlEscape(fightWinRateLabel(t))}</strong></div>
     <div class="info-row"><span>\u79f0\u53f7</span><strong>${t.isTarinaiChampion ? "\u305f\u308a\u306a\u3044\u738b\u8005" : "\u306a\u3057"}</strong></div>
   `;
   ui.selectedInfo.innerHTML = `
     <div class="selected-name-editor">
-      <input class="selected-name-input" data-selected-name data-selected-id="${escapeHtml(t.id)}" value="${escapeHtml(t.name)}" maxlength="18" aria-label="\u305f\u308a\u306a\u3044\u306e\u540d\u524d" title="\u540d\u524d\u3092\u7de8\u96c6">
+      <input class="selected-name-input" data-selected-name data-selected-id="${window.TarinaiUIHelpers.htmlEscape(t.id)}" value="${window.TarinaiUIHelpers.htmlEscape(t.name)}" maxlength="18" aria-label="\u305f\u308a\u306a\u3044\u306e\u540d\u524d" title="\u540d\u524d\u3092\u7de8\u96c6">
     </div>
     ${effectBadges.length ? `<div class="selected-effects">${effectBadges.join("")}</div>` : ""}
     <div class="selected-data-groups">
diff --git a/js/ui_tools.js b/js/ui_tools.js
index 110f59a..0d45972 100644
--- a/js/ui_tools.js
+++ b/js/ui_tools.js
@@ -2,7 +2,7 @@
 
 const SCALABLE_TOOLS = new Set(scalableToolIds());
 const PHYSICS_ICON_TOOL_IDS = new Set(window.TarinaiItemToolMetadata?.PHYSICS_TOOL_IDS || []);
-const TEXT_ICON_TOOL_IDS = new Set(["poke", "pinch", "water_hose", "copy", "undo", "redo", "area_delete", "clear_tool"]);
+const TEXT_ICON_TOOL_IDS = new Set(["poke", "pinch", "water_hose", "copy", "undo", "redo", "area_delete", "clear_tool", "bell"]);
 
 
 function drawPhysicsToolIcon(canvas, toolId) {
@@ -140,7 +140,6 @@ const PICK_MODE_NAMES = Object.freeze({
 
 function normalizedToolPickMode() {
   const value = String(world?.toolPickMode || "free").toLowerCase();
-  if (value === "grid") return "grid40";
   return PICK_MODE_LABELS[value] ? value : "free";
 }
 
@@ -342,8 +341,8 @@ function renderToolPalette() {
       if (!hasPhysicsIcon) attachToolSpritePreview(btn, def, toolId);
       if (toolId === world?.tool) btn.classList.add("selected");
       body.appendChild(btn);
-      if (category.id === "operate" && toolId === "clear_tool") body.appendChild(createToolPickModeControl());
     }
+    if (category.id === "operate") body.appendChild(createToolPickModeControl());
     section.append(toggle, body);
     frag.appendChild(section);
   }
@@ -372,6 +371,7 @@ function attachToolSpritePreview(btn, def, toolId) {
   const itemType = def?.itemType || toolId;
   if (!btn || !itemType || !def?.placeable || TEXT_ICON_TOOL_IDS.has(toolId)) return;
   if (toolId === "reciprocator") return;
+  if (toolId === "mamekusaredake") return;
   if (toolId === "ball" || itemType === "ball") return;
   if (typeof window.drawToolItemPreview !== "function") return;
 
diff --git a/js/version.js b/js/version.js
index b56b766..12c278e 100644
--- a/js/version.js
+++ b/js/version.js
@@ -1,8 +1,8 @@
 "use strict";
 
 (function () {
-  const APP_VERSION = "39.16.98";
-  const APP_BUILD = "tarinai-ui-v39-16-95";
+  const APP_VERSION = "39.18.18";
+  const APP_BUILD = "tarinai-ui-v39-18-18";
   const APP_CACHE_NAME = `tarinai-colony-${APP_VERSION}`;
   const STATIC_VERSION_PARAM = `v=${APP_VERSION}`;
 
diff --git a/js/weather_system.js b/js/weather_system.js
index 3b008f5..db8233a 100644
--- a/js/weather_system.js
+++ b/js/weather_system.js
@@ -25,13 +25,13 @@
     return fixed || null;
   }
 
-  function enforceFixedWeather(worldRef) {
+  function enforceFixedWeather(worldRef, options = {}) {
     const fixed = fixedWeatherFor(worldRef);
     if (!fixed || !worldRef) return false;
     const previous = canonicalWeather(worldRef.weather || "sunny");
     worldRef.weather = canonicalWeather(fixed);
     worldRef.nextWeatherChange = resetTimer();
-    if (previous !== worldRef.weather) {
+    if (previous !== worldRef.weather && options.silentLog !== true) {
       worldRef.log?.(`\u5929\u6C17: ${weatherLabel(worldRef.weather)}`);
     }
     return true;
diff --git a/js/world.js b/js/world.js
index 786a7b9..67f8f64 100644
--- a/js/world.js
+++ b/js/world.js
@@ -5,7 +5,9 @@ class World {  constructor() {
     this.h = 720;
     this.viewportW = 1000;
     this.viewportH = 720;
+    this._worldSizeInitialized = false;
     this.time = 0;
+    this._fixedSimulationAccumulator = 0;
     this.day = 1;
     this.elapsedDays = 0;
     this.paused = false;
@@ -76,14 +78,23 @@ class World {  constructor() {
   resetRuntimeCollections() {
     this.tarinai = [];
     this.items = [];
+    this.residues = [];
+    this.residueById = new Map();
+    this.residueTypeBuckets = new Map();
+    this.residueCells = new Map();
+    this.residueSerial = 0;
+    this.residueDecayAccumulator = 0;
     this.ants = [];
     this.effects = [];
     this.logs = [];
+    this.memorialRequests = [];
     this.events = window.TarinaiEvents || null;
     this.eventCounters = {};
     this.countsTimer = 0;
     this.compactTimer = 0;
     this.drawSortTimer = 0;
+    this._maintenanceScheduleReady = false;
+    this._nextTransientRuntimePruneAt = 0;
     this.drawListDirty = true;
     this.antUpdatePhase = 0;
     this.selected = null;
@@ -91,19 +102,14 @@ class World {  constructor() {
     this.hoverPokeTarget = null;
     this.deadCount = 0;
     this.birthEventCount = 0;
-    this.achievementNaturalSlaveGenerations = [];
-    this.achievementNaturalKingGenerations = [];
-    this.achievementPlayerPlacementCount = 0;
-    this.achievementManualTarinaiAddedCount = 0;
-    this.achievementDirectFeedCount = 0;
-    this.achievementRobotCleanCount = 0;
+    this.achievementPlayerPlacedActiveCount = 0;
     this.achievementEnemyAntKills = 0;
-    this.achievementLastTarinaiDamageAt = -Infinity;
     this.achievementSelfSufficientStartAt = -1;
-    this.achievementLastDirectFeedAt = -Infinity;
     this.achievementLastInterventionAt = 0;
     this.achievementNoDeathStartAt = -1;
     this.achievementHappyStartAt = -1;
+    this.achievementEliteFewStartAt = -1;
+    this.achievementFightSessionSerial = 0;
     this.liveIdNext = 1;
     this.liveIdSerial = 0;
     this.liveTarinai = new Map();
@@ -117,6 +123,8 @@ class World {  constructor() {
     this.relationNotices = {};
     this.resolvedFightIds = {};
     this.fightPairCooldowns = {};
+    this.ballCollisionMemo = new Map();
+    this.tarinaiCollisionMemo = new Map();
     this.deadTarinaiSinceRuntimePrune = 0;
     this.tarinaiRuntimePrunePending = false;
     this._deadTarinaiIdsPendingCleanup = new Set();
diff --git a/js/world_combat_effects.js b/js/world_combat_effects.js
index fd564dc..bc67a41 100644
--- a/js/world_combat_effects.js
+++ b/js/world_combat_effects.js
@@ -4,16 +4,15 @@
 (function (global) {
   const World = global.World;
   if (!World) throw new Error("World is not available for mixin: world_combat_effects.js");
-  const EFFECT_POOL_TYPES = new Set(["ring", "fight", "flame", "fall"]);
+  const EFFECT_POOL_TYPES = new Set(["ring", "fight", "flame", "fall", "bleed", "bubble", "eat", "explosion", "heart", "shoot_impact", "zunchi_miasma", "electric_shock", "wind", "ascend_soul"]);
   const EFFECT_POOL_LIMIT_PER_TYPE = 96;
   const effectPool = new Map();
 
   function acquireEffect(type, x, y, options) {
     const key = String(type || "");
     const bucket = EFFECT_POOL_TYPES.has(key) ? effectPool.get(key) : null;
-    const effect = bucket?.length ? bucket.pop() : new Effect(key, x, y, options);
-    if (bucket?.length >= 0) effect.reset(key, x, y, options);
-    return effect;
+    if (bucket?.length) return bucket.pop().reset(key, x, y, options);
+    return new Effect(key, x, y, options);
   }
 
   function releaseEffect(effect) {
@@ -28,8 +27,29 @@
   }
 
   Object.defineProperties(World.prototype, Object.getOwnPropertyDescriptors({
+  queueEffect(type, x, y, options = {}) {
+    const opts = options || {};
+    const forceVisual = opts.forceVisual === true || type === "ascend_soul";
+    // Semantic one-shot effects such as grave ascension remain visible even when
+    // optional ambient effects are disabled.
+    if (global.TarinaiPerf?.visualLevel?.("effects", "high") === "off" && !forceVisual) return null;
+    const importance = Math.max(0, Math.min(3, Number(opts.importance ?? (type === "explosion" || type === "electric_shock" || type === "bubble" || type === "heart" ? 3 : type === "ring" || type === "fall" ? 2 : 1))));
+    const effect = acquireEffect(type, x, y, opts);
+    effect._effectImportance = importance;
+    effect._forceVisual = forceVisual;
+    this.effects.push(effect);
+    if (global.TarinaiPerf?.diagnosticsEnabled?.() === true) {
+      this._effectSpawnStats = this._effectSpawnStats || {};
+      this._effectSpawnStats.requested = (this._effectSpawnStats.requested || 0) + 1;
+      if (EFFECT_POOL_TYPES.has(String(type || ""))) this._effectSpawnStats.poolEligible = (this._effectSpawnStats.poolEligible || 0) + 1;
+    }
+    return effect;
+  },
+
   spawnEffect(type, x, y, options = {}) {
     const opts = options || {};
+    const forceVisual = opts.forceVisual === true || type === "ascend_soul";
+    if (global.TarinaiPerf?.visualLevel?.("effects", "high") === "off" && !forceVisual) return null;
     const importance = Math.max(0, Math.min(3, Number(opts.importance ?? (type === "explosion" || type === "electric_shock" || type === "bubble" || type === "heart" ? 3 : type === "ring" || type === "fall" ? 2 : 1))));
     if (importance <= 1 && opts.allowOffscreen !== true) {
       const margin = Math.max(80, Number(opts.offscreenMargin || 140));
@@ -45,15 +65,7 @@
         return null;
       }
     }
-    const effect = acquireEffect(type, x, y, opts);
-    effect._effectImportance = importance;
-    this.effects.push(effect);
-    if (global.TarinaiPerf?.diagnosticsEnabled?.() === true) {
-      this._effectSpawnStats = this._effectSpawnStats || {};
-      this._effectSpawnStats.requested = (this._effectSpawnStats.requested || 0) + 1;
-      if (EFFECT_POOL_TYPES.has(String(type || ""))) this._effectSpawnStats.poolEligible = (this._effectSpawnStats.poolEligible || 0) + 1;
-    }
-    return effect;
+    return this.queueEffect(type, x, y, opts);
   },
 
   releaseEffect(effect) {
@@ -103,6 +115,53 @@
   },
 
 
+  applyExplosionExternalForces(x, y, blastRadius, source = null, scale = 1, salt = "explosion-force") {
+    globalThis.TarinaiItemEnvironmentHazardSystem?.igniteOilNear?.(this, x, y, blastRadius * 1.05);
+    for (const can of this.itemsOfType?.("poison_gas_can") || []) {
+      if (!can || can.dead || distXY(x, y, can.x, can.y) > blastRadius) continue;
+      global.TarinaiStructureLifecycle?.deleteItem?.(this, can, { reason: "explosion", breaker: source });
+    }
+    const radius = Math.max(1, Number(blastRadius || 0) || 1);
+    // Mechanical bodies can have long custom shapes, so do not rely on a spatial
+    // query that only sees their center/radius. Scan the bounded item list and use
+    // the mechanical extent for blast reach; this keeps rotators and reciprocators
+    // consistent even immediately after placement or shape edits.
+    const affected = this.items || [];
+    let moved = 0;
+    for (const item of affected) {
+      if (!item || item.dead || item === source) continue;
+      const mechanical = global.TarinaiMechanicalSystem?.isMechanicalType?.(item.type);
+      if (!mechanical && item.type !== "grave") continue;
+      let dx = (Number(item.x || 0) || 0) - x;
+      let dy = (Number(item.y || 0) || 0) - y;
+      let d = Math.hypot(dx, dy);
+      const bodyExtent = mechanical ? Math.max(18, Number(global.TarinaiMechanicalSystem?.extent?.(item) || item.r || 0) || 0) : Math.max(16, Number(item.r || 0) || 0);
+      if (d > radius + bodyExtent) continue;
+      if (d < 0.001) {
+        const a = deterministicAngle(this, `${salt}-overlap`, source || item, item);
+        dx = Math.cos(a); dy = Math.sin(a); d = 1;
+      }
+      const q = clamp(1 - d / Math.max(1, radius), 0, 1);
+      const force = (430 + q * 960) * Math.max(0.1, Number(scale || 1) || 1);
+      const nx = dx / d, ny = dy / d;
+      if (item.type === "grave") {
+        if (global.TarinaiMemorialBellSystem?.applyExternalForce?.(this, item, force, source, "explosion")) moved += 1;
+        continue;
+      }
+      const contactScale = Math.max(18, Math.min(160, Number(global.TarinaiMechanicalSystem?.extent?.(item) || item.r || 40) || 40)) * 0.55;
+      // Give rotators a small off-centre pressure component as well as translation.
+      // A purely radial force through the pivot produces zero torque and previously
+      // made blasts look as though they did nothing to a rotator.
+      const tangentOffset = item.type === "rotator" ? Math.min(56, contactScale * 0.42) : 0;
+      const contactX = item.x - nx * contactScale - ny * tangentOffset;
+      const contactY = item.y - ny * contactScale + nx * tangentOffset;
+      const hit = global.TarinaiMechanicalSystem?.applyExternalImpulse?.(item, contactX, contactY, nx * force, ny * force, this, item.type === "rotator" ? 1.18 : 1);
+      if (hit) moved += 1;
+    }
+    if (moved) { this.markSpatialDirty?.("explosion-external-force"); this.drawListDirty = true; }
+    return moved;
+  },
+
   blastLoosePinsFrom(x, y, blastRadius, source = null, scale = 1, salt = "blast") {
     let blastedPins = 0;
     const pinSystem = globalThis.TarinaiItemDynamicPinSystem;
@@ -209,9 +268,10 @@
       this.spawnFallEffect(t.x, t.y + t.radius * 0.45, 1.1 + p);
       const explosionChance = window.TarinaiDiseaseRegistry.infectionChance("disease_explosion", 0.15) ?? 0.15;
       if (!t.dead && p > 0.22 && deterministicChance(this, "firecracker-explosion-disease", t.diseaseChance ? t.diseaseChance(explosionChance) : explosionChance, it, t)) t.infectExplosionDisease?.(it);
-      if (!t.dead && deterministicChance(this, "firecracker-panic-bubble", 0.45, it, t)) this.spawnBubble(t.x, t.y - t.radius * 1.35, "\u306f\u3041\u3041\u3041\uff01", "rgba(84,66,86,0.80)");
+      if (!t.dead && !t.isAcquiredTarinai && deterministicChance(this, "firecracker-panic-bubble", 0.45, it, t)) this.spawnBubble(t.x, t.y - t.radius * 1.35, "\u306f\u3041\u3041\u3041\uff01", "rgba(84,66,86,0.80)");
     }
     if (typeof damageNearbyStructures === "function") damageNearbyStructures(this, x, y, blastRadius, 34 * (it.blastScale || 1), it);
+    this.applyExplosionExternalForces?.(x, y, blastRadius, it, it.blastScale || 1, "firecracker");
     this.damageAntsInRadius(x, y, blastRadius, p => 5 + p * 18, "\u7206\u7af9", {
       push: p => (260 + (p * p * 0.55 + p * 0.45) * 920) * 0.42 * (it.blastScale || 1),
       source: it,
@@ -260,6 +320,7 @@
       this.spawnEffect("ring", x, y, { size: (30 + r * 24) * blastScale, life: 0.48 + r * 0.11, color: r % 2 ? "rgba(255,116,62,0.78)" : "rgba(255,240,124,0.88)" });
     }
     this.blastZunchiFrom(x, y, blastRadius * 0.92, blastScale);
+    this.applyExplosionExternalForces?.(x, y, blastRadius, t, blastScale, "disease-explosion");
     for (let i = 0; i < 34; i++) {
       const a = Math.PI * 2 * i / 34 + deterministicRange(this, "disease-explosion-spark-angle", -0.10, 0.10, t, i);
       const speed = deterministicRange(this, "disease-explosion-spark-speed", 90, 260, t, i) * blastScale;
@@ -307,7 +368,7 @@
       this.spawnFallEffect(o.x, o.y + o.radius * 0.45, 1.1 + q);
       const explosionChance = window.TarinaiDiseaseRegistry.infectionChance("disease_explosion", 0.15) ?? 0.15;
       if (!o.dead && q > 0.22 && deterministicChance(this, "disease-explosion-spread", o.diseaseChance ? o.diseaseChance(explosionChance) : explosionChance, t, o)) o.infectExplosionDisease?.(t);
-      if (!o.dead && deterministicChance(this, "disease-explosion-panic-bubble", 0.45, t, o)) this.spawnBubble(o.x, o.y - o.radius * 1.35, "\u306f\u3041\u3041\u3041\uff01", "rgba(84,66,86,0.80)");
+      if (!o.dead && !o.isAcquiredTarinai && deterministicChance(this, "disease-explosion-panic-bubble", 0.45, t, o)) this.spawnBubble(o.x, o.y - o.radius * 1.35, "\u306f\u3041\u3041\u3041\uff01", "rgba(84,66,86,0.80)");
     }
     this.damageAntsInRadius(x, y, blastRadius, p => 5 + p * 18, "\u7206\u767a\u75c5", {
       push: p => (260 + (p * p * 0.55 + p * 0.45) * 920) * 0.42 * blastScale,
@@ -351,15 +412,18 @@
     const nx = speed > 1 ? dx / speed : Math.cos(this.time * 9.1);
     const ny = speed > 1 ? dy / speed : Math.sin(this.time * 7.7);
     let cleaned = 0;
+    let itemTouched = false;
     for (const it of this.nearbyItems(x, y, radius + 80)) {
       if (!it || it.dead) continue;
       const d = distXY(it.x, it.y, x, y);
       if (d > radius + (it.r || 12)) continue;
       const p = clamp(1 - d / (radius + (it.r || 12)), 0, 1);
-      if (it.type === "zunchi" || it.type === "splat" || it.type === "trace") {
-        it.amount -= dt * (it.type === "zunchi" ? 230 : 180) * (0.35 + p);
+      if (it.type === "zunchi") {
+        itemTouched = true;
+        it.amount -= dt * 230 * (0.35 + p);
         cleaned += p;
       } else if (it.type === "grass") {
+        itemTouched = true;
         it.amount = Math.max(0, (Number(it.amount) || 0) - dt * 135 * (0.30 + p));
         it.growth = Math.max(0, (Number(it.growth) || 0) - dt * 0.50 * (0.20 + p));
         if (it.amount <= 0.5) {
@@ -370,6 +434,7 @@
         }
         cleaned += p * 0.72;
       } else if (it.type === "fire") {
+        itemTouched = true;
         it.amount = Math.max(0, (Number(it.amount) || 0) - dt * 540 * (0.35 + p));
         it.flameLife = Math.max(0, (Number(it.flameLife) || 0) - dt * 5.2 * (0.35 + p));
         it.fireShrinkPulse = Math.max(Number(it.fireShrinkPulse || 0), 0.18);
@@ -379,12 +444,31 @@
         }
         cleaned += p * 1.15;
       } else if (it.type === "grass_bed") {
+        itemTouched = true;
         it.amount = 0;
         it.hp = 0;
-        global.TarinaiStructureLifecycle.deleteItem(this, it, { reason: "water-hose-grass-bed", userReason: "\u6d17\u6d44\u3067\u6d41\u3055\u308c\u305f", wake: true });
+        global.TarinaiStructureLifecycle.deleteItem(this, it, { reason: "water-hose-grass-bed", userReason: "洗浄で流された", wake: true });
         cleaned += p * 0.95;
+      } else if (it.type === "grave") {
+        itemTouched = true;
+        const removed = global.TarinaiStructureLifecycle?.deleteItem?.(this, it, {
+          reason: "water-hose-grave",
+          userReason: "洗浄で流された",
+          wake: true,
+        });
+        if (removed) cleaned += p * 1.05;
       }
     }
+    for (const residue of this.nearbyResidues?.(x, y, radius + 80) || []) {
+      if (!residue || residue.dead) continue;
+      const d = distXY(residue.x, residue.y, x, y);
+      if (d > radius + (residue.r || 12)) continue;
+      const p = clamp(1 - d / (radius + (residue.r || 12)), 0, 1);
+      residue.amount = Math.max(0, (Number(residue.amount) || 0) - dt * 180 * (0.35 + p));
+      cleaned += p;
+      if (residue.amount <= 0.5) this.removeResidue?.(residue, "water-hose-residue");
+      else this.markTerrainDirtyAt?.(residue.x, residue.y, Math.max(residue.r || 24, 36), "water-hose-residue");
+    }
     for (const ef of this.effects || []) {
       if (!ef || ef.dead) continue;
       if (ef.type !== "bleed" && ef.type !== "splat") continue;
@@ -423,11 +507,13 @@
     }
     if (cleaned > 0.25) {
       this.drawListDirty = true;
-      this.markItemBucketsDirty?.("water-hose-clean");
       this.markTerrainDirtyAt?.(x, y, radius + 84, "water-hose-clean");
-      this.markSpatialDirty?.("water-hose-clean");
-      this.compactItems?.();
-      this.updateItemCounts();
+      if (itemTouched) {
+        this.markItemBucketsDirty?.("water-hose-clean");
+        this.markSpatialDirty?.("water-hose-clean");
+        this.compactItems?.();
+        this.updateItemCounts();
+      }
     }
   },
 
@@ -463,7 +549,7 @@
       if (this.addItem?.(it, "zunchi-burst")) spawned += 1;
     }
     if (!spawned) return 0;
-    this.effects?.push(new Effect("zunchi_miasma", sx, sy, { size: 28, life: 0.65, color: "rgba(74,91,50,0.48)" }));
+    this.queueEffect?.("zunchi_miasma", sx, sy, { size: 28, life: 0.65, color: "rgba(74,91,50,0.48)" });
     this.log?.(`${source?.name || "\u305f\u308a\u306a\u3044"}\u304b\u3089\u6e9c\u307e\u3063\u3066\u3044\u305f\u305a\u3093\u3061\u304c\u5f3e\u3051\u98db\u3093\u3060\u3002`, "accident", { participants: source?.name ? [source] : [] });
     audio.place?.("zunchi");
     this.ensureSpatial?.("zunchi-burst");
@@ -482,6 +568,9 @@
   },
 
   spawnZunchi(x, y, source = null) {
+    if (source?.mamekusaredakeDisease && Math.random() < 0.05) {
+      globalThis.TarinaiMamekusaredakeSystem?.recover?.(source, "ずんちで取れた");
+    }
     const spawnX = clamp(x, 40, this.w - 40);
     const spawnY = clamp(y, 40, this.h - 40);
     const sand = this.toiletSandAt?.(spawnX, spawnY) || null;
@@ -503,18 +592,29 @@
   },
 
   spawnBubble(x, y, text, color = "rgba(42,36,29,0.78)") {
-    if ((this.effectCounts.bubble || 0) >= CONFIG.bubbleLimit) return;
+    const bubbleLimit = Math.max(1, Number(CONFIG.bubbleLimit || 32) || 32);
+    let bubbleCount = Math.max(0, Number(this.effectCounts.bubble || 0) || 0);
+    if (bubbleCount >= bubbleLimit) {
+      bubbleCount = 0;
+      for (const effect of this.effects || []) if (effect && !effect.dead && effect.type === "bubble") bubbleCount += 1;
+      this.effectCounts.bubble = bubbleCount;
+      if (bubbleCount >= bubbleLimit) return;
+    }
     if (text === "z") text = "Zzz...";
     audio.bubble(text);
-    this.spawnEffect("bubble", x, y, {
+    const effect = this.spawnEffect("bubble", x, y, {
       vx: deterministicRange(this, "bubble-vx", -2, 2, x, y, text),
       vy: deterministicRange(this, "bubble-vy", -5, -2, x, y, text),
       life: deterministicRange(this, "bubble-life", 2.2, 3.2, x, y, text),
       size: 8,
       text,
       color,
+      forceVisual: true,
+      importance: 3,
     });
+    if (!effect) return null;
     this.effectCounts.bubble = (this.effectCounts.bubble || 0) + 1;
+    return effect;
   },
 
   spawnHeadbuttEffect(x, y) {
@@ -677,10 +777,13 @@
 
   resolveFightOutcome(winner, loser) {
     if (!winner || !loser || winner.dead || loser.dead) return;
-    const key = `${winner.id}:${loser.id}:${Math.floor(this.time / 2)}`;
+    // Keep only one timestamp per directional pair. The old time-bucket key
+    // created a new permanent property every two seconds for recurring fights.
+    const key = `${winner.id}:${loser.id}`;
     if (!this.resolvedFightIds) this.resolvedFightIds = {};
-    if (this.resolvedFightIds[key]) return;
-    this.resolvedFightIds[key] = true;
+    const resolvedAt = Number(this.resolvedFightIds[key]);
+    if (Number.isFinite(resolvedAt) && this.time - resolvedAt < 2) return;
+    this.resolvedFightIds[key] = this.time;
     winner.defeatedById = null;
     winner.defeatedTimer = 0;
     winner.fearTimer = Math.max(0, winner.fearTimer - 0.75);
@@ -797,7 +900,6 @@
     ball.amount = Math.max(ball.amount || 999, 999);
     audio.ballHit?.();
     this.spawnEffect("ring", ball.x, ball.y, { size: Math.max(16, ball.r * (0.95 + ball.pokeCombo * 0.05)), life: 0.22, color: isBalloon ? "rgba(94,188,236,0.56)" : "rgba(255,255,255,0.58)" });
-    if (!isBalloon) this.log("\u30dc\u30fc\u30eb\u3092\u3064\u3064\u3044\u3066\u8ee2\u304c\u3057\u305f\u3002", "observe", { eventType: "ball_poke" });
     return true;
   },
 
diff --git a/js/world_environment.js b/js/world_environment.js
index 0655c1d..d925aa3 100644
--- a/js/world_environment.js
+++ b/js/world_environment.js
@@ -398,10 +398,7 @@
 
 
   nestBoxCapacity(box = null) {
-    if (box?.type === "pipe") {
-      const count = (this.items || []).reduce((n, it) => n + (it && !it.dead && it.type === "pipe" ? 1 : 0), 0);
-      return Math.max(3, count * 3);
-    }
+    if (box?.type === "pipe") return 3;
     return 5;
   },
 
@@ -839,7 +836,7 @@
       }
       if (now >= (t.lastBounceFenceEffectAt || -999) + 0.08) {
         t.lastBounceFenceEffectAt = now;
-        this.effects?.push(new Effect("ring", t.x, t.y, { size: Math.max(18, rr * 1.15), life: 0.18, color: "rgba(82,153,230,0.46)" }));
+        this.queueEffect?.("ring", t.x, t.y, { size: Math.max(18, rr * 1.15), life: 0.18, color: "rgba(82,153,230,0.46)" });
       }
     } else if (r.mechanical && opts.pressureCheap) {
       const omega = r.rotator ? clamp(Number(r.angularVelocity || 0) || 0, -4.5, 4.5) : 0;
@@ -1034,15 +1031,24 @@
     const cy = (y1 + y2) / 2;
     const maxD = Math.hypot(x2 - x1, y2 - y1) / 2 + 120;
     const exclude = opts?.exclude || null;
+    const seenNestBoxes = new Set();
     for (const rect of this.nearbySolidObstacleRects(cx, cy, maxD + padding + 170, { exclude })) {
       if (exclude && rect?.item === exclude) continue;
       if (!this.isFenceRoutingRect?.(rect)) continue;
-      if (rect?.oneWay && this.oneWayFenceAllowsPath?.(x1, y1, x2, y2, rect)) continue;
-      if (rect?.oriented) {
-        const r = { ...rect, halfW: (rect.halfW || 0) + padding, halfH: (rect.halfH || 0) + padding };
+      let routingRect = rect;
+      const routingItem = rect?.item || null;
+      if (routingItem?.type === "nest_box") {
+        const key = routingItem.id || routingItem;
+        if (seenNestBoxes.has(key)) continue;
+        seenNestBoxes.add(key);
+        routingRect = this.nestBoxBaseRect?.(routingItem) || rect;
+      }
+      if (routingRect?.oneWay && this.oneWayFenceAllowsPath?.(x1, y1, x2, y2, routingRect)) continue;
+      if (routingRect?.oriented) {
+        const r = { ...routingRect, halfW: (routingRect.halfW || 0) + padding, halfH: (routingRect.halfH || 0) + padding };
         if (this.segmentIntersectsRect(x1, y1, x2, y2, r)) return true;
       } else {
-        const r = { left: rect.left - padding, right: rect.right + padding, top: rect.top - padding, bottom: rect.bottom + padding };
+        const r = { left: routingRect.left - padding, right: routingRect.right + padding, top: routingRect.top - padding, bottom: routingRect.bottom + padding };
         if (this.segmentIntersectsRect(x1, y1, x2, y2, r)) return true;
       }
     }
@@ -1058,12 +1064,21 @@
   pointBlockedByObstacle(x, y, padding = 14, opts = {}) {
     const exclude = opts?.exclude || null;
     const searchRadius = Math.max(48, Number(padding || 0) + 72);
+    const seenNestBoxes = new Set();
     for (const rect of this.nearbySolidObstacleRects?.(x, y, searchRadius, { exclude, maxChecks: Math.max(10, Number(opts.maxChecks || 0) || 24) }) || []) {
       if (exclude && rect?.item === exclude) continue;
       // Directional pathfinding evaluates one-way fences on edges, not as
       // permanently blocked grid points. Other callers retain solid occupancy.
       if (rect?.oneWay && opts?.directionalOneWay === true) continue;
-      if (this.pointInRect?.(x, y, rect, padding)) return true;
+      let routingRect = rect;
+      const routingItem = rect?.item || null;
+      if (routingItem?.type === "nest_box") {
+        const key = routingItem.id || routingItem;
+        if (seenNestBoxes.has(key)) continue;
+        seenNestBoxes.add(key);
+        routingRect = this.nestBoxBaseRect?.(routingItem) || rect;
+      }
+      if (this.pointInRect?.(x, y, routingRect, padding)) return true;
     }
     return false;
   },
diff --git a/js/world_event_effects.js b/js/world_event_effects.js
index ebc1bc2..dcf16fd 100644
--- a/js/world_event_effects.js
+++ b/js/world_event_effects.js
@@ -5,12 +5,12 @@
   if (!events) return;
 
   events.on("world:phase", () => {
-    global.audio?.phase?.();
+    global.TarinaiAudio?.phase?.();
   });
 
   function playLogSoundForEntry(entry = {}) {
     if (!entry || entry.hiddenFromObservation || entry.sound === false || entry.silentAudio) return;
-    const audio = global.audio;
+    const audio = global.TarinaiAudio;
     if (!audio) return;
     const kind = entry.kind || "note";
     const text = String(entry.text || "");
@@ -50,6 +50,6 @@
 
   events.on("tool:placed", (event) => {
     const detail = event.detail || {};
-    if (detail.dropped) global.audio?.place?.(detail.type || detail.item?.type || "");
+    if (detail.dropped) global.TarinaiAudio?.place?.(detail.type || detail.item?.type || "");
   });
 })(typeof window !== "undefined" ? window : globalThis);
diff --git a/js/world_family_social.js b/js/world_family_social.js
index 893af98..d31af1a 100644
--- a/js/world_family_social.js
+++ b/js/world_family_social.js
@@ -2,37 +2,47 @@
 
 
 function inheritedChampionPersonality(seed = "", parents = [], opts = {}) {
-  const axes = ["aggression", "openness", "sociability"];
+  const inheritedUnit = (...parts) => typeof globalThis.stableUnit === "function" ? globalThis.stableUnit(...parts) : 0.5;
+  const axes = ["aggression", "openness", "sociability", "neuroticism"];
   const profileFor = (birthSeed, profileOpts = {}) => globalThis.TarinaiSeedFactory?.birthProfile?.(birthSeed || "", profileOpts)?.birthPersonality || {};
-  const childBase = normalizePersonality(profileFor(seed, opts));
-  let inheritedAny = false;
+  const randomBase = normalizePersonality(profileFor(seed, opts));
+  const validParents = (parents || []).filter(Boolean).slice(0, 2);
+  if (!validParents.length) return null;
+  const child = { ...randomBase };
   for (const key of axes) {
+    const values = validParents.map(parent => {
+      const parentBase = normalizePersonality(profileFor(parent.birthSeed || parent.familyKey || ""));
+      return Number(normalizePersonality(parent.birthPersonality || parentBase)[key]) || 0;
+    });
+    let inherited = values[0] || 0;
+    if (values.length > 1) {
+      const aWeight = 0.42 + inheritedUnit(seed, `personality-parent-weight-${key}`) * 0.16;
+      inherited = values[0] * aWeight + values[1] * (1 - aWeight);
+    }
+    const mutation = (inheritedUnit(seed, `personality-mut-${key}`) - 0.5) * 0.04;
+    child[key] = clampPersonalityValue(inherited * 0.94 + (Number(randomBase[key]) || 0) * 0.06 + mutation);
+  }
+
+  // Champion lineage boosts remain heritable on top of the stronger ordinary
+  // personality inheritance, so royal descendants still preserve that trait.
+  for (const key of ["aggression", "openness", "sociability"]) {
     let totalLegacy = 0;
     let parentCount = 0;
-    for (const parent of parents || []) {
-      if (!parent) continue;
+    for (const parent of validParents) {
+      if (!parent.isTarinaiChampion) continue;
       const parentBase = normalizePersonality(profileFor(parent.birthSeed || parent.familyKey || ""));
-      const born = normalizePersonality(parent.birthPersonality || parentBase);
-      // A champion's three boosted axes become a heritable lineage delta. A
-      // descendant that inherited that delta can pass a damped form onward.
-      const inheritedDelta = Math.max(0, (Number(born[key]) || 0) - (Number(parentBase[key]) || 0));
-      let championDelta = 0;
-      if (parent.isTarinaiChampion) {
-        const baseValue = Number(parentBase[key]) || 0;
-        const championTarget = clampPersonalityValue(Math.max(baseValue + 0.48, 0.86));
-        championDelta = Math.max(0, championTarget - baseValue);
-      }
-      const legacy = Math.max(inheritedDelta, championDelta);
-      if (legacy <= 0) continue;
-      totalLegacy += legacy;
+      const baseValue = Number(parentBase[key]) || 0;
+      const championTarget = clampPersonalityValue(Math.max(baseValue + 0.48, 0.86));
+      const championDelta = Math.max(0, championTarget - baseValue);
+      if (championDelta <= 0) continue;
+      totalLegacy += championDelta;
       parentCount += 1;
     }
     if (parentCount > 0 && totalLegacy > 0) {
-      childBase[key] = clampPersonalityValue((Number(childBase[key]) || 0) + (totalLegacy / parentCount) * 0.70);
-      inheritedAny = true;
+      child[key] = clampPersonalityValue((Number(child[key]) || 0) + (totalLegacy / parentCount) * 0.82);
     }
   }
-  return inheritedAny ? childBase : null;
+  return child;
 }
 
 (function (global) {
@@ -143,14 +153,66 @@ function inheritedChampionPersonality(seed = "", parents = [], opts = {}) {
     return ["\u304b\u3093\u305f\u3093\u30d9\u30c3\u30c9", `\u6301\u3061\u4e3b: ${owner?.name || "\u4e0d\u660e"}`, worldRef.temperatureTooltipLineFor?.(bed, "\u5468\u8fba\u6c17\u6e29")].filter(Boolean);
   }
 
+
+  function pointerObjectTooltipInfoLocal(worldRef) {
+    const p = worldRef?.pointer;
+    if (!p?.inside) return null;
+    const nearby = worldRef.nearbyItems?.(p.x, p.y, 150) || worldRef.nearbyNonGrassItems?.(p.x, p.y, 150) || [];
+    let best = null;
+    let bestDistance = Infinity;
+    const sleepFurniture = global.TarinaiItemToolMetadata?.ITEM_TRAITS?.sleepFurniture || null;
+    for (const item of nearby) {
+      if (!item || item.dead || item.type === "trace" || item.type === "splat") continue;
+      const isSleepFurniture = sleepFurniture?.has?.(item.type) || ["bed", "nest_box", "pipe", "grass_bed"].includes(item.type);
+      const isMemorial = item.type === "grave";
+      if (!isSleepFurniture && !isMemorial) continue;
+      const isNest = global.TarinaiToolRuntime?.isNestContainerItem?.(item);
+      const isOwnedBed = item.type === "grass_bed";
+      const fallbackDistance = distXY(p.x, p.y, Number(item.x || 0), Number(item.y || 0));
+      let hit = false;
+      let hitDistance = fallbackDistance;
+      const hitTest = global.TarinaiCollisionFootprints?.hitTestItem;
+      if (typeof hitTest === "function") {
+        const result = hitTest(worldRef, item, p.x, p.y, {
+          padding: worldRef.screenSizeToWorld ? worldRef.screenSizeToWorld(5) : 5,
+          radiusMultiplier: 1.15,
+        }) || null;
+        hit = Boolean(result?.hit);
+        if (Number.isFinite(Number(result?.distance))) hitDistance = Number(result.distance);
+      } else {
+        hit = fallbackDistance <= Math.max(30, (Number(item.r) || 18) * 1.35);
+      }
+      if (!hit || hitDistance >= bestDistance) continue;
+      best = item;
+      bestDistance = hitDistance;
+    }
+    if (!best) return null;
+    if (global.TarinaiToolRuntime?.isNestContainerItem?.(best)) {
+      return { target: best, lines: worldRef.nestBoxTooltipLines?.(best) || [], kind: best.type === "pipe" ? "pipe" : "nest_box" };
+    }
+    if (best.type === "grass_bed") {
+      return { target: best, lines: ownedBedTooltipLinesLocal(worldRef, best), kind: "grass_bed" };
+    }
+    if (best.type === "grave") {
+      return { target: best, lines: global.TarinaiMemorialBellSystem?.graveTooltipLines?.(best) || ["墓"], kind: "grave" };
+    }
+    const definition = global.TarinaiToolRuntime?.itemDefinition?.(best.type) || null;
+    const lines = [definition?.label || String(best.type || "\u30aa\u30d6\u30b8\u30a7\u30af\u30c8")];
+    if (definition?.tooltip) lines.push(definition.tooltip);
+    const temperatureLine = worldRef.temperatureTooltipLineFor?.(best, "\u5468\u8fba\u6c17\u6e29");
+    if (temperatureLine && (best.isStructure || best.type === "toilet" || best.type === "rain_shelter")) lines.push(temperatureLine);
+    return { target: best, lines: lines.filter(Boolean), kind: "object" };
+  }
+
   Object.defineProperties(World.prototype, Object.getOwnPropertyDescriptors({
   reset(seedPopulation = null, fieldType = this.fieldType || "garden", presetId = "default") {
     const field = FIELD_TYPES?.[fieldType] || FIELD_TYPES.garden;
     const preset = normalizeResetPresetId(presetId);
     this.fieldType = field.id;
     this.fieldZoom = 1;
-    this.setViewportSize(this.viewportW, this.viewportH);
+    this.setViewportSize(this.viewportW, this.viewportH, { resizeWorld: true });
     this.time = 0;
+    this._fixedSimulationAccumulator = 0;
     this.day = 1;
     this.elapsedDays = 0;
     this.paused = false;
@@ -242,6 +304,16 @@ function inheritedChampionPersonality(seed = "", parents = [], opts = {}) {
     return t && !t.dead ? t : null;
   },
 
+  compactFamilyGeneticSummary(genetics = null) {
+    const g = typeof normalizeGenetics === "function" ? normalizeGenetics(genetics, "") : (genetics || {});
+    return [
+      Math.round(((Number(g.lifeSpanMul) || 1) - 1) * 100),
+      Math.round(((Number(g.sizeMul) || 1) - 1) * 100),
+      Math.round(((Number(g.attackMul) || 1) - 1) * 100),
+      Math.round(((Number(g.speedMul) || 1) - 1) * 100),
+    ];
+  },
+
   recordFamily(t) {
     if (!this.family) this.family = {};
     const familyKey = this.tarinaiFamilyKey(t);
@@ -285,6 +357,7 @@ function inheritedChampionPersonality(seed = "", parents = [], opts = {}) {
         isTarinaiChampion: nextChampion,
         alive: !t.dead,
         deathReason: t.deathReason || "",
+        deathTime: t.deathTime != null && Number.isFinite(Number(t.deathTime)) ? Number(t.deathTime) : null,
       };
       changed = true;
     } else {
@@ -309,6 +382,7 @@ function inheritedChampionPersonality(seed = "", parents = [], opts = {}) {
       if ((Number(entry.totalFightLosses) || 0) !== nextFightLosses) changed = true;
       if (!!entry.isTarinaiChampion !== nextChampion) changed = true;
       if ((entry.deathReason || "") !== (t.deathReason || entry.deathReason || "")) changed = true;
+      if ((entry.deathTime ?? null) !== (t.deathTime != null && Number.isFinite(Number(t.deathTime)) ? Number(t.deathTime) : (entry.deathTime ?? null))) changed = true;
       if (entry.alive !== nextAlive) changed = true;
       if (!sameList(entry.parents, nextParents)) changed = true;
       if (!sameList(entry.children, nextChildren)) changed = true;
@@ -328,10 +402,22 @@ function inheritedChampionPersonality(seed = "", parents = [], opts = {}) {
       entry.isTarinaiChampion = nextChampion;
       entry.hasPaired = !!t.hasPaired;
       entry.deathReason = t.deathReason || entry.deathReason || "";
+      entry.deathTime = t.deathTime != null && Number.isFinite(Number(t.deathTime)) ? Number(t.deathTime) : (entry.deathTime ?? null);
       entry.parents = nextParents;
       entry.parentNames = [...(t.parentNames || entry.parentNames || [])];
       entry.children = nextChildren;
     }
+    if (t.dead && this.family[familyKey]) {
+      const archived = this.family[familyKey];
+      archived.geneticSummary = this.compactFamilyGeneticSummary(archived.genetics);
+      delete archived.genetics;
+      delete archived.personality;
+      delete archived.lifeSpan;
+      delete archived.growth;
+      delete archived.adultScale;
+      delete archived.totalFightWins;
+      delete archived.totalFightLosses;
+    }
     if (changed) {
       this.familyVersion = (this.familyVersion || 0) + 1;
       this.markFamilyTreeDirty("family-record");
@@ -346,11 +432,12 @@ function inheritedChampionPersonality(seed = "", parents = [], opts = {}) {
     if (!this.family) this.family = {};
     if (this.familyCleanVersion === (this.familyVersion || 0)) return false;
     const family = this.family;
-    const liveById = new Map((this.tarinai || []).map(t => [this.tarinaiFamilyKey(t), t]).filter(([id]) => id));
+    const liveById = new Map((this.tarinai || []).filter(t => t && !t.dead).map(t => [this.tarinaiFamilyKey(t), t]).filter(([id]) => id));
     let changed = false;
     const uniqueIds = (list, allow) => Array.from(new Set((list || []).filter(id => id && (!allow || allow.has(id)))));
     const sameList = (a, b) => a.length === b.length && a.every((id, i) => id === b[i]);
     for (const t of this.tarinai || []) {
+      if (!t || t.dead) continue;
       const familyKey = this.tarinaiFamilyKey(t);
       if (!familyKey || (!this.family[familyKey] && !(t.hasPaired || (t.parents || []).length || (t.children || []).length))) continue;
       const before = this.familyVersion || 0;
@@ -381,15 +468,21 @@ function inheritedChampionPersonality(seed = "", parents = [], opts = {}) {
         children,
         birthTime: live?.birthTime ?? n.birthTime ?? 0,
         scale: Number.isFinite(live?.scale) ? live.scale : (Number.isFinite(n.scale) ? n.scale : (Number.isFinite(live?.adultScale) ? live.adultScale : (Number.isFinite(n.adultScale) ? n.adultScale : 0.28))),
-        adultScale: Number.isFinite(live?.adultScale) ? live.adultScale : (Number.isFinite(n.adultScale) ? n.adultScale : (Number.isFinite(live?.scale) ? live.scale : (Number.isFinite(n.scale) ? n.scale : 0.28))),
-        growth: Number.isFinite(live?.growth) ? live.growth : (Number.isFinite(n.growth) ? n.growth : 1),
-        genetics: live && typeof normalizeGenetics === "function" ? normalizeGenetics(live.genetics, live.familyKey || live.id || "") : (typeof normalizeGenetics === "function" ? normalizeGenetics(n.genetics, id) : { ...(n.genetics || {}) }),
-        lifeSpan: Number(live?.lifeSpan || n.lifeSpan || 0) || 0,
-        totalFightWins: Number(live?.totalFightWins ?? n.totalFightWins ?? 0) || 0,
-        totalFightLosses: Number(live?.totalFightLosses ?? n.totalFightLosses ?? 0) || 0,
-        isTarinaiChampion: !!(live?.isTarinaiChampion || n.isTarinaiChampion),
+        ...(live ? {
+          adultScale: Number.isFinite(live.adultScale) ? live.adultScale : (Number.isFinite(live.scale) ? live.scale : 0.28),
+          growth: Number.isFinite(live.growth) ? live.growth : 1,
+          genetics: typeof normalizeGenetics === "function" ? normalizeGenetics(live.genetics, live.familyKey || live.id || "") : { ...(live.genetics || {}) },
+          lifeSpan: Number(live.lifeSpan || 0) || 0,
+          totalFightWins: Number(live.totalFightWins || 0) || 0,
+          totalFightLosses: Number(live.totalFightLosses || 0) || 0,
+          isTarinaiChampion: !!live.isTarinaiChampion,
+        } : {
+          geneticSummary: Array.isArray(n.geneticSummary) ? n.geneticSummary.slice(0, 4) : this.compactFamilyGeneticSummary(n.genetics),
+          isTarinaiChampion: !!n.isTarinaiChampion,
+        }),
         alive: live ? !live.dead : n.alive !== false,
         deathReason: live?.deathReason || n.deathReason || "",
+        deathTime: live?.deathTime != null && Number.isFinite(Number(live.deathTime)) ? Number(live.deathTime) : (n.deathTime != null && Number.isFinite(Number(n.deathTime)) ? Number(n.deathTime) : null),
       };
       for (const key of Object.keys(next)) {
         const a = family[id]?.[key];
@@ -502,15 +595,25 @@ function inheritedChampionPersonality(seed = "", parents = [], opts = {}) {
   },
 
   markDead(t, reason) {
-    this.clearLiveReferencesTo(t);
     if (!this.family) this.family = {};
     const finalReason = t?.normalizeDeathReason ? t.normalizeDeathReason(reason) : reason;
+    if (t && (t.deathTime == null || !Number.isFinite(Number(t.deathTime)))) t.deathTime = Number(this.time || 0) || 0;
+    global.TarinaiMemorialBellSystem?.captureDeath?.(this, t, finalReason);
+    this.clearLiveReferencesTo(t);
     const familyKey = this.tarinaiFamilyKey(t);
     if (familyKey && this.family[familyKey]) {
-      if (this.family[familyKey].alive !== false || this.family[familyKey].deathReason !== finalReason) {
+      if (this.family[familyKey].alive !== false || this.family[familyKey].deathReason !== finalReason || this.family[familyKey].deathTime == null) {
         this.family[familyKey].alive = false;
         this.family[familyKey].deathReason = finalReason;
+        this.family[familyKey].deathTime = t?.deathTime != null && Number.isFinite(Number(t.deathTime)) ? Number(t.deathTime) : (Number(this.time || 0) || 0);
+        this.family[familyKey].geneticSummary = this.compactFamilyGeneticSummary(this.family[familyKey].genetics);
+        delete this.family[familyKey].genetics;
         delete this.family[familyKey].personality;
+        delete this.family[familyKey].lifeSpan;
+        delete this.family[familyKey].growth;
+        delete this.family[familyKey].adultScale;
+        delete this.family[familyKey].totalFightWins;
+        delete this.family[familyKey].totalFightLosses;
         this.familyVersion = (this.familyVersion || 0) + 1;
         this.markFamilyTreeDirty("death");
       }
@@ -690,17 +793,18 @@ function inheritedChampionPersonality(seed = "", parents = [], opts = {}) {
   },
 
   pointerItemTooltipInfo() {
+    // Precise object hit-testing comes first; only if no object is actually
+    // under the pointer do we fall back to the Tarinai tooltip.
+    const objectInfo = pointerObjectTooltipInfoLocal(this);
+    if (objectInfo?.target) return objectInfo;
     const tarinaiInfo = pointerTarinaiTooltipInfoLocal(this);
     if (tarinaiInfo?.target) return tarinaiInfo;
-    const nest = this.pointerNestBoxInfo?.();
-    if (nest?.box) return { target: nest.box, lines: this.nestBoxTooltipLines(nest.box), kind: nest.box?.type === "pipe" ? "pipe" : "nest_box" };
-    const bedInfo = pointerOwnedBedInfoLocal(this);
-    if (bedInfo?.bed) return { target: bedInfo.bed, lines: ownedBedTooltipLinesLocal(this, bedInfo.bed), kind: "grass_bed" };
     return null;
   },
 
   startBirthRitual(a, b) {
     if (!a || !b || a.dead || b.dead) return false;
+    if (a.juvenile || b.juvenile) return false;
     if (!(this.canAddTarinai?.(1) ?? true)) return false;
     if (!this.tarinai?.includes?.(a) || !this.tarinai?.includes?.(b)) return false;
     if (!!a.isZunchiSlave !== !!b.isZunchiSlave) return false;
@@ -894,9 +998,11 @@ function inheritedChampionPersonality(seed = "", parents = [], opts = {}) {
 
   spawnChild(a, b, index = 0, total = 1) {
     const zunchiSlaveChild = !!(a.isZunchiSlave && b.isZunchiSlave);
+    const ochibiChild = !!(a.isAcquiredTarinai && b.isAcquiredTarinai);
     const child = this.addTarinai({
       seedParents: [a, b],
       isZunchiSlave: zunchiSlaveChild,
+      isAcquiredTarinai: ochibiChild,
       age: 0,
       x: (a.x + b.x) / 2 + rand(-14, 14) + (index - (total - 1) / 2) * 18,
       y: (a.y + b.y) / 2 + rand(-14, 14) + (total > 1 ? rand(-10, 10) : 0),
@@ -1011,6 +1117,7 @@ function inheritedChampionPersonality(seed = "", parents = [], opts = {}) {
     target.intimidationCooldown = Math.max(target.intimidationCooldown || 0, deterministicRange(this, "fight-mochi-intimidate-repeat-cooldown-target", 4.5, 7.5, actor, target));
     actor.intimidateTimer = Math.max(actor.intimidateTimer || 0, deterministicRange(this, "fight-mochi-intimidate-actor-timer", 0.32, 0.58, actor, target));
     actor.intimidateTargetId = target.id;
+    globalThis.prepareTarinaiIntimidatePresentation?.(actor);
     actor.surpriseTimer = Math.max(actor.surpriseTimer || 0, 0.28);
     target.intimidatedTimer = Math.max(target.intimidatedTimer || 0, deterministicRange(this, "fight-mochi-intimidate-target-timer", 0.30, 0.56, actor, target));
     const targetProfile = socialPersonalityProfile(target);
@@ -1022,7 +1129,7 @@ function inheritedChampionPersonality(seed = "", parents = [], opts = {}) {
       size: actor.radius * 0.62,
       color: "rgba(154, 88, 42, 0.74)",
     });
-    this.spawnBubble(actor.x, actor.y - actor.radius * 1.30, "!", "rgba(120,62,38,0.82)");
+    if (actor.intimidateSpriteVariant !== "intimidate_alt" && !actor.isAcquiredTarinai) this.spawnBubble(actor.x, actor.y - actor.radius * 1.30, "!", "rgba(120,62,38,0.82)");
     return true;
   },
 
@@ -1085,7 +1192,7 @@ function inheritedChampionPersonality(seed = "", parents = [], opts = {}) {
       size: actor.radius * 0.55,
       color: "rgba(145, 106, 55, 0.70)",
     });
-    this.spawnBubble(actor.x, actor.y - actor.radius * 1.30, "\u306f\u3046\u30fc\uff01", "rgba(92,62,34,0.82)");
+    if (actor.intimidateSpriteVariant !== "intimidate_alt" && !actor.isAcquiredTarinai) this.spawnBubble(actor.x, actor.y - actor.radius * 1.30, "\u306f\u3046\u30fc\uff01", "rgba(92,62,34,0.82)");
     target.intimidatedTimer = Math.max(target.intimidatedTimer || 0, deterministicRange(this, "intimidation-target-prep-timer", 0.28, 0.52, actor, target));
     target.fearTimer = Math.max(target.fearTimer, 0.65 * targetProfile.fear);
     if (!deterministicChance(this, "intimidation-success", successChance, actor, target)) {
@@ -1108,7 +1215,7 @@ function inheritedChampionPersonality(seed = "", parents = [], opts = {}) {
     target.intimidatedTimer = Math.max(target.intimidatedTimer || 0, deterministicRange(this, "intimidation-success-timer", 0.34, 0.70, actor, target));
     if (target.enterPanic) target.enterPanic({ threat: actor, target: actor, reason: "\u5a01\u5687\u3055\u308c\u3066\u9003\u3052\u3066\u3044\u308b", fear: 1.35, wake: true, cause: "intimidated" });
     else { target.fearTimer = Math.max(target.fearTimer, 1.35 * targetProfile.fear); target.setActionState?.("panic", { target: actor, reason: "\u5a01\u5687\u3055\u308c\u3066\u9003\u3052\u3066\u3044\u308b", wake: true }); }
-    this.spawnBubble(target.x, target.y - target.radius * 1.28, "\u306f\u3041\u3041\u3041\uff01", "rgba(84,66,86,0.80)");
+    if (!target.isAcquiredTarinai) this.spawnBubble(target.x, target.y - target.radius * 1.28, "\u306f\u3041\u3041\u3041\uff01", "rgba(84,66,86,0.80)");
     target.vx += (target.x < actor.x ? -1 : 1) * deterministicRange(this, "intimidation-knockback-x", 26, 54, actor, target);
     target.vy += deterministicRange(this, "intimidation-knockback-y", -18, 18, actor, target);
     actor.adjustRelation(target, -0.08, 0.06, "intimidate");
diff --git a/js/world_pathfinding_system.js b/js/world_pathfinding_system.js
index c39b4c8..6043280 100644
--- a/js/world_pathfinding_system.js
+++ b/js/world_pathfinding_system.js
@@ -145,8 +145,17 @@
     };
 
     let blockers = 0;
-    for (const rect of rects) {
-      if (!this.isFenceRoutingRect?.(rect)) continue;
+    const seenNestBoxes = new Set();
+    for (const rawRect of rects) {
+      if (!this.isFenceRoutingRect?.(rawRect)) continue;
+      let rect = rawRect;
+      const routingItem = rawRect?.item || null;
+      if (routingItem?.type === "nest_box") {
+        const key = routingItem.id || routingItem;
+        if (seenNestBoxes.has(key)) continue;
+        seenNestBoxes.add(key);
+        rect = this.nestBoxBaseRect?.(routingItem) || rawRect;
+      }
       const inflated = rect?.oriented
         ? { ...rect, halfW: (rect.halfW || 0) + padding, halfH: (rect.halfH || 0) + padding }
         : { left: (rect.left || 0) - padding, right: (rect.right || 0) + padding, top: (rect.top || 0) - padding, bottom: (rect.bottom || 0) + padding };
diff --git a/js/world_placement_log.js b/js/world_placement_log.js
index 1eddc18..e0ed9ef 100644
--- a/js/world_placement_log.js
+++ b/js/world_placement_log.js
@@ -16,10 +16,34 @@
     dialog.id = id;
     dialog.className = className;
     dialog.innerHTML = html;
+    const panel = dialog.querySelector('[role="dialog"], [role="alertdialog"]');
+    dialog.setAttribute("role", panel?.getAttribute("role") || "dialog");
+    dialog.setAttribute("aria-modal", panel?.getAttribute("aria-modal") || "true");
+    const labelledBy = panel?.getAttribute("aria-labelledby");
+    const describedBy = panel?.getAttribute("aria-describedby");
+    if (labelledBy) dialog.setAttribute("aria-labelledby", labelledBy);
+    if (describedBy) dialog.setAttribute("aria-describedby", describedBy);
+    panel?.removeAttribute("role");
+    panel?.removeAttribute("aria-modal");
+    panel?.removeAttribute("aria-labelledby");
+    panel?.removeAttribute("aria-describedby");
+    dialog.setAttribute("aria-hidden", dialog.classList.contains("hidden") ? "true" : "false");
     document.body.appendChild(dialog);
     return dialog;
   }
 
+  function showEditorDialog(dialog, opener = document.activeElement) {
+    if (!dialog) return;
+    if (global.TarinaiManagedDialogs?.open) global.TarinaiManagedDialogs.open(dialog, opener);
+    else { dialog.classList.remove("hidden"); dialog.setAttribute("aria-hidden", "false"); }
+  }
+
+  function hideEditorDialog(dialog) {
+    if (!dialog) return;
+    if (global.TarinaiManagedDialogs?.close) global.TarinaiManagedDialogs.close(dialog);
+    else { dialog.classList.add("hidden"); dialog.setAttribute("aria-hidden", "true"); }
+  }
+
   function bindEditorClose(dialog, close, selectors = []) {
     if (!dialog || typeof close !== "function") return;
     for (const selector of selectors) {
@@ -27,6 +51,9 @@
       if (button) button.onclick = close;
     }
     dialog.onclick = (event) => { if (event.target === dialog) close(); };
+    if (dialog._tarinaiCloseRequestHandler) dialog.removeEventListener("tarinai:dialog-close-request", dialog._tarinaiCloseRequestHandler);
+    dialog._tarinaiCloseRequestHandler = close;
+    dialog.addEventListener("tarinai:dialog-close-request", close);
   }
 
   function ensureSignboardEditor() {
@@ -91,7 +118,7 @@
     const clear = dialog.querySelector("#signboardEditorClear");
     const closeBtn = dialog.querySelector("#signboardEditorClose");
     const close = () => {
-      dialog.classList.add("hidden");
+      hideEditorDialog(dialog);
     };
     const syncCount = () => {
       if (!area || !count) return;
@@ -100,7 +127,6 @@
     const commit = (value) => {
       const next = sanitizeSignboardText(value);
       sign.text = next;
-      worldRef?.log?.(sign.text ? `\u770b\u677f\u3092\u66f8\u304d\u63db\u3048\u305f\u3002` : `\u770b\u677f\u306e\u6587\u5b57\u3092\u6d88\u3057\u305f\u3002`, "observe");
       worldRef.drawListDirty = true;
       global.render?.();
       close();
@@ -149,7 +175,7 @@
     if (apply) apply.onclick = () => commit(area?.value || "");
     if (clear) clear.onclick = () => commit("");
     bindEditorClose(dialog, close, ["#signboardEditorCancel", "#signboardEditorClose"]);
-    dialog.classList.remove("hidden");
+    showEditorDialog(dialog);
     syncCount();
     return true;
   }
@@ -171,6 +197,7 @@
           <label><input type="checkbox" data-robot-target="grass"> \u8349</label>
           <label><input type="checkbox" data-robot-target="grass_bed"> \u304b\u3093\u305f\u3093\u30d9\u30c3\u30c9</label>
           <label><input type="checkbox" data-robot-target="water"> \u6c34\u6ef4</label>
+          <label><input type="checkbox" data-robot-target="grave"> \u5893</label>
         </div>
         <div class="robot-cleaner-targets robot-cleaner-target-scan">
           <label><input id="robotCleanerHighSpeed" type="checkbox"> \u9ad8\u901f\u30e2\u30fc\u30c9</label>
@@ -200,7 +227,7 @@
       for (const input of inputs) input.checked = Boolean((Number(mask) | 0) & (bits[input.dataset.robotTarget] || 0));
     };
     const close = () => {
-      dialog.classList.add("hidden");
+      hideEditorDialog(dialog);
     };
     const commit = (mask) => {
       api?.setRobotCleanerMask?.(robot, mask);
@@ -210,7 +237,6 @@
       robot.robotCleanerScanTimer = 0;
       worldRef?.markItemBucketsDirty?.("robot-cleaner-settings");
       if (worldRef) worldRef.drawListDirty = true;
-      worldRef?.log?.("\u30ed\u30dc\u6383\u9664\u6a5f\u306e\u5bfe\u8c61\u8a2d\u5b9a\u3092\u5909\u66f4\u3057\u305f\u3002", "observe");
       global.TarinaiAchievements?.evaluateCleanFreak?.(worldRef, { robot, source: "robot-cleaner-settings" });
       if (typeof showToast === "function") showToast("\u30ed\u30dc\u6383\u9664\u6a5f\u306e\u8a2d\u5b9a\u3092\u4fdd\u5b58\u3057\u307e\u3057\u305f\u3002");
       global.render?.();
@@ -221,7 +247,7 @@
     bindEditorClose(dialog, close, ["#robotCleanerEditorClose", "#robotCleanerCancel"]);
     if (def) def.onclick = () => { writeMask(defaultMask); if (highSpeed) highSpeed.checked = false; };
     if (apply) apply.onclick = () => commit(readMask());
-    dialog.classList.remove("hidden");
+    showEditorDialog(dialog);
     return true;
   }
 
@@ -292,7 +318,7 @@
     syncEditorInputPair(center, centerNum);
     syncEditorInputPair(swingRange, swingRangeNum);
     syncEditorInputPair(swingSpeed, swingSpeedNum);
-    const close = () => dialog.classList.add("hidden");
+    const close = () => hideEditorDialog(dialog);
     const commit = (forceStop = false) => {
       global.TarinaiHistory.capture(worldRef, "fan-swing-edit");
       const cDeg = Math.max(0, Math.min(355, Number(centerNum?.value || center?.value || 0) || 0));
@@ -308,7 +334,6 @@
       item.angle = item.fanSwingCenter;
       worldRef?.markSpatialDirty?.("fan-swing-settings");
       if (worldRef) worldRef.drawListDirty = true;
-      worldRef?.log?.(item.fanSwingOn ? "\u6247\u98a8\u6a5f\u306e\u9996\u632f\u308a\u8a2d\u5b9a\u3092\u5909\u66f4\u3057\u305f\u3002" : "\u6247\u98a8\u6a5f\u3092\u56fa\u5b9a\u5411\u304d\u306b\u3057\u305f\u3002", "observe");
       if (typeof showToast === "function") showToast(item.fanSwingOn ? "\u6247\u98a8\u6a5f: \u9996\u632f\u308aON" : "\u6247\u98a8\u6a5f: \u56fa\u5b9a\u5411\u304d");
       global.render?.();
       close();
@@ -316,7 +341,7 @@
     if (stop) stop.onclick = () => commit(true);
     if (apply) apply.onclick = () => commit(false);
     bindEditorClose(dialog, close, ["#fanEditorCancel", "#fanEditorClose"]);
-    dialog.classList.remove("hidden");
+    showEditorDialog(dialog);
     return true;
   }
 
@@ -421,7 +446,7 @@
     editor.syncInputPair(speed, speedNum, controller.draw);
     editor.syncInputPair(thick, thickNum, controller.draw);
     const close = () => {
-      dialog.classList.add("hidden");
+      hideEditorDialog(dialog);
       controller.close();
     };
     if (apply) apply.onclick = () => {
@@ -444,13 +469,12 @@
       global.TarinaiLinkRuntime.remapLinksForEditedMechanicalItem(worldRef, item, isPoisonBlock ? "poison-block-link-remap" : "rotator-link-remap");
       worldRef?.markSpatialDirty?.(isPoisonBlock ? "poison-block-edited" : "rotator-edited");
       worldRef.drawListDirty = true;
-      worldRef?.log?.(isPoisonBlock ? "\u6bd2\u30d6\u30ed\u30c3\u30af\u306e\u8a2d\u8a08\u3092\u5909\u66f4\u3057\u305f\u3002" : "\u56de\u8ee2\u4f53\u306e\u8a2d\u8a08\u3092\u5909\u66f4\u3057\u305f\u3002", "observe");
       global.render?.();
       close();
     };
     bindEditorClose(dialog, close, ["#rotatorCancel", "#rotatorEditorClose"]);
     controller.draw();
-    dialog.classList.remove("hidden");
+    showEditorDialog(dialog);
     return true;
   }
 
@@ -560,7 +584,7 @@
     editor.syncInputPair(travel, travelNum, controller.draw);
     editor.syncInputPair(thick, thickNum, controller.draw);
     const close = () => {
-      dialog.classList.add("hidden");
+      hideEditorDialog(dialog);
       controller.close();
     };
     if (apply) apply.onclick = () => {
@@ -588,13 +612,12 @@
       global.TarinaiLinkRuntime.remapLinksForEditedMechanicalItem(worldRef, item, "reciprocator-link-remap");
       worldRef?.markSpatialDirty?.("reciprocator-edited");
       worldRef.drawListDirty = true;
-      worldRef?.log?.("\u5f80\u5fa9\u4f53\u306e\u8a2d\u8a08\u3092\u5909\u66f4\u3057\u305f\u3002", "observe");
       global.render?.();
       close();
     };
     bindEditorClose(dialog, close, ["#reciprocatorCancel", "#reciprocatorEditorClose"]);
     controller.draw();
-    dialog.classList.remove("hidden");
+    showEditorDialog(dialog);
     return true;
   }
 
@@ -746,7 +769,7 @@
     }
     if (item.type === "robot_cleaner") {
       const mask = Number(data.robotCleanerMask);
-      item.robotCleanerMask = Number.isFinite(mask) ? Math.max(0, Math.min(0x3f, mask | 0)) : (global.TarinaiItemDynamicToolSystem?.robotCleanerDefaultMask?.() ?? 3);
+      item.robotCleanerMask = Number.isFinite(mask) ? Math.max(0, Math.min(0x7f, mask | 0)) : (global.TarinaiItemDynamicToolSystem?.robotCleanerDefaultMask?.() ?? 3);
       item.robotCleanerHighSpeed = Boolean(data.robotCleanerHighSpeed);
       item.robotCleanerSpeed = global.TarinaiItemDynamicToolSystem?.robotCleanerEffectiveSpeed?.(item) ?? (item.robotCleanerHighSpeed ? 120 : 60);
       item.robotCleanerTargetId = "";
@@ -896,7 +919,7 @@
     const timeEnd = dialog.querySelector("#pressureSwitchTimeEnd");
     const timeStartLabel = dialog.querySelector("#pressureSwitchTimeStartLabel");
     const timeEndLabel = dialog.querySelector("#pressureSwitchTimeEndLabel");
-    const normalizeMinute = (value, fallback) => Math.max(0, Math.min(1435, Math.round((Number.isFinite(Number(value)) ? Number(value) : fallback) / 5) * 5));
+    const normalizeMinute = global.TarinaiSignalSystem.normalizeMinute;
     const formatMinute = value => { const minute = normalizeMinute(value, 0); return `${String(Math.floor(minute / 60)).padStart(2, "0")}:${String(minute % 60).padStart(2, "0")}`; };
     const targetDef = () => DETECTOR_TARGETS[target.value] || DETECTOR_TARGETS.tarinai;
     const normalizeValue = (value, fallback, def = targetDef()) => {
@@ -1006,7 +1029,7 @@
     bindNearestThumbTeleport(timeRange, timeStart, timeEnd, value => normalizeMinute(value, 0), updateTimeRange);
     target.onchange = () => updateMode(true);
     updateMode(false);
-    const close = () => { dialog.classList.add("hidden"); if (worldRef._pressureSwitchOverlay?.item === item) worldRef._pressureSwitchOverlay = null; global.render?.(); };
+    const close = () => { hideEditorDialog(dialog); if (worldRef._pressureSwitchOverlay?.item === item) worldRef._pressureSwitchOverlay = null; global.render?.(); };
     dialog.querySelector("#signalItemEditorApply").onclick = () => {
       global.TarinaiHistory.capture(worldRef, "detector-edit");
       item.pressureTarget = DETECTOR_TARGETS[target.value] ? target.value : "tarinai";
@@ -1020,10 +1043,8 @@
       item.pressureTimeEnd = normalizeMinute(timeEnd.value, 1080);
       worldRef.drawListDirty = true; worldRef.markSpatialDirty?.("detector-edit"); global.render?.(); close();
     };
-    dialog.querySelector("#signalItemEditorCancel").onclick = close;
-    dialog.querySelector("#signalItemEditorClose").onclick = close;
-    dialog.onclick = e => { if (e.target === dialog) close(); };
-    dialog.classList.remove("hidden");
+    bindEditorClose(dialog, close, ["#signalItemEditorCancel", "#signalItemEditorClose"]);
+    showEditorDialog(dialog);
     return true;
   }
 
@@ -1062,7 +1083,6 @@
       item.gateOpen = !item.gateOpen;
       worldRef?.markSpatialDirty?.("gate-toggle");
       worldRef.drawListDirty = true;
-      worldRef?.log?.(item.gateOpen ? "\u30b2\u30fc\u30c8\u67f5\u3092\u958b\u3051\u305f\u3002" : "\u30b2\u30fc\u30c8\u67f5\u3092\u9589\u3081\u305f\u3002", "observe");
       if (typeof showToast === "function") showToast(item.gateOpen ? "\u30b2\u30fc\u30c8\u67f5: \u958b" : "\u30b2\u30fc\u30c8\u67f5: \u9589");
       global.render?.();
       return true;
@@ -1170,6 +1190,9 @@
     const search = placementSoftSearchRadius(item);
     for (const soft of worldRef.nearbyItems?.(item.x, item.y, search, true) || worldRef.items || []) {
       if (!soft || soft === item || soft.dead || !isSoftPlacementIgnoredItemType(soft.type)) continue;
+      // Easy beds are intentionally valid under a parasol. Placing the parasol
+      // after the bed must preserve the same layout that AI can build later.
+      if (item.type === "rain_shelter" && soft.type === "grass_bed") continue;
       if (placementItemOverlapsSoftItem(worldRef, item, soft)) out.push(soft);
     }
     return out;
@@ -1240,7 +1263,6 @@
       }
       this.copyBuffer = makeCopyBufferForItem(target);
       showToast(`${toolLabel(target.type)}\u3092\u30b3\u30d4\u30fc\u3057\u307e\u3057\u305f\u3002`);
-      this.log?.(`${toolLabel(target.type)}\u3092\u30b3\u30d4\u30fc\u3057\u305f\u3002`, "observe");
       return true;
     }
     const item = this.copyPreviewItemAt?.(x, y);
@@ -1251,7 +1273,6 @@
         if (placed.type === "grass" || placed.type === "trace" || placed.type === "splat") this.markTerrainDirtyAt?.(placed.x, placed.y, Math.max(placed.r || 24, 36), "copy-paste");
         this._forceImmediateToolVisualRefresh?.("tool-change");
         const label = toolLabel(item.type);
-        this.log?.(`${label}\u3092\u8cbc\u308a\u4ed8\u3051\u305f\u3002`, "observe");
         showToast(`${label}\u3092\u8cbc\u308a\u4ed8\u3051\u307e\u3057\u305f\u3002`);
         return true;
       }
@@ -1518,7 +1539,7 @@
 
   handleClick(x, y) {
     const tool = this.tool;
-    if (!isPlacementTool(tool) && !["delete", "area_delete", "copy", "poke", "pinch", "water_hose", "rope", "rod", "spring", "wire", "insulated_wire", "new"].includes(tool)) {
+    if (!isPlacementTool(tool) && !["delete", "area_delete", "copy", "poke", "pinch", "water_hose", "rope", "rod", "spring", "wire", "insulated_wire", "new", "acquired_tarinai", "bell"].includes(tool)) {
       const editable = findEditableItemAt(this, x, y);
       if (editable && openEditableItemEditor(editable, this)) {
         global.TarinaiCommands.setSelection(this, null) || (this.selected = null);
@@ -1540,10 +1561,12 @@
       if (!found && !this.findDeleteToolTargetAt?.(x, y)) {
         global.TarinaiAchievements?.recordEmptyClick?.({ world: this, x, y });
       }
-      const wasSelectionEmpty = !this.selected;
-      if (found && wasSelectionEmpty) this._scrollSelectedDataTopOnNextSelection = true;
-      else this._scrollSelectedDataTopOnNextSelection = false;
-      global.TarinaiCommands.setSelection(this, found) || (this.selected = found);
+      this._scrollSelectedDataTopOnNextSelection = Boolean(found);
+      const selectionResult = global.TarinaiCommands.setSelection(this, found);
+      if (!selectionResult) this.selected = found;
+      if (found && selectionResult?.changed === false) {
+        global.setTimeout?.(() => global.scrollToSelectedDataPanel?.(), 0);
+      }
       return;
     }
   
@@ -1564,7 +1587,7 @@
         const vx = dx / length * speed;
         const vy = Math.min(dy / length * speed - 95, -145);
         if (target.fling(this, x, y, { source: "poke", vx, vy, speed, life: 5.2, destroyOffscreen: true })) {
-          this.effects?.push(new Effect("ring", target.x, target.y, { size: 26, life: 0.20, color: "rgba(190,82,92,0.40)" }));
+          this.queueEffect?.("ring", target.x, target.y, { size: 26, life: 0.20, color: "rgba(190,82,92,0.40)" });
           this.drawListDirty = true;
           audio.poke?.();
           global.TarinaiAchievements?.recordPlushiePokeFling?.({ world: this, item: target, owner });
@@ -1579,30 +1602,55 @@
         if (global.TarinaiMechanicalSystem.applyPokeImpulse(target, x, y, this)) {
           const label = target.type === "rotator" ? "\u56de\u8ee2\u4f53" : (target.type === "poison_block" ? "\u6bd2\u30d6\u30ed\u30c3\u30af" : "\u5f80\u5fa9\u4f53");
           const color = target.type === "rotator" ? "rgba(184,132,230,0.40)" : (target.type === "poison_block" ? "rgba(92,188,68,0.40)" : "rgba(90,150,214,0.40)");
-          this.effects?.push(new Effect("ring", x, y, { size: 22, life: 0.18, color }));
+          this.queueEffect?.("ring", x, y, { size: 22, life: 0.18, color });
           this.drawListDirty = true;
           audio.poke?.();
-          this.log(`${label}\u3092\u3064\u3064\u3044\u3066\u52d5\u304b\u3057\u305f\u3002`, "observe", { eventType: "mechanism_poke" });
         }
         return;
       }
       if (typeof target.poke === "function") {
         target.poke();
-        if (!target.dead) this.log(`${target.name}\u306f\u3064\u3064\u304b\u308c\u3001\u305f\u308a\u306a\u3044\u3053\u3068\u3092\u899a\u3048\u305f\u3002`, "observe", { participants: [target] });
       }
       return;
     }
   
+    if (tool === "bell") {
+      const size = this.toolSizeFor?.("bell") || "medium";
+      global.TarinaiAchievements?.recordIntervention?.({ world: this, tool: "bell", x, y });
+      global.TarinaiMemorialBellSystem?.ringAt?.(this, x, y, size);
+      return;
+    }
+  
     if (tool === "new") {
       const spot = this.edgeSpawnPoint(x, y, 42, true);
       const t = this.addTarinai({ x: spot.x, y: spot.y, vx: spot.vx, vy: spot.vy, generation: 1, entryTimer: 2.0 });
       if (!t) { showToast(`\u305f\u308a\u306a\u3044\u500b\u4f53\u6570\u306f${this.tarinaiPopulationLimit}\u5339\u307e\u3067\u3067\u3059\u3002`); return; }
       t.wanderAngle = spot.angle;
       global.TarinaiAchievements?.recordManualTarinaiAdded?.({ world: this, tarinai: t, tool: "new" });
-      this.log(`${t.name}\u304c\u753b\u9762\u5916\u304b\u3089\u8ff7\u3044\u8fbc\u3093\u3067\u304d\u305f\u3002`);
       return;
     }
-  
+
+    if (tool === "acquired_tarinai") {
+      const spot = this.edgeSpawnPoint(x, y, 42, true);
+      const t = this.addTarinai({ x: spot.x, y: spot.y, vx: spot.vx, vy: spot.vy, generation: 1, entryTimer: 2.0, isAcquiredTarinai: true });
+      if (!t) { showToast(`\u305f\u308a\u306a\u3044\u500b\u4f53\u6570\u306f${this.tarinaiPopulationLimit}\u5339\u307e\u3067\u3067\u3059\u3002`); return; }
+      t.wanderAngle = spot.angle;
+      if (Math.random() < 0.5 && typeof t.enterPanic === "function") {
+        t.enterPanic({
+          target: null,
+          reason: "おちびになって混乱している",
+          fear: 1.25,
+          wake: true,
+          cause: "acquired_tarinai_spawn",
+          bubble: "!!",
+          bubbleCooldown: 0.75
+        });
+      }
+      global.TarinaiAchievements?.recordManualTarinaiAdded?.({ world: this, tarinai: t, tool: "acquired_tarinai" });
+      return;
+    }
+
+
     if (tool === "copy") { this.useCopyToolAt?.(x, y); return; }
     if (this.useToolAt?.(x, y)) return;
   
diff --git a/js/world_spatial_budget.js b/js/world_spatial_budget.js
index 316d888..cc59614 100644
--- a/js/world_spatial_budget.js
+++ b/js/world_spatial_budget.js
@@ -108,6 +108,14 @@
         fps: window.__tarinaiFps || 0,
         dpr: (typeof uiCache !== "undefined" ? uiCache?.canvasDpr : window.uiCache?.canvasDpr) || 0,
       },
+      runtimeCaches: {
+        ballCollisions: this.ballCollisionMemo?.size || 0,
+        tarinaiCollisions: this.tarinaiCollisionMemo?.size || 0,
+        relationNotices: Object.keys(this.relationNotices || {}).length,
+        fightCooldowns: Object.keys(this.fightPairCooldowns || {}).length,
+        resolvedFights: Object.keys(this.resolvedFightIds || {}).length,
+        familyRecords: Object.keys(this.family || {}).length,
+      },
       work: {
         budget: this.workBudget || null,
         stats: this.workStats || null,
@@ -193,12 +201,10 @@
     this.ensureSpatial?.("nearby-items");
     const out = this.spatialItemScratch || [];
     out.length = 0;
-    if (this.spatial?.nearbyInto && this.spatial.staticItemCells && this.spatial.dynamicItemCells) {
-      this.spatial.nearbyInto(this.spatial.staticItemCells, x, y, radius, out, precise);
-      this.spatial.nearbyInto(this.spatial.dynamicItemCells, x, y, radius, out, precise);
-      return out;
-    }
-    return this.spatial.nearby(this.spatial.itemCells, x, y, radius, out, precise);
+    if (!this.spatial?.nearbyInto) return out;
+    this.spatial.nearbyInto(this.spatial.staticItemCells, x, y, radius, out, precise);
+    this.spatial.nearbyInto(this.spatial.dynamicItemCells, x, y, radius, out, precise);
+    return out;
   },
 
   nearbyGrass(x, y, radius, precise = false) {
@@ -245,26 +251,20 @@
   },
   nearbyFood(x, y, radius, precise = false) {
     this.ensureSpatial?.("nearby-food");
-    if (this.spatial?.nearbySplitInto && this.spatial.staticFoodCells && this.spatial.dynamicFoodCells) {
-      return this.spatial.nearbySplitInto(this.spatial.staticFoodCells, this.spatial.dynamicFoodCells, x, y, radius, this.spatialFoodScratch, precise);
-    }
-    return this.spatial.nearby(this.spatial.foodCells, x, y, radius, this.spatialFoodScratch, precise);
+    if (!this.spatial?.nearbySplitInto) return this.spatialFoodScratch;
+    return this.spatial.nearbySplitInto(this.spatial.staticFoodCells, this.spatial.dynamicFoodCells, x, y, radius, this.spatialFoodScratch, precise);
   },
 
   nearbyObstacles(x, y, radius, precise = false) {
     this.ensureSpatial?.("nearby-obstacles");
-    if (this.spatial?.nearbySplitInto && this.spatial.staticObstacleCells && this.spatial.dynamicObstacleCells) {
-      return this.spatial.nearbySplitInto(this.spatial.staticObstacleCells, this.spatial.dynamicObstacleCells, x, y, radius, this.spatialObstacleScratch, precise);
-    }
-    return this.spatial.nearby(this.spatial.obstacleCells, x, y, radius, this.spatialObstacleScratch, precise);
+    if (!this.spatial?.nearbySplitInto) return this.spatialObstacleScratch;
+    return this.spatial.nearbySplitInto(this.spatial.staticObstacleCells, this.spatial.dynamicObstacleCells, x, y, radius, this.spatialObstacleScratch, precise);
   },
 
   nearbyHazards(x, y, radius, precise = false) {
     this.ensureSpatial?.("nearby-hazards");
-    if (this.spatial?.nearbySplitInto && this.spatial.staticHazardCells && this.spatial.dynamicHazardCells) {
-      return this.spatial.nearbySplitInto(this.spatial.staticHazardCells, this.spatial.dynamicHazardCells, x, y, radius, this.spatialHazardScratch, precise);
-    }
-    return this.spatial.nearby(this.spatial.hazardCells, x, y, radius, this.spatialHazardScratch, precise);
+    if (!this.spatial?.nearbySplitInto) return this.spatialHazardScratch;
+    return this.spatial.nearbySplitInto(this.spatial.staticHazardCells, this.spatial.dynamicHazardCells, x, y, radius, this.spatialHazardScratch, precise);
   },
   rebuildSpatial(force = false, reason = "manual") {
     // Direct calls keep their old eager semantics. update() uses markSpatialDirty + ensureSpatial
@@ -441,9 +441,135 @@
     return item;
   },
 
+  residueCellKey(x, y) {
+    const size = 160;
+    return `${Math.floor((Number(x) || 0) / size)}:${Math.floor((Number(y) || 0) / size)}`;
+  },
+
+  addResidue(type, x, y, opts = {}) {
+    const residueType = String(type || "");
+    if (residueType !== "trace" && residueType !== "splat") return null;
+    if (!(this.residueById instanceof Map)) this.residueById = new Map();
+    if (!(this.residueTypeBuckets instanceof Map)) this.residueTypeBuckets = new Map();
+    if (!(this.residueCells instanceof Map)) this.residueCells = new Map();
+    if (!Array.isArray(this.residues)) this.residues = [];
+    const id = String(opts.id || `res${++this.residueSerial}`);
+    const residue = {
+      id, type: residueType,
+      x: Number(x) || 0, y: Number(y) || 0,
+      r: Math.max(1, Number(opts.r ?? (residueType === "splat" ? 26 : 16)) || 1),
+      amount: Math.max(0, Number(opts.amount ?? (residueType === "splat" ? 260 : 220)) || 0),
+      seed: Number.isFinite(Number(opts.seed)) ? Number(opts.seed) : Math.random() * 1000,
+      dead: false,
+      _memorialReservedBy: String(opts._memorialReservedBy || ""),
+    };
+    this.residues.push(residue);
+    this.residueById.set(id, residue);
+    let typeBucket = this.residueTypeBuckets.get(residueType);
+    if (!typeBucket) { typeBucket = new Set(); this.residueTypeBuckets.set(residueType, typeBucket); }
+    typeBucket.add(residue);
+    const cellKey = this.residueCellKey(residue.x, residue.y);
+    residue._cellKey = cellKey;
+    let cell = this.residueCells.get(cellKey);
+    if (!cell) { cell = new Set(); this.residueCells.set(cellKey, cell); }
+    cell.add(residue);
+    this.markTerrainDirtyAt?.(residue.x, residue.y, Math.max(residue.r, 36), opts.reason || "residue-add");
+    return residue;
+  },
+
+  rebuildResidueIndex() {
+    if (!(this.residueById instanceof Map)) this.residueById = new Map();
+    if (!(this.residueTypeBuckets instanceof Map)) this.residueTypeBuckets = new Map();
+    if (!(this.residueCells instanceof Map)) this.residueCells = new Map();
+    this.residueById.clear(); this.residueTypeBuckets.clear(); this.residueCells.clear();
+    for (const residue of this.residues || []) {
+      if (!residue || residue.dead || residue.amount <= 0) continue;
+      this.residueById.set(String(residue.id), residue);
+      let typeBucket = this.residueTypeBuckets.get(residue.type);
+      if (!typeBucket) { typeBucket = new Set(); this.residueTypeBuckets.set(residue.type, typeBucket); }
+      typeBucket.add(residue);
+      const key = this.residueCellKey(residue.x, residue.y); residue._cellKey = key;
+      let cell = this.residueCells.get(key);
+      if (!cell) { cell = new Set(); this.residueCells.set(key, cell); }
+      cell.add(residue);
+    }
+    return this.residueById.size;
+  },
+
+  residueByRuntimeId(id) {
+    if (id == null || id === "") return null;
+    const residue = this.residueById?.get?.(String(id)) || null;
+    return residue && !residue.dead && residue.amount > 0 ? residue : null;
+  },
+
+  residuesOfType(type) {
+    return this.residueTypeBuckets?.get?.(String(type || "")) || [];
+  },
+
+  nearbyResidues(x, y, radius, type = "") {
+    const out = this._nearbyResidueScratch || (this._nearbyResidueScratch = []);
+    out.length = 0;
+    if (!(this.residueCells instanceof Map) || !this.residueCells.size) return out;
+    const size = 160;
+    const r = Math.max(0, Number(radius) || 0);
+    const minX = Math.floor(((Number(x) || 0) - r) / size), maxX = Math.floor(((Number(x) || 0) + r) / size);
+    const minY = Math.floor(((Number(y) || 0) - r) / size), maxY = Math.floor(((Number(y) || 0) + r) / size);
+    const wanted = String(type || "");
+    const r2 = r * r;
+    for (let cy = minY; cy <= maxY; cy++) for (let cx = minX; cx <= maxX; cx++) {
+      const cell = this.residueCells.get(`${cx}:${cy}`);
+      if (!cell) continue;
+      for (const residue of cell) {
+        if (!residue || residue.dead || residue.amount <= 0 || (wanted && residue.type !== wanted)) continue;
+        const dx = residue.x - x, dy = residue.y - y;
+        if (dx * dx + dy * dy <= r2) out.push(residue);
+      }
+    }
+    return out;
+  },
+
+  removeResidue(residue, reason = "residue-remove") {
+    if (!residue || residue.dead) return false;
+    residue.dead = true;
+    residue.amount = 0;
+    this.residueById?.delete?.(residue.id);
+    const typeBucket = this.residueTypeBuckets?.get?.(residue.type);
+    typeBucket?.delete?.(residue);
+    if (typeBucket && typeBucket.size === 0) this.residueTypeBuckets.delete(residue.type);
+    const cell = this.residueCells?.get?.(residue._cellKey || this.residueCellKey(residue.x, residue.y));
+    cell?.delete?.(residue);
+    if (cell && cell.size === 0) this.residueCells.delete(residue._cellKey || this.residueCellKey(residue.x, residue.y));
+    this.markTerrainDirtyAt?.(residue.x, residue.y, Math.max(residue.r || 24, 36), reason);
+    return true;
+  },
+
+  updateResidues(dt) {
+    if (!Array.isArray(this.residues) || !this.residues.length) return 0;
+    this.residueDecayAccumulator = Math.max(0, Number(this.residueDecayAccumulator || 0)) + Math.max(0, Number(dt) || 0);
+    if (this.residueDecayAccumulator < 0.75) return 0;
+    const step = this.residueDecayAccumulator;
+    this.residueDecayAccumulator = 0;
+    let removed = 0;
+    for (const residue of this.residues) {
+      if (!residue || residue.dead) continue;
+      const before = Number(residue.amount || 0) || 0;
+      residue.amount = Math.max(0, before - step * (residue.type === "splat" ? 1.05 : 1.35));
+      if (residue.type === "splat" && Math.floor(before / 18) !== Math.floor(residue.amount / 18)) {
+        this.markTerrainDirtyAt?.(residue.x, residue.y, Math.max(residue.r || 24, 36), "splat-fade");
+      }
+      if (residue.amount <= 0.001 && this.removeResidue(residue, "residue-decay")) removed += 1;
+    }
+    if (removed > 0 || this.residues.length > 512) this.residues = this.residues.filter(r => r && !r.dead && r.amount > 0);
+    return removed;
+  },
+
   noteItemInactive(item, reason = "item-inactive", notifyAchievements = true) {
     if (!item || item._worldCountedActive !== true) return false;
     item._worldCountedActive = false;
+    if (item._achievementPlayerPlaced && item._achievementPlayerPlacedCounted !== false) {
+      this.achievementPlayerPlacedActiveCount = Math.max(0, (Number(this.achievementPlayerPlacedActiveCount || 0) || 0) - 1);
+      item._achievementPlayerPlacedCounted = false;
+    }
     if (item.type) this.itemCounts[item.type] = Math.max(0, (Number(this.itemCounts[item.type] || 0) || 0) - 1);
     if (Number.isFinite(this._activeObjectCountCache)) this._activeObjectCountCache = Math.max(0, this._activeObjectCountCache - 1);
     if (notifyAchievements && !this._suspendAchievementEvents) global.TarinaiAchievements?.evaluateEvent?.(this, "items", { item, delta: -1, reason });
@@ -481,10 +607,17 @@
     this.itemOwnerBuckets.clear();
     this.carriedPlushies.length = 0;
     let activeObjectCount = 0;
+    let playerPlacedActiveCount = 0;
     for (const it of this.items) {
       if (!it || it.dead) continue;
       activeObjectCount += 1;
       it._worldCountedActive = true;
+      if (it._achievementPlayerPlaced) {
+        playerPlacedActiveCount += 1;
+        it._achievementPlayerPlacedCounted = true;
+      } else {
+        it._achievementPlayerPlacedCounted = false;
+      }
       counts[it.type] = (counts[it.type] || 0) + 1;
       if (it.id != null) this.itemIdMap.set(it.id, it);
       if (it.isStructure && it.type === "plushie" && it.carriedById) this.carriedPlushies.push(it);
@@ -504,6 +637,7 @@
       bucket.push(it);
     }
     this._activeObjectCountCache = activeObjectCount;
+    this.achievementPlayerPlacedActiveCount = playerPlacedActiveCount;
     this.itemBucketsDirty = false;
     this.itemBucketRebuildsTotal = (this.itemBucketRebuildsTotal || 0) + 1;
   },
diff --git a/js/world_tool_actions.js b/js/world_tool_actions.js
index c029fde..02910a6 100644
--- a/js/world_tool_actions.js
+++ b/js/world_tool_actions.js
@@ -45,8 +45,10 @@
       global.TarinaiAchievements?.recordIntervention?.({ world: this, tool: "delete", x, y });
       const target = this.findDeleteToolTargetAt?.(x, y);
       if (!target) { showToast("\u6d88\u305b\u308b\u3082\u306e\u304c\u3042\u308a\u307e\u305b\u3093\u3002"); return true; }
-      if (isPinType(target.type) && target.pinState === "lodged") { showToast("\u523a\u3055\u3063\u305f\u92f2\u306f\u3001\u3064\u307e\u3093\u3067\u629c\u3044\u3066\u304f\u3060\u3055\u3044\u3002"); return true; }
       const label = toolLabel(target.type);
+      if (isPinType(target.type) && target.pinState === "lodged") {
+        global.TarinaiItemDynamicPinSystem?.detach?.(target, this, "pinch");
+      }
       const removed = global.TarinaiStructureLifecycle.deleteItem(this, target, {
         reason: "delete-tool",
         userReason: target.type === "grass_bed" ? "\u30d9\u30c3\u30c9\u304c\u306a\u304f\u306a\u3063\u305f" : "\u7f6e\u304d\u3082\u306e\u304c\u306a\u304f\u306a\u3063\u305f",
@@ -58,7 +60,6 @@
       this.compactItems?.();
       this.updateItemCounts?.();
       this.rebuildSpatial?.();
-      this.log?.(`${label}\u3092\u6d88\u3057\u305f\u3002`, "observe");
       return true;
     },
 
@@ -116,7 +117,6 @@
       if (options.drag) this._areaDeleteDragRemoved = (this._areaDeleteDragRemoved || 0) + removedCount;
       if (!options.silentLog) {
         const detail = [...kindCounts.entries()].slice(0, 4).map(([label, count]) => `${label}${count > 1 ? `\u00d7${count}` : ""}`).join("\u3001");
-        this.log?.(`\u7bc4\u56f2\u524a\u9664\u3067${removedCount}\u500b\u6d88\u3057\u305f${detail ? `\uff08${detail}\uff09` : ""}\u3002`, "observe");
         showToast(`${removedCount}\u500b\u6d88\u3057\u307e\u3057\u305f\u3002`);
       }
       return true;
@@ -256,7 +256,6 @@
       global.TarinaiAchievements?.recordLinkPlaced?.(constraintType, { world: this, item, type: constraintType });
       global.TarinaiPhysicsSoftClear.clearForItem(this, item, `${constraintType}-soft-overlap-clear`);
       this._forceImmediateToolVisualRefresh?.("tool-action");
-      this.log?.(`${toolName}\u3092\u3064\u306a\u3044\u3060\u3002`, "observe");
       showToast(`${toolName}\u3092\u3064\u306a\u304e\u307e\u3057\u305f\u3002`);
       return true;
     },
@@ -405,8 +404,8 @@
       global.TarinaiAchievements?.recordIntervention?.({ world: this, tool: "shoot", x: aim.x, y: aim.y });
       const hit = this.findShootToolTargetAt?.(aim.x, aim.y);
       audio.shoot?.();
-      this.effects?.push(new Effect("shoot_impact", aim.x, aim.y, { size: hit ? 22 : 16, life: hit ? 0.28 : 0.22, color: hit ? "rgba(255,208,116,0.96)" : "rgba(190,212,240,0.64)" }));
-      this.effects?.push(new Effect("ring", aim.x, aim.y, { size: hit ? 20 : 14, life: hit ? 0.18 : 0.14, color: hit ? "rgba(255,246,206,0.74)" : "rgba(196,220,255,0.42)" }));
+      this.queueEffect?.("shoot_impact", aim.x, aim.y, { size: hit ? 22 : 16, life: hit ? 0.28 : 0.22, color: hit ? "rgba(255,208,116,0.96)" : "rgba(190,212,240,0.64)" });
+      this.queueEffect?.("ring", aim.x, aim.y, { size: hit ? 20 : 14, life: hit ? 0.18 : 0.14, color: hit ? "rgba(255,246,206,0.74)" : "rgba(196,220,255,0.42)" });
       let handled = false;
       if (hit?.kind === "tarinai") {
         const t = hit.target;
@@ -453,7 +452,7 @@
             target.noStickUntil = (this.time || 0) + 0.22;
             target.lastPokedAt = this.time || 0;
           }
-          this.effects?.push(new Effect("ring", target.x || aim.x, target.y || aim.y, { size: Math.max(12, (target.r || 8) * 1.8), life: 0.18, color: "rgba(255,230,116,0.48)" }));
+          this.queueEffect?.("ring", target.x || aim.x, target.y || aim.y, { size: Math.max(12, (target.r || 8) * 1.8), life: 0.18, color: "rgba(255,230,116,0.48)" });
           this.markSpatialDirty?.("shoot-pin-blast");
           this.drawListDirty = true;
         } else {
diff --git a/js/world_view.js b/js/world_view.js
index 8ed9b85..c76c8eb 100644
--- a/js/world_view.js
+++ b/js/world_view.js
@@ -196,7 +196,7 @@
       if (next !== previous && !opts.silent) {
         window.TarinaiAchievements?.recordGroundChange?.({ world: this, previous, next, silent: false });
       }
-      window.TarinaiWeatherSystem.enforceFixedWeather(this);
+      window.TarinaiWeatherSystem.enforceFixedWeather(this, { silentLog: true });
       this.markTerrainDirty?.("ground-type");
       this.enforceGrassLimit?.("ground-type");
       this.updateItemCounts?.("ground-type");
@@ -211,7 +211,6 @@
       }
       if (!opts.silent) {
         const label = this.groundLabel?.() || "\u5730\u9762";
-        this.log?.(`\u5730\u9762: ${label}`);
         showToast(`\u5730\u9762\u3092 ${label} \u306b\u3057\u307e\u3057\u305f\u3002`);
       }
     }
@@ -340,13 +339,22 @@
     const oldH = this.h || height;
     this.viewportW = Math.max(1, width || this.viewportW || 1000);
     this.viewportH = Math.max(1, height || this.viewportH || 720);
-    const requestedScale = fieldWorldScale(this);
-    const scale = Math.max(requestedScale, 220 / this.viewportW, 180 / this.viewportH);
-    this.w = this.viewportW * scale;
-    this.h = this.viewportH * scale;
+
+    // The playable world follows the CSS canvas size. Callers can opt out for
+    // presentation-only measurements, but normal viewport resizes keep the two
+    // dimensions linked and may scale existing contents to preserve layout.
+    const resizeWorld = opts.resizeWorld !== false || !this._worldSizeInitialized;
+    if (resizeWorld) {
+      const requestedScale = fieldWorldScale(this);
+      const scale = Math.max(requestedScale, 220 / this.viewportW, 180 / this.viewportH);
+      this.w = this.viewportW * scale;
+      this.h = this.viewportH * scale;
+      this._worldSizeInitialized = true;
+    }
+
     this.fieldZoom = this.normalizedFieldZoom(this.fieldZoom);
     this.clampCamera();
-    if (opts.scaleContents && oldW > 0 && oldH > 0) {
+    if (resizeWorld && opts.scaleContents && oldW > 0 && oldH > 0) {
       const sx = this.w / oldW;
       const sy = this.h / oldH;
       const scalePoint = (p) => {
@@ -356,6 +364,8 @@
       };
       for (const t of this.tarinai || []) scalePoint(t);
       for (const it of this.items || []) scalePoint(it);
+      for (const residue of this.residues || []) scalePoint(residue);
+      this.rebuildResidueIndex?.();
       for (const ef of this.effects || []) scalePoint(ef);
       scalePoint(this.pointer);
       this.cameraX *= sx;
diff --git a/manifest.webmanifest b/manifest.webmanifest
new file mode 100644
index 0000000..cd7400b
--- /dev/null
+++ b/manifest.webmanifest
@@ -0,0 +1,27 @@
+{
+  "id": "./",
+  "name": "たりない観察",
+  "short_name": "たりない観察",
+  "description": "たりないたちの暮らしを観察・操作する実験ゲーム",
+  "lang": "ja",
+  "start_url": "./",
+  "scope": "./",
+  "display": "standalone",
+  "orientation": "any",
+  "background_color": "#dfe9df",
+  "theme_color": "#244d3a",
+  "icons": [
+    {
+      "src": "assets/ui/pwa-icon-192.png",
+      "sizes": "192x192",
+      "type": "image/png",
+      "purpose": "any"
+    },
+    {
+      "src": "assets/ui/pwa-icon-512.png",
+      "sizes": "512x512",
+      "type": "image/png",
+      "purpose": "any"
+    }
+  ]
+}
diff --git a/router.php b/router.php
new file mode 100644
index 0000000..c011c31
--- /dev/null
+++ b/router.php
@@ -0,0 +1,24 @@
+<?php
+declare(strict_types=1);
+
+// Router for PHP's built-in development server. Apache protects the legacy
+// directory with .htaccess, but the built-in server ignores it completely.
+$uri = rawurldecode((string)(parse_url((string)($_SERVER['REQUEST_URI'] ?? '/'), PHP_URL_PATH) ?: '/'));
+$segments = array_values(array_filter(explode('/', str_replace('\\', '/', $uri)), static fn(string $part): bool => $part !== ''));
+foreach ($segments as $segment) {
+    if (str_starts_with($segment, '.')) {
+        http_response_code(404);
+        header('Content-Type: text/plain; charset=utf-8');
+        echo "Not found\n";
+        return true;
+    }
+}
+
+$relative = ltrim($uri, '/');
+$candidate = __DIR__ . ($relative === '' ? DIRECTORY_SEPARATOR . 'index.html' : DIRECTORY_SEPARATOR . $relative);
+if (is_file($candidate)) return false;
+
+http_response_code(404);
+header('Content-Type: text/plain; charset=utf-8');
+echo "Not found\n";
+return true;
diff --git a/scripts/achievement_audit.js b/scripts/achievement_audit.js
deleted file mode 100644
index 8ab5aa3..0000000
--- a/scripts/achievement_audit.js
+++ /dev/null
@@ -1,714 +0,0 @@
-"use strict";
-
-const fs = require("fs");
-const vm = require("vm");
-const path = require("path");
-
-const source = fs.readFileSync(path.join(__dirname, "..", "js", "achievements.js"), "utf8");
-
-class ClassList {
-  constructor() { this.values = new Set(["hidden"]); }
-  add(...names) { names.forEach(name => this.values.add(name)); }
-  remove(...names) { names.forEach(name => this.values.delete(name)); }
-  contains(name) { return this.values.has(name); }
-  toggle(name, force) {
-    const next = force === undefined ? !this.values.has(name) : Boolean(force);
-    if (next) this.values.add(name); else this.values.delete(name);
-    return next;
-  }
-}
-class Element {
-  constructor(id = "", tagName = "div") {
-    this.tagName = String(tagName || "div").toUpperCase();
-    this.open = false;
-    this.id = id;
-    this.className = "";
-    this.classList = new ClassList();
-    this.dataset = {};
-    this.styles = new Map();
-    this.style = {
-      setProperty: (name, value) => this.styles.set(name, value),
-      removeProperty: name => this.styles.delete(name),
-    };
-    this.children = [];
-    this.textContent = "";
-    this.tabIndex = -1;
-    this.isConnected = true;
-  }
-  append(...children) { this.children.push(...children); }
-  replaceChildren(...children) { this.children = children; }
-  setAttribute() {}
-  addEventListener() {}
-  focus() {}
-  getBoundingClientRect() { return { left: 0, top: 0, width: 100, height: 30 }; }
-  get offsetWidth() { return 100; }
-}
-
-function createHarness(existingStorage = null, search = "", options = {}) {
-  const storage = existingStorage || new Map();
-  const elements = new Map();
-  const ids = [
-    "achievementsBtn", "achievementButtonCount", "achievementsDialog", "achievementDialogCount",
-    "achievementsCloseBtn", "achievementsCloseIconBtn", "achievementRefreshBtn", "achievementResetBtn", "achievementUnlockAllBtn",
-    "achievementList", "achievementSharedStatus", "achievementToast", "achievementToastTitle", "pauseBtn",
-  ];
-  ids.forEach(id => elements.set(id, new Element(id)));
-  elements.get("achievementsDialog").classList.add("hidden");
-  elements.get("achievementToast").classList.add("hidden");
-  let timerId = 0;
-  const context = {
-    console, Date, Intl, Math, JSON, Object, Array, Map, Set, WeakMap, Promise,
-    Number, String, Boolean, Error, AbortController, encodeURIComponent, URLSearchParams,
-    location: { protocol: options.protocol || "file:", search },
-    crypto: { randomUUID: () => "11111111-1111-4111-8111-111111111111" },
-    localStorage: {
-      getItem(key) { return storage.has(key) ? storage.get(key) : null; },
-      setItem(key, value) { storage.set(key, String(value)); },
-      removeItem(key) { storage.delete(key); },
-    },
-    document: {
-      hidden: false,
-      getElementById(id) { return elements.get(id) || null; },
-      createElement(tagName) { return new Element("", tagName); },
-      addEventListener() {},
-    },
-    TarinaiEvents: { emit() {} },
-    showToast() {},
-    audio: { uiClick() {} },
-    setTimeout() { timerId += 1; return timerId; },
-    clearTimeout() {},
-    setInterval() { timerId += 1; return timerId; },
-    clearInterval() {},
-    fetch: options.fetch || (async () => { throw new Error("offline"); }),
-    TARINAI_VERSION: "39.16.65",
-    TarinaiGameDialogs: { confirm: async () => true },
-  };
-  context.window = context;
-  context.globalThis = context;
-  vm.createContext(context);
-  vm.runInContext(source, context, { filename: "achievements.js" });
-  return { context, api: context.TarinaiAchievements, storage, elements };
-}
-
-function assert(condition, message) { if (!condition) throw new Error(message); }
-function unlocked(h, id) { return h.api.isUnlocked(id); }
-
-const expectedIds = [
-  "first_birth", "natural_zunchi_slave", "natural_tarinai_king", "self_zunchi_death",
-  "natural_zunchi_slave_5_generations", "natural_tarinai_king_3_generations",
-  "death_50_in_10_seconds", "birth_50_in_60_seconds", "great_mother_1000_births", "lifespan_completed",
-  "soccer_ball_death", "fight_pair_danger_kill", "all_non_sleep_diseased_25", "colony_happy", "direct_feed_33",
-  "ignite_during_birth_ritual", "laxative_starvation", "idle_observer_5_minutes",
-  "placed_objects_100", "mechanized_industry", "safe_colony_25_5_minutes",
-  "ants_alive_25", "ants_killed_100", "secret_collection_9_slots",
-  "pause_spam_4_in_1_second", "continuous_play_1_hour", "below_absolute_zero_item",
-  "undo_mass_revival", "robot_cleaner_100", "held_30_seconds", "minimalist_happy",
-  "overprotective", "self_sufficient", "unplanned_city_30", "sauna_cold_plunge",
-  "rain_shelter_all", "medicine_ledger_all", "mercury_lifespan", "enemy_enemy_friend",
-  "revolution", "fuel_to_fire", "undo_20", "redo_20",
-  "eternal_history_generation_10", "king_full_satisfaction", "slave_zero_satisfaction", "town_doctor_50", "poke_plushie_fling",
-  "chaos_seeker_666_fights", "clean_freak_robot_only", "true_tarinai_observer",
-  "sniper_333_shots", "megalopolis", "fertility_seeker_721_love_births",
-  "low_fps_single_digit", "continuous_play_24_hours", "sandbox_five_toilets",
-  "park_ground_changed", "ground_change_4_in_1_second",
-  "ant_nest_without_tarinai", "sticky_bomb_15_passes",
-  "daily_play_7_days", "wire_shock_7_tarinai", "information_industry",
-  "strength_in_numbers", "elite_few", "zunchi_overflow", "comfortable_beds",
-  "stone_pillow", "across_seasons", "favorite_one", "statistician",
-  "well_informed", "lively_making", "memento_mori",
-];
-
-(async function run() {
-  let h = createHarness();
-  let storage;
-  assert(h.api.definitions.length === 75, "definition count must be 75");
-  {
-    const spellHarness = createHarness();
-    spellHarness.api.unlock("statistician");
-    const spell = spellHarness.api.exportSpellState();
-    assert(spell[0] === 8, "current achievement spell version must be 8");
-    assert(spell[3] === 128, "achievement 72 is not stored in the extended mask");
-    spellHarness.api.unlock("memento_mori");
-    const extendedSpell = spellHarness.api.exportSpellState();
-    assert((extendedSpell[3] & 0x0400) !== 0, "achievement 75 is not stored in the second extended mask byte");
-    const oldSpellHarness = createHarness();
-    const imported = oldSpellHarness.api.importSpellState([7, 1, 0, 0, 100, [0], []]);
-    assert(!imported.included && !oldSpellHarness.api.isUnlocked("first_birth"), "obsolete achievement spell version was accepted");
-  }
-  assert(JSON.stringify(h.api.definitions.map(d => d.id)) === JSON.stringify(expectedIds), "definition IDs mismatch");
-  const categorizedIds = h.api.categories.flatMap(category => category.ids);
-  assert(categorizedIds.length === expectedIds.length, "achievement category count mismatch");
-  assert(new Set(categorizedIds).size === expectedIds.length, "achievement category contains duplicates");
-  assert(expectedIds.every(id => categorizedIds.includes(id)), "achievement category misses an ID");
-  assert(h.api.categories.length === 6, "achievement categories must be reorganized into six groups");
-  assert(JSON.stringify(h.api.categories.map(category => category.title)) === JSON.stringify(["生態", "繁殖・人口", "実験", "建築", "操作", "その他"]), "achievement category titles/order mismatch");
-  h.api.open();
-  const titles = Object.fromEntries(h.api.definitions.map(def => [def.id, def.title]));
-  assert(titles.natural_zunchi_slave === "ずんちどれい", "slave title mismatch");
-  assert(titles.natural_tarinai_king === "たりない王", "king title mismatch");
-  assert(titles.self_zunchi_death === "あぁ＾～ たまらねぇぜ", "self-zunchi title mismatch");
-  assert(titles.natural_zunchi_slave_5_generations === "末代までの恥", "five-generation title mismatch");
-  assert(titles.natural_tarinai_king_3_generations === "華麗なる王族", "three-generation title mismatch");
-  assert(titles.death_50_in_10_seconds === "6番目の大量絶滅", "mass-extinction title mismatch");
-  assert(titles.birth_50_in_60_seconds === "ベビーブーム", "baby-boom title mismatch");
-  assert(titles.idle_observer_5_minutes === "監視カメラ", "observer title mismatch");
-  assert(titles.laxative_starvation === "内臓全部出た", "laxative title mismatch");
-  assert(titles.colony_happy === "管理された楽園", "happy colony title mismatch");
-  assert(titles.soccer_ball_death === "豆野、殺ッカーやろうぜ！", "soccer title mismatch");
-  assert(titles.ants_alive_25 === "アリの惑星", "ant planet title mismatch");
-  assert(titles.all_non_sleep_diseased_25 === "緊急事態宣言", "emergency title mismatch");
-  assert(titles.secret_collection_9_slots === "秘密のコレクション", "save-slot title mismatch");
-  assert(titles.pause_spam_4_in_1_second === "何やってるの？", "pause-spam title mismatch");
-  assert(titles.continuous_play_1_hour === "めっちゃたりない観察", "continuous-play title mismatch");
-  assert(titles.below_absolute_zero_item === "物理法則を下側に超越", "absolute-zero title mismatch");
-  assert(titles.ignite_during_birth_ritual === "燃え上がる恋", "ritual ignition title mismatch");
-  assert(titles.safe_colony_25_5_minutes === "安全第一", "safe colony title mismatch");
-  assert(titles.great_mother_1000_births === "大いなる母", "great mother title mismatch");
-  assert(titles.fight_pair_danger_kill === "喧嘩両成敗", "fight-pair title mismatch");
-  assert(titles.direct_feed_33 === "餌やりじいさん", "feeding title mismatch");
-  assert(titles.eternal_history_generation_10 === "悠久の歴史", "generation title mismatch");
-  assert(titles.king_full_satisfaction === "五体満足", "king effect title mismatch");
-  assert(titles.slave_zero_satisfaction === "零体満足", "slave effect title mismatch");
-  assert(titles.chaos_seeker_666_fights === "混沌ヲ希求スル者", "chaos seeker title mismatch");
-  assert(titles.clean_freak_robot_only === "潔癖症", "clean freak title mismatch");
-  assert(titles.true_tarinai_observer === "真・たりない観察", "completionist title mismatch");
-  assert(titles.sniper_333_shots === "狙撃手", "sniper title mismatch");
-  assert(titles.megalopolis === "メガロポリス", "megalopolis title mismatch");
-  assert(titles.fertility_seeker_721_love_births === "豊穣ヲ希求スル者", "fertility title mismatch");
-  assert(titles.low_fps_single_digit === "スペックがたりない", "low-fps title mismatch");
-  assert(titles.continuous_play_24_hours === "寝ろ", "24-hour title mismatch");
-  assert(titles.sandbox_five_toilets === "砂場", "sandbox title mismatch");
-  assert(titles.park_ground_changed === "そこ公共空間だよ？", "park-ground title mismatch");
-  assert(titles.ground_change_4_in_1_second === "破格の工事費用", "ground-spam title mismatch");
-  assert(titles.ant_nest_without_tarinai === "アリ観察", "ant observation title mismatch");
-  assert(titles.sticky_bomb_15_passes === "命のバトン", "sticky-bomb relay title mismatch");
-  assert(titles.daily_play_7_days === "毎日たりない観察", "daily observation title mismatch");
-  assert(titles.wire_shock_7_tarinai === "抵抗器じゃない", "wire shock title mismatch");
-  const descriptions = Object.fromEntries(h.api.definitions.map(def => [def.id, def.description]));
-  assert(descriptions.natural_zunchi_slave === "ずんちどれいが出現する。", "slave description mismatch");
-  assert(descriptions.natural_tarinai_king === "たりない王が出現する。", "king description mismatch");
-  assert(descriptions.self_zunchi_death === "おしり鋲を抜いた時、自分のずんちで自爆する。", "self-zunchi description mismatch");
-  assert(descriptions.natural_zunchi_slave_5_generations === "5代連続でずんちどれい（鎖なし）", "five-generation description mismatch");
-  assert(descriptions.natural_tarinai_king_3_generations === "3代連続でたりない王（王冠なし）", "three-generation description mismatch");
-  assert(descriptions.great_mother_1000_births.includes("3333体"), "great mother description threshold mismatch");
-  assert(descriptions.robot_cleaner_100.includes("200個"), "cleaner description threshold mismatch");
-  assert(descriptions.minimalist_happy.includes("6日目以降"), "minimalist start-day description mismatch");
-  assert(descriptions.chaos_seeker_666_fights.includes("けんか餅") && descriptions.chaos_seeker_666_fights.includes("666回"), "chaos seeker description mismatch");
-  assert(descriptions.sniper_333_shots.includes("333発"), "sniper description mismatch");
-  assert(descriptions.megalopolis.includes("10個") && descriptions.megalopolis.includes("15個") && descriptions.megalopolis.includes("100体"), "megalopolis description mismatch");
-  assert(descriptions.fertility_seeker_721_love_births.includes("へこ餅") && descriptions.fertility_seeker_721_love_births.includes("721回"), "fertility description mismatch");
-  assert(descriptions.idle_observer_5_minutes === "3ゲーム日、操作せず画面を見るだけ", "observer description mismatch");
-  assert(descriptions.safe_colony_25_5_minutes.includes("寿命以外で"), "safe-colony lifespan exclusion description mismatch");
-  assert(descriptions.pause_spam_4_in_1_second.includes("何もない部分"), "empty-click description mismatch");
-  assert(descriptions.low_fps_single_digit === "fpsを1桁にする。", "low-fps description mismatch");
-  assert(descriptions.park_ground_changed === "公園の地面を勝手に変更する。", "park-ground description mismatch");
-  assert(descriptions.ground_change_4_in_1_second === "地面を変えすぎて破産する。", "ground-spam description mismatch");
-  assert(descriptions.sauna_cold_plunge === "暑すぎる状態になったたりないを、15秒以内に寒すぎる状態にする。", "sauna description mismatch");
-  assert(descriptions.ant_nest_without_tarinai === "アリの巣があるが、たりないがいない。", "ant observation description mismatch");
-  assert(descriptions.sticky_bomb_15_passes === "粘着ボムを爆発までに15回以上パスする。", "sticky-bomb relay description mismatch");
-  assert(!source.includes("TarinaiTooltips"), "achievement tooltips were not removed");
-  assert(source.includes("PRE_UNLOCK_DESCRIPTION_IDS"), "pre-unlock disclosure allowlist is missing");
-  function walk(node, out = []) { for (const child of node?.children || []) { out.push(child); walk(child, out); } return out; }
-  const cards = walk(h.elements.get("achievementList")).filter(node => node.dataset?.achievementId);
-  const firstBirthCard = cards.find(node => node.dataset.achievementId === "first_birth");
-  const disclosedSlaveCard = cards.find(node => node.dataset.achievementId === "natural_zunchi_slave");
-  const disclosedKingCard = cards.find(node => node.dataset.achievementId === "natural_tarinai_king");
-  const disclosedRevolutionCard = cards.find(node => node.dataset.achievementId === "revolution");
-  const disclosedLaxativeCard = cards.find(node => node.dataset.achievementId === "laxative_starvation");
-  const eternalHistoryCard = cards.find(node => node.dataset.achievementId === "eternal_history_generation_10");
-  const lowFpsCard = cards.find(node => node.dataset.achievementId === "low_fps_single_digit");
-  const sleepCard = cards.find(node => node.dataset.achievementId === "continuous_play_24_hours");
-  const livelyCard = cards.find(node => node.dataset.achievementId === "lively_making");
-  const hiddenCard = cards.find(node => node.dataset.achievementId === "self_zunchi_death");
-  assert(firstBirthCard.children[1].children[0].children[1].textContent === descriptions.first_birth, "disclosed locked condition is not shown in the UI");
-  for (const card of [disclosedSlaveCard, disclosedKingCard, disclosedRevolutionCard, disclosedLaxativeCard, eternalHistoryCard, lowFpsCard, sleepCard, livelyCard]) {
-    assert(card.children[1].children[0].children[1].textContent !== "？？？", "requested pre-unlock condition is hidden");
-  }
-  assert(hiddenCard.children[1].children[0].children[1].textContent === "？？？", "undisclosed locked condition is not hidden as question marks");
-  const groups = h.elements.get("achievementList").children;
-  assert(groups.length === 6, "achievement UI must contain exactly six category groups");
-  assert(JSON.stringify(groups.map(group => group.dataset.achievementGroup)) === JSON.stringify(["ecology", "population", "experiment", "construction", "operation", "other"]), "achievement category order mismatch");
-  assert(groups.every(group => group.tagName === "DETAILS"), "achievement categories are not collapsible details");
-  const categoryTitles = h.api.categories.map(category => category.title);
-  assert(JSON.stringify(categoryTitles) === JSON.stringify(["生態", "繁殖・人口", "実験", "建築", "操作", "その他"]), "achievement category titles mismatch");
-  const operationIds = h.api.categories.find(category => category.id === "operation").ids;
-  const otherIds = h.api.categories.find(category => category.id === "other").ids;
-  const populationIds = h.api.categories.find(category => category.id === "population").ids;
-  assert(otherIds.at(-1) === "true_tarinai_observer", "completionist is not at the bottom of その他");
-  assert(otherIds.includes("across_seasons"), "across_seasons is not in その他");
-  assert(operationIds.includes("statistician") && operationIds.includes("well_informed"), "requested 操作 achievements are missing");
-  assert(populationIds.includes("lively_making") && populationIds.includes("memento_mori"), "population achievements are missing from 繁殖・人口");
-  h.api.unlock("natural_zunchi_slave");
-  const rerenderedGroups = h.elements.get("achievementList").children;
-  const ecologyCards = walk(rerenderedGroups[0]).filter(node => node.dataset?.achievementId);
-  const allRenderedCards = rerenderedGroups.flatMap(group => walk(group).filter(node => node.dataset?.achievementId));
-  assert(ecologyCards[0]?.dataset.achievementId === "natural_zunchi_slave", "unlocked achievement was not moved to the top of its category");
-  assert(allRenderedCards.filter(card => card.dataset.achievementId === "natural_zunchi_slave").length === 1, "unlocked achievement is duplicated across categories");
-  assert(await h.api.reset(), "in-game achievement reset confirmation was not accepted");
-  assert(!h.api.isUnlocked("natural_zunchi_slave"), "achievement reset did not clear unlocked state");
-  assert(source.includes('card.style.setProperty("--achievement-rate"'), "achievement percentage bar is not wired");
-
-  h = createHarness();
-  h.api.recordBirth({ world: { time: 0 } });
-  assert(unlocked(h, "first_birth"), "first birth did not unlock");
-
-  h = createHarness();
-  const birthWorld = { time: 0 };
-  for (let i = 0; i < 29; i += 1) { birthWorld.time = i; h.api.recordBirth({ world: birthWorld }); }
-  assert(!unlocked(h, "birth_50_in_60_seconds"), "rapid birth unlocked before 30");
-  birthWorld.time = 59;
-  h.api.recordBirth({ world: birthWorld });
-  assert(unlocked(h, "birth_50_in_60_seconds"), "rapid birth did not unlock at 30");
-
-  storage = new Map();
-  h = createHarness(storage);
-  for (let i = 0; i < 2000; i += 1) h.api.recordBirth({ world: { time: i % 61 } });
-  assert(!unlocked(h, "great_mother_1000_births"), "great mother unlocked before 3333");
-  h = createHarness(storage);
-  for (let i = 0; i < 1332; i += 1) h.api.recordBirth({ world: { time: i % 61 } });
-  assert(!unlocked(h, "great_mother_1000_births"), "great mother unlocked at 3332");
-  h.api.recordBirth({ world: { time: 1 } });
-  assert(unlocked(h, "great_mother_1000_births"), "great mother did not persist to 3333");
-
-  h = createHarness();
-  const deathWorld = { time: 0 };
-  for (let i = 0; i < 49; i += 1) { deathWorld.time = i * 0.19; h.api.recordDeath({ world: deathWorld, reason: "accident" }); }
-  assert(!unlocked(h, "death_50_in_10_seconds"), "rapid death unlocked before 50");
-  deathWorld.time = 9.5;
-  h.api.recordDeath({ world: deathWorld, reason: "accident" });
-  assert(unlocked(h, "death_50_in_10_seconds"), "rapid death did not unlock at 50");
-
-  h = createHarness();
-  h.api.recordDeath({ world: { time: 1 }, tarinai: {}, reason: "天寿を全うした" });
-  assert(unlocked(h, "lifespan_completed"), "lifespan did not unlock");
-  h = createHarness();
-  h.api.recordDeath({ world: { time: 1 }, tarinai: { _achievementLaxativeActiveThisFrame: true }, reason: "飢餓" });
-  assert(unlocked(h, "laxative_starvation"), "laxative starvation did not unlock");
-
-  h = createHarness();
-  const slaveWorld = { tarinai: [] };
-  let parent = { id: "s1", parents: [], generation: 1 }; slaveWorld.tarinai.push(parent); h.api.recordNaturalZunchiSlave({ world: slaveWorld, tarinai: parent });
-  for (let i = 2; i <= 5; i += 1) { const child = { id: `s${i}`, parents: [parent.id], generation: i }; slaveWorld.tarinai.push(child); h.api.recordNaturalZunchiSlave({ world: slaveWorld, tarinai: child }); parent = child; }
-  assert(unlocked(h, "natural_zunchi_slave_5_generations"), "direct slave lineage did not unlock");
-
-  h = createHarness();
-  const kingWorld = { tarinai: [] };
-  let kingParent = { id: "k1", parents: [], generation: 4 }; kingWorld.tarinai.push(kingParent); h.api.recordNaturalTarinaiKing({ world: kingWorld, tarinai: kingParent });
-  for (let i = 2; i <= 3; i += 1) { const child = { id: `k${i}`, parents: [kingParent.id], generation: 3 + i }; kingWorld.tarinai.push(child); h.api.recordNaturalTarinaiKing({ world: kingWorld, tarinai: child }); kingParent = child; }
-  assert(unlocked(h, "natural_tarinai_king_3_generations"), "direct king lineage did not unlock");
-
-  h = createHarness();
-  const unrelatedWorld = { tarinai: [] };
-  for (let i = 1; i <= 5; i += 1) { const t = { id: `u${i}`, parents: [], generation: i }; unrelatedWorld.tarinai.push(t); h.api.recordNaturalZunchiSlave({ world: unrelatedWorld, tarinai: t }); }
-  assert(!unlocked(h, "natural_zunchi_slave_5_generations"), "unrelated generations incorrectly counted as a lineage");
-
-  h = createHarness();
-  const feedWorldA = { time: 0, achievementDirectFeedCount: 0 };
-  for (let i = 0; i < 32; i += 1) h.api.recordDirectFeed({ world: feedWorldA });
-  assert(!unlocked(h, "direct_feed_33"), "direct feed unlocked before 33");
-  const feedWorldB = { time: 0, achievementDirectFeedCount: 0 };
-  h.api.recordDirectFeed({ world: feedWorldB });
-  assert(!unlocked(h, "direct_feed_33"), "direct-feed count survived a field reset");
-  h.api.recordDirectFeed({ world: feedWorldA });
-  assert(unlocked(h, "direct_feed_33"), "direct feed did not unlock at 33 in one field");
-
-  h = createHarness();
-  const diseased = Array.from({ length: 25 }, () => ({ fightDisease: true, dead: false }));
-  h.api.evaluateWorld({ tarinai: diseased, ants: [], time: 0 }, { id: "relaxed" });
-  assert(unlocked(h, "all_non_sleep_diseased_25"), "disease colony did not unlock");
-  h = createHarness();
-  const happyWorld = { tarinai: [{ dead: false }], ants: [], items: [], time: 600, day: 6 };
-  h.api.evaluateWorld(happyWorld, { id: "happy" });
-  happyWorld.time = 719.99;
-  h.api.evaluateWorld(happyWorld, { id: "happy" });
-  assert(!unlocked(h, "colony_happy"), "happy colony unlocked before one day");
-  happyWorld.time = 720;
-  h.api.evaluateWorld(happyWorld, { id: "happy" });
-  assert(unlocked(h, "colony_happy"), "happy colony did not unlock after one day from day 6");
-
-  h = createHarness();
-  const interruptedHappyWorld = { tarinai: [{ dead: false }], ants: [], items: [], time: 600, day: 6 };
-  h.api.evaluateWorld(interruptedHappyWorld, { id: "happy" });
-  interruptedHappyWorld.time = 650;
-  h.api.evaluateWorld(interruptedHappyWorld, { id: "normal" });
-  interruptedHappyWorld.time = 700;
-  h.api.evaluateWorld(interruptedHappyWorld, { id: "happy" });
-  interruptedHappyWorld.time = 819.99;
-  h.api.evaluateWorld(interruptedHappyWorld, { id: "happy" });
-  assert(!unlocked(h, "colony_happy"), "interrupted happiness did not restart the one-day timer");
-  interruptedHappyWorld.time = 820;
-  h.api.evaluateWorld(interruptedHappyWorld, { id: "happy" });
-  assert(unlocked(h, "colony_happy"), "happy colony did not unlock one full day after restart");
-
-  h = createHarness();
-  h.api.recordIgnition({});
-  h.api.recordSelfZunchiDeath({});
-  h.api.recordSoccerBallDeath({});
-  assert(unlocked(h, "ignite_during_birth_ritual"), "ritual ignition failed");
-  assert(unlocked(h, "self_zunchi_death"), "self zunchi failed");
-  assert(unlocked(h, "soccer_ball_death"), "soccer death failed");
-
-
-  h = createHarness();
-  const dangerItem = { id: "danger-1", type: "firecracker", roles: { danger: true } };
-  const fighterA = { id: "a", dead: true, fightTimer: 2, fightTargetId: "b", fightTargetIds: ["b"] };
-  const fighterB = { id: "b", dead: false, fightTimer: 2, fightTargetId: "a", fightTargetIds: ["a"] };
-  const fightWorld = {
-    time: 5,
-    tarinai: [fighterA, fighterB],
-    fightPairKey(a, b) { return [a.id, b.id].sort().join(":"); },
-    isAlreadyFightingPair() { return true; },
-  };
-  fighterA.world = fightWorld; fighterB.world = fightWorld;
-  h.api.recordDamageSource(fighterA, dangerItem, { world: fightWorld });
-  h.api.recordDeath({ world: fightWorld, tarinai: fighterA, reason: "爆竹", fromDamage: true });
-  assert(!unlocked(h, "fight_pair_danger_kill"), "fight pair unlocked after only one death");
-  fightWorld.time = 6;
-  fighterB.dead = true; fighterB.fightTimer = 0; fighterB.fightTargetId = null; fighterB.fightTargetIds = [];
-  h.api.recordDamageSource(fighterB, dangerItem, { world: fightWorld });
-  h.api.recordDeath({ world: fightWorld, tarinai: fighterB, reason: "爆竹", fromDamage: true });
-  assert(unlocked(h, "fight_pair_danger_kill"), "fight pair danger kill did not unlock");
-
-  h = createHarness();
-  const falsePositiveA = { id: "fa", dead: true, fightTimer: 2, fightTargetId: "fb", fightTargetIds: ["fb"] };
-  const falsePositiveB = { id: "fb", dead: false, fightTimer: 2, fightTargetId: "fa", fightTargetIds: ["fa"] };
-  const falsePositiveWorld = {
-    time: 3,
-    tarinai: [falsePositiveA, falsePositiveB],
-    fightPairKey(a, b) { return [a.id, b.id].sort().join(":"); },
-    isAlreadyFightingPair() { return true; },
-  };
-  falsePositiveA.world = falsePositiveWorld; falsePositiveB.world = falsePositiveWorld;
-  h.api.recordDamageSource(falsePositiveA, dangerItem, { world: falsePositiveWorld });
-  h.api.recordDeath({ world: falsePositiveWorld, tarinai: falsePositiveA, reason: "飢餓", fromDamage: false });
-  falsePositiveWorld.time = 4;
-  falsePositiveB.dead = true;
-  h.api.recordDamageSource(falsePositiveB, dangerItem, { world: falsePositiveWorld });
-  h.api.recordDeath({ world: falsePositiveWorld, tarinai: falsePositiveB, reason: "爆竹", fromDamage: true });
-  assert(!unlocked(h, "fight_pair_danger_kill"), "non-lethal danger damage was misclassified as a danger kill");
-
-  h = createHarness();
-  const generationWorld = { time: 0, maxGeneration: 9 };
-  h.api.recordBirth({ world: generationWorld, child: { generation: 9, world: generationWorld } });
-  assert(!unlocked(h, "eternal_history_generation_10"), "generation history unlocked before generation 10");
-  generationWorld.maxGeneration = 10;
-  h.api.recordBirth({ world: generationWorld, child: { generation: 10, world: generationWorld } });
-  assert(unlocked(h, "eternal_history_generation_10"), "generation history did not unlock at generation 10");
-
-  h = createHarness();
-  const king = { dead: false, isTarinaiChampion: true, isZunchiSlave: false, powerItemMode: "protein", sizeItemMode: "", world: {} };
-  h.api.recordConsumableUse({ tarinai: king, world: king.world, type: "protein" });
-  assert(!unlocked(h, "king_full_satisfaction"), "king satisfaction unlocked without giant drug");
-  king.sizeItemMode = "giant_drug";
-  h.api.recordConsumableUse({ tarinai: king, world: king.world, type: "giant_drug" });
-  assert(unlocked(h, "king_full_satisfaction"), "king satisfaction did not unlock with both effects");
-
-  h = createHarness();
-  const slave = { dead: false, isTarinaiChampion: false, isZunchiSlave: true, powerItemMode: "niteropu", sizeItemMode: "", world: {} };
-  h.api.recordConsumableUse({ tarinai: slave, world: slave.world, type: "niteropu" });
-  assert(!unlocked(h, "slave_zero_satisfaction"), "slave satisfaction unlocked without dwarf drug");
-  slave.sizeItemMode = "dwarf_drug";
-  h.api.recordConsumableUse({ tarinai: slave, world: slave.world, type: "dwarf_drug" });
-  assert(unlocked(h, "slave_zero_satisfaction"), "slave satisfaction did not unlock with both effects");
-
-  h = createHarness();
-  const allExceptCompletionist = expectedIds.filter(id => id !== "true_tarinai_observer");
-  for (let i = 0; i < allExceptCompletionist.length - 1; i += 1) h.api.unlock(allExceptCompletionist[i]);
-  assert(!unlocked(h, "true_tarinai_observer"), "completionist unlocked before every other achievement");
-  h.api.unlock(allExceptCompletionist[allExceptCompletionist.length - 1]);
-  assert(unlocked(h, "true_tarinai_observer"), "completionist did not unlock with every other achievement");
-
-  h = createHarness();
-  const idleWorld = { time: 360, tarinai: [], ants: [], achievementLastInterventionAt: 0, achievementNoDeathStartAt: -1 };
-  h.api.evaluateWorld(idleWorld, { id: "relaxed" });
-  assert(unlocked(h, "idle_observer_5_minutes"), "idle observer did not unlock");
-
-  storage = new Map();
-  h = createHarness(storage);
-  for (let i = 0; i < 60; i += 1) h.api.recordPlayerPlacement({ world: { time: 1 }, item: { type: "grass" } });
-  assert(!unlocked(h, "placed_objects_100"), "placement unlocked before 100");
-  h = createHarness(storage);
-  for (let i = 0; i < 39; i += 1) h.api.recordPlayerPlacement({ world: { time: 1 }, item: { type: "grass" } });
-  assert(!unlocked(h, "placed_objects_100"), "placement unlocked at 99");
-  h.api.recordPlayerPlacement({ world: { time: 1 }, item: { type: "grass" } });
-  assert(unlocked(h, "placed_objects_100"), "placement did not persist across field reset/reload to 100");
-
-  storage = new Map();
-  h = createHarness(storage);
-  h.api.recordLinkPlaced("wire", { world: { time: 1 }, item: { type: "wire" } });
-  h.api.recordLinkPlaced("insulated_wire", { world: { time: 2 }, item: { type: "insulated_wire" } });
-  const wireProgress = JSON.parse(storage.get("tarinai_achievements_v2")).progress;
-  assert(wireProgress.placementCount === 2, "wire placements were not counted toward placed objects");
-  assert(wireProgress.linkTypes.length === 0, "wire placements incorrectly advanced mechanized link types");
-
-  h = createHarness();
-  h.api.recordLinkPlaced("rope", { world: { time: 1 } });
-  h.api.recordLinkPlaced("rod", { world: { time: 1 } });
-  h.api.recordLinkPlaced("spring", { world: { time: 1 } });
-  assert(!unlocked(h, "mechanized_industry"), "mechanized industry unlocked without signal");
-  h.api.recordSignalActivation({ world: {}, target: { type: "gate_fence" } });
-  assert(unlocked(h, "mechanized_industry"), "mechanized industry did not unlock after logical AND");
-  assert(!unlocked(h, "signal_automation_first") && !unlocked(h, "link_craftsman"), "removed achievements remain accessible");
-
-  h = createHarness();
-  const safeAlive = Array.from({ length: 25 }, () => ({ dead: false }));
-  const safeWorld = { time: 0, tarinai: safeAlive, ants: [], achievementLastInterventionAt: 0, achievementNoDeathStartAt: -1 };
-  h.api.evaluateWorld(safeWorld, { id: "relaxed" });
-  safeWorld.time = 300;
-  h.api.evaluateWorld(safeWorld, { id: "relaxed" });
-  assert(unlocked(h, "safe_colony_25_5_minutes"), "safe colony did not unlock");
-
-  h = createHarness();
-  const lifespanSafeAlive = Array.from({ length: 25 }, () => ({ dead: false }));
-  const lifespanSafeWorld = { time: 100, tarinai: lifespanSafeAlive, achievementNoDeathStartAt: 0 };
-  h.api.recordDeath({ world: lifespanSafeWorld, reason: "天寿を全うした", tarinai: { deathReason: "天寿を全うした" } });
-  assert(lifespanSafeWorld.achievementNoDeathStartAt === 0, "lifespan death reset safe-colony timer");
-  h.api.recordDeath({ world: lifespanSafeWorld, reason: "事故", tarinai: { deathReason: "事故" } });
-  assert(lifespanSafeWorld.achievementNoDeathStartAt === 100, "non-lifespan death did not reset safe-colony timer");
-
-  h = createHarness();
-  const antWorld = { time: 1, tarinai: [], ants: Array.from({ length: 25 }, () => ({ dead: false })), achievementLastInterventionAt: 0, achievementNoDeathStartAt: -1 };
-  h.api.evaluateWorld(antWorld, { id: "relaxed" });
-  assert(unlocked(h, "ants_alive_25"), "ant herd did not unlock at 25");
-
-  storage = new Map();
-  h = createHarness(storage);
-  for (let i = 0; i < 65; i += 1) h.api.recordAntKilled({ world: {}, playerCaused: true });
-  assert(!unlocked(h, "ants_killed_100"), "ant extermination unlocked before 100");
-  h = createHarness(storage);
-  for (let i = 0; i < 34; i += 1) h.api.recordAntKilled({ world: {}, playerCaused: true });
-  assert(!unlocked(h, "ants_killed_100"), "ant extermination unlocked at 99");
-  h.api.recordAntKilled({ world: {}, playerCaused: true });
-  assert(unlocked(h, "ants_killed_100"), "ant extermination did not persist to 100");
-
-
-  h = createHarness();
-  const antObservationWorld = { tarinai: [], ants: [], items: [] };
-  h.api.evaluateWorld(antObservationWorld, {});
-  assert(!unlocked(h, "ant_nest_without_tarinai"), "ant observation unlocked without an ant nest");
-  antObservationWorld.items.push({ type: "ant_nest", dead: false });
-  antObservationWorld.tarinai.push({ dead: false });
-  h.api.evaluateWorld(antObservationWorld, {});
-  assert(!unlocked(h, "ant_nest_without_tarinai"), "ant observation unlocked while a tarinai was alive");
-  antObservationWorld.tarinai[0].dead = true;
-  h.api.evaluateWorld(antObservationWorld, {});
-  assert(unlocked(h, "ant_nest_without_tarinai"), "ant observation did not unlock with a nest and zero living tarinai");
-
-  h = createHarness();
-  const stickyBomb = { type: "sticky_bomb", dead: false };
-  for (let i = 0; i < 14; i += 1) h.api.recordStickyBombPass(stickyBomb, {});
-  assert(!unlocked(h, "sticky_bomb_15_passes"), "sticky-bomb relay unlocked before 15 passes");
-  h.api.recordStickyBombPass(stickyBomb, {});
-  assert(unlocked(h, "sticky_bomb_15_passes"), "sticky-bomb relay did not unlock at 15 passes");
-
-  h = createHarness();
-  h.api.recordSaveSlotsFilled({ filled: 8 });
-  assert(!unlocked(h, "secret_collection_9_slots"), "save-slot collection unlocked before 9");
-  h.api.recordSaveSlotsFilled({ filled: 9 });
-  assert(unlocked(h, "secret_collection_9_slots"), "save-slot collection did not unlock at 9");
-
-  h = createHarness();
-  [0, 250, 500].forEach(now => h.api.recordEmptyClick({ now }));
-  assert(!unlocked(h, "pause_spam_4_in_1_second"), "empty-click achievement unlocked before four clicks");
-  h.api.recordEmptyClick({ now: 999 });
-  assert(unlocked(h, "pause_spam_4_in_1_second"), "empty-click achievement did not unlock within one second");
-  h = createHarness();
-  [0, 400, 800, 1201].forEach(now => h.api.recordEmptyClick({ now }));
-  assert(!unlocked(h, "pause_spam_4_in_1_second"), "empty-click achievement unlocked outside one-second window");
-
-  h = createHarness();
-  h.api.recordContinuousPlay({ elapsedMs: 3599999 });
-  assert(!unlocked(h, "continuous_play_1_hour"), "continuous play unlocked before one hour");
-  h.api.recordContinuousPlay({ elapsedMs: 3600000 });
-  assert(unlocked(h, "continuous_play_1_hour"), "continuous play did not unlock at one hour");
-  assert(!unlocked(h, "continuous_play_24_hours"), "24-hour play unlocked at one hour");
-  h.api.recordContinuousPlay({ elapsedMs: 86399999 });
-  assert(!unlocked(h, "continuous_play_24_hours"), "24-hour play unlocked early");
-  h.api.recordContinuousPlay({ elapsedMs: 86400000 });
-  assert(unlocked(h, "continuous_play_24_hours"), "24-hour play did not unlock");
-
-  h = createHarness();
-  h.api.recordLowFps({ fps: 10 });
-  assert(!unlocked(h, "low_fps_single_digit"), "low-fps achievement unlocked at 10 fps");
-  h.api.recordLowFps({ fps: 9 });
-  assert(unlocked(h, "low_fps_single_digit"), "low-fps achievement did not unlock at 9 fps");
-
-  h = createHarness();
-  const sandboxWorld = { items: Array.from({ length: 4 }, () => ({ type: "toilet", dead: false })) };
-  h.api.evaluateSandbox(sandboxWorld);
-  assert(!unlocked(h, "sandbox_five_toilets"), "sandbox unlocked before five toilet sands");
-  sandboxWorld.items.push({ type: "toilet", dead: false });
-  h.api.evaluateSandbox(sandboxWorld);
-  assert(unlocked(h, "sandbox_five_toilets"), "sandbox did not unlock at five toilet sands");
-
-  h = createHarness();
-  h.api.recordGroundChange({ world: { fieldType: "garden" }, previous: "soil", next: "ice", now: 0 });
-  assert(!unlocked(h, "park_ground_changed"), "park-ground achievement unlocked outside park");
-  h.api.recordGroundChange({ world: { fieldType: "park" }, previous: "soil", next: "ice", now: 100 });
-  assert(unlocked(h, "park_ground_changed"), "park-ground achievement did not unlock in park");
-  h = createHarness();
-  const groundWorld = { fieldType: "garden" };
-  [0, 250, 500].forEach((now, index) => h.api.recordGroundChange({ world: groundWorld, previous: `g${index}`, next: `g${index + 1}`, now }));
-  assert(!unlocked(h, "ground_change_4_in_1_second"), "ground-spam achievement unlocked before four changes");
-  h.api.recordGroundChange({ world: groundWorld, previous: "g3", next: "g4", now: 999 });
-  assert(unlocked(h, "ground_change_4_in_1_second"), "ground-spam achievement did not unlock within one second");
-
-  h = createHarness();
-  const thermalWorld = {
-    time: 0, tarinai: [], ants: [], items: [{ id: "cold", x: 10, y: 20, dead: false }],
-    temperatureAt() { return -273.15; }, achievementLastInterventionAt: 0, achievementNoDeathStartAt: -1,
-  };
-  h.api.evaluateWorld(thermalWorld, { id: "relaxed" });
-  assert(!unlocked(h, "below_absolute_zero_item"), "absolute-zero achievement unlocked at exactly absolute zero");
-  thermalWorld.temperatureAt = () => -273.16;
-  h.api.evaluateWorld(thermalWorld, { id: "relaxed" });
-  assert(unlocked(h, "below_absolute_zero_item"), "absolute-zero achievement did not unlock below absolute zero");
-
-  storage = new Map();
-  storage.set("tarinai_achievements_v2", JSON.stringify({
-    unlocked: { signal_automation_first: 1000, link_craftsman: 2000 },
-    pending: ["signal_automation_first", "link_craftsman"],
-    progress: { linkTypes: ["rope", "rod", "spring"] },
-  }));
-  h = createHarness(storage);
-  assert(unlocked(h, "mechanized_industry"), "legacy AND achievements were not migrated");
-
-  storage = new Map();
-  storage.set("tarinai_achievements_v2", JSON.stringify({
-    unlocked: { link_craftsman: 2000 },
-    pending: [],
-    progress: {},
-  }));
-  h = createHarness(storage);
-  h.api.recordSignalActivation({ world: {}, target: { type: "gate_fence" } });
-  assert(unlocked(h, "mechanized_industry"), "legacy link-craftsman progress was not reconstructed before a later signal");
-
-  storage = new Map();
-  h = createHarness(storage, "?debug=1");
-  assert(h.elements.get("achievementUnlockAllBtn").hidden === false, "debug all-achievements button was not shown");
-  h.api.debugUnlockAll();
-  assert(h.api.definitions.every(def => unlocked(h, def.id)), "debug all-achievements button did not unlock all");
-  const debugState = JSON.parse(storage.get("tarinai_achievements_v2"));
-  assert(debugState.pending.length === 0, "debug unlocks were queued for shared statistics");
-  assert(debugState.debugUnlocked.length === h.api.definitions.length, "debug unlocks were not marked as local-only");
-  h = createHarness(storage, "");
-  assert(h.api.definitions.every(def => !unlocked(h, def.id)), "debug-only unlocks leaked into normal play");
-
-  storage = new Map();
-  storage.set("tarinai_achievements_v2", JSON.stringify({
-    unlocked: { first_birth: 1700000000123, lifespan_completed: 1700000000456 },
-    pending: [],
-    progress: {},
-  }));
-  const recoveryRequests = [];
-  h = createHarness(storage, "", {
-    protocol: "https:",
-    fetch: async (_url, options = {}) => {
-      recoveryRequests.push(JSON.parse(options.body || "{}"));
-      return { ok: true, async json() { return { ok: true, totalPlayers: 1, achievements: {} }; } };
-    },
-  });
-  await h.api.refresh();
-  assert(recoveryRequests.length === 1, "recovery sync did not issue exactly one request");
-  assert(recoveryRequests[0].action === "sync", "recovery request did not use bulk sync");
-  assert(recoveryRequests[0].completionistEligible === false, "full recovery sync did not report completionist eligibility");
-  assert(recoveryRequests[0].unlocked.first_birth === 1700000000123, "recovery sync omitted first birth timestamp");
-  assert(recoveryRequests[0].unlocked.lifespan_completed === 1700000000456, "recovery sync omitted lifespan timestamp");
-
-  h = createHarness();
-  for (let i = 0; i < 49; i += 1) h.api.recordFirstAidRecovery({ recovered: 10 });
-  assert(!unlocked(h, "town_doctor_50"), "doctor unlocked before 50 recoveries");
-  h.api.recordFirstAidRecovery({ recovered: 0 });
-  assert(!unlocked(h, "town_doctor_50"), "zero recovery counted for doctor");
-  h.api.recordFirstAidRecovery({ recovered: 1 });
-  assert(unlocked(h, "town_doctor_50"), "doctor did not unlock at 50 recoveries");
-
-  h = createHarness();
-  h.api.recordPlushiePokeFling({});
-  assert(unlocked(h, "poke_plushie_fling"), "plushie poke achievement did not unlock");
-
-  storage = new Map();
-  h = createHarness(storage);
-  const chaosWorld = { time: 0 };
-  for (let i = 0; i < 700; i += 1) h.api.recordFightStarted({ world: chaosWorld, a: {}, b: {} });
-  assert(!unlocked(h, "chaos_seeker_666_fights"), "ordinary fights counted toward chaos seeker");
-  const fightMochiTarinai = { fightMochiTimer: 10 };
-  for (let i = 0; i < 400; i += 1) h.api.recordFightStarted({ world: chaosWorld, a: fightMochiTarinai, b: {} });
-  h = createHarness(storage);
-  for (let i = 0; i < 265; i += 1) h.api.recordFightStarted({ world: chaosWorld, a: fightMochiTarinai, b: {} });
-  assert(!unlocked(h, "chaos_seeker_666_fights"), "chaos seeker unlocked at 665 influenced fights");
-  h.api.recordFightStarted({ world: chaosWorld, a: fightMochiTarinai, b: {} });
-  assert(unlocked(h, "chaos_seeker_666_fights"), "chaos seeker did not persist to 666 influenced fights");
-
-  storage = new Map();
-  h = createHarness(storage);
-  for (let i = 0; i < 332; i += 1) h.api.recordShotFired({});
-  assert(!unlocked(h, "sniper_333_shots"), "sniper unlocked before 333 shots");
-  h = createHarness(storage);
-  h.api.recordShotFired({});
-  assert(unlocked(h, "sniper_333_shots"), "sniper did not persist to 333 shots");
-
-  storage = new Map();
-  h = createHarness(storage);
-  for (let i = 0; i < 800; i += 1) h.api.recordLoveMochiBirth({ loveMochiInfluenced: false });
-  assert(!unlocked(h, "fertility_seeker_721_love_births"), "ordinary reproduction counted toward fertility seeker");
-  for (let i = 0; i < 720; i += 1) h.api.recordLoveMochiBirth({ loveMochiInfluenced: true });
-  assert(!unlocked(h, "fertility_seeker_721_love_births"), "fertility seeker unlocked before 721 influenced reproductions");
-  h = createHarness(storage);
-  h.api.recordLoveMochiBirth({ loveMochiInfluenced: true });
-  assert(unlocked(h, "fertility_seeker_721_love_births"), "fertility seeker did not persist to 721 influenced reproductions");
-
-  h = createHarness();
-  const metroWorld = {
-    tarinai: Array.from({ length: 99 }, () => ({ dead: false })),
-    items: [
-      ...Array.from({ length: 10 }, () => ({ type: "duplicator", dead: false })),
-      ...Array.from({ length: 15 }, (_v, i) => ({ type: i % 3 === 0 ? "grass_bed" : (i % 3 === 1 ? "nest_box" : "pipe"), dead: false })),
-    ],
-  };
-  h.api.evaluateMegalopolis(metroWorld);
-  assert(!unlocked(h, "megalopolis"), "megalopolis ignored the 100-tarinai threshold");
-  metroWorld.tarinai.push({ dead: false });
-  metroWorld.items[0].dead = true;
-  h.api.evaluateMegalopolis(metroWorld);
-  assert(!unlocked(h, "megalopolis"), "megalopolis ignored the 10-duplicator threshold");
-  metroWorld.items[0].dead = false;
-  metroWorld.items[10].dead = true;
-  h.api.evaluateMegalopolis(metroWorld);
-  assert(!unlocked(h, "megalopolis"), "megalopolis ignored the 15-shelter threshold");
-  metroWorld.items[10].dead = false;
-  h.api.evaluateMegalopolis(metroWorld);
-  assert(unlocked(h, "megalopolis"), "megalopolis did not unlock at exact thresholds");
-
-  h = createHarness();
-  const cleaner = { type: "robot_cleaner", dead: false, robotCleanerMask: 0x3f, robotCleanerHighSpeed: true, _signalDriven: true, _signalOn: false };
-  const cleanWorld = { items: [cleaner], tarinai: [], ants: [], time: 0 };
-  h.api.evaluateCleanFreak(cleanWorld);
-  assert(!unlocked(h, "clean_freak_robot_only"), "clean freak unlocked while signal-powered cleaner was off");
-  cleaner._signalOn = true;
-  cleanWorld.tarinai.push({ dead: false });
-  h.api.evaluateCleanFreak(cleanWorld);
-  assert(!unlocked(h, "clean_freak_robot_only"), "clean freak ignored a living tarinai");
-  cleanWorld.tarinai.length = 0;
-  cleanWorld.items.push({ type: "grass", dead: false });
-  h.api.evaluateCleanFreak(cleanWorld);
-  assert(!unlocked(h, "clean_freak_robot_only"), "clean freak ignored another field item");
-  cleanWorld.items.pop();
-  h.api.evaluateCleanFreak(cleanWorld);
-  assert(unlocked(h, "clean_freak_robot_only"), "clean freak did not unlock with all settings and robot-only field");
-
-
-  h = createHarness();
-  const livelyWorldA = { time: 0, tarinai: [] };
-  for (let i = 0; i < 60; i += 1) h.api.recordManualTarinaiAdded({ world: livelyWorldA });
-  h.api.resetWorldProgress(livelyWorldA);
-  const livelyWorldB = { time: 0, tarinai: [] };
-  for (let i = 0; i < 39; i += 1) h.api.recordManualTarinaiAdded({ world: livelyWorldB });
-  assert(!unlocked(h, "lively_making"), "lively making unlocked before 100 additions across resets");
-  h.api.recordManualTarinaiAdded({ world: livelyWorldB });
-  assert(unlocked(h, "lively_making"), "lively making did not persist across field reset");
-  console.log("[OK] all 75 achievement definitions, categorized UI, inline disclosures, and recovery synchronization passed");
-})().catch(error => {
-  console.error(error);
-  process.exitCode = 1;
-});
diff --git a/scripts/achievement_integration_audit.py b/scripts/achievement_integration_audit.py
deleted file mode 100644
index ae33782..0000000
--- a/scripts/achievement_integration_audit.py
+++ /dev/null
@@ -1,128 +0,0 @@
-#!/usr/bin/env python3
-from pathlib import Path
-import re
-
-ROOT = Path(__file__).resolve().parents[1]
-
-def read(name):
-    return (ROOT / name).read_text()
-
-def require(condition, message):
-    if not condition:
-        raise AssertionError(message)
-
-ach = read('js/achievements.js')
-api = read('achievement_api.php')
-css = read('css/components.css')
-
-ids_js = re.findall(r'id: "([a-z0-9_]+)"', ach.split('const DEFINITIONS',1)[1].split(']);',1)[0])
-ids_php = re.findall(r"'([a-z0-9_]+)'", api.split('const ACHIEVEMENT_IDS',1)[1].split('];',1)[0])
-require(len(ids_js) == 75, 'JS achievement count is not 75')
-require(ids_js == ids_php, 'JS/PHP achievement IDs are not synchronized')
-require('signal_automation_first' not in ids_js and 'link_craftsman' not in ids_js, 'retired achievements remain defined')
-require('mechanized_industry' in ids_js, 'mechanized industry is missing')
-require('placed_objects_100' in ids_js and 'ants_killed_100' in ids_js, '100-count achievements are missing')
-require('great_mother_1000_births' in ids_js and 'fight_pair_danger_kill' in ids_js, 'previous new achievements are missing')
-require(all(item in ids_js for item in ['secret_collection_9_slots','pause_spam_4_in_1_second','continuous_play_1_hour','below_absolute_zero_item']), 'previous achievement IDs are missing')
-require(all(item in ids_js for item in ['eternal_history_generation_10','king_full_satisfaction','slave_zero_satisfaction','town_doctor_50','poke_plushie_fling','chaos_seeker_666_fights','clean_freak_robot_only','true_tarinai_observer','sniper_333_shots','megalopolis','fertility_seeker_721_love_births','low_fps_single_digit','continuous_play_24_hours','sandbox_five_toilets','park_ground_changed','ground_change_4_in_1_second','ant_nest_without_tarinai','sticky_bomb_15_passes','daily_play_7_days','wire_shock_7_tarinai','well_informed','lively_making','memento_mori']), 'latest achievement IDs are missing')
-require(all(item in ids_js for item in ['undo_mass_revival','robot_cleaner_100','held_30_seconds','minimalist_happy','overprotective','self_sufficient','unplanned_city_30','sauna_cold_plunge','rain_shelter_all','medicine_ledger_all','mercury_lifespan','enemy_enemy_friend','revolution','fuel_to_fire','undo_20','redo_20']), 'playstyle achievement IDs are missing')
-
-checks = {
-    'birth event': 'recordBirth?.({ world: this, child, parents: [a, b] })' in read('js/world_family_social.js'),
-    'death event after final reason': 'recordDeath?.({ world: this.world, tarinai: this, reason: finalReason, fromDamage: Boolean(opts.fromDamage), achievementDangerKill: Boolean(opts.achievementDangerKill) })' in read('js/tarinai_social_move_life.js'),
-    'natural slave event only in fight-record path': 'recordNaturalZunchiSlave?.({ world: this, tarinai, other, wins, losses, total, winRate })' in read('js/world_combat_effects.js'),
-    'natural king event only in fight-record path': 'recordNaturalTarinaiKing?.({ world: this, tarinai, other, wins, losses, total, winRate })' in read('js/world_combat_effects.js'),
-    'direct feed is food-only': 'if (foodGift) {' in read('js/tarinai_direct_feeding_system.js') and 'recordDirectFeed?.' in read('js/tarinai_direct_feeding_system.js'),
-    'ritual ignition checks state before mutation': 'const ignitedDuringBirthRitual = !already' in read('js/tarinai_disease_nest.js'),
-    'soccer unlock follows fatal ball impact': 'if (t.dead && ball.type === "ball")' in read('js/collision_response_system.js'),
-    'self-zunchi return collision is armed only after owner clearance': 'achievementBurstClearedOwner = false' in read('js/world_combat_effects.js') and 'updateBurstOwnerClearance(item, worldRef)' in read('js/item_dynamic_zunchi_system.js') and 'if (isBurstOwner && item.achievementBurstClearedOwner !== true) continue' in read('js/item_dynamic_zunchi_system.js'),
-    'self-zunchi unlock survives fatal ID release': 'const hitTarinaiIdBeforeDamage = String(t.id || t.releasedLiveId || "")' in read('js/item_dynamic_zunchi_system.js') and 'const eligibleSelfZunchiDeath = Boolean(' in read('js/item_dynamic_zunchi_system.js') and 'if (t.dead && eligibleSelfZunchiDeath)' in read('js/item_dynamic_zunchi_system.js'),
-    'held launched zunchi is disqualified': 'if (item.playerHeld || item._heldByPlayer)' in read('js/item_dynamic_zunchi_system.js') and 'target.achievementBurstNeverStopped = false' in read('js/ui_input_shared.js'),
-    'generation runs persist in saves': 'achievementNaturalSlaveGenerations' in read('js/snapshot_system.js') and 'achievementNaturalKingGenerations' in read('js/snapshot_system.js'),
-    'direct-feed field progress persists in saves': 'achievementDirectFeedCount' in read('js/snapshot_system.js'),
-    'direct-feed field progress resets with world': 'this.achievementDirectFeedCount = 0;' in read('js/world.js'),
-    'simultaneous toast queue exists': 'let toastQueue = [];' in ach and 'runNextUnlockToast' in ach,
-    'achievement toast is top-left': 'top: 18px;' in css and 'left: 18px;' in css and 'right: auto;' in css,
-    'laxative frame-edge marker exists': '_achievementLaxativeActiveThisFrame' in read('js/tarinai_update_step_frame.js') and '_achievementLaxativeActiveThisFrame' in ach,
-    'disease condition excludes sleep-only': 't.zunchiDisease || t.explosionDisease || t.fightDisease' in ach,
-    'locked condition display policy': 'lockedDescriptionText' in ach and '\\uff1f\\uff1f\\uff1f' in ach and 'PRE_UNLOCK_DESCRIPTION_IDS' in ach,
-    'condition shown beside title': 'heading.append(title, description);' in ach,
-    'achievement tooltips removed': 'TarinaiTooltips' not in ach and 'dataset.tip' not in ach and 'achievementTooltipText' not in ach,
-    'percentage background bar including unlocked cards': '--achievement-rate' in ach and '.achievement-entry::before' in css and 'width: var(--achievement-rate);' in css and '.achievement-entry > *' in css and 'z-index: 0;' in css,
-    'achievement category folds': 'ACHIEVEMENT_CATEGORIES' in ach and 'createAchievementGroup' in ach and 'achievement-group' in css,
-    'category-local unlocked ordering': 'orderedDefinitions = [...unlockedDefinitions, ...lockedDefinitions]' in ach and 'id: "completed"' not in ach,
-    'requested pre-unlock disclosures': all(item in ach.split('const PRE_UNLOCK_DESCRIPTION_IDS', 1)[1].split(']);', 1)[0] for item in ['natural_zunchi_slave','natural_tarinai_king','revolution','laxative_starvation']),
-    'native browser confirmations removed': not re.search(r'\b(?:alert|confirm|prompt)\s*\(', ach + read('js/save_system.js')) and 'TarinaiGameDialogs' in ach and 'TarinaiGameDialogs' in read('js/save_system.js'),
-    'achiever count beside percentage': 'unlockedPlayers' in ach and 'sharedAchievementText' in ach and '\\u9054\\u6210\\u8005' in ach,
-    'persistent placement count': 'progress.placementCount' in ach and 'unlock("placed_objects_100"' in ach,
-    'mechanized logical AND': 'progress.signalActivated && hasAllLinks' in ach,
-    'persistent ant kill count': 'progress.antKills' in ach and 'unlock("ants_killed_100"' in ach,
-    'persistent reproduction count': 'progress.birthCount' in ach and 'progress.birthCount >= 3333' in ach and 'unlock("great_mother_1000_births"' in ach,
-    'danger damage source pipeline': 'recordDamageSource' in ach and 'options.source' in read('js/health.js') and '{ source: it }' in read('js/world_combat_effects.js') and 'type: "shoot"' in read('js/world_tool_actions.js') and '_achievementDangerSource = pin' in read('js/world_combat_effects.js') and 'recordDamageSource?.(target, home' in read('js/world_ants_system.js'),
-    'fight-pair danger tracker': 'recordFightPairDangerDeath' in ach and 'fight_pair_danger_kill' in ach and 'detail.fromDamage || detail.achievementDangerKill' in ach,
-    'debug unlock-all button': 'achievementUnlockAllBtn' in read('index.html') and 'unlockAllAchievementsForDebug' in ach and 'DEBUG_MODE' in ach and 'debugUnlocked' in ach,
-    'idle intervention hooks': 'recordIntervention?.({ world: this, tool: "poke"' in read('js/world_placement_log.js') and 'recordIntervention?.({ world, tool: "pinch"' in read('js/ui_input_shared.js') and 'recordIntervention?.({ world: this, tool: "shoot"' in read('js/world_tool_actions.js'),
-    'link placement hook': 'recordLinkPlaced?.(constraintType' in read('js/world_tool_actions.js') and 'insulated_wire' in ach and 'recordPlayerPlacement(detail);' in ach,
-    'signal activation hook': 'recordSignalActivation?.({ world: worldRef' in read('js/signal_system.js'),
-    'ant kill hook': 'recordAntKilled?.({ world: this.world, ant: this' in read('js/ants.js'),
-    'ant population spawn hook': read('js/world_ants_system.js').count('recordAntPopulation?.(this)') >= 2,
-    'ant herd threshold': 'if (aliveAnts >= 25)' in ach,
-    'safe colony timer': 'now - safeStart >= 300' in ach,
-    'safe colony ignores lifespan deaths': 'lifespanDeath' in ach and '\\u5bff\\u547d|\\u5929\\u5bff' in ach,
-    'low fps heartbeat': 'recordLowFps' in ach and '__tarinaiFps' in ach,
-    'toilet-sand field count': 'evaluateSandbox' in ach and 'item.type === "toilet"' in ach,
-    'ground-change hooks': 'recordGroundChange' in ach and 'recordGroundChange?.' in read('js/world_view.js'),
-    'idle observer timer': 'observerTarget' in ach and 'OBSERVER_GAME_DAYS = 3' in ach,
-    'server legacy AND migration': "unset($unlocks['signal_automation_first'], $unlocks['link_craftsman'])" in api and "mechanized_industry" in api,
-    'automatic aggregate recovery sync': 'localUnlockSnapshot' in ach and 'action: "sync"' in ach and "['session', 'unlock', 'sync', 'reset', 'summary']" in api and "$action === 'sync'" in api,
-    'save-slot collection hook': 'recordSaveSlotsFilled' in ach and 'recordSaveSlotsFilled?.' in read('js/save_storage.js'),
-    'empty-click hook': 'recordEmptyClick' in ach and 'recordEmptyClick?.' in read('js/world_placement_log.js') and 'recordPauseClick' not in ach and 'pauseButton?.addEventListener' not in ach,
-    'continuous play heartbeat': 'CONTINUOUS_PLAY_TARGET_MS' in ach and 'CONTINUOUS_PLAY_24H_TARGET_MS' in ach and 'recordContinuousPlay' in ach and 'visibilitychange' in ach and 'continuousPlayStartedAt = Date.now()' in ach and 'if (!document.hidden) continuousPlayLastHeartbeatAt = Date.now();' in ach,
-    'continuous play survives tab switches': 'if (document.hidden) continuousPlayStartedAt' not in ach and 'continuousPlayStartedAt = Date.now();\n    continuousPlayLastHeartbeatAt' not in ach.split('document.addEventListener("visibilitychange"',1)[-1],
-    'ant observation evaluator': 'evaluateAntNestWithoutTarinai' in ach and 'item.type === "ant_nest"' in ach,
-    'sticky bomb relay hook and persistence': 'recordStickyBombPass' in ach and 'recordStickyBombPass' in read('js/item_dynamic_tool_system.js') and 'stickyBombPassCount' in read('js/snapshot_system.js') and '[0, -1, 0], 3' in read('js/save_codec.js'),
-    'current-only achievement and save format': 'const SPELL_STATE_VERSION = 8;' in ach and 'PREVIOUS_SPELL_STATE_VERSION' not in ach and 'version !== SPELL_STATE_VERSION' in ach and 'schema !== BINARY_SCHEMA_VERSION' in read('js/save_codec.js') and 'schema !== 52' not in read('js/save_codec.js'),
-    'progress text weight is stable': 'font-weight: 500;' in read('css/components.css').split('.achievement-entry-progress',1)[1].split('}',1)[0],
-    'sauna description matches evaluator': r'15\u79d2\u4ee5\u5185\u306b\u5bd2\u3059\u304e\u308b' in ach,
-    'enemy streak resets on dangerous damage': 'world.achievementEnemyAntKills = 0;' in ach,
-    'absolute-zero item evaluation': 'ABSOLUTE_ZERO_C' in ach and 'recordBelowAbsoluteZeroItem(worldRef)' in ach and 'temperatureAt?.(item.x, item.y, null)' in ach,
-    'recovery sync is additive': "if (isset($state['unlocks'][$achievementId][$playerId])) continue;" in api,
-    'debug unlocks excluded from recovery': 'state.debugUnlocked?.includes?.(definition.id)' in ach,
-    'hidden achievement UI skips list rebuild': 'dom.dialog?.classList.contains("hidden")' in ach and 'achievementListSignature' in ach,
-    'achievement category definitions are cached': 'CATEGORY_DEFINITIONS' in ach,
-    'achievement sync is debounced and pending-only': 'SYNC_DEBOUNCE_MS' in ach and 'schedulePendingSync' in ach and 'pendingIds' in ach,
-    'completionist excludes itself': 'definition.id === COMPLETIONIST_ID' in ach and 'allOtherAchievementsUnlocked' in ach,
-    'generation ten is event-driven': 'generation >= GENERATION_TARGET' in ach and 'eternal_history_generation_10' in ach,
-    'status effect combinations are event-driven': 'evaluateStatusEffectAchievements' in ach and 'king_full_satisfaction' in ach and 'slave_zero_satisfaction' in ach,
-    'doctor counts actual recovery only': 'recordFirstAidRecovery' in ach and 'recovered > 0.0001' in read('js/item_effect_definitions.js'),
-    'plushie poke uses shared target and overlay': 'findPokeTargetAt' in read('js/world_placement_log.js') and 'hoverPokeTarget' in read('js/ui_input_shared.js') and 'recordPlushiePokeFling' in ach,
-    'persistent fight-mochi chaos counter': 'progress.fightMochiFightCount' in ach and 'CHAOS_FIGHT_TARGET = 666' in ach and 'fightMochiInfluenced' in ach and 'recordFightStarted' in ach,
-    'persistent sniper counter': 'progress.shotCount' in ach and 'SNIPER_SHOT_TARGET = 333' in ach and 'recordShotFired' in ach and 'recordShotFired?.' in read('js/world_tool_actions.js'),
-    'persistent love-mochi fertility counter': 'progress.loveMochiBirthCount' in ach and 'FERTILITY_BIRTH_TARGET = 721' in ach and 'recordLoveMochiBirth' in ach and 'loveMochiInfluenced' in read('js/world_family_social.js'),
-    'megalopolis exact thresholds': 'duplicatorCount < 10' in ach and 'shelterCount < 15' in ach and 'aliveCount < 100' in ach and 'evaluateMegalopolis' in ach,
-    'clean-freak robot-only evaluation': 'evaluateCleanFreak' in ach and 'ROBOT_ALL_TARGET_MASK = 0x3f' in ach and 'robotCleanerHighSpeed' in ach and 'signal-power' in read('js/signal_system.js'),
-    'medicine ledger excludes chain and crown': 'slave_chain' not in ach.split('const MEDICINE_LEDGER_TYPES', 1)[1].split(']);', 1)[0] and 'golden_crown' not in ach.split('const MEDICINE_LEDGER_TYPES', 1)[1].split(']);', 1)[0],
-    'cleaner target raised to 200': 'ROBOT_CLEAN_TARGET = 200' in ach and r'\u7d2f\u8a08200\u500b' in ach,
-    'minimalist starts on day six': 'day >= 6 && !state.unlocked.minimalist_happy' in ach,
-    'managed paradise starts day six': 'day >= 6' in ach and 'now - happyStart >= dayLength' in ach,
-    'compact server state v3': 'function compact_state' in api and 'return [STATE_SCHEMA_VERSION, $baseTime, $versions, $players, $unlocks];' in api and 'compact_player_id' in api,
-    'spell omits completed counters': 'state.unlocked.sniper_333_shots ? 0' in ach and 'state.unlocked.fertility_seeker_721_love_births ? 0' in ach and 'state.unlocked.chaos_seeker_666_fights ? 0' in ach,
-    'obsolete spell versions are rejected': 'const SPELL_STATE_VERSION = 8;' in ach and 'LEGACY_SPELL_STATE_VERSION' not in ach and 'PREVIOUS_SPELL_STATE_VERSION' not in ach,
-    'stale completionist server record is revocable': 'completionistEligible' in ach and "unset($state['unlocks']['true_tarinai_observer'][$playerId])" in api,
-    'server corruption is non-destructive': 'JSON_THROW_ON_ERROR' in api and "throw new RuntimeException('storage_corrupt')" in api and 'atomic_write_state' in api,
-    'server writes use a separate lock': "LOCK_FILE_NAME = 'state.lock'" in api and 'flock($lockHandle, LOCK_EX)' in api and '@rename($tempPath, $dataPath)' in api,
-    'summary is read-only': "$mutatesPlayer = $action !== 'summary';" in api and 'if ($mutatesPlayer)' in api,
-    'completionist false cannot be re-added': "unset($syncUnlocks['true_tarinai_observer'])" in api,
-    'GET mutations are rejected': "$method === 'GET' && $action !== 'summary'" in api,
-}
-for name, ok in checks.items():
-    require(ok, name)
-
-social = read('js/world_family_social.js') + read('js/tarinai_social_action_runtime.js')
-require('!!a.isZunchiSlave !== !!b.isZunchiSlave' in social or '!!t.isZunchiSlave === !!other.isZunchiSlave' in social, 'slave mating rule not found')
-require('recordNaturalGeneration(world, tarinai, "achievementNaturalSlaveGenerations", 5)' in ach, 'slave achievement still uses impossible direct-line logic')
-require('\\u52dd\\u738730%\\u4ee5\\u4e0b' in read('js/world_combat_effects.js'), 'slave fight-record text does not state the 30% threshold')
-
-print('[OK] achievement integration audit passed')
-for name in checks:
-    print(f'[OK] {name}')
diff --git a/scripts/achievement_save_v6_audit.js b/scripts/achievement_save_v6_audit.js
deleted file mode 100644
index 815c3eb..0000000
--- a/scripts/achievement_save_v6_audit.js
+++ /dev/null
@@ -1,47 +0,0 @@
-"use strict";
-
-global.window = global;
-global.TarinaiSnapshot = { version: 40 };
-global.TarinaiSaveSchema = {
-  BINARY_SCHEMA_VERSION: 53,
-  FIELD_IDS: ["garden"],
-  itemTypeValue(_index, fallback = "") { return fallback; },
-};
-
-require("../js/save_codec.js");
-
-// first_birth + statistician + memento_mori. v8 also stores persistent lively-making progress.
-// Achievements 65-75 remain in the extended mask value at spell[3].
-const progress = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 29, 9999, 99];
-const spell = [8, 1, 0, 1152, 100, [0, 1, 2], progress];
-const snapshot = {
-  v: 40,
-  a: "tj1",
-  m: [1, 0, "garden", 0],
-  w: [0, 0, 0, 0, 0, -9990, 1, 0, "w0000000000000000", 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
-  t: [],
-  i: [],
-  g: {
-    w: [[], [], 0, 0, 0, null, -1, null, 0, -1, -1],
-    t: [],
-    i: [],
-    s: spell,
-  },
-};
-
-const bytes = global.TarinaiSaveCodec.encodeBinarySnapshot(snapshot);
-const decoded = global.TarinaiSaveCodec.decodeBinarySnapshot(bytes);
-const restored = decoded?.g?.s;
-if (!Array.isArray(restored) || restored[0] !== 8) throw new Error("achievement spell v8 was not restored");
-if (restored[3] !== 1152) throw new Error("extended achievement mask bytes were lost");
-if (restored[6]?.[14] !== 29) throw new Error("statistician progress was lost");
-if (restored[6]?.[15] !== 9999) throw new Error("memento mori progress was lost");
-if (restored[6]?.[16] !== 99) throw new Error("lively making progress was lost");
-
-const oldSchemaBytes = Uint8Array.from(bytes);
-oldSchemaBytes[0] = (oldSchemaBytes[0] & 0x80) | 52;
-let rejectedOldSchema = false;
-try { global.TarinaiSaveCodec.decodeBinarySnapshot(oldSchemaBytes); } catch (_) { rejectedOldSchema = true; }
-if (!rejectedOldSchema) throw new Error("obsolete binary schema was accepted");
-
-console.log("[OK] current-only schema 53, achievement v8 mask, and persistent progress binary round-trip passed");
diff --git a/scripts/achievement_server_state_audit.py b/scripts/achievement_server_state_audit.py
deleted file mode 100644
index 970ca24..0000000
--- a/scripts/achievement_server_state_audit.py
+++ /dev/null
@@ -1,341 +0,0 @@
-#!/usr/bin/env python3
-from __future__ import annotations
-
-import base64
-import concurrent.futures
-import json
-import os
-from pathlib import Path
-import random
-import re
-import shutil
-import signal
-import socket
-import subprocess
-import tempfile
-import time
-import urllib.error
-import urllib.request
-import uuid
-
-ROOT = Path(__file__).resolve().parents[1]
-API_SOURCE = ROOT / "achievement_api.php"
-
-
-def achievement_ids() -> list[str]:
-    source = API_SOURCE.read_text(encoding="utf-8")
-    match = re.search(r"const ACHIEVEMENT_IDS = \[(.*?)\n\];", source, re.S)
-    if not match:
-        raise AssertionError("ACHIEVEMENT_IDS was not found")
-    values = re.findall(r"'([^']+)'", match.group(1))
-    if len(values) != 75 or len(values) != len(set(values)):
-        raise AssertionError(f"expected 75 unique achievement IDs, got {len(values)}")
-    return values
-
-
-ACHIEVEMENTS = achievement_ids()
-
-
-def compact_uuid(value: str) -> str:
-    return base64.urlsafe_b64encode(uuid.UUID(value).bytes).decode("ascii").rstrip("=")
-
-
-def expand_uuid(value: str) -> str:
-    return str(uuid.UUID(bytes=base64.urlsafe_b64decode(value + "==")))
-
-
-def decode_v3(value: object) -> dict:
-    if not isinstance(value, list) or len(value) < 5 or value[0] != 3:
-        raise AssertionError("state is not compact v3")
-    base_time = int(value[1])
-    versions = value[2]
-    rows = value[3]
-    unlock_rows = value[4]
-    if not isinstance(versions, list) or not isinstance(rows, list) or not isinstance(unlock_rows, list):
-        raise AssertionError("invalid v3 sections")
-    players: dict[str, dict] = {}
-    player_ids: list[str] = []
-    for row in rows:
-        player_id = expand_uuid(str(row[0]))
-        first_seen = base_time + max(0, int(row[1] if len(row) > 1 else 0))
-        last_seen = first_seen + max(0, int(row[2] if len(row) > 2 else 0))
-        version_index = max(0, int(row[3] if len(row) > 3 else 0))
-        player_ids.append(player_id)
-        players[player_id] = {
-            "firstSeen": first_seen,
-            "lastSeen": last_seen,
-            "gameVersion": str(versions[version_index] if version_index < len(versions) else ""),
-        }
-    unlocks: dict[str, dict[str, int]] = {}
-    for row in unlock_rows:
-        achievement_index = int(row[0])
-        if achievement_index < 0 or achievement_index >= len(ACHIEVEMENTS):
-            continue
-        records: dict[str, int] = {}
-        for offset in range(1, len(row) - 1, 2):
-            player_index = int(row[offset])
-            if 0 <= player_index < len(player_ids):
-                records[player_ids[player_index]] = base_time + max(0, int(row[offset + 1]))
-        if records:
-            unlocks[ACHIEVEMENTS[achievement_index]] = records
-    return {"players": players, "unlocks": unlocks}
-
-
-def make_random_v2(seed: int, player_count: int, unlock_probability: float) -> tuple[dict, dict]:
-    rng = random.Random(seed)
-    versions = ["39.16.60", "39.16.63", "39.16.64", "39.16.65", "dev"]
-    base_time = 1_780_000_000 + seed * 10_000
-    rows: list[list] = []
-    players: dict[str, dict] = {}
-    player_ids: list[str] = []
-    for index in range(player_count):
-        player_id = str(uuid.UUID(int=rng.getrandbits(128), version=4))
-        first_seen = base_time + rng.randint(0, 200_000)
-        last_seen = first_seen + rng.randint(0, 80_000)
-        version = rng.choices(versions, weights=[2, 4, 9, 12, 1], k=1)[0]
-        player_ids.append(player_id)
-        rows.append([player_id, first_seen, last_seen, version])
-        players[player_id] = {"firstSeen": first_seen, "lastSeen": last_seen, "gameVersion": version}
-    unlocks_flat: dict[str, list[int]] = {}
-    unlocks: dict[str, dict[str, int]] = {}
-    for achievement_id in ACHIEVEMENTS:
-        flat: list[int] = []
-        records: dict[str, int] = {}
-        for player_index, player_id in enumerate(player_ids):
-            if rng.random() >= unlock_probability:
-                continue
-            timestamp = players[player_id]["firstSeen"] + rng.randint(0, max(0, players[player_id]["lastSeen"] - players[player_id]["firstSeen"]))
-            flat.extend([player_index, timestamp])
-            records[player_id] = timestamp
-        if flat:
-            unlocks_flat[achievement_id] = flat
-            unlocks[achievement_id] = records
-    return {"v": 2, "p": rows, "u": unlocks_flat}, {"players": players, "unlocks": unlocks}
-
-
-def make_random_verbose(seed: int, player_count: int, unlock_probability: float) -> tuple[dict, dict]:
-    v2, expected = make_random_v2(seed, player_count, unlock_probability)
-    players = {
-        row[0]: {"firstSeen": row[1], "lastSeen": row[2], "gameVersion": row[3]}
-        for row in v2["p"]
-    }
-    player_ids = [row[0] for row in v2["p"]]
-    unlocks = {
-        achievement_id: {player_ids[flat[i]]: flat[i + 1] for i in range(0, len(flat), 2)}
-        for achievement_id, flat in v2["u"].items()
-    }
-    return {"players": players, "unlocks": unlocks}, expected
-
-
-def normalize_expected(value: dict) -> dict:
-    return {
-        "players": {key: value["players"][key] for key in sorted(value["players"])},
-        "unlocks": {
-            achievement_id: {key: records[key] for key in sorted(records)}
-            for achievement_id, records in value["unlocks"].items()
-            if records
-        },
-    }
-
-
-def free_port() -> int:
-    with socket.socket(socket.AF_INET, socket.SOCK_STREAM) as sock:
-        sock.bind(("127.0.0.1", 0))
-        return int(sock.getsockname()[1])
-
-
-class PhpServer:
-    def __init__(self, root: Path):
-        self.root = root
-        self.port = free_port()
-        env = dict(os.environ)
-        env["PHP_CLI_SERVER_WORKERS"] = "8"
-        self.process = subprocess.Popen(
-            ["php", "-S", f"127.0.0.1:{self.port}"],
-            cwd=root,
-            env=env,
-            stdout=subprocess.DEVNULL,
-            stderr=subprocess.DEVNULL,
-            start_new_session=True,
-        )
-        deadline = time.time() + 8
-        while time.time() < deadline:
-            try:
-                with socket.create_connection(("127.0.0.1", self.port), timeout=0.2):
-                    break
-            except OSError:
-                if self.process.poll() is not None:
-                    raise RuntimeError("PHP test server exited")
-                time.sleep(0.05)
-        else:
-            raise RuntimeError("PHP test server did not start")
-
-    def close(self) -> None:
-        if self.process.poll() is None:
-            os.killpg(self.process.pid, signal.SIGTERM)
-            try:
-                self.process.wait(timeout=4)
-            except subprocess.TimeoutExpired:
-                os.killpg(self.process.pid, signal.SIGKILL)
-                self.process.wait(timeout=4)
-
-    def request(self, *, action: str = "summary", player_id: str, payload: dict | None = None) -> tuple[int, dict]:
-        if payload is None:
-            url = f"http://127.0.0.1:{self.port}/achievement_api.php?action={action}&playerId={player_id}"
-            request = urllib.request.Request(url, method="GET")
-        else:
-            url = f"http://127.0.0.1:{self.port}/achievement_api.php"
-            data = json.dumps(payload, separators=(",", ":")).encode()
-            request = urllib.request.Request(url, data=data, headers={"Content-Type": "application/json"}, method="POST")
-        try:
-            with urllib.request.urlopen(request, timeout=10) as response:
-                return response.status, json.loads(response.read())
-        except urllib.error.HTTPError as error:
-            return error.code, json.loads(error.read())
-
-
-def assert_equal_state(actual: dict, expected: dict, label: str) -> None:
-    actual_normalized = normalize_expected(actual)
-    expected_normalized = normalize_expected(expected)
-    if actual_normalized != expected_normalized:
-        raise AssertionError(f"{label}: semantic state changed")
-
-
-def run_migration_cases(server: PhpServer, state_path: Path) -> tuple[int, int]:
-    total_original = 0
-    total_compact = 0
-    probe_id = str(uuid.uuid4())
-    for case_index in range(32):
-        player_count = 1 + (case_index * 37) % 260
-        probability = 0.02 + ((case_index * 11) % 55) / 100
-        if case_index % 5 == 0:
-            source, expected = make_random_verbose(10_000 + case_index, player_count, probability)
-        else:
-            source, expected = make_random_v2(10_000 + case_index, player_count, probability)
-        original = json.dumps(source, separators=(",", ":")).encode()
-        state_path.write_bytes(original)
-        status, summary = server.request(player_id=probe_id)
-        if status != 200 or not summary.get("ok"):
-            raise AssertionError(f"migration case {case_index} failed: {status} {summary}")
-        if summary.get("totalPlayers") != player_count:
-            raise AssertionError("read-only summary changed or miscounted players")
-        first_bytes = state_path.read_bytes()
-        decoded = decode_v3(json.loads(first_bytes))
-        assert_equal_state(decoded, expected, f"migration case {case_index}")
-        status, second_summary = server.request(player_id=probe_id)
-        if status != 200 or second_summary.get("totalPlayers") != player_count:
-            raise AssertionError("v3 reread failed")
-        if state_path.read_bytes() != first_bytes:
-            raise AssertionError("canonical v3 changed on a second read")
-        total_original += len(original)
-        total_compact += len(first_bytes)
-    if total_compact >= total_original * 0.72:
-        raise AssertionError(f"aggregate compaction is insufficient: {total_compact}/{total_original}")
-    return total_original, total_compact
-
-
-def run_corruption_cases(server: PhpServer, state_path: Path) -> None:
-    probe_id = str(uuid.uuid4())
-    for payload in [b'{"v":2,', b'{"v":99}', b'[3,1]']:
-        state_path.write_bytes(payload)
-        status, body = server.request(player_id=probe_id)
-        if status != 503 or body.get("error") != "storage_corrupt":
-            raise AssertionError(f"corrupt state was not rejected: {status} {body}")
-        if state_path.read_bytes() != payload:
-            raise AssertionError("corrupt state was overwritten")
-
-
-def run_completionist_case(server: PhpServer, state_path: Path) -> None:
-    state_path.write_text("", encoding="utf-8")
-    player_id = str(uuid.uuid4())
-    now_ms = int(time.time() * 1000)
-    status, body = server.request(player_id=player_id, payload={
-        "action": "sync",
-        "playerId": player_id,
-        "gameVersion": "39.16.65",
-        "completionistEligible": False,
-        "unlocked": {"first_birth": now_ms, "true_tarinai_observer": now_ms},
-    })
-    if status != 200 or body["achievements"]["first_birth"]["unlockedPlayers"] != 1:
-        raise AssertionError("ordinary sync unlock was lost")
-    if body["achievements"]["true_tarinai_observer"]["unlockedPlayers"] != 0:
-        raise AssertionError("ineligible completionist unlock was re-added")
-    status, body = server.request(player_id=player_id, payload={
-        "action": "sync",
-        "playerId": player_id,
-        "gameVersion": "39.16.65",
-        "completionistEligible": True,
-        "unlocked": {"true_tarinai_observer": now_ms},
-    })
-    if status != 200 or body["achievements"]["true_tarinai_observer"]["unlockedPlayers"] != 1:
-        raise AssertionError("eligible completionist unlock was not accepted")
-    before = state_path.read_bytes()
-    status, body = server.request(action="reset", player_id=player_id)
-    if status != 405 or body.get("error") != "method_not_allowed":
-        raise AssertionError("GET reset was not rejected")
-    if state_path.read_bytes() != before:
-        raise AssertionError("rejected GET reset mutated state")
-
-
-def run_concurrency_case(server: PhpServer, state_path: Path) -> None:
-    state_path.write_text("", encoding="utf-8")
-    rng = random.Random(52_001)
-    requests: list[tuple[str, dict[str, int]]] = []
-    now_ms = int(time.time() * 1000)
-    for index in range(75):
-        player_id = str(uuid.UUID(int=rng.getrandbits(128), version=4))
-        selected = rng.sample(ACHIEVEMENTS, rng.randint(1, 18))
-        unlocks = {achievement_id: now_ms - rng.randint(0, 1_000_000) for achievement_id in selected}
-        requests.append((player_id, unlocks))
-
-    def submit(entry: tuple[str, dict[str, int]]) -> None:
-        player_id, unlocks = entry
-        status, body = server.request(player_id=player_id, payload={
-            "action": "sync",
-            "playerId": player_id,
-            "gameVersion": "39.16.65",
-            "completionistEligible": "true_tarinai_observer" in unlocks,
-            "unlocked": unlocks,
-        })
-        if status != 200 or not body.get("ok"):
-            raise AssertionError(f"concurrent sync failed: {status} {body}")
-
-    with concurrent.futures.ThreadPoolExecutor(max_workers=24) as executor:
-        list(executor.map(submit, requests))
-
-    status, summary = server.request(player_id=str(uuid.uuid4()))
-    if status != 200 or summary.get("totalPlayers") != len(requests):
-        raise AssertionError("concurrent updates lost players")
-    decoded = decode_v3(json.loads(state_path.read_bytes()))
-    if len(decoded["players"]) != len(requests):
-        raise AssertionError("concurrent state player count mismatch")
-    for player_id, unlocks in requests:
-        for achievement_id in unlocks:
-            if player_id not in decoded["unlocks"].get(achievement_id, {}):
-                raise AssertionError(f"concurrent update lost {achievement_id} for {player_id}")
-
-
-def main() -> None:
-    with tempfile.TemporaryDirectory(prefix="tarinai-achievement-random-audit-") as temp_dir:
-        root = Path(temp_dir)
-        shutil.copy2(API_SOURCE, root / "achievement_api.php")
-        data_dir = root / ".achievement_data"
-        data_dir.mkdir()
-        state_path = data_dir / "state.json"
-        server = PhpServer(root)
-        try:
-            original, compact = run_migration_cases(server, state_path)
-            run_corruption_cases(server, state_path)
-            run_completionist_case(server, state_path)
-            run_concurrency_case(server, state_path)
-        finally:
-            server.close()
-    print(
-        "[OK] 32 randomized v2/verbose migrations, exact semantic round-trips, corruption preservation, "
-        f"completionist filtering, GET mutation rejection, and 75 concurrent syncs passed; "
-        f"aggregate JSON shrank {original}→{compact} bytes ({compact / original:.1%})"
-    )
-
-
-if __name__ == "__main__":
-    main()
diff --git a/scripts/ai_inventory.ps1 b/scripts/ai_inventory.ps1
deleted file mode 100644
index 095c7e6..0000000
--- a/scripts/ai_inventory.ps1
+++ /dev/null
@@ -1,124 +0,0 @@
-param(
-  [string]$Query = "",
-  [switch]$All,
-  [switch]$Json
-)
-
-$Root = Resolve-Path (Join-Path $PSScriptRoot "..")
-$RoutingPath = Join-Path $Root "FILES.json"
-$Routing = Get-Content -Raw -LiteralPath $RoutingPath | ConvertFrom-Json
-
-$Exact = @{
-  ".gitignore" = "ignore rules for local/generated artifacts"
-  ".htaccess" = "Apache/static-host cache, MIME, and service-worker behavior"
-  "app_manifest.json" = "canonical version plus CSS/JS app shell manifest"
-  "favicon.ico" = "legacy favicon"
-  "index.html" = "app DOM shell, canvas, panels, dialogs, and ordered script tags"
-  "README.md" = "small AI entrypoint and read strategy"
-  "AI_MAP.md" = "subsystem map and task-oriented read sets"
-  "GAME_FEATURES.md" = "player-facing game features, UI, items, and behavior guide"
-  "FILES.json" = "machine-readable file routing and glob semantics"
-  "service-worker.js" = "generated offline/cache service worker"
-}
-
-$JsExact = @{
-  "ants.js" = "ant actor and ant nest worker behavior"
-  "assets.js" = "image loading, image metrics, and render caches"
-  "audio.js" = "sample playback and audio controls"
-  "burn_motion_util.js" = "burning drift and smoke motion helpers"
-  "collision_footprint_system.js" = "collision footprint shapes and overlap tests"
-  "command_dispatcher.js" = "central command routing for UI/tools/pointers/save"
-  "constraint_system.js" = "attachments, ropes, push/pull, and collision constraints"
-  "data.js" = "sprite/decor definitions, needs, config, field tuning"
-  "debug_tools.js" = "browser debug overlay and diagnostics"
-  "disease_registry.js" = "disease definitions and lookup"
-  "display_helpers.js" = "shared canvas/display helpers and weather labels"
-  "event_bus.js" = "global event bus singleton"
-  "family_graph.js" = "lineage graph helpers"
-  "geometry_helpers.js" = "shared primitive geometry helpers"
-  "ground_types.js" = "ground definitions, multipliers, limits, labels"
-  "health.js" = "health, stress, need, damage, and death helpers"
-  "history_system.js" = "rolling world statistics/history"
-  "impact_core_system.js" = "impact force and hit candidate helpers"
-  "input_mode_manager.js" = "pointer/touch/mobile input classification"
-  "items.js" = "item constructors, food/grass helpers, item preview drawing"
-  "main.js" = "startup, restore, UI binding, update/render loop"
-  "math.js" = "shared numeric helpers"
-  "mechanical_shape_bridge.js" = "mechanical item shape bridge for world queries"
-  "mechanical_system.js" = "mechanical item forces, rails, ropes, pins, fences"
-  "perf_profiler.js" = "performance profiler and quality adaptation"
-  "registry_base.js" = "registry normalization helper base"
-  "render.js" = "main canvas renderer"
-  "restore_coordinator.js" = "post-load restore ordering/fixups"
-  "sim_core.js" = "simulation primitives and shared helpers"
-  "snapshot_system.js" = "world snapshot capture/restore"
-  "sound_pack.js" = "logical sound ID to asset mapping"
-  "structure_lifecycle.js" = "structure update lifecycle"
-  "structures.js" = "structure definitions and placement/runtime helpers"
-  "system_order.js" = "named update phase order"
-  "text_catalog.js" = "Japanese UI/state/behavior labels"
-  "version.js" = "app version/cache/static query config"
-  "weather_system.js" = "weather selection and application"
-}
-
-function Get-GroupId($Path) {
-  foreach ($Group in $Routing.groups) {
-    foreach ($Pattern in $Group.patterns) {
-      if ($Path -like $Pattern) { return $Group.id }
-    }
-  }
-  return ($Path -split "/")[0]
-}
-
-function Get-Meaning($Path) {
-  if ($Exact.ContainsKey($Path)) { return $Exact[$Path] }
-  if ($Path.StartsWith("js/")) {
-    $Name = Split-Path -Leaf $Path
-    if ($JsExact.ContainsKey($Name)) { return $JsExact[$Name] }
-    if ($Name.StartsWith("world_")) { return "world state/view/update/tool/environment/combat/social subsystem" }
-    if ($Name.StartsWith("tarinai_")) { return "creature action/needs/social/item/update subsystem" }
-    if ($Name.StartsWith("item_lifecycle_step_")) { return "item lifecycle pipeline stage" }
-    if ($Name.StartsWith("item_lifecycle_")) { return "item lifecycle subsystem" }
-    if ($Name.StartsWith("item_dynamic_")) { return "dynamic item behavior subsystem" }
-    if ($Name.StartsWith("item_")) { return "item registry/runtime/update/render subsystem" }
-    if ($Name.StartsWith("simulation_")) { return "simulation phase subsystem" }
-    if ($Name.StartsWith("ui_family_")) { return "family tree UI subsystem" }
-    if ($Name.StartsWith("ui_input_")) { return "input handling subsystem" }
-    if ($Name.StartsWith("ui_")) { return "DOM/panel UI subsystem" }
-    if ($Name.StartsWith("save_")) { return "save/load persistence subsystem" }
-    if ($Name.StartsWith("physics_")) { return "physics helper/world subsystem" }
-    return "runtime JavaScript module"
-  }
-  if ($Path.StartsWith("scripts/")) { return "repo script/tooling" }
-  if ($Path.StartsWith("css/")) { return "stylesheet layer" }
-  if ($Path.StartsWith("assets/sprites/")) { return "creature state sprite" }
-  if ($Path.StartsWith("assets/ui/")) { return "UI/app/tool image asset" }
-  if ($Path.StartsWith("assets/objects/")) { return "field object image asset" }
-  if ($Path.StartsWith("assets/sounds/")) { return "voice or sound-effect sample" }
-  return "project file"
-}
-
-$Files = Get-ChildItem -LiteralPath $Root -Recurse -File -Force |
-  Where-Object { $_.FullName -notmatch "\\.git\\" -and $_.FullName -notmatch "\\__pycache__\\" } |
-  ForEach-Object { $_.FullName.Substring($Root.Path.Length + 1).Replace("\", "/") } |
-  Sort-Object
-
-$Records = foreach ($Path in $Files) {
-  $Group = Get-GroupId $Path
-  $Meaning = Get-Meaning $Path
-  if ($Query -and ($Path.ToLowerInvariant() -notlike "*$($Query.ToLowerInvariant())*" -and $Group.ToLowerInvariant() -notlike "*$($Query.ToLowerInvariant())*" -and $Meaning.ToLowerInvariant() -notlike "*$($Query.ToLowerInvariant())*")) {
-    continue
-  }
-  [pscustomobject]@{ path = $Path; group = $Group; meaning = $Meaning }
-}
-
-if ($Json) {
-  $Records | ConvertTo-Json -Depth 4
-} elseif ($All) {
-  $Records | ForEach-Object { "$($_.path): $($_.meaning)" }
-} else {
-  $Records | Group-Object group | Sort-Object Name | ForEach-Object {
-    "$($_.Name): $($_.Count) files"
-    $_.Group | Select-Object -ExpandProperty meaning -Unique | Sort-Object | Select-Object -First 8 | ForEach-Object { "  - $_" }
-  }
-}
diff --git a/scripts/ai_inventory.py b/scripts/ai_inventory.py
deleted file mode 100644
index 4ae68ca..0000000
--- a/scripts/ai_inventory.py
+++ /dev/null
@@ -1,212 +0,0 @@
-from __future__ import annotations
-
-import argparse
-import fnmatch
-import json
-from pathlib import Path
-
-
-ROOT = Path(__file__).resolve().parents[1]
-ROUTING_FILE = ROOT / "FILES.json"
-
-
-EXCLUDE_DIRS = {".git", "__pycache__"}
-
-
-EXACT_DESCRIPTIONS = {
-    ".gitignore": "ignore rules for local/generated artifacts",
-    ".htaccess": "Apache/static-host cache, MIME, and service-worker behavior",
-    "app_manifest.json": "canonical version plus CSS/JS app shell manifest",
-    "favicon.ico": "legacy favicon",
-    "index.html": "app DOM shell, canvas, panels, dialogs, and ordered script tags",
-    "README.md": "small AI entrypoint and read strategy",
-    "AI_MAP.md": "subsystem map and task-oriented read sets",
-    "GAME_FEATURES.md": "player-facing game features, UI, items, and behavior guide",
-    "FILES.json": "machine-readable file routing and glob semantics",
-    "service-worker.js": "generated offline/cache service worker",
-}
-
-
-GROUP_DESCRIPTIONS = {
-    "css": "stylesheet layer",
-    "scripts": "repo tooling",
-    "js": "runtime JavaScript",
-    "assets/sprites": "creature state sprite",
-    "assets/ui": "UI/app/tool image asset",
-    "assets/objects": "field object image asset",
-    "assets/sounds": "voice or sound-effect sample",
-}
-
-
-JS_PREFIX_DESCRIPTIONS = [
-    ("world_", "world state/view/update/tool/environment/combat/social subsystem"),
-    ("tarinai_", "creature action/needs/social/item/update subsystem"),
-    ("item_lifecycle_step_", "item lifecycle pipeline stage"),
-    ("item_lifecycle_", "item lifecycle subsystem"),
-    ("item_dynamic_", "dynamic item behavior subsystem"),
-    ("item_", "item registry/runtime/update/render subsystem"),
-    ("simulation_", "simulation phase subsystem"),
-    ("ui_family_", "family tree UI subsystem"),
-    ("ui_input_", "input handling subsystem"),
-    ("ui_", "DOM/panel UI subsystem"),
-    ("save_", "save/load persistence subsystem"),
-    ("physics_", "physics helper/world subsystem"),
-]
-
-
-JS_EXACT_DESCRIPTIONS = {
-    "ants.js": "ant actor and ant nest worker behavior",
-    "assets.js": "image loading, image metrics, and render caches",
-    "audio.js": "sample playback and audio controls",
-    "burn_motion_util.js": "burning drift and smoke motion helpers",
-    "collision_footprint_system.js": "collision footprint shapes and overlap tests",
-    "command_dispatcher.js": "central command routing for UI/tools/pointers/save",
-    "constraint_system.js": "attachments, ropes, push/pull, and collision constraints",
-    "data.js": "sprite/decor definitions, needs, config, field tuning",
-    "display_helpers.js": "shared canvas/display helpers and weather labels",
-    "debug_tools.js": "browser debug overlay and diagnostics",
-    "disease_registry.js": "disease definitions and lookup",
-    "event_bus.js": "global event bus singleton",
-    "family_graph.js": "lineage graph helpers",
-    "geometry_helpers.js": "shared primitive geometry helpers",
-    "ground_types.js": "ground definitions, multipliers, limits, labels",
-    "health.js": "health, stress, need, damage, and death helpers",
-    "history_system.js": "rolling world statistics/history",
-    "impact_core_system.js": "impact force and hit candidate helpers",
-    "input_mode_manager.js": "pointer/touch/mobile input classification",
-    "items.js": "item constructors, food/grass helpers, item preview drawing",
-    "main.js": "startup, restore, UI binding, update/render loop",
-    "math.js": "shared numeric helpers",
-    "mechanical_shape_bridge.js": "mechanical item shape bridge for world queries",
-    "mechanical_system.js": "mechanical item forces, rails, ropes, pins, fences",
-    "perf_profiler.js": "performance profiler and quality adaptation",
-    "registry_base.js": "registry normalization helper base",
-    "render.js": "main canvas renderer",
-    "restore_coordinator.js": "post-load restore ordering/fixups",
-    "sim_core.js": "simulation primitives and shared helpers",
-    "sound_pack.js": "logical sound ID to asset mapping",
-    "snapshot_system.js": "world snapshot capture/restore",
-    "structures.js": "structure definitions and placement/runtime helpers",
-    "structure_lifecycle.js": "structure update lifecycle",
-    "system_order.js": "named update phase order",
-    "text_catalog.js": "Japanese UI/state/behavior labels",
-    "version.js": "app version/cache/static query config",
-    "weather_system.js": "weather selection and application",
-}
-
-
-def rel(path: Path) -> str:
-    return path.relative_to(ROOT).as_posix()
-
-
-def iter_files() -> list[str]:
-    files: list[str] = []
-    for path in ROOT.rglob("*"):
-        if not path.is_file():
-            continue
-        if any(part in EXCLUDE_DIRS for part in path.relative_to(ROOT).parts):
-            continue
-        files.append(rel(path))
-    return sorted(files)
-
-
-def load_routing() -> dict:
-    return json.loads(ROUTING_FILE.read_text(encoding="utf-8"))
-
-
-def group_for(path: str, routing: dict) -> str:
-    for group in routing.get("groups", []):
-        for pattern in group.get("patterns", []):
-            if fnmatch.fnmatch(path, pattern):
-                return group["id"]
-    return path.split("/", 1)[0]
-
-
-def describe(path: str, routing: dict) -> str:
-    if path in EXACT_DESCRIPTIONS:
-        return EXACT_DESCRIPTIONS[path]
-    if path.startswith("js/"):
-        name = path.rsplit("/", 1)[-1]
-        if name in JS_EXACT_DESCRIPTIONS:
-            return JS_EXACT_DESCRIPTIONS[name]
-        for prefix, desc in JS_PREFIX_DESCRIPTIONS:
-            if name.startswith(prefix):
-                return desc
-        return "runtime JavaScript module"
-    if path.startswith("scripts/"):
-        return "repo script/tooling"
-    if path.startswith("css/"):
-        return "stylesheet layer"
-    if path.startswith("assets/"):
-        for prefix, desc in GROUP_DESCRIPTIONS.items():
-            if path.startswith(prefix + "/"):
-                return desc
-        return "static asset"
-    group_id = group_for(path, routing)
-    for group in routing.get("groups", []):
-        if group.get("id") == group_id:
-            return group.get("meaning", "project file")
-    return "project file"
-
-
-def matches_query(path: str, query: str, routing: dict) -> bool:
-    if not query:
-        return True
-    q = query.lower()
-    if q in path.lower():
-        return True
-    group_id = group_for(path, routing).lower()
-    if q == group_id or q in group_id:
-        return True
-    return q in describe(path, routing).lower()
-
-
-def build_records(query: str = "") -> list[dict]:
-    routing = load_routing()
-    records = []
-    for path in iter_files():
-        if not matches_query(path, query, routing):
-            continue
-        records.append({
-            "path": path,
-            "group": group_for(path, routing),
-            "meaning": describe(path, routing),
-        })
-    return records
-
-
-def print_compact(records: list[dict]) -> None:
-    groups: dict[str, list[dict]] = {}
-    for record in records:
-        groups.setdefault(record["group"], []).append(record)
-    for group_id in sorted(groups):
-        print(f"{group_id}: {len(groups[group_id])} files")
-        meanings = sorted({record["meaning"] for record in groups[group_id]})
-        for meaning in meanings[:8]:
-            print(f"  - {meaning}")
-
-
-def print_all(records: list[dict]) -> None:
-    for record in records:
-        print(f"{record['path']}: {record['meaning']}")
-
-
-def main() -> int:
-    parser = argparse.ArgumentParser(description="Print token-aware AI file inventory.")
-    parser.add_argument("query", nargs="?", default="", help="Optional group/path/meaning filter, e.g. ui, world, assets.")
-    parser.add_argument("--all", action="store_true", help="Print every matching file instead of grouped summary.")
-    parser.add_argument("--json", action="store_true", help="Print JSON records.")
-    args = parser.parse_args()
-
-    records = build_records(args.query)
-    if args.json:
-        print(json.dumps(records, ensure_ascii=False, indent=2))
-    elif args.all:
-        print_all(records)
-    else:
-        print_compact(records)
-    return 0
-
-
-if __name__ == "__main__":
-    raise SystemExit(main())
diff --git a/scripts/colony_crisis_regression_audit.js b/scripts/colony_crisis_regression_audit.js
deleted file mode 100644
index e550e5c..0000000
--- a/scripts/colony_crisis_regression_audit.js
+++ /dev/null
@@ -1,44 +0,0 @@
-"use strict";
-
-global.window = global;
-global.CONFIG = { dayLength: 120 };
-global.TarinaiAchievements = { evaluateWorld() {} };
-require("../js/colony_situation_system.js");
-
-function actor({ energy = 80, hunger = 20, health = 0 } = {}) {
-  return { dead: false, energy, hunger, stress: 10, needs: { health, safety: 0 }, state: "idle" };
-}
-function world(actors, deaths = 0, previousPopulation = null) {
-  return {
-    time: 100,
-    tarinai: actors,
-    recentDeathTimes: Array.from({ length: deaths }, (_, i) => 99 - i * 0.1),
-    lastColonyMoodPopulation: previousPopulation == null ? actors.length : previousPopulation,
-    colonyMoodDefinition(id) { return { id, label: id, effects: { personality: {} } }; },
-    config: { dayLength: 120 },
-  };
-}
-function evaluate(w) { return global.TarinaiColonySituationSystem.evaluate(w, true).id; }
-function assert(ok, message) { if (!ok) throw new Error(message); }
-
-// Ten recent deaths alone at 100 population must no longer trigger crisis without systemic weakness.
-let w = world(Array.from({ length: 100 }, () => actor()), 10);
-assert(evaluate(w) !== "crisis", "recent deaths alone still trigger crisis too easily");
-
-// Systemic weakness alone below collapse severity must not trigger crisis.
-w = world(Array.from({ length: 100 }, (_, i) => actor(i < 50 ? { energy: 24, hunger: 90, health: 70 } : {})), 0);
-assert(evaluate(w) !== "crisis", "moderate systemic weakness alone still triggers crisis");
-
-// Mortality plus systemic weakness should trigger crisis.
-w = world(Array.from({ length: 100 }, (_, i) => actor(i < 50 ? { energy: 24, hunger: 90, health: 70 } : {})), 10);
-assert(evaluate(w) === "crisis", "compound mortality/systemic stress does not trigger crisis");
-
-// Extreme collapse can trigger even without recent deaths.
-w = world(Array.from({ length: 100 }, (_, i) => actor(i < 70 ? { energy: 10, hunger: 98, health: 80 } : {})), 0);
-assert(evaluate(w) === "crisis", "extreme colony collapse does not trigger crisis");
-
-// Population growth still suppresses crisis.
-w = world(Array.from({ length: 100 }, (_, i) => actor(i < 70 ? { energy: 10, hunger: 98, health: 80 } : {})), 20, 90);
-assert(evaluate(w) !== "crisis", "crisis ignored population-growth exclusion");
-
-console.log("[OK] stricter compound crisis classification passed");
diff --git a/scripts/effect_runtime_regression_audit.js b/scripts/effect_runtime_regression_audit.js
deleted file mode 100644
index 472ca87..0000000
--- a/scripts/effect_runtime_regression_audit.js
+++ /dev/null
@@ -1,15 +0,0 @@
-"use strict";
-const fs = require("fs");
-function ok(cond, msg) { if (!cond) throw new Error(msg); console.log(`[OK] ${msg}`); }
-const sim = fs.readFileSync("js/simulation_effects_system.js", "utf8");
-const combat = fs.readFileSync("js/world_combat_effects.js", "utf8");
-const all = fs.readdirSync("js").filter(x => x.endsWith(".js")).map(x => fs.readFileSync(`js/${x}`, "utf8")).join("\n");
-ok(!/\.map\([\s\S]{0,300}\.sort\(/.test(sim), "effect pressure compaction no longer map/sorts all effects");
-ok(sim.includes("for (let priority = 1; priority <= 3"), "effect pressure drops by priority tiers");
-ok(combat.includes('new Set(["ring", "fight", "flame", "fall"])'), "effect pool is limited to simple high-frequency types");
-ok(combat.includes("offscreenCulled"), "low-importance offscreen spawns are tracked and culled");
-ok(sim.includes('if (effect.type === "ring")') && sim.includes("lightweight"), "rings bypass the budgeted physics update path");
-ok(sim.includes("spawnRequested") && sim.includes("poolEligible") && sim.includes("pooled"), "effect runtime diagnostics expose spawn and pool counters");
-const direct = [...all.matchAll(/effects\.push\(new Effect\(/g)].length;
-ok(direct === 0, "normal Effect construction is routed through spawnEffect");
-console.log("[OK] effect runtime regression audit passed");
diff --git a/scripts/generate_app_files.py b/scripts/generate_app_files.py
deleted file mode 100644
index 106cafd..0000000
--- a/scripts/generate_app_files.py
+++ /dev/null
@@ -1,52 +0,0 @@
-#!/usr/bin/env python3
-"""Regenerate index.html CSS/script tags and service-worker.js from app_manifest.json.
-This project intentionally stays buildless; this script is a lightweight manifest sync tool.
-"""
-from __future__ import annotations
-from pathlib import Path
-import json
-import re
-
-ROOT = Path(__file__).resolve().parents[1]
-manifest = json.loads((ROOT / "app_manifest.json").read_text(encoding="utf-8"))
-version = manifest["version"]
-css_files = manifest["css"]
-js_files = manifest["js"]
-
-index = ROOT / "index.html"
-s = index.read_text(encoding="utf-8")
-css_block = "".join([f'\n  <link rel="stylesheet" href="{f}?v={version}" />' for f in css_files])
-s = re.sub(
-    r'\s*<link rel="stylesheet" href="css/[^\"]+" />(?:\s*<link rel="stylesheet" href="css/[^\"]+" />)*',
-    css_block,
-    s,
-    count=1,
-)
-script_block = "\n".join([f'  <script src="{f}?v={version}" defer></script>' for f in js_files])
-static_icon_paths = ["assets/ui/favicon.png", "assets/ui/apple-touch-icon.png", "favicon.ico"]
-for icon_path in static_icon_paths:
-    s = re.sub(rf'(href="{re.escape(icon_path)}\?v=)[^"]+', rf'\g<1>{version}', s)
-s = re.sub(
-    r'\n\s*<script src="js/version\.js\?v=[^\"]+" defer></script>[\s\S]*?\n\s*<script src="js/debug_tools\.js\?v=[^\"]+" defer></script>',
-    "\n" + script_block,
-    s,
-    count=1,
-)
-index.write_text(s, encoding="utf-8")
-
-core_names = [Path(f).stem for f in js_files]
-css_entries = ",\n  ".join([f'`./{f}?${{v}}`' for f in css_files])
-js_names = ", ".join([json.dumps(n, ensure_ascii=False) for n in core_names])
-(ROOT / "service-worker.js").write_text(f'''"use strict";\n\nconst APP_VERSION = "{version}";\nconst CACHE_NAME = `tarinai-colony-${{APP_VERSION}}`;\nconst v = `v=${{APP_VERSION}}`;\n// Generated from app_manifest.json. Run scripts/generate_app_files.py after changing static files.\nconst coreScriptNames = [\n  {js_names}\n];\nconst CORE_ASSETS = [\n  "./",\n  "./index.html",\n  {css_entries},\n  ...coreScriptNames.map(name => `./js/${{name}}.js?${{v}}`),\n];\n\nself.addEventListener("install", (event) => {{\n  event.waitUntil(caches.open(CACHE_NAME).then(cache => cache.addAll(CORE_ASSETS)).catch(() => undefined));\n  self.skipWaiting();\n}});\n\nself.addEventListener("activate", (event) => {{\n  event.waitUntil(caches.keys().then(keys => Promise.all(keys.filter(key => key !== CACHE_NAME).map(key => caches.delete(key)))));\n  self.clients.claim();\n}});\n\nfunction isStaticAsset(request) {{\n  const url = new URL(request.url);\n  return /\\.(?:js|css|webp|png|jpg|jpeg|gif|svg|mp3|wav|woff2?)$/i.test(url.pathname);\n}}\n\nfunction cacheableResponse(response) {{\n  return response && response.status === 200 && response.type !== "opaque";\n}}\n\nfunction putCacheSafely(request, response) {{\n  if (!cacheableResponse(response)) return Promise.resolve(false);\n  return caches.open(CACHE_NAME).then(cache => cache.put(request, response.clone())).then(() => true).catch(() => false);\n}}\n\nself.addEventListener("fetch", (event) => {{\n  const request = event.request;\n  if (request.method !== "GET") return;\n  const url = new URL(request.url);\n  if (url.origin !== self.location.origin) return;\n  if (/service-worker\\.js$/i.test(url.pathname)) return;\n  if (request.mode === "navigate" || /index\\.html$/i.test(url.pathname)) {{\n    event.respondWith(fetch(request).then(response => {{\n      putCacheSafely(request, response);\n      return response;\n    }}).catch(() => caches.match(request).then(cached => cached || caches.match("./index.html"))));\n    return;\n  }}\n  if (isStaticAsset(request)) {{\n    event.respondWith(caches.match(request).then(cached => cached || fetch(request).then(response => {{\n      putCacheSafely(request, response);\n      return response;\n    }})));\n  }}\n}});\n''', encoding="utf-8")
-
-
-# Keep machine routing metadata version-aligned when present.
-files_json = ROOT / "FILES.json"
-if files_json.exists():
-    try:
-        files_data = json.loads(files_json.read_text(encoding="utf-8"))
-        if isinstance(files_data, dict):
-            files_data["version"] = version
-            files_json.write_text(json.dumps(files_data, ensure_ascii=False, indent=2) + "\n", encoding="utf-8")
-    except Exception:
-        pass
diff --git a/scripts/generate_item_icons.py b/scripts/generate_item_icons.py
deleted file mode 100644
index 7978599..0000000
--- a/scripts/generate_item_icons.py
+++ /dev/null
@@ -1,146 +0,0 @@
-#!/usr/bin/env python3
-"""Generate UI icons for item designs that must match js/items.js.
-
-The game is buildless, but these icons are generated snapshots of the field
-appearance. Do not invent separate tool-UI-only designs.
-"""
-from __future__ import annotations
-from pathlib import Path
-import json, math, re
-from PIL import Image, ImageDraw
-
-ROOT = Path(__file__).resolve().parents[1]
-OUT = ROOT / "assets" / "ui"
-REGISTRY = ROOT / "js" / "item_registry.js"
-
-
-def visual_registry() -> dict:
-    text = REGISTRY.read_text(encoding="utf-8")
-    match = re.search(r"String\.raw`([\s\S]*?)`", text)
-    if not match:
-        raise RuntimeError("Could not find JSON visual registry in js/item_registry.js")
-    return json.loads(match.group(1))
-
-
-def save_icon(name: str, draw_fn) -> None:
-    im = Image.new("RGBA", (96, 96), (0, 0, 0, 0))
-    d = ImageDraw.Draw(im, "RGBA")
-    draw_fn(d)
-    im.save(OUT / name, "WEBP", lossless=True, quality=95)
-
-
-def draw_drop(fill, stroke, highlight):
-    def fn(d: ImageDraw.ImageDraw) -> None:
-        d.ellipse([18, 60, 78, 74], fill=(60, 45, 35, 32))
-        # Same horizontal oval as fallen water/zunda/mercury item sprites; rain overlay is separate diagonal lines.
-        d.ellipse([12, 33, 84, 63], fill=fill, outline=stroke, width=4)
-        d.ellipse([24, 38, 45, 48], fill=highlight)
-    return fn
-
-def rgba(value, fallback):
-    if not value:
-      return fallback
-    if value.startswith("#"):
-      value = value.lstrip("#")
-      if len(value) == 6:
-        return tuple(int(value[i:i+2], 16) for i in (0, 2, 4)) + (255,)
-    match = re.match(r"rgba?\(([^)]+)\)", value.replace(" ", ""))
-    if match:
-      parts = match.group(1).split(",")
-      r, g, b = (int(float(parts[i])) for i in range(3))
-      a = int(float(parts[3]) * 255) if len(parts) > 3 else 255
-      return (r, g, b, a)
-    return fallback
-
-
-def draw_powder(fill, stroke, highlight):
-    def fn(d: ImageDraw.ImageDraw) -> None:
-        d.ellipse([18, 62, 78, 76], fill=(60, 45, 35, 36))
-        for i in range(20):
-            x = 48 + math.cos(i * 1.9) * (8 + (i % 5) * 4)
-            y = 56 - abs(math.sin(i * 1.3)) * 24 + (i % 3) * 3
-            r = 5 + (i % 4)
-            d.ellipse([x - r, y - r * 0.65, x + r, y + r * 0.65], fill=highlight if i % 4 == 0 else fill, outline=stroke, width=1)
-        d.ellipse([31, 31, 52, 39], fill=rgba("rgba(255,255,255,0.62)", (255, 255, 255, 158)))
-    return fn
-
-
-def draw_pill(fill, stroke, highlight, scale=1.0):
-    def fn(d: ImageDraw.ImageDraw) -> None:
-        cx, cy = 48, 48
-        w, h = 66 * scale, 28 * scale
-        box = [cx - w / 2, cy - h / 2, cx + w / 2, cy + h / 2]
-        d.rounded_rectangle(box, radius=int(h / 2), fill=fill, outline=stroke, width=4)
-        d.line([(cx, cy - h / 2 + 2), (cx, cy + h / 2 - 2)], fill=highlight, width=4)
-        d.ellipse([cx - w * 0.32, cy - h * 0.24, cx - w * 0.08, cy - h * 0.04], fill=(255, 255, 255, 110))
-    return fn
-
-
-def draw_laxative(d: ImageDraw.ImageDraw) -> None:
-    d.rounded_rectangle([14, 28, 82, 68], radius=15, fill=(244, 212, 154, 255), outline=(98, 61, 29, 235), width=4)
-    # Zunchi mound motif inside the tablet.
-    for box in ([26, 47, 44, 60], [38, 36, 60, 53], [54, 47, 74, 61], [46, 29, 61, 41]):
-        d.ellipse(box, fill=(96, 70, 38, 230), outline=(56, 39, 22, 130), width=2)
-    d.arc([22, 27, 72, 50], 205, 330, fill=(255, 255, 255, 135), width=3)
-
-def star_points(cx: float, cy: float, r1: float, r2: float, n: int = 5, rot: float = -math.pi / 2):
-    return [(cx + math.cos(rot + i * math.pi / n) * (r1 if i % 2 == 0 else r2), cy + math.sin(rot + i * math.pi / n) * (r1 if i % 2 == 0 else r2)) for i in range(n * 2)]
-
-
-def draw_mystery(d: ImageDraw.ImageDraw) -> None:
-    d.ellipse([18, 23, 78, 73], fill=(243, 236, 255, 255), outline=(91, 55, 150, 240), width=5)
-    try:
-        from PIL import ImageFont
-        font = ImageFont.truetype("DejaVuSans-Bold.ttf", 44)
-    except Exception:
-        font = None
-    d.text((48, 48), "?", anchor="mm", fill=(91, 55, 150, 245), font=font)
-    d.arc([25, 24, 74, 54], 205, 330, fill=(255, 255, 255, 135), width=3)
-
-def draw_bullet(d: ImageDraw.ImageDraw) -> None:
-    d.ellipse([20, 62, 76, 77], fill=(60, 45, 35, 38))
-    pts = [(76, 48), (60, 28), (27, 28), (16, 35), (16, 61), (27, 68), (60, 68)]
-    d.polygon(pts, fill=(244, 196, 106, 255), outline=(87, 51, 22, 240))
-    d.line(pts + [pts[0]], fill=(87, 51, 22, 240), width=4)
-    d.rectangle([16, 35, 29, 61], fill=(176, 111, 35, 255), outline=(87, 51, 22, 220), width=3)
-    d.line([(34, 36), (64, 42)], fill=(255, 237, 176, 170), width=4)
-    d.line([(34, 60), (58, 56)], fill=(142, 82, 30, 110), width=3)
-
-
-def draw_sleep(d: ImageDraw.ImageDraw) -> None:
-    d.ellipse([17, 28, 79, 68], fill=(235, 228, 255, 255), outline=(74, 60, 144, 230), width=4)
-    d.ellipse([41, 31, 65, 56], fill=(112, 91, 188, 220))
-    d.ellipse([52, 27, 74, 52], fill=(235, 228, 255, 255))
-    d.arc([24, 27, 74, 57], 200, 330, fill=(255, 255, 255, 190), width=3)
-
-
-def main() -> None:
-    registry = visual_registry()
-    renderer_map = {
-        "laxative_tablet": draw_laxative,
-        "mystery_tablet": draw_mystery,
-        "bullet": draw_bullet,
-        "sleep_tablet": draw_sleep,
-    }
-    for item_id, visual in registry.items():
-        if item_id == "ball":
-            continue
-        palette = visual.get("palette") or {}
-        renderer = visual.get("renderer")
-        fill = rgba(palette.get("fill"), (255, 250, 241, 255))
-        stroke = rgba(palette.get("stroke"), (141, 111, 72, 220))
-        highlight = rgba(palette.get("highlight") or palette.get("accent"), (255, 255, 255, 150))
-        if renderer == "oval_droplet":
-            draw_fn = draw_drop(fill, stroke, highlight)
-        elif renderer == "powder_pile":
-            draw_fn = draw_powder(fill, stroke, highlight)
-        elif renderer == "split_pill":
-            draw_fn = draw_pill(fill, stroke, highlight, visual.get("uiPreviewScale") or visual.get("scale") or 1.0)
-        else:
-            draw_fn = renderer_map.get(renderer)
-        if draw_fn:
-            save_icon(f"tool_{item_id}.webp", draw_fn)
-
-
-if __name__ == "__main__":
-    main()
diff --git a/scripts/history_binary_regression_audit.js b/scripts/history_binary_regression_audit.js
deleted file mode 100644
index 48f816c..0000000
--- a/scripts/history_binary_regression_audit.js
+++ /dev/null
@@ -1,46 +0,0 @@
-"use strict";
-
-const path = require("path");
-global.window = global;
-
-const encoder = new TextEncoder();
-const decoder = new TextDecoder();
-global.TarinaiSaveCodec = {
-  encodeBinarySnapshot(snapshot) {
-    return encoder.encode(JSON.stringify(snapshot));
-  },
-  decodeBinarySnapshot(bytes) {
-    return JSON.parse(decoder.decode(bytes));
-  },
-};
-global.TarinaiSnapshot = {
-  createSnapshot(world) {
-    return { v: 1, a: "tj1", value: world.value, time: world.time };
-  },
-};
-global.TarinaiRestoreCoordinator = {
-  restoreSnapshot(snapshot, world) {
-    world.value = snapshot.value;
-    world.time = snapshot.time;
-  },
-};
-
-require(path.join(__dirname, "..", "js", "history_system.js"));
-
-const world = { value: 1, time: 10 };
-if (!global.TarinaiHistory.capture(world, "first")) throw new Error("initial history capture failed");
-if (!(world._undoStack[0].bytes instanceof Uint8Array)) throw new Error("history entry is not binary");
-if ("snapshot" in world._undoStack[0] || "patch" in world._undoStack[0]) throw new Error("legacy object history payload remains");
-if (global.TarinaiHistory.capture(world, "duplicate")) throw new Error("duplicate snapshot was not suppressed");
-
-world.value = 2;
-world.time = 20;
-if (!global.TarinaiHistory.capture(world, "second")) throw new Error("second history capture failed");
-world.value = 3;
-world.time = 30;
-let result = global.TarinaiHistory.undo(world);
-if (!result.ok || world.value !== 2 || world.time !== 20) throw new Error("undo did not restore the binary snapshot");
-result = global.TarinaiHistory.redo(world);
-if (!result.ok || world.value !== 3 || world.time !== 30) throw new Error("redo did not restore the captured current state");
-
-console.log("[OK] binary undo/redo history, duplicate suppression, and synchronous restore passed");
diff --git a/scripts/non_tarinai_performance_regression_audit.js b/scripts/non_tarinai_performance_regression_audit.js
deleted file mode 100644
index 4c9eafb..0000000
--- a/scripts/non_tarinai_performance_regression_audit.js
+++ /dev/null
@@ -1,21 +0,0 @@
-"use strict";
-const fs = require("fs");
-const viewSrc = fs.readFileSync("js/world_view.js", "utf8");
-const maintenanceSrc = fs.readFileSync("js/simulation_maintenance_system.js", "utf8");
-const spatialSrc = fs.readFileSync("js/world_spatial_budget.js", "utf8");
-const mainSrc = fs.readFileSync("js/main.js", "utf8");
-const statsSrc = fs.readFileSync("js/ui_charts.js", "utf8");
-const decaySrc = fs.readFileSync("js/item_lifecycle_decay_system.js", "utf8");
-function ok(cond, msg) { if (!cond) { console.error(`[FAIL] ${msg}`); process.exitCode = 1; } else console.log(`[OK] ${msg}`); }
-ok(!viewSrc.includes('terrain-periodic'), "terrain cache is not globally invalidated on a timer");
-ok(viewSrc.includes('return `${worldRef.fieldType || "garden"}:${worldRef.groundType || "soil"}`'), "terrain signature excludes object-count churn");
-ok(maintenanceSrc.includes('_nextStructureDependencyCheckAt'), "structure dependency safety sweeps are throttled");
-ok(maintenanceSrc.includes('_nextItemCompactAt') && maintenanceSrc.includes('_nextAntCompactAt'), "item and ant compactions are staggered");
-ok(!maintenanceSrc.includes('countsInterval = 2.75'), "item bucket rebuilds are no longer forced by a periodic timer");
-ok(spatialSrc.includes('if (terrainChanged) this.markTerrainDirty?.("compact-terrain-items")'), "item compaction only invalidates terrain when cached terrain items were removed");
-ok(!spatialSrc.includes('else this.markTerrainDirty?.(reason);'), "adding ordinary objects no longer invalidates the whole terrain cache");
-ok(mainSrc.includes('requestIdleCallback') && mainSrc.includes('scheduleStatsRefresh'), "periodic stats refresh is deferred outside the simulation frame");
-ok(statsSrc.includes('world.tarinaiCounts?.()') && statsSrc.includes('collectDynamicColonyStats'), "stats use differential population counters and isolate dynamic aggregation");
-ok(statsSrc.includes('colonyStatsUiVisible') && mainSrc.includes('!colonyStatsUiVisible()'), "hidden colony UI skips scheduled stats work");
-ok(decaySrc.includes('"splat-fade"'), "splat fading invalidates only its local terrain chunk");
-if (process.exitCode) process.exit(process.exitCode);
diff --git a/scripts/pathfinding_regression_audit.js b/scripts/pathfinding_regression_audit.js
deleted file mode 100644
index 034af3a..0000000
--- a/scripts/pathfinding_regression_audit.js
+++ /dev/null
@@ -1,58 +0,0 @@
-"use strict";
-
-const path = require("path");
-global.window = global;
-global.CONFIG = { worldPadding: 28 };
-global.clamp = (v, a, b) => Math.max(a, Math.min(b, v));
-class World {}
-global.World = World;
-require(path.join(__dirname, "..", "js", "world_pathfinding_system.js"));
-
-function makeWorld({ directBlocked = false } = {}) {
-  const w = new World();
-  w.w = 1400;
-  w.h = 1000;
-  w.time = 10;
-  w.routingObstacleVersion = 3;
-  w.pointChecks = 0;
-  w.edgeChecks = 0;
-  w.pointBlockedByObstacle = () => { w.pointChecks++; return false; };
-  w.pathBlockedByFence = () => { w.edgeChecks++; return directBlocked; };
-  return w;
-}
-
-function waypointFor(id) {
-  const w = makeWorld();
-  const actor = { id, x: 120, y: 120, radius: 20 };
-  const target = { id: "goal", x: 1120, y: 780 };
-  const first = w.findGridPathWaypoint(actor, target, { gridStep: 58, state: "seek_food" });
-  if (!first) throw new Error(`no path for ${id}`);
-  const pointAfterFirst = w.pointChecks;
-  const edgeAfterFirst = w.edgeChecks;
-  const again = w.findGridPathWaypoint(actor, target, { gridStep: 58, state: "seek_food" });
-  if (!again || first.x !== again.x || first.y !== again.y) throw new Error("same actor route cache is not stable");
-  if (w.pointChecks !== pointAfterFirst || w.edgeChecks !== edgeAfterFirst) throw new Error("throttled actor cache still performs geometry checks every call");
-  if (actor._routeCache?.spatialVersion !== 3 || actor._routeCache?.mode !== "grid") throw new Error("unified route cache was not stored");
-  if (actor._gridPathWaypoint || actor._pathWaypoint) throw new Error("legacy route caches still exist");
-  w.routingObstacleVersion = 4;
-  w.findGridPathWaypoint(actor, target, { gridStep: 58, state: "seek_food" });
-  if (actor._routeCache?.spatialVersion !== 4) throw new Error("cache did not invalidate after obstacle version change");
-  if (w.pointChecks > 18 * 18 * 3) throw new Error(`excessive point checks: ${w.pointChecks}`);
-  if (w.edgeChecks > 18 * 18 * 8 * 3) throw new Error(`excessive edge checks: ${w.edgeChecks}`);
-  return `${first.x.toFixed(3)},${first.y.toFixed(3)}`;
-}
-
-const routes = new Set(Array.from({ length: 64 }, (_, i) => waypointFor(`tarinai-${i}`)));
-if (routes.size < 2) throw new Error("ID-fixed bias did not diversify independently computed routes");
-
-const directWorld = makeWorld();
-const directTarget = { id: "direct-goal", x: 600, y: 400 };
-const directActor = { id: "direct-a", x: 100, y: 100, radius: 20 };
-directWorld.findTarinaiPathWaypoint(directActor, directTarget, { state: "seek_food" });
-const directChecks = directWorld.edgeChecks;
-for (let i = 0; i < 100; i++) directWorld.findTarinaiPathWaypoint(directActor, directTarget, { state: "seek_food" });
-if (directWorld.edgeChecks !== directChecks) throw new Error("direct-route throttle did not suppress repeated fence checks");
-
-const w = makeWorld();
-w.markSpatialDirty = World.prototype.markSpatialDirty;
-console.log(`[OK] throttled actor-local route cache, obstacle invalidation, stable ID bias, and route diversity passed (${routes.size} first-waypoint variants)`);
diff --git a/scripts/performance_5to7_regression_audit.js b/scripts/performance_5to7_regression_audit.js
deleted file mode 100644
index eacb052..0000000
--- a/scripts/performance_5to7_regression_audit.js
+++ /dev/null
@@ -1,58 +0,0 @@
-"use strict";
-
-const assert = require("assert");
-const fs = require("fs");
-const path = require("path");
-const ROOT = path.resolve(__dirname, "..");
-const read = rel => fs.readFileSync(path.join(ROOT, rel), "utf8");
-
-const creatureSource = read("js/simulation_creature_system.js");
-assert(creatureSource.includes("_creatureScheduledWorkCursor"), "rotating scheduled-work cursor is missing");
-assert(creatureSource.includes("creatureCount >= 80"), "high-population guard for rotating AI work is missing");
-assert(creatureSource.includes("perfProfile.aiBudget"), "AI budget is not used as the low-overhead rotation step");
-assert(!creatureSource.includes("sortScheduledAi"), "AI spreading introduced an unnecessary sort queue");
-console.log("[OK] high-cost creature work uses a rotating, queue-free budget order");
-
-const renderSource = read("js/render.js");
-assert(renderSource.includes("creatureSortRect = visibleWorldRect(world, 72)"), "narrow creature depth-sort rectangle is missing");
-assert(renderSource.includes("nearbyRectInto(worldRef.spatial.tarinaiCells, creatureSortRect"), "Tarinai sort candidates are not limited before sorting");
-assert(renderSource.includes("nearbyRectInto(worldRef.spatial.antCells, creatureSortRect"), "ant sort candidates are not limited before sorting");
-assert(renderSource.includes("collectVisibleRenderStack(world, visibleRect, creatureSortRect)"), "render stack does not receive the narrowed creature sort rectangle");
-console.log("[OK] creature depth sorting is limited to near-viewport candidates before list insertion");
-
-const relationSource = read("js/tarinai_identity_social.js");
-assert(relationSource.includes("lazyDropDeadRelationPeer"), "lazy dead relationship deletion helper is missing");
-assert(relationSource.includes("pruneDeadRelationshipRefs(deadIds)"), "dead-ID batch relationship cleanup is missing");
-assert(!/entry\.ownCount\s*=\s*Math\.max\(entry\.ownCount,\s*Object\.keys\(this\.relationships\)\.length\)/.test(relationSource), "relation insertion still enumerates all relationship keys");
-console.log("[OK] dead relationship references are lazily removed without per-insert full key enumeration");
-
-class World {}
-global.World = World;
-global.TarinaiHistory = { trimMemory() { return 0; } };
-require(path.join(ROOT, "js/world_spatial_budget.js"));
-
-const world = new World();
-world.time = 100;
-const aliveA = { id: "A", dead: false, relationships: { D1: { affinity: 1 }, C: { affinity: 2 } }, relationCache: { stale: true } };
-const aliveC = { id: "C", dead: false, relationships: { A: { affinity: 2 }, X: { affinity: 9 } }, relationCache: { stale: true } };
-world.tarinai = [aliveA, aliveC];
-world.liveTarinai = new Map([["A", { target: aliveA }], ["C", { target: aliveC }]]);
-world._deadTarinaiIdsPendingCleanup = new Set(["D1"]);
-world.tarinaiCollisionMemo = new Map();
-world.relationNotices = {};
-world.fightPairCooldowns = {};
-world.resolvedFightIds = {};
-world.queueTarinaiRuntimeCachePrune("audit", { resetRelationPeerCaches: true });
-assert(world._tarinaiRuntimePruneJob, "threshold cleanup job was not queued");
-world.processTarinaiRuntimeCachePruneStep(1);
-assert(world._tarinaiRuntimePruneJob, "threshold cleanup was not split across frames");
-while (world._tarinaiRuntimePruneJob) world.processTarinaiRuntimeCachePruneStep(1);
-assert(!Object.prototype.hasOwnProperty.call(aliveA.relationships, "D1"), "known dead relationship was not removed");
-assert(Object.prototype.hasOwnProperty.call(aliveA.relationships, "C"), "live relationship was incorrectly removed");
-assert(Object.prototype.hasOwnProperty.call(aliveC.relationships, "X"), "unrelated stale reference was scanned/removed by targeted cleanup");
-assert.strictEqual(world._deadTarinaiIdsPendingCleanup.size, 0, "processed dead-ID set was not released after chunked cleanup");
-console.log("[OK] threshold cleanup is split across frames and removes only queued dead IDs");
-
-const deathSource = read("js/tarinai_social_move_life.js");
-assert(deathSource.includes("noteTarinaiDeathForRuntimeCleanup?.(this.id)"), "death hook does not queue the dead Tarinai ID");
-console.log("Performance 5-7 regression audit passed.");
diff --git a/scripts/performance_architecture_regression_audit.js b/scripts/performance_architecture_regression_audit.js
deleted file mode 100644
index 1c4ade9..0000000
--- a/scripts/performance_architecture_regression_audit.js
+++ /dev/null
@@ -1,28 +0,0 @@
-"use strict";
-const fs = require("fs");
-const path = require("path");
-const root = path.resolve(__dirname, "..");
-const read = rel => fs.readFileSync(path.join(root, rel), "utf8");
-const ok = (value, message) => { if (!value) throw new Error(message); console.log(`[OK] ${message}`); };
-
-const budget = read("js/world_spatial_budget.js");
-const family = read("js/world_family_social.js");
-const life = read("js/tarinai_social_move_life.js");
-const achievements = read("js/achievements.js");
-const charts = read("js/ui_charts.js");
-const main = read("js/main.js");
-const render = read("js/render.js");
-
-ok(budget.includes("rebuildTarinaiCountCache") && budget.includes("syncTarinaiCountEntry") && budget.includes("tarinaiCounts()"), "population counters use mutation-maintained differential cache");
-ok(family.includes("syncTarinaiCountEntry?.(t)") && life.includes("syncTarinaiCountEntry?.(this)"), "birth/add and death paths update differential population counters");
-ok(budget.includes('noteItemInactive(item, reason = "item-inactive", notifyAchievements = true)') && budget.includes('noteItemInactive?.(it, "compact-items", false)'), "bulk item compaction suppresses per-item achievement checks");
-ok(budget.includes('evaluateEvent?.(this, "items", { delta: 0, reason: "compact-items" })'), "bulk item compaction emits one aggregate achievement event");
-ok(achievements.includes("function evaluateEvent(worldRef, trigger") && achievements.includes('evaluateEvent(worldRef, "timer"'), "achievement evaluation has event-driven trigger entry point");
-ok(!achievements.includes("const needsHabitatItemScan"), "playstyle habitat achievements no longer rescan every item on periodic evaluation");
-ok(achievements.includes("worldRef?.itemCounts") && achievements.includes("playstyleItemCount"), "item-dependent achievements use differential item counts in normal runtime");
-ok(charts.includes("function colonyStatsUiVisible()") && main.includes("!colonyStatsUiVisible()"), "hidden colony UI prevents scheduled stats aggregation");
-ok(charts.includes("world.tarinaiCounts?.()") && charts.includes("collectDynamicColonyStats"), "visible stats separate hot counters from dynamic full-population aggregation");
-ok(render.includes("nearbyRectInto(worldRef.spatial.tarinaiCells") && render.includes("isPointVisibleInRect") && render.includes("!isEntityVisibleInRect(entity, visibleRect)"), "render stack pre-culls entities before list insertion");
-ok(!render.includes("isEntityVisibleInRect({ ...it, x: pose.x, y: pose.y }"), "carried-item visibility culling avoids temporary object allocation");
-
-console.log("[OK] performance architecture: differential counters, event triggers, hidden UI gating, and pre-render culling verified");
diff --git a/scripts/performance_cleanup_regression_audit.js b/scripts/performance_cleanup_regression_audit.js
deleted file mode 100644
index 8182385..0000000
--- a/scripts/performance_cleanup_regression_audit.js
+++ /dev/null
@@ -1,77 +0,0 @@
-"use strict";
-
-const assert = require("assert");
-const fs = require("fs");
-const path = require("path");
-const vm = require("vm");
-const ROOT = path.resolve(__dirname, "..");
-const read = rel => fs.readFileSync(path.join(ROOT, rel), "utf8");
-
-const render = read("js/render.js");
-assert(!render.includes("insertionSortNearPrevious"), "custom insertion sort still exists");
-assert(!render.includes("_renderPrevDynamicLayeredIds") && !render.includes("_renderBackSortMap"), "previous-order render bookkeeping still exists");
-assert(render.includes("dynamicBack.sort(compareBackItems)") && render.includes("dynamicLayered.sort(compareRenderEntries)"), "native render sort is not active");
-console.log("[OK] previous-order Map and custom insertion sort are removed");
-
-const pathfinding = read("js/world_pathfinding_system.js");
-assert(!pathfinding.includes("_sharedRouteCache") && !pathfinding.includes("trySharedRoute") && !pathfinding.includes("storeSharedRoute"), "shared route cache still exists");
-assert(pathfinding.includes("actor._routeCache"), "actor-local route cache was removed accidentally");
-console.log("[OK] shared route cache is removed while actor-local throttling remains");
-
-const profiler = read("js/perf_profiler.js");
-const budget = read("js/world_spatial_budget.js");
-assert(profiler.includes("diagnosticsEnabled"), "diagnostic-mode gate is missing");
-assert(budget.includes("diagnostics ?") && budget.includes("this.workStats = diagnostics ?"), "production detailed diagnostic allocation is still unconditional");
-assert(profiler.includes("transitionHoldSeconds") && profiler.includes("pendingProfileSeconds"), "performance-profile hysteresis hold timers are missing");
-console.log("[OK] production diagnostics are gated and auto profile switching uses hysteresis");
-
-const environment = read("js/world_environment.js");
-assert(environment.includes("`${this.routingObstacleVersion || 0}:${qx},${qy},${qr},${cacheLimit},${maxRects}`"), "obstacle cache is not keyed by routingObstacleVersion only");
-assert(!environment.includes("`${this.spatialVersion || 0}:${this.spatialDirtyMarksTotal || 0}:${qx}"), "obstacle cache still invalidates on generic spatial movement");
-console.log("[OK] obstacle cache invalidation is isolated from generic spatial movement");
-
-const simCore = read("js/sim_core.js");
-const start = simCore.indexOf("class SpatialGrid {");
-const end = simCore.indexOf("\nfunction drawHeartShape", start);
-assert(start >= 0 && end > start, "SpatialGrid source could not be isolated");
-const context = { console, Map, Set, Math, Number, Array, globalThis: {} };
-vm.createContext(context);
-vm.runInContext(`${simCore.slice(start, end)}\nglobalThis.SpatialGrid = SpatialGrid;`, context);
-const SpatialGrid = context.globalThis.SpatialGrid;
-const grid = new SpatialGrid(100);
-const a = { id: "a", x: 10, y: 10, dead: false };
-const b = { id: "b", x: 40, y: 40, dead: false };
-grid.rebuildTarinai([a, b]);
-const firstKey = a._spatialTarinaiCellKey;
-a.x = 50;
-assert.strictEqual(grid.syncTarinai([a, b]), 0, "same-cell movement should not rewrite the grid");
-a.x = 150;
-assert.strictEqual(grid.syncTarinai([a, b]), 1, "cell crossing should update exactly one entity");
-assert.notStrictEqual(a._spatialTarinaiCellKey, firstKey, "cell key did not change after crossing");
-b.dead = true;
-assert(grid.syncTarinai([a, b]) >= 1, "dead entity was not removed incrementally");
-assert(!grid._indexedTarinai.has(b), "dead entity remains in the Tarinai spatial index");
-console.log("[OK] Tarinai spatial grid updates only cell crossings/removals instead of full rebuilds");
-
-class World {}
-global.World = World;
-global.TarinaiHistory = { trimMemory() { return 0; } };
-require(path.join(ROOT, "js", "world_spatial_budget.js"));
-const world = new World();
-world.time = 100;
-world.tarinai = Array.from({ length: 120 }, (_, i) => ({ id: `T${i}`, dead: false, relationships: { D: { affinity: 1 } } }));
-world.liveTarinai = new Map(world.tarinai.map(t => [t.id, { target: t }]));
-world._deadTarinaiIdsPendingCleanup = new Set(["D"]);
-world.tarinaiCollisionMemo = new Map();
-world.relationNotices = {};
-world.fightPairCooldowns = {};
-world.resolvedFightIds = {};
-assert(world.queueTarinaiRuntimeCachePrune("audit", { resetRelationPeerCaches: true }), "cleanup job was not queued");
-world.processTarinaiRuntimeCachePruneStep(24);
-assert(world._tarinaiRuntimePruneJob, "cleanup finished in one frame instead of being chunked");
-assert.strictEqual(world._tarinaiRuntimePruneJob.cursor, 24, "cleanup chunk size was not respected");
-while (world._tarinaiRuntimePruneJob) world.processTarinaiRuntimeCachePruneStep(24);
-assert(world.tarinai.every(t => !Object.prototype.hasOwnProperty.call(t.relationships, "D")), "chunked cleanup left dead references behind");
-console.log("[OK] death-reference cleanup runs in bounded per-frame chunks");
-
-console.log("Performance cleanup regression audit passed.");
diff --git a/scripts/playstyle_achievement_audit.js b/scripts/playstyle_achievement_audit.js
deleted file mode 100644
index 6cb8648..0000000
--- a/scripts/playstyle_achievement_audit.js
+++ /dev/null
@@ -1,232 +0,0 @@
-"use strict";
-
-const fs = require("fs");
-const vm = require("vm");
-const path = require("path");
-const root = path.join(__dirname, "..");
-const source = fs.readFileSync(path.join(root, "js", "achievements.js"), "utf8");
-
-class ClassList {
-  constructor() { this.values = new Set(["hidden"]); }
-  add(...names) { names.forEach(name => this.values.add(name)); }
-  remove(...names) { names.forEach(name => this.values.delete(name)); }
-  contains(name) { return this.values.has(name); }
-  toggle(name, force) { const next = force === undefined ? !this.values.has(name) : Boolean(force); if (next) this.values.add(name); else this.values.delete(name); return next; }
-}
-class Element {
-  constructor(id = "") { this.id = id; this.className = ""; this.classList = new ClassList(); this.dataset = {}; this.styles = new Map(); this.style = { setProperty: (n,v)=>this.styles.set(n,v), removeProperty:n=>this.styles.delete(n) }; this.children=[]; this.textContent=""; this.tabIndex=-1; this.isConnected=true; this.hidden=true; }
-  append(...children){this.children.push(...children);} replaceChildren(...children){this.children=children;} setAttribute(){} addEventListener(){} focus(){} getBoundingClientRect(){return{left:0,top:0,width:100,height:30};} get offsetWidth(){return 100;}
-}
-function harness(storage = new Map()) {
-  const elements = new Map();
-  ["achievementsBtn","achievementButtonCount","achievementsDialog","achievementDialogCount","achievementsCloseBtn","achievementsCloseIconBtn","achievementRefreshBtn","achievementResetBtn","achievementUnlockAllBtn","achievementList","achievementSharedStatus","achievementToast","achievementToastTitle","pauseBtn"].forEach(id=>elements.set(id,new Element(id)));
-  let timer=0;
-  const c={console,Date,Intl,Math,JSON,Object,Array,Map,Set,WeakMap,Promise,Number,String,Boolean,Error,AbortController,encodeURIComponent,URLSearchParams,
-    location:{protocol:"file:",search:""},crypto:{randomUUID:()=>"11111111-1111-4111-8111-111111111111"},
-    localStorage:{getItem:k=>storage.has(k)?storage.get(k):null,setItem:(k,v)=>storage.set(k,String(v)),removeItem:k=>storage.delete(k)},
-    document:{hidden:false,getElementById:id=>elements.get(id)||null,createElement:()=>new Element(),addEventListener(){}},
-    TarinaiEvents:{emit(){}},showToast(){},TarinaiGameDialogs:{confirm:async()=>true},audio:{uiClick(){}},setTimeout(){return ++timer;},clearTimeout(){},setInterval(){return ++timer;},clearInterval(){},fetch:async()=>{throw new Error("offline");},TARINAI_VERSION:"39.16.65"};
-  c.window=c;c.globalThis=c;vm.createContext(c);vm.runInContext(source,c,{filename:"achievements.js"});
-  return {c,api:c.TarinaiAchievements,storage,elements};
-}
-function assert(v,m){if(!v)throw new Error(m);} function off(h,id){return !h.api.isUnlocked(id);} function on(h,id){return h.api.isUnlocked(id);}
-function alive(n){return Array.from({length:n},(_,i)=>({id:`t${i}`,dead:false,x:i,y:0}));}
-function findCard(h,id){const stack=[h.elements.get("achievementList")];while(stack.length){const node=stack.shift();if(node?.dataset?.achievementId===id)return node;stack.push(...(node?.children||[]));}return null;}
-
-(function run(){
-  let h=harness();
-  assert(h.api.definitions.length===75,"must have 75 achievements");
-  h.api.open();
-  const title=Object.fromEntries(h.api.definitions.map(d=>[d.id,d.title]));
-  assert(title.medicine_ledger_all==="おくすり手帳全埋め","medicine title");
-  assert(title.mercury_lifespan==="不老不死まであと一歩","mercury title");
-  const description=(id)=>findCard(h,id).children[1].children[0].children[1].textContent;
-  assert(description("robot_cleaner_100").includes("ずんち・死骸・汚れを累計200個処理させる。"),"cleaner condition disclosed in UI");
-  assert(description("mercury_lifespan").includes("水銀を使用したたりないが天寿を全うする。"),"mercury condition disclosed in UI");
-  assert(findCard(h,"enemy_enemy_friend").children[1].children.some(node=>node.textContent.includes("現在の達成率 0.0%")),"enemy progress shown in UI");
-  assert(description("overprotective")==="？？？","other new condition hidden");
-  assert(description("elite_few").includes("25体以下の状態を5日間維持"),"elite few condition must be visible before unlock");
-
-  // One Undo only: multiple smaller Undo operations never aggregate.
-  h.api.recordHistoryAction("undo",{deadRestored:9}); h.api.recordHistoryAction("undo",{deadRestored:1});
-  assert(off(h,"undo_mass_revival"),"mass undo aggregated across operations");
-  h.api.recordHistoryAction("undo",{deadRestored:10}); assert(on(h,"undo_mass_revival"),"mass undo boundary");
-
-  // Undo/Redo counters persist across field resets and reloads.
-  let storage=new Map(); h=harness(storage);
-  for(let i=0;i<12;i++)h.api.recordHistoryAction("undo",{});
-  h.api.resetWorldProgress({});
-  h=harness(storage); for(let i=0;i<7;i++)h.api.recordHistoryAction("undo",{});
-  assert(off(h,"undo_20"),"undo unlocked at 19"); h.api.recordHistoryAction("undo",{}); assert(on(h,"undo_20"),"undo did not persist to 20");
-  for(let i=0;i<11;i++)h.api.recordHistoryAction("redo",{}); h=harness(storage); for(let i=0;i<8;i++)h.api.recordHistoryAction("redo",{});
-  assert(off(h,"redo_20"),"redo unlocked at 19"); h.api.recordHistoryAction("redo",{}); assert(on(h,"redo_20"),"redo did not persist to 20");
-
-  // Cleaner is field-local.
-  h=harness(); const wa={time:0},wb={time:0}; h.api.recordRobotClean({world:wa,type:"tarinai"}); assert((wa.achievementRobotCleanCount||0)===0,"cleaner counted non-cleanup target");
-  for(let i=0;i<199;i++)h.api.recordRobotClean({world:wa,type:i%2?"zunchi":"trace"});
-  assert(off(h,"robot_cleaner_100"),"cleaner before 200"); h.api.recordRobotClean({world:wb,type:"ant_corpse"}); assert(off(h,"robot_cleaner_100"),"cleaner crossed field reset");
-  h.api.recordRobotClean({world:wa,type:"splat"}); assert(on(h,"robot_cleaner_100"),"cleaner at 200");
-
-  // Continuous pinch must be uninterrupted and same individual.
-  h=harness(); const held={dead:false,playerHeld:true}; const hw={tarinai:[held]};
-  h.api.recordHeldTarinai(hw,1000); h.api.recordHeldTarinai(hw,30999); assert(off(h,"held_30_seconds"),"held before 30s");
-  held.playerHeld=false; h.api.recordHeldTarinai(hw,31000); held.playerHeld=true; h.api.recordHeldTarinai(hw,40000); h.api.recordHeldTarinai(hw,69999); assert(off(h,"held_30_seconds"),"held did not reset after release");
-  h.c.document.hidden=true; h.api.recordHeldTarinai(hw,70000); h.c.document.hidden=false;
-  h.api.recordHeldTarinai(hw,70001); h.api.recordHeldTarinai(hw,100000); assert(off(h,"held_30_seconds"),"hidden tab time counted toward hold");
-  h.api.recordHeldTarinai(hw,100001); assert(on(h,"held_30_seconds"),"held at 30s after visible reset");
-
-  // Minimalist counts only surviving player placements.
-  h=harness(); let mw={time:0,day:5,tarinai:alive(1),ants:[],items:Array.from({length:11},()=>({_achievementPlayerPlaced:true,dead:false}))};
-  h.api.evaluateWorld(mw,{id:"happy"}); assert(off(h,"minimalist_happy"),"minimalist allowed 11 items");
-  mw.items[10].dead=true; h.api.evaluateWorld(mw,{id:"happy"}); assert(off(h,"minimalist_happy"),"minimalist unlocked before day 6");
-  mw.day=6; h.api.evaluateWorld(mw,{id:"happy"}); assert(on(h,"minimalist_happy"),"minimalist at day 6 with 10 items");
-
-  // Overprotective requires both thresholds on the same individual.
-  h=harness(); const cared={dead:false}; const cw={time:0};
-  for(let i=0;i<9;i++)h.api.recordDirectFeed({world:cw,tarinai:cared,type:"food"});
-  for(let i=0;i<3;i++)h.api.recordDirectCare({world:cw,tarinai:cared,type:"first_aid",beneficialRecovery:true});
-  assert(off(h,"overprotective"),"overprotective before 10 feeds"); h.api.recordDirectFeed({world:cw,tarinai:cared,type:"food"}); assert(on(h,"overprotective"),"overprotective thresholds");
-
-  // Self-sufficient: 20+, no direct feed, no duplicator, 10 game minutes.
-  h=harness(); let sw={time:0,tarinai:alive(20),ants:[],items:[]}; h.api.evaluateWorld(sw,{}); sw.time=599.99;h.api.evaluateWorld(sw,{});assert(off(h,"self_sufficient"),"self sufficient early");
-  sw.items.push({type:"duplicator",dead:false});sw.time=600;h.api.evaluateWorld(sw,{});assert(off(h,"self_sufficient"),"self sufficient with duplicator");
-  sw.items=[];sw.time=700;h.api.evaluateWorld(sw,{});sw.time=1300;h.api.evaluateWorld(sw,{});assert(on(h,"self_sufficient"),"self sufficient after clean 10m");
-  h=harness(); sw={time:0,tarinai:alive(20),ants:[],items:[]};h.api.evaluateWorld(sw,{});sw.time=500;h.api.recordDirectFeed({world:sw,tarinai:sw.tarinai[0],type:"food"});sw.time=600;h.api.evaluateWorld(sw,{});assert(off(h,"self_sufficient"),"direct feed did not reset self sufficient");
-
-  // Unplanned city is persistent and deletion must be within 30 seconds.
-  storage=new Map(); h=harness(storage); let qw={time:0};
-  for(let i=0;i<15;i++){const item={};h.api.recordPlayerPlacement({world:qw,item});qw.time=30;h.api.recordPlayerDeletion({world:qw,item});qw.time=0;}
-  h=harness(storage);qw={time:0};for(let i=0;i<14;i++){const item={};h.api.recordPlayerPlacement({world:qw,item});qw.time=30;h.api.recordPlayerDeletion({world:qw,item});qw.time=0;}
-  assert(off(h,"unplanned_city_30"),"unplanned at 29");let item={};h.api.recordPlayerPlacement({world:qw,item});qw.time=30.001;h.api.recordPlayerDeletion({world:qw,item});assert(off(h,"unplanned_city_30"),"late deletion counted");
-  item={_achievementPlayerPlaced:true,_achievementPlacedAt:null};qw.time=0;h.api.recordPlayerDeletion({world:qw,item});assert(off(h,"unplanned_city_30"),"missing placement timestamp counted");
-  item={};qw.time=0;h.api.recordPlayerPlacement({world:qw,item});qw.time=30;h.api.recordPlayerDeletion({world:qw,item});assert(on(h,"unplanned_city_30"),"unplanned at 30");
-  h=harness(); qw={time:0}; for(let i=0;i<30;i++){const x={};h.api.recordPlayerPlacement({world:qw,item:x});h.api.recordPlayerDeletion({world:qw,item:x,operationId:"same-area-op"});} assert(off(h,"unplanned_city_30"),"area deletion counted each removed item instead of one operation");
-
-  // Sauna -> cold within 15 seconds; cold alone must never unlock.
-  h=harness(); const st={dead:false,x:0,y:0}; let temp=0; const tw={time:0,tarinai:[st],ants:[],items:[],feltTemperatureFor(){return temp;},temperatureStatusFor(v){return {direction:v>25?"hot":v<10?"cold":"comfort",comfortable:v>=10&&v<=25};}};
-  temp=0;h.api.evaluateWorld(tw,{});assert(off(h,"sauna_cold_plunge"),"cold alone unlocked sauna");temp=40;h.api.evaluateWorld(tw,{});tw.time=15;temp=0;h.api.evaluateWorld(tw,{});assert(on(h,"sauna_cold_plunge"),"sauna boundary 15s");
-  h=harness(); const st2={dead:false,x:0,y:0};temp=40;const tw2={time:0,tarinai:[st2],ants:[],items:[],feltTemperatureFor(){return temp;},temperatureStatusFor(v){return {direction:v>25?"hot":"cold",comfortable:false};}};h.api.evaluateWorld(tw2,{});tw2.time=15.01;temp=0;h.api.evaluateWorld(tw2,{});assert(off(h,"sauna_cold_plunge"),"sauna allowed over 15s");
-
-  // Rain shelter requires all 20 and accepts nest/pipe via shelter system.
-  h=harness(); h.c.TarinaiRainShelterSystem={isSheltered(_w,_x,_y,t){return Boolean(t.sheltered);}};
-  const rw={time:0,weather:"light_rain",tarinai:alive(20).map(t=>({...t,sheltered:true})),ants:[],items:[]};h.api.evaluateWorld(rw,{});assert(on(h,"rain_shelter_all"),"all sheltered rain achievement");
-  h=harness();h.c.TarinaiRainShelterSystem={isSheltered(_w,_x,_y,t){return Boolean(t.sheltered);}};rw.tarinai[19].sheltered=false;h.api.evaluateWorld(rw,{});assert(off(h,"rain_shelter_all"),"rain achievement allowed one exposed");
-
-  // Nest boxes and pipes are genuine weather blockers, not only achievement stubs.
-  h=harness();
-  vm.runInContext(fs.readFileSync(path.join(root,"js","tarinai_local_environment_system.js"),"utf8"),h.c,{filename:"tarinai_local_environment_system.js"});
-  const nest={id:"n1",type:"nest_box",dead:false};
-  const pipe={id:"p1",type:"pipe",dead:false};
-  const shelterWorld={items:[nest,pipe],nestBoxById(id){return this.items.find(x=>x.id===id)||null;}};
-  assert(h.c.TarinaiRainShelterSystem.isSheltered(shelterWorld,0,0,{insideNestBoxId:"n1"}),"nest box did not block weather");
-  assert(h.c.TarinaiRainShelterSystem.isSheltered(shelterWorld,0,0,{insideNestBoxId:"p1"}),"pipe did not block weather");
-  assert(!h.c.TarinaiRainShelterSystem.isSheltered(shelterWorld,0,0,{}),"unsheltered target treated as sheltered");
-
-  // Nest-box and pipe occupants must also be insulated from weather temperature offsets.
-  {
-    class FakeWorld {}
-    const tc={console,Math,Number,Object,Array,Set,Map,WeakMap,Date,CONFIG:{standardTemperature:15,temperatureItemRange:190},
-      World:FakeWorld,clamp:(v,a,b)=>Math.max(a,Math.min(b,v)),distXY:(x1,y1,x2,y2)=>Math.hypot(x1-x2,y1-y2),
-      TarinaiParasolSystem:h.c.TarinaiRainShelterSystem};
-    tc.window=tc;tc.globalThis=tc;vm.createContext(tc);
-    vm.runInContext(fs.readFileSync(path.join(root,"js","world_temperature_system.js"),"utf8"),tc,{filename:"world_temperature_system.js"});
-    const box={id:"box",type:"nest_box",dead:false,x:0,y:0,r:42};
-    const pipeItem={id:"pipe",type:"pipe",dead:false,x:0,y:0,r:42};
-    const weatherWorld=new FakeWorld();Object.assign(weatherWorld,{currentTemperature:15,temperatureAuto:true,groundType:"soil",weather:"light_rain",items:[box,pipeItem],
-      nearbyItems(x,y,r){return this.items.filter(it=>Math.hypot(it.x-x,it.y-y)<=r);},nestBoxById(id){return this.items.find(x=>x.id===id)||null;},nestBoxBaseRect(){return null;}});
-    const outside={x:500,y:0}; const inBox={x:0,y:0,insideNestBoxId:"box"}; const inPipe={x:0,y:0,insideNestBoxId:"pipe"};
-    assert(weatherWorld.feltTemperatureFor(outside)<15,"rain weather offset missing outside");
-    assert(weatherWorld.feltTemperatureFor(inBox)>=15,"nest box still received rain temperature offset");
-    assert(weatherWorld.feltTemperatureFor(inPipe)>=15,"pipe still received rain temperature offset");
-  }
-
-  // Every medicine item once; chain and crown are explicitly excluded.
-  h=harness(); const meds=["first_aid","sedative","sleep_drug","laxative","protein","niteropu","ammo","mystery_drug","mercury","giant_drug","dwarf_drug"];
-  meds.slice(0,-1).forEach(type=>h.api.recordConsumableUse({type}));assert(off(h,"medicine_ledger_all"),"medicine ledger early");h.api.recordConsumableUse({type:meds.at(-1)});assert(on(h,"medicine_ledger_all"),"medicine ledger complete");
-
-  // Mercury lifespan, revolution, fight mochi.
-  h=harness();h.api.recordDeath({world:{time:1,tarinai:[]},tarinai:{lifeItemMode:"mercury"},reason:"天寿を全うした"});assert(on(h,"mercury_lifespan"),"mercury lifespan");
-  h=harness();const slave={id:"s",isZunchiSlave:true,dead:false};const king={id:"k",isTarinaiChampion:true,dead:true,_achievementLastFightAttackerId:"s",_achievementLastFightDamageAt:5};const revWorld={time:5,tarinai:[slave,king]};h.api.recordDeath({world:revWorld,tarinai:king,reason:"喧嘩",fromDamage:true});assert(on(h,"revolution"),"revolution");
-  h=harness();const oil={};const fw={time:0};h.api.recordConsumableUse({world:fw,tarinai:oil,type:"fight_mochi"});fw.time=30;h.api.recordFightStarted({world:fw,a:oil,b:{}});assert(on(h,"fuel_to_fire"),"fight mochi at 30s");
-  h=harness();const noOil={};h.api.recordFightStarted({world:{time:0},a:noOil,b:{}});assert(off(h,"fuel_to_fire"),"fight without mochi unlocked at time zero");
-  h=harness();const oil2={};const fw2={time:0};h.api.recordConsumableUse({world:fw2,tarinai:oil2,type:"fight_mochi"});fw2.time=30.01;h.api.recordFightStarted({world:fw2,a:oil2,b:{}});assert(off(h,"fuel_to_fire"),"fight mochi over 30s");
-
-  // Enemy's enemy: 30 alive, danger-item kills, and any dangerous tarinai hit resets the streak.
-  h=harness(); const ew={time:20,tarinai:alive(30)};
-  for(let i=0;i<9;i++){const ant={world:ew};h.api.recordAntDamageSource(ant,{type:"firecracker"},{world:ew});h.api.recordAntKilled({world:ew,ant});}
-  assert(off(h,"enemy_enemy_friend"),"enemy achievement early");
-  h.api.recordDamageSource(ew.tarinai[0],{type:"firecracker"},{world:ew});
-  assert((ew.achievementEnemyAntKills||0)===0,"dangerous tarinai damage did not reset enemy streak");
-  for(let i=0;i<10;i++){const ant={world:ew};h.api.recordAntDamageSource(ant,{type:"firecracker"},{world:ew});h.api.recordAntKilled({world:ew,ant});}
-  assert(on(h,"enemy_enemy_friend"),"enemy achievement did not unlock after 10 clean danger kills");
-  h=harness();const ew2={time:20,tarinai:alive(30)};
-  for(let i=0;i<5;i++){const ant={world:ew2};h.api.recordAntDamageSource(ant,{type:"firecracker"},{world:ew2});h.api.recordAntKilled({world:ew2,ant});}
-  ew2.tarinai[0].dead=true;const resetAnt={world:ew2};h.api.recordAntDamageSource(resetAnt,{type:"firecracker"},{world:ew2});h.api.recordAntKilled({world:ew2,ant:resetAnt});
-  assert((ew2.achievementEnemyAntKills||0)===0,"population below 30 did not reset enemy streak");
-  h=harness();const ewDip={time:20,tarinai:alive(30)};
-  for(let i=0;i<5;i++){const ant={world:ewDip};h.api.recordAntDamageSource(ant,{type:"firecracker"},{world:ewDip});h.api.recordAntKilled({world:ewDip,ant});}
-  ewDip.tarinai[0].dead=true;h.api.recordDeath({world:ewDip,tarinai:ewDip.tarinai[0],reason:"天寿を全うした"});
-  assert((ewDip.achievementEnemyAntKills||0)===0,"population dip without an ant kill preserved the enemy streak");
-  ewDip.tarinai.push({dead:false});const afterDip={world:ewDip};h.api.recordAntDamageSource(afterDip,{type:"firecracker"},{world:ewDip});h.api.recordAntKilled({world:ewDip,ant:afterDip});
-  assert((ewDip.achievementEnemyAntKills||0)===1,"enemy streak did not restart from one after population recovery");
-  const ordinary={world:ew2};h.api.recordAntDamageSource(ordinary,{type:"food"},{world:ew2});h.api.recordAntKilled({world:ew2,ant:ordinary});assert((ew2.achievementEnemyAntKills||0)===0,"non-danger ant kill counted");
-  h=harness();const ew3={time:20,tarinai:alive(30)};const overwritten={world:ew3};h.api.recordAntDamageSource(overwritten,{type:"firecracker"},{world:ew3});h.api.recordAntDamageSource(overwritten,{id:"t0"},{world:ew3});h.api.recordAntKilled({world:ew3,ant:overwritten});assert((ew3.achievementEnemyAntKills||0)===0,"stale danger attribution survived later non-danger damage");
-
-  // New observation and sticky-bomb relay achievements.
-  h=harness();const antWorld={tarinai:[],ants:[],items:[{type:"ant_nest",dead:false}]};h.api.evaluateWorld(antWorld,{});assert(on(h,"ant_nest_without_tarinai"),"ant observation condition");
-  h=harness();const bomb={type:"sticky_bomb",dead:false};for(let i=0;i<14;i++)h.api.recordStickyBombPass(bomb,{});assert(off(h,"sticky_bomb_15_passes"),"sticky relay early");h.api.recordStickyBombPass(bomb,{});assert(on(h,"sticky_bomb_15_passes"),"sticky relay at 15");
-
-
-
-  // New playstyle-survey achievements.
-  h=harness(); let popWorld={time:0,day:1,tarinai:alive(99),ants:[],items:[]}; h.api.evaluateWorld(popWorld,{}); assert(off(h,"strength_in_numbers"),"strength in numbers unlocked before 100"); popWorld.tarinai.push({id:"t99",dead:false,x:99,y:0}); h.api.evaluateWorld(popWorld,{}); assert(on(h,"strength_in_numbers"),"strength in numbers did not unlock at 100");
-
-  h=harness(); let eliteWorld={time:0,day:1,tarinai:alive(25),ants:[],items:[],config:{dayLength:120}}; h.api.evaluateWorld(eliteWorld,{}); eliteWorld.time=599.99; h.api.evaluateWorld(eliteWorld,{}); assert(off(h,"elite_few"),"elite few unlocked before five days"); eliteWorld.time=600; h.api.evaluateWorld(eliteWorld,{}); assert(on(h,"elite_few"),"elite few did not unlock at five days");
-  h=harness(); eliteWorld={time:0,day:1,tarinai:alive(25),ants:[],items:[],config:{dayLength:120}}; h.api.evaluateWorld(eliteWorld,{}); eliteWorld.time=300; eliteWorld.tarinai.push({dead:false}); h.api.evaluateWorld(eliteWorld,{}); eliteWorld.tarinai.pop(); h.api.evaluateWorld(eliteWorld,{}); eliteWorld.time=899.99; h.api.evaluateWorld(eliteWorld,{}); assert(off(h,"elite_few"),"elite few timer survived population overflow"); eliteWorld.time=900; h.api.evaluateWorld(eliteWorld,{}); assert(on(h,"elite_few"),"elite few did not restart after overflow");
-
-  h=harness(); let zWorld={time:0,tarinai:alive(20),ants:[],items:Array.from({length:20},()=>({type:"zunchi",dead:false}))}; h.api.evaluateWorld(zWorld,{}); assert(off(h,"zunchi_overflow"),"zunchi overflow unlocked at equal count"); zWorld.items.push({type:"zunchi",dead:false}); h.api.evaluateWorld(zWorld,{}); assert(on(h,"zunchi_overflow"),"zunchi overflow did not unlock above population");
-
-  h=harness(); let bedWorld={time:0,tarinai:alive(5),ants:[],items:[{type:"nest_box",dead:false}],nestBoxCapacity(){return 5;}}; h.api.evaluateWorld(bedWorld,{}); assert(on(h,"comfortable_beds"),"comfortable beds did not count nest capacity");
-  h=harness(); bedWorld={time:0,tarinai:alive(30),ants:[],items:[]}; h.api.evaluateWorld(bedWorld,{}); assert(on(h,"stone_pillow"),"stone pillow did not unlock at 30 with zero bed capacity");
-
-  h=harness(); const seasonWorld={time:2400,elapsedDays:20,tarinai:alive(1),ants:[],items:[]}; h.api.evaluateWorld(seasonWorld,{}); assert(on(h,"across_seasons"),"across seasons did not unlock after full cycle");
-  h=harness(); const fav={dead:false,favorite:true}; h.api.recordFavoriteTarinai({tarinai:fav}); assert(on(h,"favorite_one"),"favorite achievement did not unlock");
-
-  storage=new Map(); h=harness(storage); for(let i=0;i<15;i++) h.api.recordStatsButtonPress({control:"chart:population"}); h.api.resetWorldProgress({}); h=harness(storage); for(let i=0;i<14;i++) h.api.recordStatsButtonPress({control:"series:pop"}); assert(off(h,"statistician"),"statistician unlocked at 29 across reset"); h.api.recordStatsButtonPress({control:"chart:life"}); assert(on(h,"statistician"),"statistician did not persist across reset to 30");
-
-  storage=new Map(); h=harness(storage); for(let i=0;i<60;i++) h.api.recordManualTarinaiAdded({tool:"new"}); h.api.resetWorldProgress({}); h=harness(storage); for(let i=0;i<39;i++) h.api.recordManualTarinaiAdded({tool:"new"}); assert(off(h,"lively_making"),"lively making unlocked at 99 across reset"); h.api.recordManualTarinaiAdded({tool:"new"}); assert(on(h,"lively_making"),"lively making did not persist across reset to 100");
-
-  // Static integration guards for all production hook points.
-  const checks={
-    "js/command_dispatcher.js":["deadRestored","recordHistoryAction","recordFavoriteTarinai"],
-    "js/robot_cleaner_system.js":["recordRobotClean"],
-    "js/world_tool_actions.js":["recordPlayerDeletion","recordAntDamageSource"],
-    "js/world_family_social.js":["resetWorldProgress","recordFightStarted"],
-    "js/tarinai_social_move_life.js":["_achievementLastFightAttackerId"],
-    "js/tarinai_direct_feeding_system.js":["recordDirectCare"],
-    "js/tarinai_consumable_behavior.js":["recordConsumableUse"],
-    "js/tarinai_contact_item_system.js":["recordConsumableUse", "slave_chain", "golden_crown"],
-    "js/world_combat_effects.js":["recordAntDamageSource","source: it"],
-    "js/impact_response_system.js":["source: it"],
-    "js/ants.js":["recordAntDamageSource", "tarinai_struggle"],
-    "js/signal_system.js":["recordAntDamageSource", "electric_wire"],
-    "js/tarinai_item_effects.js":["recordAntDamageSource", "tarinai_ammo_collision"],
-    "js/tarinai_local_environment_system.js":["enclosedShelterFor","nest_box","pipe"],
-    "js/tarinai_update_step_frame.js":["isSheltered?.(t.world, t.x, t.y, t)"],
-    "js/tarinai_disease_nest.js":["isSheltered?.(this.world, this.x, this.y, this)"],
-    "js/item_dynamic_tool_system.js":["recordStickyBombPass", "reason === \"transfer\""],
-    "js/snapshot_system.js":["stickyBombPassCount"],
-    "js/save_codec.js":["sticky_bomb", "[0, -1, 0], 3"],
-    "js/ui_bind.js":["recordStatsButtonPress","chart:","series:"],
-  };
-  for(const [file,needles] of Object.entries(checks)){const text=fs.readFileSync(path.join(root,file),"utf8");for(const needle of needles)assert(text.includes(needle),`${file} missing ${needle}`);}
-  console.log("[OK] playstyle achievements: boundaries, reset scope, persistence, inline disclosures, and hook coverage passed");
-})();
-
-{
-  const achSrc = fs.readFileSync("js/achievements.js", "utf8");
-  const ecologyBlock = achSrc.match(/id: "ecology"[\s\S]*?id: "population"/)?.[0] || "";
-  const otherBlock = achSrc.match(/id: "other"[\s\S]*?const DEFINITIONS/)?.[0] || "";
-  assert(!ecologyBlock.includes('"across_seasons"'), "across_seasons category remained ecology");
-  assert(otherBlock.includes('"across_seasons"'), "across_seasons category is not その他");
-}
diff --git a/scripts/population_recovery_regression_audit.js b/scripts/population_recovery_regression_audit.js
deleted file mode 100644
index f8f4648..0000000
--- a/scripts/population_recovery_regression_audit.js
+++ /dev/null
@@ -1,194 +0,0 @@
-"use strict";
-
-const assert = require("assert");
-const fs = require("fs");
-const path = require("path");
-
-const ROOT = path.resolve(__dirname, "..");
-const read = rel => fs.readFileSync(path.join(ROOT, rel), "utf8");
-
-// The removed load-settle feature may only be explicitly cleared for stale
-// runtime state; it must never be scheduled or checked as active behavior.
-const snapshotSource = read("js/snapshot_system.js");
-const settleSources = [
-  "js/collision_response_system.js",
-  "js/tarinai_social_move_life.js",
-  "js/tarinai_update_step_movement.js",
-  "js/world_environment.js",
-].map(read).join("\n");
-assert(!/_restoreSettleUntil\s*=/.test(snapshotSource), "load settle timer is still assigned");
-assert(!/_restoreSettleUntil/.test(settleSources), "load settle behavior is still checked outside snapshot cleanup");
-assert(snapshotSource.includes("delete worldRef._restoreSettleUntil"), "stale settle state is not cleared on restore");
-
-// Colony population statistics must expose both special populations.
-const chartsSource = read("js/ui_charts.js");
-assert(chartsSource.includes('key: "zunchiSlaves"') && chartsSource.includes('label: "\\u305a\\u3093\\u3061\\u3069\\u308c\\u3044"'), "zunchi slave population series is missing");
-assert(chartsSource.includes('key: "tarinaiKings"') && chartsSource.includes('label: "\\u305f\\u308a\\u306a\\u3044\\u738b"'), "tarinai king population series is missing");
-assert(chartsSource.includes("world.tarinaiCounts?.()") && chartsSource.includes("counts.zunchiSlaves") && chartsSource.includes("counts.tarinaiKings"), "special population counters are not sourced from differential live counters");
-assert(chartsSource.indexOf('key: "deaths"') < chartsSource.indexOf('key: "zunchiSlaves"'), "zunchi slave button must appear after deaths");
-assert(chartsSource.indexOf('key: "zunchiSlaves"') < chartsSource.indexOf('key: "tarinaiKings"'), "tarinai king button must follow zunchi slave");
-
-const maintenanceSource = read("js/simulation_maintenance_system.js");
-assert(!maintenanceSource.includes("periodic-runtime-cache-prune"), "periodic full runtime-cache prune is still enabled");
-
-class World {}
-global.World = World;
-let historyTrimCalls = 0;
-global.TarinaiHistory = {
-  trimMemory(world, options) {
-    historyTrimCalls += 1;
-    world._lastTrimOptions = options;
-    return 0;
-  },
-};
-
-require(path.join(ROOT, "js/family_graph.js"));
-require(path.join(ROOT, "js/world_spatial_budget.js"));
-require(path.join(ROOT, "js/world_family_social.js"));
-
-function makeWorld() {
-  const world = new World();
-  world.time = 100;
-  world.tarinai = [];
-  world.spatial = { tarinaiCells: new Map([["old", [1, 2, 3]]]) };
-  world.markSpatialDirty = () => { world._spatialDirtyMarked = true; };
-  world.markFamilyTreeDirty = () => {};
-  world.normalizeFamily = () => false;
-  return world;
-}
-
-// Runtime cache pruning is death-triggered: small numbers of deaths must not
-// schedule a full survivor relationship scan, while the adaptive threshold does.
-{
-  const world = makeWorld();
-  world.liveTarinai = new Map(Array.from({ length: 100 }, (_, i) => [`T${i}`, { target: { id: `T${i}`, dead: false } }]));
-  for (let i = 0; i < 19; i++) world.noteTarinaiDeathForRuntimeCleanup();
-  assert.strictEqual(world.tarinaiRuntimePrunePending, false, "cleanup scheduled before the minimum 20-death threshold");
-  world.noteTarinaiDeathForRuntimeCleanup();
-  assert.strictEqual(world.tarinaiRuntimePrunePending, true, "cleanup was not scheduled at the death threshold");
-}
-
-// A pending death-threshold cleanup executes once at compaction and then resets.
-{
-  const world = makeWorld();
-  const alive = Array.from({ length: 100 }, (_, i) => ({ id: `A${i}`, dead: false, relationships: {} }));
-  const dead = Array.from({ length: 20 }, (_, i) => ({ id: `D${i}`, dead: true, relationships: {} }));
-  world.tarinai = [...alive, ...dead];
-  world.liveTarinai = new Map(alive.map(t => [t.id, { target: t }]));
-  world.deadTarinaiSinceRuntimePrune = 20;
-  world.tarinaiRuntimePrunePending = true;
-  world._deadTarinaiIdsPendingCleanup = new Set(dead.map(t => t.id));
-  world.compactTarinai();
-  assert(world._tarinaiRuntimePruneJob, "pending runtime cleanup was not queued during compaction");
-  assert.strictEqual(world.deadTarinaiSinceRuntimePrune, 0, "death cleanup counter was not reset when the job was queued");
-  assert.strictEqual(world.tarinaiRuntimePrunePending, false, "death cleanup pending flag was not cleared when queued");
-  let steps = 0;
-  while (world._tarinaiRuntimePruneJob && steps++ < 10) world.processTarinaiRuntimeCachePruneStep(24);
-  assert(!world._tarinaiRuntimePruneJob, "queued runtime cleanup did not finish in bounded chunks");
-}
-
-// Runtime caches must stop retaining dead peers and expired peak-population keys.
-{
-  const world = makeWorld();
-  const aliveA = { id: "A", dead: false, relationships: { B: { affinity: 1 }, C: { affinity: 2 } }, relationCache: { stale: true } };
-  const deadB = { id: "B", dead: true, relationships: {} };
-  const aliveC = { id: "C", dead: false, relationships: { A: { affinity: 3 } } };
-  world.tarinai = [aliveA, deadB, aliveC];
-  world.liveTarinai = new Map([["A", { target: aliveA }], ["B", { target: deadB }], ["ghost", { target: null }]]);
-  world.tarinaiCollisionMemo = new Map([["old", 90], ["recent", 99.5]]);
-  world.relationNotices = { old: -50, recent: 50 };
-  world.fightPairCooldowns = { expired: 99, future: 110 };
-  world.resolvedFightIds = { stale: true };
-  world._lastResolvedFightIdsResetAt = 0;
-  world._deadTarinaiIdsPendingCleanup = new Set(["B"]);
-
-  world.pruneTarinaiRuntimeCaches("audit", { resetRelationPeerCaches: true });
-  assert.deepStrictEqual(Object.keys(aliveA.relationships), ["C"], "dead relationship peer was retained");
-  assert.strictEqual(aliveA.relationCache, null, "relationship hot cache was not invalidated");
-  assert.deepStrictEqual([...world.liveTarinai.keys()], ["A"], "dead live-id cache entries were retained");
-  assert.deepStrictEqual([...world.tarinaiCollisionMemo.keys()], ["recent"], "stale collision memo was retained");
-  assert.deepStrictEqual(Object.keys(world.relationNotices), ["recent"], "stale relation notice was retained");
-  assert.deepStrictEqual(Object.keys(world.fightPairCooldowns), ["future"], "expired fight cooldown was retained");
-  assert.deepStrictEqual(world.resolvedFightIds, {}, "old resolved-fight keys were retained");
-}
-
-// A large population collapse must recreate high-water scratch containers and
-// release large undo snapshots rather than keeping the peak footprint forever.
-{
-  const world = makeWorld();
-  const oldRenderScratch = new Array(400).fill(null);
-  const oldRenderSeen = new Set(Array.from({ length: 400 }, (_, i) => `id-${i}`));
-  world._renderVisibleTarinaiScratch = oldRenderScratch;
-  world._renderVisibleSeen = oldRenderSeen;
-  world.tarinaiCollisionMemo = new Map([["peak", 100]]);
-  world.relationNotices = { peak: 100 };
-  world.resolvedFightIds = { peak: true };
-  world.fightPairCooldowns = { peak: 999 };
-  world._solidObstacleRectQueryCache = new Map([["peak", []]]);
-  world.spatialTarinaiScratch = new Array(400).fill(null);
-  world.drawList = new Array(400).fill(null);
-  world._tarinaiRuntimeHighWater = 400;
-  world.tarinai = Array.from({ length: 400 }, (_, i) => ({ id: `T${i}`, dead: i >= 200, relationships: {} }));
-
-  const changed = world.compactTarinai();
-  assert.strictEqual(changed, true, "population compaction did not run");
-  assert(world._tarinaiRuntimePruneJob, "population collapse did not queue an aggressive cleanup job");
-  let shrinkSteps = 0;
-  while (world._tarinaiRuntimePruneJob && shrinkSteps++ < 20) world.processTarinaiRuntimeCachePruneStep(32);
-  assert(!world._tarinaiRuntimePruneJob, "aggressive population cleanup did not complete in chunks");
-  assert.strictEqual(world.tarinai.length, 200, "dead tarinai were not compacted");
-  assert.strictEqual(world._tarinaiRuntimeHighWater, 200, "population high-water mark did not collapse");
-  assert.notStrictEqual(world._renderVisibleTarinaiScratch, oldRenderScratch, "render scratch retained peak backing store");
-  assert.notStrictEqual(world._renderVisibleSeen, oldRenderSeen, "render seen-set retained peak entries");
-  assert.strictEqual(world.tarinaiCollisionMemo.size, 0, "collision peak cache survived aggressive shrink");
-  assert(historyTrimCalls > 0, "history snapshots were not memory-trimmed after population collapse");
-  assert.strictEqual(world._lastTrimOptions.targetBytes, 8 * 1024 * 1024, "population-collapse history target is incorrect");
-}
-
-function node(id, generation, alive, parents = [], children = []) {
-  return { id, generation, alive, parents: [...parents], children: [...children], hasPaired: true };
-}
-
-// A dead generation is protected while an older generation above it is alive.
-{
-  const world = makeWorld();
-  world.family = {
-    A: node("A", 1, true, [], ["B"]),
-    B: node("B", 2, false, ["A"], ["C"]),
-    C: node("C", 3, true, ["B"], []),
-  };
-  world.tarinai = [{ id: "A", dead: false, parents: [], children: ["B"] }, { id: "C", dead: false, parents: ["B"], children: [] }];
-  assert.strictEqual(world.pruneExtinctFamilies({ normalize: false }), false, "dead generation was pruned despite a living older generation");
-  assert.deepStrictEqual(Object.keys(world.family).sort(), ["A", "B", "C"]);
-}
-
-// Once all older generations are extinct, extinct leading generations are removed.
-{
-  const world = makeWorld();
-  world.family = {
-    A: node("A", 1, false, [], ["B"]),
-    B: node("B", 2, false, ["A"], ["C"]),
-    C: node("C", 3, true, ["B"], []),
-  };
-  world.tarinai = [{ id: "C", dead: false, parents: ["B"], children: [] }];
-  assert.strictEqual(world.pruneExtinctFamilies({ normalize: false }), true, "extinct leading generations were not pruned");
-  assert.deepStrictEqual(Object.keys(world.family), ["C"], "unexpected family generations remained after pruning");
-  assert.deepStrictEqual(world.family.C.parents, [], "survivor retained a deleted parent link");
-  assert.deepStrictEqual(world.tarinai[0].parents, [], "live tarinai retained a deleted parent link");
-}
-
-// A fully extinct disconnected family component may be dropped completely.
-{
-  const world = makeWorld();
-  world.family = {
-    A: node("A", 1, false, [], ["B"]),
-    B: node("B", 2, false, ["A"], []),
-    X: node("X", 1, true, [], ["Y"]),
-    Y: node("Y", 2, true, ["X"], []),
-  };
-  world.tarinai = [{ id: "X", dead: false, parents: [], children: ["Y"] }, { id: "Y", dead: false, parents: ["X"], children: [] }];
-  assert.strictEqual(world.pruneExtinctFamilies({ normalize: false }), true);
-  assert.deepStrictEqual(Object.keys(world.family).sort(), ["X", "Y"], "fully extinct component was retained or living component was removed");
-}
-
-console.log("Population recovery regression audit passed.");
diff --git a/scripts/regression_check.py b/scripts/regression_check.py
deleted file mode 100644
index a557696..0000000
--- a/scripts/regression_check.py
+++ /dev/null
@@ -1,2937 +0,0 @@
-#!/usr/bin/env python3
-"""Lightweight regression guard for the buildless Tarinai app.
-
-Checks static-file consistency, generated-load order, syntax, and the ActionSpec
-registry contract. This covers static contracts and focused runtime smoke tests. The current codec intentionally supports only the current binary schema.
-"""
-from __future__ import annotations
-
-from pathlib import Path
-import json
-import re
-import subprocess
-import sys
-import tempfile
-
-ROOT = Path(__file__).resolve().parents[1]
-MANIFEST = ROOT / "app_manifest.json"
-
-
-def fail(message: str) -> None:
-    print(f"[FAIL] {message}", file=sys.stderr)
-    raise SystemExit(1)
-
-
-def ok(message: str) -> None:
-    print(f"[OK] {message}")
-
-
-def read_text(path: Path) -> str:
-    return path.read_text(encoding="utf-8")
-
-
-def manifest() -> dict:
-    try:
-      data = json.loads(read_text(MANIFEST))
-    except Exception as exc:  # pragma: no cover - diagnostic path
-      fail(f"cannot read app_manifest.json: {exc}")
-    for key in ("version", "css", "js"):
-      if key not in data:
-        fail(f"manifest missing {key}")
-    return data
-
-
-def check_files_exist(data: dict) -> None:
-    missing = [p for p in [*data["css"], *data["js"]] if not (ROOT / p).exists()]
-    if missing:
-        fail("manifest references missing files: " + ", ".join(missing))
-    ok("manifest file references exist")
-
-
-def check_versions(data: dict) -> None:
-    version = str(data["version"])
-    version_js = read_text(ROOT / "js/version.js")
-    service_worker = read_text(ROOT / "service-worker.js")
-    if f'APP_VERSION = "{version}"' not in version_js:
-        fail("js/version.js APP_VERSION does not match manifest")
-    if f'APP_VERSION = "{version}"' not in service_worker:
-        fail("service-worker.js APP_VERSION does not match manifest")
-    ok(f"version synchronized: {version}")
-
-
-def check_index_order(data: dict) -> None:
-    index = read_text(ROOT / "index.html")
-    css = re.findall(r'<link rel="stylesheet" href="([^"]+)"\s*/>', index)
-    scripts = re.findall(r'<script src="([^"]+)" defer></script>', index)
-    css_clean = [entry.split("?", 1)[0] for entry in css if entry.startswith("css/")]
-    script_clean = [entry.split("?", 1)[0] for entry in scripts if entry.startswith("js/")]
-    if css_clean[: len(data["css"])] != data["css"]:
-        fail("index.html CSS order differs from manifest")
-    if script_clean[: len(data["js"])] != data["js"]:
-        fail("index.html JS order differs from manifest")
-    ok("index.html load order matches manifest")
-
-
-def check_service_worker_order(data: dict) -> None:
-    sw = read_text(ROOT / "service-worker.js")
-    match = re.search(r"const coreScriptNames = \[\s*(.*?)\s*\];", sw, re.S)
-    if not match:
-        fail("service-worker.js coreScriptNames not found")
-    names = re.findall(r'"([^"]+)"', match.group(1))
-    expected = [Path(p).stem for p in data["js"]]
-    if names != expected:
-        fail("service-worker.js coreScriptNames differs from manifest JS order")
-    ok("service-worker.js core script order matches manifest")
-
-
-def node_check(paths: list[Path]) -> None:
-    node = "node"
-    for path in paths:
-        result = subprocess.run([node, "--check", str(path)], cwd=ROOT, text=True, capture_output=True)
-        if result.returncode != 0:
-            sys.stderr.write(result.stdout)
-            sys.stderr.write(result.stderr)
-            fail(f"node --check failed: {path.relative_to(ROOT)}")
-    ok(f"node --check passed for {len(paths)} files")
-
-
-def action_spec_smoke() -> None:
-    source = read_text(ROOT / "js/tarinai_action_spec.js")
-    js = f"""
-const vm = require('vm');
-const context = {{ console, globalThis: null }};
-context.globalThis = context;
-context.window = context;
-vm.createContext(context);
-vm.runInContext({source!r}, context, {{ filename: 'tarinai_action_spec.js' }});
-const action = context.registerTarinaiActionSpecs([{{
-  id: 'smoke_action',
-  need: 'fulfill',
-  label: 'smoke',
-  selectTarget() {{ return {{ id: 'target-1' }}; }},
-  canStart(t, world, ctx) {{ const target = ctx.target || this.selectTarget(t, world, ctx); return target && target.id === 'target-1'; }},
-  start(t, world, ctx) {{ t.startedWith = ctx.target.id; return true; }},
-  tick() {{ return 'finished'; }},
-  finish(t) {{ t.finished = true; return true; }},
-}}])[0];
-const subject = {{}};
-if (!context.canStartTarinaiAction('smoke_action', subject, {{}})) throw new Error('canStart failed');
-if (!context.startTarinaiAction(action, subject, {{}})) throw new Error('start failed');
-if (subject.startedWith !== 'target-1') throw new Error('selectTarget/start context failed');
-if (context.tickTarinaiAction('smoke_action', subject, {{}}, 0.1, {{}}) !== 'finished') throw new Error('tick failed');
-if (!context.finishTarinaiAction('smoke_action', subject, {{}}, {{ phase: 'finished' }})) throw new Error('finish failed');
-"""
-    with tempfile.NamedTemporaryFile("w", encoding="utf-8", suffix=".js", delete=False) as f:
-        f.write(js)
-        tmp = Path(f.name)
-    try:
-        result = subprocess.run(["node", str(tmp)], cwd=ROOT, text=True, capture_output=True)
-    finally:
-        tmp.unlink(missing_ok=True)
-    if result.returncode != 0:
-        sys.stderr.write(result.stdout)
-        sys.stderr.write(result.stderr)
-        fail("ActionSpec smoke test failed")
-    ok("ActionSpec lifecycle smoke test passed")
-
-
-def behavior_state_smoke() -> None:
-    source = read_text(ROOT / "js/tarinai_behavior_state.js")
-    js = f"""
-const vm = require('vm');
-const context = {{ console, globalThis: null }};
-context.globalThis = context;
-context.window = context;
-context.Tarinai = class Tarinai {{}};
-vm.createContext(context);
-vm.runInContext({source!r}, context, {{ filename: 'tarinai_behavior_state.js' }});
-const t = new context.Tarinai();
-t.world = {{ time: 12 }};
-t.state = 'seek_food';
-context.setTarinaiBehavior(t, {{ actionId: 'eat_food', need: 'food', label: 'eat', reason: 'hungry', text: 'hungry', tiedNeeds: ['food', 'sleep'], source: 'forced', forcedId: 'f1', forcedRequest: {{ uid: 'f1', id: 'eat_food', source: 'test', priority: 99, reasonText: 'forced hungry', status: 'active' }} }});
-if (context.getTarinaiBehaviorId(t) !== 'eat_food') throw new Error('behavior id mismatch');
-if (context.getTarinaiBehaviorNeed(t) !== 'food') throw new Error('behavior need mismatch');
-if (!context.isTarinaiBehaviorForced(t)) throw new Error('forced state not visible');
-const behavior = context.currentTarinaiBehavior(t);
-if (!behavior || behavior.actionId !== 'eat_food' || behavior.reason !== 'hungry' || behavior.source !== 'forced') throw new Error('canonical behavior fields not normalized');
-if ('intent' in t || 'currentAction' in t || 'activeBehavior' in t || 'activeForcedBehavior' in t) throw new Error('legacy behavior accessors still present');
-const forced = context.getTarinaiForcedBehavior(t);
-if (!forced || forced.uid !== 'f1' || forced.priority !== 99) throw new Error('forced request not normalized');
-context.setTarinaiForcedBehavior(t, null);
-if (context.currentTarinaiBehavior(t).source === 'forced' || context.getTarinaiForcedBehavior(t)) throw new Error('forced source not cleared');
-context.clearTarinaiBehavior(t);
-if (context.currentTarinaiBehavior(t) !== null) throw new Error('behavior not cleared');
-"""
-    with tempfile.NamedTemporaryFile("w", encoding="utf-8", suffix=".js", delete=False) as f:
-        f.write(js)
-        tmp = Path(f.name)
-    try:
-        result = subprocess.run(["node", str(tmp)], cwd=ROOT, text=True, capture_output=True)
-    finally:
-        tmp.unlink(missing_ok=True)
-    if result.returncode != 0:
-        sys.stderr.write(result.stdout)
-        sys.stderr.write(result.stderr)
-        fail("Behavior state smoke test failed")
-    ok("behavior state smoke test passed")
-
-
-def need_action_runtime_bridge_smoke() -> None:
-    items_source = read_text(ROOT / "js/tarinai_needs_items.js")
-    core_source = read_text(ROOT / "js/tarinai_needs_core.js")
-    forced_source = read_text(ROOT / "js/tarinai_forced_behavior.js")
-    js = f"""
-const vm = require('vm');
-const context = {{ console, globalThis: null }};
-context.globalThis = context;
-context.window = context;
-context.Tarinai = class Tarinai {{}};
-vm.createContext(context);
-vm.runInContext({items_source!r}, context, {{ filename: 'tarinai_needs_items.js' }});
-if (!context.TarinaiNeedsRuntime) throw new Error('TarinaiNeedsRuntime missing');
-if (typeof context.TarinaiNeedsRuntime.startNeedAction !== 'function') throw new Error('startNeedAction bridge missing');
-"""
-    with tempfile.NamedTemporaryFile("w", encoding="utf-8", suffix=".js", delete=False) as f:
-        f.write(js)
-        tmp = Path(f.name)
-    try:
-        result = subprocess.run(["node", str(tmp)], cwd=ROOT, text=True, capture_output=True)
-    finally:
-        tmp.unlink(missing_ok=True)
-    if result.returncode != 0:
-        sys.stderr.write(result.stdout)
-        sys.stderr.write(result.stderr)
-        fail("need-action runtime bridge smoke test failed")
-    qualified_call = "globalThis.TarinaiNeedsRuntime?.startNeedAction?.("
-    if core_source.count(qualified_call) != 2:
-        fail("tarinai_needs_core.js must route both emergency starts through TarinaiNeedsRuntime")
-    if forced_source.count(qualified_call) != 1:
-        fail("tarinai_forced_behavior.js must route forced starts through TarinaiNeedsRuntime")
-    if re.search(r"(?<![.\w])startNeedAction\s*\(", core_source + "\n" + forced_source):
-        fail("cross-file bare startNeedAction call remains")
-    ok("need-action runtime bridge is exported and all cross-file calls are qualified")
-
-
-def check_legacy_behavior_refs() -> None:
-    tokens = re.compile(r"\b(activeBehavior|currentAction|activeForcedBehavior|intent)\b")
-    offenders = []
-    for path in (ROOT / "js").glob("*.js"):
-        for i, line in enumerate(read_text(path).splitlines(), start=1):
-            stripped = line.strip()
-            if stripped.startswith("//"):
-                continue
-            if tokens.search(line):
-                offenders.append(f"{path.relative_to(ROOT).as_posix()}:{i}")
-    if offenders:
-        fail("legacy behavior fields still present: " + ", ".join(offenders[:20]))
-    ok("legacy behavior runtime fields removed")
-
-
-
-
-def check_legacy_physics_props_removed() -> None:
-    terms = [
-        "rotatorThickness", "rotatorSegments", "rotatorPowered", "rotatorSpeed", "rotatorAngularVelocity",
-        "poisonCollisionEnabled", "poisonDamage", "poisonMass", "poisonInertia",
-        "reciprocatorPowered", "reciprocatorSpeed", "reciprocatorTravel", "reciprocatorPhase",
-        "reciprocatorDirection", "reciprocatorAxisAngle", "reciprocatorVelocity", "reciprocatorAnchorX", "reciprocatorAnchorY",
-        "linkA", "linkB", "linkLength", "linkMidX", "linkMidY", "linkMidVX", "linkMidVY",
-        "ropeParticles", "_physicsAwakeUntil", "_linkAwakeUntil",
-    ]
-    offenders = []
-    for path in (ROOT / "js").glob("*.js"):
-        text = read_text(path)
-        for term in terms:
-            if term in text:
-                offenders.append(f"{path.relative_to(ROOT).as_posix()}:{term}")
-    if offenders:
-        fail("legacy physics property names still present: " + ", ".join(offenders[:20]))
-    ok("legacy physics property names removed")
-
-
-def check_redundant_correction_paths_removed() -> None:
-    terms = [
-        "markBodyChanged", "purgeLegacyPhysicsStorage", "nextTarinaiCollisionCheckAt",
-        "_physicsWorldFrame", "bodyReads", "bodyWrites", "constraintReads", "constraintWrites",
-        "compactEffects",
-    ]
-    offenders = []
-    for path in (ROOT / "js").glob("*.js"):
-        text = read_text(path)
-        for term in terms:
-            if term in text:
-                offenders.append(f"{path.relative_to(ROOT).as_posix()}:{term}")
-    if offenders:
-        fail("redundant correction path returned: " + ", ".join(offenders[:20]))
-    ball_source = read_text(ROOT / "js/item_dynamic_ball_system.js")
-    if ball_source.count("tryBallPickup(") != 1:
-        fail("ball update must perform exactly one pickup check")
-    ok("redundant correction paths remain removed")
-
-
-
-def direct_feeding_smoke() -> None:
-    source = read_text(ROOT / "js/tarinai_direct_feeding_system.js")
-    placement = read_text(ROOT / "js/world_placement_log.js")
-    ui = read_text(ROOT / "js/ui_input_shared.js")
-    render = read_text(ROOT / "js/render.js")
-    world_source = read_text(ROOT / "js/world.js")
-    js = f"""
-const vm = require('vm');
-class TestEffect {{
-  constructor(type, x, y, options = {{}}) {{ Object.assign(this, {{ type, x, y }}, options); }}
-}}
-const context = {{
-  console, globalThis: null, window: null,
-  rand(a, b) {{ return (Number(a) + Number(b)) * 0.5; }},
-  distXY(ax, ay, bx, by) {{ return Math.hypot(ax - bx, ay - by); }},
-  isServingFoodType(type) {{ return !['grass', 'water'].includes(type); }},
-  toolLabel(type) {{ return ({{ sweet: '\u305a\u3093\u3060\u9905', protein: '\u30d7\u30ed\u30c6\u30a4\u30f3' }})[type] || type; }},
-  TarinaiEffect: TestEffect,
-  TarinaiItemRegistry: {{ food: {{ nutrition(type) {{ return type === 'sweet' ? 16.5 : 15; }} }} }},
-  uiCache: {{ selectedSnapshot: 'stale' }},
-}};
-context.globalThis = context; context.window = context;
-context.consumeBehaviorTarget = (t, world, item, role) => {{
-  item.consumedRole = role;
-  item.foodServingsRemaining = Math.max(0, Number(item.foodServingsRemaining || 1) - 1);
-  return true;
-}};
-context.TarinaiStructureLifecycle = {{
-  deleteItem(world, item) {{ item.dead = true; world.items = world.items.filter(entry => entry !== item); return true; }}
-}};
-vm.createContext(context);
-vm.runInContext({source!r}, context, {{ filename: 'tarinai_direct_feeding_system.js' }});
-const api = context.TarinaiDirectFeedingSystem;
-if (!api || !api.isDirectFeedType('sweet') || !api.isDirectFeedType('protein') || api.isDirectFeedType('ball')) throw new Error('direct-feed eligibility mismatch');
-const world = {{
-  tarinai: [], items: [], effects: [], logs: [], time: 12, hoverGiveTarget: null,
-  isTarinaiHiddenInNestBox() {{ return false; }},
-  log(text, kind, meta) {{ this.logs.push({{ text, kind, meta }}); }},
-  recordFamily(t) {{ this.recorded = t; }},
-}};
-function makeTarinai(name, x, y) {{
-  return {{
-    name, x, y, radius: 22, world, affection: 0, currentPersonality: {{ openness: 0, sociability: 0 }},
-    contains(px, py) {{ return Math.hypot(px - this.x, py - this.y) <= 24; }},
-    adjustPersonality(key, delta, reason) {{
-      this.currentPersonality[key] += delta;
-      this.personalityReasons = this.personalityReasons || [];
-      this.personalityReasons.push(reason);
-      return delta;
-    }},
-    bubble(text) {{ this.lastBubble = text; }},
-  }};
-}}
-const first = makeTarinai('first', 20, 20);
-const top = makeTarinai('top', 20, 20);
-world.tarinai = [first, top];
-if (api.findTargetAt(world, 20, 20) !== top) throw new Error('top-most direct-feed target was not selected');
-const sweet = {{ type: 'sweet', amount: 5, foodServingsRemaining: 5, x: 20, y: 20 }};
-world.items.push(sweet);
-const result = api.give(world, top, sweet, {{ source: 'pinch' }});
-if (!result?.foodGift || !result.removed || !sweet.dead || world.items.includes(sweet)) throw new Error('pinched food was not consumed and removed');
-const hearts = world.effects.filter(effect => effect.type === 'heart');
-if (hearts.length < 10 || hearts.length > 14) throw new Error(`food gift heart count out of range: ${{hearts.length}}`);
-if (!(top.currentPersonality.openness > 0.018) || !(top.currentPersonality.sociability >= 0.010)) throw new Error('food gift personality effect is too weak');
-if (top.currentPersonality.openness <= 0.006) throw new Error('food gift does not exceed one second of cursor openness effect');
-const expectedPersonalityReason = '\u30ab\u30fc\u30bd\u30eb\u304b\u3089\u76f4\u63a5\u98df\u3079\u7269\u3092\u98df\u3079\u305f';
-if (!top.personalityReasons?.length || top.personalityReasons.some(reason => reason !== expectedPersonalityReason)) throw new Error('direct-feed personality reason mismatch');
-if (top.lastBubble !== '\u2661' || context.uiCache.selectedSnapshot !== '') throw new Error('food gift feedback/cache refresh missing');
-if (!world.logs.some(entry => entry.meta?.eventType === 'direct_feed')) throw new Error('direct-feed observation log missing');
-const priorEffects = world.effects.length;
-const medicine = {{ type: 'protein', amount: 5, foodServingsRemaining: 5, x: 20, y: 20 }};
-world.items.push(medicine);
-const medicineResult = api.give(world, top, medicine, {{ source: 'pinch' }});
-if (!medicineResult || medicineResult.foodGift || medicine.consumedRole !== 'medicine') throw new Error('medicine direct-feed path mismatch');
-if (world.effects.length !== priorEffects) throw new Error('medicine incorrectly emitted food hearts');
-if (!(top.focusPulseTimer >= 0.72)) throw new Error('medicine feedback pulse missing');
-const placementItem = {{ type: 'sweet', amount: 5, foodServingsRemaining: 5, x: 20, y: 20 }};
-const placementResult = api.give(world, top, placementItem, {{ source: 'placement' }});
-if (!placementResult || placementResult.removed || placementItem.dead) throw new Error('ephemeral placement item should be consumed without lifecycle deletion');
-"""
-    with tempfile.NamedTemporaryFile("w", encoding="utf-8", suffix=".js", delete=False) as f:
-        f.write(js)
-        tmp = Path(f.name)
-    try:
-        result = subprocess.run(["node", str(tmp)], cwd=ROOT, text=True, capture_output=True)
-    finally:
-        tmp.unlink(missing_ok=True)
-    if result.returncode != 0:
-        sys.stderr.write(result.stdout)
-        sys.stderr.write(result.stderr)
-        fail("direct feeding runtime smoke test failed")
-    placement_start = placement.find("placeItem(item, dropped = true)")
-    direct_call = placement.find("directFeeding.give?.", placement_start)
-    object_limit = placement.find("this.canAddObjects?.(1)", placement_start)
-    blocked = placement.find("this.placementBlocked(item)", placement_start)
-    if min(placement_start, direct_call, object_limit, blocked) < 0 or not (direct_call < object_limit < blocked):
-        fail("direct placement feeding must run before object-limit and overlap rejection")
-    click_section = placement.find("const itemType = toolItemType(tool)")
-    click_direct = placement.find("const directTarget =", click_section)
-    duplicator_set = placement.find("this.directSetDuplicatorAt?.", click_section)
-    if min(click_section, click_direct, duplicator_set) < 0 or duplicator_set > click_direct:
-        fail("Duplicator loading must take precedence over Tarinai direct feeding at the same point")
-    required_ui = ["directFeedTargetAt", 'source: "pinch"', "setGiveHover", "hoverGiveTarget"]
-    if any(token not in ui for token in required_ui):
-        fail("pinch direct-feeding input bridge is incomplete")
-    if 'label: "\\u4e0e\\u3048\\u308b"' not in render or "world.hoverGiveTarget" not in render:
-        fail("direct-feeding hover overlay is missing")
-    if world_source.count("this.hoverGiveTarget = null;") < 2:
-        fail("direct-feeding hover state is not initialized and reset")
-    ok("direct food/medicine feeding, placement interception, personality, hearts, and overlay verified")
-
-
-def check_collision_reason_and_projection_dirty_removed() -> None:
-    collision_paths = [
-        ROOT / "js/world_environment.js",
-        ROOT / "js/tarinai_update_step_movement.js",
-        ROOT / "js/tarinai_social_move_life.js",
-    ]
-    collision_source = "\n".join(read_text(path) for path in collision_paths)
-    if re.search(r"resolveSolidObstacleCollision\s*\([^)]*\{[^}]*\breason\s*:", collision_source, re.S):
-        fail("unused resolveSolidObstacleCollision reason option returned")
-    environment = read_text(ROOT / "js/world_environment.js")
-    if "opts.reason" in environment:
-        fail("resolveSolidObstacleCollision still reads unused reason option")
-    constraint = read_text(ROOT / "js/constraint_system.js")
-    match = re.search(r"function finishLinkSpatialUpdate\([^)]*\)\s*\{(.*?)\n  \}", constraint, re.S)
-    if not match:
-        fail("finishLinkSpatialUpdate helper not found")
-    body = match.group(1)
-    if "Math.hypot" in body or "before" in body or body.count("markConstraintSpatialDirty") != 1:
-        fail("constraint Projection dirty determination is duplicated")
-    ok("unused collision reason and duplicate constraint Projection dirty determination removed")
-
-def check_basic_action_spec_runtime() -> None:
-    source = "\n".join(read_text(ROOT / rel) for rel in ["js/tarinai_action_definitions.js", "js/tarinai_needs_items.js"])
-    required = {
-        "eat_food": "createConsumableActionSpec",
-        "drink_water": "createConsumableActionSpec",
-        "use_medicine": "createConsumableActionSpec",
-        "sleep_in_bed": "createSleepInBedActionSpec",
-        "sleep_build_grass_bed": "createSleepBuildGrassBedActionSpec",
-        "sleep_anywhere": "createSleepAnywhereActionSpec",
-        "rest_to_recover": "createRestActionSpec",
-        "sunbath": "createSunbathActionSpec",
-        "wander_lightly": "createWanderActionSpec",
-    }
-    for action_id, factory in required.items():
-        if factory not in source:
-            fail(f"basic ActionSpec factory missing for {action_id}: {factory}")
-    forbidden_late_ticks = [
-        'set("eat_food",',
-        'set("drink_water",',
-        'set("use_medicine",',
-        'set("sunbath",',
-    ]
-    offenders = [token for token in forbidden_late_ticks if token in source]
-    if offenders:
-        fail("basic actions still patched in configureTarinaiNeedActions: " + ", ".join(offenders))
-    ok("basic need actions owned by ActionSpec factories")
-
-
-
-def check_social_action_spec_runtime() -> None:
-    source = "\n".join(read_text(ROOT / rel) for rel in ["js/tarinai_action_definitions.js", "js/tarinai_needs_items.js"])
-    required_factories = [
-        "createPanicEscapeActionSpec",
-        "createApproachFriendActionSpec",
-        "createApproachFamilyActionSpec",
-        "createApproachMateActionSpec",
-        "createFightRivalActionSpec",
-        "createIntimidateEnemyActionSpec",
-        "createBirthRitualActionSpec",
-    ]
-    for factory in required_factories:
-        if factory not in source:
-            fail(f"social/combat ActionSpec factory missing: {factory}")
-    definitions_match = re.search(r"const TARINAI_ACTION_DEFINITIONS = \[(.*?)\];", source, re.S)
-    if not definitions_match:
-        fail("TARINAI_ACTION_DEFINITIONS block missing")
-    definitions = definitions_match.group(1)
-    for factory in required_factories:
-        if f"{factory}()" not in definitions:
-            fail(f"{factory} is not registered in TARINAI_ACTION_DEFINITIONS")
-    if "function configureTarinaiNeedActions" in source:
-        fail("configureTarinaiNeedActions should not be needed after ActionSpec runtime consolidation")
-    forbidden_late_ticks = [
-        'set("panic_escape",',
-        'set("approach_friend",',
-        'set("approach_parent_or_child",',
-        'set("approach_mate",',
-        'set("fight_rival",',
-        'set("intimidate_enemy",',
-        'set("sunbath",',
-        "birthRitualAction",
-        "TARINAI_ACTIONS.push",
-    ]
-    offenders = [token for token in forbidden_late_ticks if token in source]
-    if offenders:
-        fail("actions still patched late: " + ", ".join(offenders))
-    ok("social/fear/combat/mate/birth/sunbath actions owned by ActionSpec factories")
-
-
-def check_action_spec_no_legacy_hooks() -> None:
-    source = read_text(ROOT / "js/tarinai_action_spec.js")
-    forbidden = ["condition", "originalRun", "originalUpdate", "Legacy hooks"]
-    offenders = [token for token in forbidden if token in source]
-    if offenders:
-        fail("ActionSpec legacy hook support still present: " + ", ".join(offenders))
-    needs = "\n".join(read_text(ROOT / rel) for rel in ["js/tarinai_action_definitions.js", "js/tarinai_consumable_behavior.js", "js/tarinai_social_action_runtime.js", "js/tarinai_building_behavior.js", "js/tarinai_needs_items.js"])
-    if ".condition" in needs or "action.condition" in needs:
-        fail("need action runtime still falls back to action.condition")
-    ok("ActionSpec legacy hooks removed")
-
-def check_runtime_diagnostics_hooks() -> None:
-    spatial_budget = read_text(ROOT / "js/world_spatial_budget.js")
-    debug_tools = read_text(ROOT / "js/debug_tools.js")
-    world_update = read_text(ROOT / "js/world_update.js")
-    simulation_systems = read_text(ROOT / "js/simulation_systems.js")
-    if "runtimeDiagnostics()" not in spatial_budget:
-        fail("World.runtimeDiagnostics hook missing")
-    if "lastRuntimeDiagnostics" not in (world_update + simulation_systems):
-        fail("world update systems do not publish lastRuntimeDiagnostics")
-    if "spatial rebuild" not in debug_tools or "behavior forced" not in debug_tools:
-        fail("debug overlay is missing runtime diagnostic lines")
-    spatial_budget = read_text(ROOT / "js/world_spatial_budget.js")
-    debug_tools = read_text(ROOT / "js/debug_tools.js")
-    if "performance:" in spatial_budget or "diag.performance" in debug_tools or "load-check removed" in debug_tools:
-        fail("removed performance/load-check diagnostics residue remains")
-    ok("runtime diagnostics hooks present")
-
-def check_social_balance_guards() -> None:
-    needs = "\n".join(read_text(ROOT / rel) for rel in [
-        "js/tarinai_needs_core.js",
-        "js/tarinai_behavior_text.js",
-        "js/tarinai_forced_behavior.js",
-        "js/tarinai_item_targeting.js",
-        "js/tarinai_action_definitions.js",
-        "js/tarinai_consumable_behavior.js",
-        "js/tarinai_social_action_runtime.js",
-        "js/tarinai_building_behavior.js",
-        "js/tarinai_needs_items.js",
-    ])
-    world_social = read_text(ROOT / "js/world_family_social.js")
-    social_move = read_text(ROOT / "js/tarinai_social_move_life.js")
-    required_need_tokens = [
-        "fight_rival: 72",
-        "intimidate_enemy: 0",
-        "approach_mate: 72",
-        "approach_friend: 66",
-        "return ({ conflict: 18, mate: 24, family: 12, bond: 14",
-        "const relationDrive = Math.max(Number(parts.mate || 0)",
-        "drugBoosted || relationDrive >= Math.min",
-        "social-fight-vs-mate-weighted",
-    ]
-    for token in required_need_tokens:
-        if token not in needs:
-            fail(f"social balance guard token missing: {token}")
-    if "canStart: basicCanStartWithTarget,\n    start(t, world, ctx = {}) {\n      const rival" in needs:
-        fail("intimidate_enemy reverted to ungated basicCanStart")
-    required_world_tokens = [
-        "fightPairCooldowns",
-        "fightPairKey(a, b)",
-        "fightPairCooldownRemaining(a, b)",
-        "markFightPairCooldown(a, b",
-        "isAlreadyFightingPair(a, b)",
-        "if (this.isAlreadyFightingPair?.(a, b)) return true",
-    ]
-    for token in required_world_tokens:
-        if token not in world_social:
-            fail(f"fight re-entry guard missing: {token}")
-    if "social-weighted-fight-mate-start" not in social_move or "pickSocialFightMate" not in social_move:
-        fail("ordinary proximity weighted fight/mate guard missing")
-    ok("social balance and fight re-entry guards present")
-
-
-def check_item_bucket_polish() -> None:
-    spatial_budget = read_text(ROOT / "js/world_spatial_budget.js")
-    required_tokens = [
-        "markItemBucketsDirty(reason",
-        "ensureItemBuckets(reason",
-        "addItem(item",
-        "itemById(id)",
-        "itemsOfType(type)",
-        "this.itemIdMap = new Map()",
-        "bucketRebuildsTotal",
-    ]
-    for token in required_tokens:
-        if token not in spatial_budget:
-            fail(f"item bucket polish helper missing: {token}")
-    if "return item && !item.dead ? item : null" not in spatial_budget:
-        fail("itemById must not return dead items")
-    debug_tools = read_text(ROOT / "js/debug_tools.js")
-    if "bucket" not in debug_tools.lower() and "id-map" not in debug_tools.lower():
-        fail("debug overlay is missing item bucket/id-map diagnostics")
-    routed_files = {
-        "js/world_placement_log.js": "addItem?.(item",
-        "js/simulation_ambient_system.js": "addItem?.(drop",
-        "js/world_combat_effects.js": "addItem?.(it",
-        "js/ants.js": "addItem?.(corpse",
-        "js/tarinai_social_move_life.js": "addItem?.(new Item(\"trace\"",
-        "js/tarinai_building_behavior.js": "addItem?.(structure",
-    }
-    for rel, token in routed_files.items():
-        if token not in read_text(ROOT / rel):
-            fail(f"runtime item creation path is not routed through addItem: {rel}")
-    ok("runtime item bucket/id-map polish present")
-
-
-def check_current_save_format() -> None:
-    snapshot = read_text(ROOT / "js/snapshot_system.js")
-    save = read_text(ROOT / "js/save_system.js")
-    save_codec = read_text(ROOT / "js/save_codec.js")
-    save_storage = read_text(ROOT / "js/save_storage.js")
-    restore_coordinator = read_text(ROOT / "js/restore_coordinator.js")
-    required_snapshot = [
-        "const SNAPSHOT_VERSION = SaveSchema.SNAPSHOT_VERSION",
-        "a: \"tj1\"",
-        "function compactWorld",
-        "function compactTarinai",
-        "function compactItem",
-        "worldRef.logs = []",
-        "worldRef.family = {}",
-        "recordFamily",
-    ]
-    for token in required_snapshot:
-        if token not in snapshot:
-            fail(f"binary save snapshot token missing: {token}")
-    forbidden_snapshot = [
-        "compactAnt",
-        "effects: (worldRef.effects",
-        "cameraX",
-        "cameraY",
-        "behavior:",
-        "deathReason",
-        "summary:",
-        "app: \"tarinai_colony_game\"",
-    ]
-    offenders = [token for token in forbidden_snapshot if token in snapshot]
-    if offenders:
-        fail("broad snapshot fields still present after light-save conversion: " + ", ".join(offenders))
-    required_codec = [
-        'EXPORT_PREFIX = "\\u305f"',
-        'SAVE_TEXT_BITS = 15',
-        "writeStringTable",
-        "saveTextCharFromValue",
-        "saveTextValueFromCode",
-        "base32768Encode",
-        "base32768Decode",
-        "makeSaveFrame",
-        "openSaveFrame",
-        "writeTarinaiBitPlane",
-        "readTarinaiBitPlane",
-        "TARINAI_COLUMN_LAYOUT",
-        "chooseCommonExtraPlan",
-        "standardItemAmount",
-        "chooseAmountPlan",
-        "worldSeedWords",
-        "saveTextCharFromValue",
-        "saveTextValueFromCode",
-        "itemFlagPlaneBytes",
-        "writeNormalItemExtra",
-        "readNormalItemExtra",
-        "writeBirthDescriptor",
-        "readBirthDescriptor",
-        "async function encodeSnapshot",
-        "async function decodeSnapshot",
-    ]
-    for token in required_codec:
-        if token not in save_codec:
-            fail(f"binary save codec token missing: {token}")
-    if "SAVE_TEXT_ALPHABET" in save_codec or "SAVE_TEXT_REVERSE" in save_codec:
-        fail("15-bit save text still allocates the legacy alphabet or reverse map")
-    if "writer.u(Snapshot.version)" in save_codec:
-        fail("duplicate snapshot version remains in the binary header")
-    if "writeSaveString(writer, w[8]" in save_codec:
-        fail("worldSeed is still stored as a string")
-    for token in ("formatHeader & 0x7f", "formatHeader & 0x80", "payload.length * 2 + (useCompressed ? 1 : 0)"):
-        if token not in save_codec:
-            fail(f"compact save framing token missing: {token}")
-    if "tailMask" in save_codec:
-        fail("redundant Tarinai tailMask remains in current schema")
-    if "costBits < best.costBits" not in save_codec or "itemFlagPlaneBytes" not in save_codec:
-        fail("cost-based common extra or continuous item flag plane is missing")
-    required_storage = [
-        'STORAGE_PREFIX = "tarinai_japanese_hash_slot_v1_"',
-        'hash.startsWith("\\u305f")',
-        "function writeSlot",
-        "function readSlot",
-        "function requireSlot",
-        "function deleteSlot",
-    ]
-    for token in required_storage:
-        if token not in save_storage:
-            fail(f"binary save storage token missing: {token}")
-    required_facade = [
-        "TarinaiSaveSystem",
-        "TarinaiSaveCodec",
-        "TarinaiSaveStorage",
-        "TarinaiRestoreCoordinator",
-    ]
-    combined = save + save_codec + save_storage + restore_coordinator
-    for token in required_facade:
-        if token not in combined:
-            fail(f"save/restore split facade token missing: {token}")
-    for token in ("TN2!", "TN3!", "tarinai_save_slot_v2_", "tarinai_save_slot_v3_", "legacyForcedColumn"):
-        if token in combined or token in snapshot:
-            fail(f"save backward compatibility residue still present: {token}")
-    if "renderStats" in snapshot or "TarinaiFreezeSystem" in snapshot or "renderArchive" in snapshot:
-        fail("snapshot restore must not call UI or freeze subsystems directly")
-    effects = read_text(ROOT / "js/world_event_effects.js")
-    if "tool:placed" not in effects or "function playLogSoundForEntry" not in effects:
-        fail("event effects do not own tool/log side effects")
-    for rel in ("js/freeze_system.js", "js/freeze_store.js", "js/freeze_snapshot_adapter.js", "js/freeze_panel.js"):
-        if (ROOT / rel).exists():
-            fail(f"freezer subsystem file still exists after freezer removal: {rel}")
-    placement = read_text(ROOT / "js/world_placement_log.js")
-    if "playLogSoundForEntry" in placement:
-        fail("log sound mapping still lives in world_placement_log.js")
-    if "player_item_placement" in placement:
-        fail("player item placement should not create placement log entries")
-    ok("binary hash save snapshot, codec, storage, and restore coordinator present")
-
-def check_unified_item_registry() -> None:
-    data = manifest()
-    js_files = data["js"]
-    required_files = [
-        "js/item_tool_definitions.js",
-        "js/item_visual_definitions.js",
-        "js/item_food_definitions.js",
-        "js/item_effect_definitions.js",
-        "js/item_registry.js",
-    ]
-    missing = [rel for rel in required_files if rel not in js_files or not (ROOT / rel).exists()]
-    if missing:
-        fail("split item registry files missing: " + ", ".join(missing))
-    order = [js_files.index(rel) for rel in required_files]
-    if order != sorted(order):
-        fail("split item registry files are not loaded before the facade in manifest order")
-    stale_files = [rel for rel in ["js/food_registry.js", "js/effect_registry.js", "js/item_visual_registry.js"] if (ROOT / rel).exists() or rel in js_files]
-    if stale_files:
-        fail("obsolete item registry split files remain: " + ", ".join(stale_files))
-
-    tool_source = read_text(ROOT / "js/item_tool_definitions.js")
-    visual_source = read_text(ROOT / "js/item_visual_definitions.js")
-    food_source = read_text(ROOT / "js/item_food_definitions.js")
-    effect_source = read_text(ROOT / "js/item_effect_definitions.js")
-    facade_source = read_text(ROOT / "js/item_registry.js")
-    required_pairs = [
-        (tool_source, "const TOOL_DEFINITIONS"),
-        (visual_source, "function itemVisualDefinition"),
-        (food_source, "class FoodRegistry"),
-        (food_source, "global.TarinaiFoodRegistry"),
-        (effect_source, "class EffectRegistry"),
-        (effect_source, "global.TarinaiEffectRegistry"),
-        (facade_source, "global.TarinaiItemRegistry"),
-        (facade_source, "food: global.TarinaiFoodRegistry"),
-        (facade_source, "effect: global.TarinaiEffectRegistry"),
-    ]
-    for source, token in required_pairs:
-        if token not in source:
-            fail(f"split item registry token missing: {token}")
-    data_source = read_text(ROOT / "js/data.js")
-    forbidden_data = ["const TOOL_DEFINITIONS", "const ITEM_TRAITS", "class FoodRegistry", "class EffectRegistry", "TARINAI_ITEM_VISUALS"]
-    offenders = [token for token in forbidden_data if token in data_source]
-    if offenders:
-        fail("item definitions still mixed into data.js: " + ", ".join(offenders))
-    ok("item registry responsibilities split behind facade")
-
-def check_docs_removed() -> None:
-    docs = ROOT / "docs"
-    if docs.exists() and any(docs.iterdir()):
-        fail("non-runtime docs directory still contains files")
-    ok("non-runtime docs removed")
-
-def check_phase_and_input_split() -> None:
-    data = manifest()
-    js_files = data["js"]
-    required = [
-        "js/simulation_runtime_helpers.js",
-        "js/simulation_environment_system.js",
-        "js/simulation_item_ant_system.js",
-        "js/simulation_effects_system.js",
-        "js/simulation_creature_system.js",
-        "js/simulation_maintenance_system.js",
-        "js/simulation_ambient_system.js",
-        "js/simulation_systems.js",
-        "js/ui_input_shared.js",
-        "js/ui_input_touch.js",
-        "js/ui_input_mouse.js",
-    ]
-    for rel in required:
-        if rel not in js_files:
-            fail(f"split runtime module missing from manifest: {rel}")
-    world_update = read_text(ROOT / "js/world_update.js")
-    ui_bind = read_text(ROOT / "js/ui_bind.js")
-    touch = read_text(ROOT / "js/ui_input_touch.js")
-    mouse = read_text(ROOT / "js/ui_input_mouse.js")
-    shared = read_text(ROOT / "js/ui_input_shared.js")
-    systems = read_text(ROOT / "js/simulation_systems.js")
-    if "TarinaiSimulation" not in world_update:
-        fail("World.update is not delegated to TarinaiSimulation")
-    for token in ["updateClock", "updateEnvironment", "updateItemsAndAnts", "updateCreatures", "runMaintenance", "spawnRainWater"]:
-        if token not in systems:
-            fail(f"world update phase missing: {token}")
-    if "touchstart" in ui_bind or "mousedown" in ui_bind or "touchmove" in ui_bind:
-        fail("ui_bind.js still owns field pointer input handlers")
-    for token in ["TarinaiUIInputShared", "createInputContext"]:
-        if token not in shared:
-            fail(f"shared input helper missing: {token}")
-    if "touchstart" not in touch or "TarinaiTouchInput" not in touch:
-        fail("touch input module missing touch handlers")
-    if "mousedown" not in mouse or "TarinaiMouseInput" not in mouse:
-        fail("mouse input module missing mouse handlers")
-    if ui_bind.count("syncToolSizeBadges();") != 1:
-        fail("ui_bind.js should bind/sync tool size badges only once")
-    phase_birth_direct = False
-    placement_birth_direct = "audio.birth" in read_text(ROOT / "js/world_placement_log.js")
-    family_birth_direct = "audio.birth" in read_text(ROOT / "js/world_family_social.js")
-    if phase_birth_direct or placement_birth_direct or family_birth_direct:
-        fail("birth log sound can double-fire; direct audio.birth remains in log-emitting birth flows")
-    ok("world phase split and UI input split present")
-
-
-def check_processing_split() -> None:
-    data = manifest()
-    js_files = data["js"]
-    required = [
-        "js/item_type_initializers.js",
-        "js/item_render_runtime.js",
-        "js/tarinai_item_targeting.js",
-        "js/tarinai_action_definitions.js",
-        "js/tarinai_consumable_behavior.js",
-        "js/tarinai_social_action_runtime.js",
-        "js/tarinai_building_behavior.js",
-    ]
-    for rel in required:
-        if rel not in js_files:
-            fail(f"processing split module missing from manifest: {rel}")
-    if not (js_files.index("js/items.js") < js_files.index("js/item_type_initializers.js") < js_files.index("js/item_render_runtime.js") < js_files.index("js/ants.js")):
-        fail("item init/render split load order is invalid")
-    if not (js_files.index("js/tarinai_forced_behavior.js") < js_files.index("js/tarinai_item_targeting.js") < js_files.index("js/tarinai_consumable_behavior.js") < js_files.index("js/tarinai_social_action_runtime.js") < js_files.index("js/tarinai_building_behavior.js") < js_files.index("js/tarinai_action_definitions.js") < js_files.index("js/tarinai_needs_items.js")):
-        fail("tarinai behavior split load order is invalid")
-    items = read_text(ROOT / "js/items.js")
-    temperature_system = read_text(ROOT / "js/world_temperature_system.js")
-    init = read_text(ROOT / "js/item_type_initializers.js")
-    item_render = read_text(ROOT / "js/item_render_runtime.js")
-    if "class Item" not in items or "function initializeItemTypeState" not in init or "Object.assign(Item.prototype" not in item_render:
-        fail("item construction/init/render split is incomplete")
-    if "updateDuplicator" in items or "\ndraw(ctx" in items or "if (type === \"grass\")" in items:
-        fail("items.js still owns type init, runtime, or render methods")
-    defs = read_text(ROOT / "js/tarinai_action_definitions.js")
-    consumable = read_text(ROOT / "js/tarinai_consumable_behavior.js")
-    social = read_text(ROOT / "js/tarinai_social_action_runtime.js")
-    building = read_text(ROOT / "js/tarinai_building_behavior.js")
-    needs = read_text(ROOT / "js/tarinai_needs_items.js")
-    required_pairs = [
-        (defs, "const TARINAI_ACTION_DEFINITIONS"),
-        (defs, "const TARINAI_ACTIONS"),
-        (consumable, "function updateConsumableBehavior"),
-        (social, "function updateMateBehavior"),
-        (social, "function updatePanicBehavior"),
-        (building, "function continueBuildPlan"),
-    ]
-    for source, token in required_pairs:
-        if token not in source:
-            fail(f"processing split token missing: {token}")
-    for token in ["createConsumableActionSpec", "function updateConsumableBehavior", "function continueBuildPlan"]:
-        if token in needs:
-            fail(f"tarinai_needs_items.js still owns extracted processing: {token}")
-    ok("item and Tarinai processing split present")
-
-
-def command_dispatcher_smoke() -> None:
-    source = read_text(ROOT / "js/command_dispatcher.js")
-    js = f"""
-const vm = require('vm');
-const context = {{ console, globalThis: null }};
-context.globalThis = context;
-context.window = context;
-context.World = class World {{}};
-context.scalableToolIds = () => ['grass', 'sweet'];
-context.normalizedToolSizeFor = (world, tool) => (world.toolSizes && world.toolSizes[tool]) || world.toolSize || 'medium';
-vm.createContext(context);
-vm.runInContext({source!r}, context, {{ filename: 'command_dispatcher.js' }});
-const events = [];
-const world = new context.World();
-world.tool = 'observe';
-world.toolSize = 'medium';
-world.toolSizes = {{}};
-world.speed = 1;
-world.paused = false;
-world.w = 1000;
-world.h = 700;
-world.viewportW = 500;
-world.viewportH = 300;
-world.clampCamera = () => {{ world.clamped = true; }};
-world.emit = (type, payload) => events.push([type, payload]);
-world.handleClick = (x, y) => {{ world.clicked = [x, y]; }};
-const target = {{ x: 420, y: 260, dead: false }};
-if (!context.TarinaiCommands.dispatch(world, {{ type: 'tool.select', toolId: 'grass' }}).ok || world.tool !== 'grass') throw new Error('tool select failed');
-if (!context.TarinaiCommands.dispatch(world, {{ type: 'tool.size.cycle', toolId: 'grass', order: ['small', 'medium', 'large'] }}).ok || world.toolSize !== 'large') throw new Error('tool size failed');
-if (!context.TarinaiCommands.dispatch(world, {{ type: 'selection.focus', target }}).ok || world.selected !== target || world.cameraX !== 170 || world.cameraY !== 110) throw new Error('focus failed');
-if (!context.TarinaiCommands.dispatch(world, {{ type: 'selection.favorite.toggle' }}).ok || target.favorite !== true) throw new Error('favorite failed');
-if (!context.TarinaiCommands.dispatch(world, {{ type: 'simulation.paused.toggle' }}).ok || world.paused !== true) throw new Error('pause failed');
-if (!context.TarinaiCommands.dispatch(world, {{ type: 'simulation.speed.cycle', speeds: [1, 2, 4] }}).ok || world.speed !== 2) throw new Error('speed failed');
-if (!context.TarinaiCommands.dispatch(world, {{ type: 'pointer.primary', x: 7, y: 9 }}).ok || world.clicked[0] !== 7 || world.clicked[1] !== 9) throw new Error('pointer failed');
-if (typeof world['dispatch' + 'Command'] !== 'undefined') throw new Error('World facade should not be installed');
-if (!context.TarinaiCommands.dispatch(world, {{ type: 'selection.clear' }}).ok || world.selected !== null) throw new Error('selection clear failed');
-if (!events.some(([type]) => type === 'selection:changed')) throw new Error('selection event missing');
-"""
-    with tempfile.NamedTemporaryFile("w", encoding="utf-8", suffix=".js", delete=False) as f:
-        f.write(js)
-        tmp = Path(f.name)
-    try:
-        result = subprocess.run(["node", str(tmp)], cwd=ROOT, text=True, capture_output=True)
-    finally:
-        tmp.unlink(missing_ok=True)
-    if result.returncode != 0:
-        sys.stderr.write(result.stdout)
-        sys.stderr.write(result.stderr)
-        fail("command dispatcher smoke test failed")
-    ok("command dispatcher smoke test passed")
-
-
-def check_system_order_boundary() -> None:
-    data = manifest()
-    js_files = data["js"]
-    required = [
-        "js/simulation_runtime_helpers.js",
-        "js/simulation_environment_system.js",
-        "js/simulation_item_ant_system.js",
-        "js/simulation_effects_system.js",
-        "js/simulation_creature_system.js",
-        "js/simulation_maintenance_system.js",
-        "js/simulation_ambient_system.js",
-        "js/simulation_systems.js",
-        "js/system_order.js",
-        "js/simulation.js",
-        "js/world_update.js",
-    ]
-    for rel in required:
-        if rel not in js_files:
-            fail(f"simulation boundary module missing from manifest: {rel}")
-    split_order = [
-        "js/simulation_runtime_helpers.js",
-        "js/simulation_environment_system.js",
-        "js/simulation_item_ant_system.js",
-        "js/simulation_effects_system.js",
-        "js/simulation_creature_system.js",
-        "js/simulation_maintenance_system.js",
-        "js/simulation_ambient_system.js",
-        "js/simulation_systems.js",
-        "js/system_order.js",
-        "js/simulation.js",
-        "js/world_update.js",
-    ]
-    if [rel for rel in js_files if rel in split_order] != split_order:
-        fail("simulation boundary load order is invalid")
-    system_order = read_text(ROOT / "js/system_order.js")
-    simulation = read_text(ROOT / "js/simulation.js")
-    systems_source = read_text(ROOT / "js/simulation_systems.js")
-    if "TarinaiSimulationSystems" not in systems_source or "const phases = Object.freeze" not in systems_source:
-        fail("concrete simulation systems facade missing exported phase registry")
-    concrete_modules = {
-        "js/simulation_runtime_helpers.js": "TarinaiSimulationRuntime",
-        "js/simulation_environment_system.js": "TarinaiEnvironmentSimulationSystem",
-        "js/simulation_item_ant_system.js": "TarinaiItemAntSimulationSystem",
-        "js/simulation_effects_system.js": "TarinaiEffectsSimulationSystem",
-        "js/simulation_creature_system.js": "TarinaiCreatureSimulationSystem",
-        "js/simulation_maintenance_system.js": "TarinaiMaintenanceSimulationSystem",
-        "js/simulation_ambient_system.js": "TarinaiAmbientSimulationSystem",
-    }
-    for rel, token in concrete_modules.items():
-        if token not in read_text(ROOT / rel):
-            fail(f"concrete simulation split module missing export: {rel}")
-    for token in ["const SYSTEM_ORDER", "clock", "environment", "items_and_ants", "creatures", "maintenance", "diagnostics"]:
-        if token not in system_order:
-            fail(f"system order token missing: {token}")
-    if "TarinaiSystemOrder" not in simulation or "Object.freeze({ update })" not in simulation:
-        fail("simulation.js does not expose the update boundary")
-    ok("named simulation system order present")
-
-
-def simulation_boundary_smoke() -> None:
-    sources = {rel: read_text(ROOT / rel) for rel in [
-        "js/simulation_runtime_helpers.js",
-        "js/simulation_environment_system.js",
-        "js/simulation_item_ant_system.js",
-        "js/simulation_effects_system.js",
-        "js/simulation_creature_system.js",
-        "js/simulation_maintenance_system.js",
-        "js/simulation_ambient_system.js",
-        "js/simulation_systems.js",
-        "js/system_order.js",
-        "js/simulation.js",
-    ]}
-    js = f"""
-const vm = require('vm');
-const context = {{ console, globalThis: null }};
-context.globalThis = context;
-context.window = context;
-vm.createContext(context);
-for (const [filename, source] of Object.entries({sources!r})) {{
-  vm.runInContext(source, context, {{ filename }});
-}}
-if (!context.TarinaiSimulationSystems?.phases?.updateClock) throw new Error('simulation systems missing');
-if (!context.TarinaiSystemOrder?.update) throw new Error('system order missing');
-if (!context.TarinaiSimulation?.update) throw new Error('simulation facade missing');
-"""
-    with tempfile.NamedTemporaryFile("w", encoding="utf-8", suffix=".js", delete=False) as f:
-        f.write(js)
-        tmp = Path(f.name)
-    try:
-        result = subprocess.run(["node", str(tmp)], cwd=ROOT, text=True, capture_output=True)
-    finally:
-        tmp.unlink(missing_ok=True)
-    if result.returncode != 0:
-        sys.stderr.write(result.stdout)
-        sys.stderr.write(result.stderr)
-        fail("simulation boundary smoke test failed")
-    ok("simulation boundary smoke test passed")
-
-
-
-def check_update_policy_boundaries() -> None:
-    data = manifest()
-    js_files = data["js"]
-    required = ["js/item_update_policy.js", "js/tarinai_update_policy.js"]
-    for rel in required:
-        if rel not in js_files:
-            fail(f"update policy boundary module missing from manifest: {rel}")
-    if not (js_files.index("js/item_lifecycle_support.js") < js_files.index("js/item_update_policy.js") < js_files.index("js/item_runtime.js")):
-        fail("item update policy load order is invalid")
-    if not (js_files.index("js/simulation_runtime_helpers.js") < js_files.index("js/tarinai_update_policy.js") < js_files.index("js/simulation_creature_system.js")):
-        fail("Tarinai update policy load order is invalid")
-    item_policy = read_text(ROOT / "js/item_update_policy.js")
-    tarinai_policy = read_text(ROOT / "js/tarinai_update_policy.js")
-    scheduler = read_text(ROOT / "js/item_update_scheduler.js")
-    sim_helpers = read_text(ROOT / "js/simulation_runtime_helpers.js")
-    creature_system = read_text(ROOT / "js/simulation_creature_system.js")
-    required_tokens = [
-        (item_policy, "global.TarinaiItemUpdatePolicy"),
-        (item_policy, "itemUpdateInterval"),
-        (item_policy, "forScheduledItems"),
-        (tarinai_policy, "global.TarinaiCreatureUpdatePolicy"),
-        (tarinai_policy, "updateCadence"),
-        (scheduler, "TarinaiItemUpdatePolicy"),
-        (sim_helpers, "TarinaiItemUpdatePolicy"),
-        (creature_system, "TarinaiCreatureUpdatePolicy"),
-    ]
-    for source, token in required_tokens:
-        if token not in source:
-            fail(f"update policy boundary token missing: {token}")
-    duplicated_item_policy_sources = [scheduler, sim_helpers]
-    for source in duplicated_item_policy_sources:
-        if "const REALTIME_ITEM_TYPES" in source or "const PIN_ITEM_TYPES" in source or "SCHEDULED_ITEM_TYPES =" in source:
-            fail("item update policy constants are duplicated outside item_update_policy.js")
-    if "function tarinaiUpdateInterval" in creature_system:
-        fail("Tarinai update cadence still lives inside simulation_creature_system.js")
-    js = f"""
-const vm = require('vm');
-const fs = require('fs');
-const context = {{ console, globalThis: null }};
-context.globalThis = context;
-context.window = context;
-context.isServingFoodType = (type) => type === 'food';
-context.TarinaiItemRuntime = {{
-  updateOne(item, dt) {{ item.runs = (item.runs || 0) + 1; item.lastDt = dt; return true; }}
-}};
-context.TarinaiPerf = {{ begin() {{ return () => undefined; }}, renderQualityTier() {{ return "normal"; }} }};
-context.TarinaiPhysicsWorldSystem = {{ updateWorld() {{ return {{ mechanical: 0, constraintRan: 0, postConstraintPairs: 0 }}; }} }};
-context.TarinaiInputMode = {{ snapshot() {{ return {{ touchFirst: false }}; }} }};
-vm.createContext(context);
-for (const file of ['js/item_update_policy.js', 'js/item_update_scheduler.js']) {{
-  vm.runInContext(fs.readFileSync(file, 'utf8'), context, {{ filename: file }});
-}}
-const world = {{ time: 0, items: [{{ type: 'ball' }}, {{ type: 'food' }}, {{ type: 'grass' }}], ensureItemBuckets() {{}}, itemBucketRebuildsTotal: 0 }};
-if (context.TarinaiItemUpdateScheduler.run(world, 0.1) < 1) throw new Error('realtime item did not run');
-world.time = 5.1;
-if (context.TarinaiItemUpdateScheduler.run(world, 0.1) < 1) throw new Error('scheduled item did not run');
-"""
-    with tempfile.NamedTemporaryFile("w", encoding="utf-8", suffix=".js", delete=False) as f:
-        f.write(js)
-        tmp = Path(f.name)
-    try:
-        result = subprocess.run(["node", str(tmp)], cwd=ROOT, text=True, capture_output=True)
-    finally:
-        tmp.unlink(missing_ok=True)
-    if result.returncode != 0:
-        sys.stderr.write(result.stdout)
-        sys.stderr.write(result.stderr)
-        fail("update policy scheduler smoke test failed")
-    ok("update policy boundaries present")
-
-
-def check_entity_runtime_boundary() -> None:
-    data = manifest()
-    js_files = data["js"]
-    required = ["js/item_runtime.js", "js/tarinai_runtime.js"]
-    for rel in required:
-        if rel not in js_files:
-            fail(f"entity runtime boundary module missing from manifest: {rel}")
-    if not (js_files.index("js/item_lifecycle_pipeline.js") < js_files.index("js/item_runtime.js") < js_files.index("js/structure_lifecycle.js")):
-        fail("item runtime boundary load order is invalid")
-    if not (js_files.index("js/tarinai_needs_items.js") < js_files.index("js/tarinai_social_move_life.js") < js_files.index("js/tarinai_runtime.js") < js_files.index("js/tarinai_render.js")):
-        fail("Tarinai runtime boundary load order is invalid")
-    item_runtime = read_text(ROOT / "js/item_runtime.js")
-    tarinai_runtime = read_text(ROOT / "js/tarinai_runtime.js")
-    item_scheduler = read_text(ROOT / "js/item_update_scheduler.js")
-    sim_helpers = read_text(ROOT / "js/simulation_runtime_helpers.js")
-    creature_system = read_text(ROOT / "js/simulation_creature_system.js")
-    required_tokens = [
-        (item_runtime, "global.TarinaiItemRuntime"),
-        (item_runtime, "installPrototypeBoundary"),
-        (item_runtime, "updateScheduled"),
-        (tarinai_runtime, "global.TarinaiCreatureRuntime"),
-        (item_scheduler, "TarinaiItemRuntime.updateOne"),
-        (sim_helpers, "TarinaiItemRuntime.updateScheduled"),
-        (creature_system, "TarinaiCreatureRuntime.updateOne"),
-    ]
-    for source, token in required_tokens:
-        if token not in source:
-            fail(f"entity runtime boundary token missing: {token}")
-    ok("entity update runtime boundary present")
-
-
-def check_tarinai_update_pipeline_boundary() -> None:
-    data = manifest()
-    js_files = data["js"]
-    required = [
-        "js/tarinai_sunbath_system.js",
-        "js/tarinai_cursor_care_system.js",
-        "js/tarinai_local_environment_system.js",
-        "js/tarinai_need_planner_system.js",
-        "js/tarinai_item_interaction_context.js",
-        "js/tarinai_food_interaction_system.js",
-        "js/tarinai_contact_item_system.js",
-        "js/tarinai_item_interaction_system.js",
-        "js/tarinai_update_step_frame.js",
-        "js/tarinai_update_step_ai.js",
-        "js/tarinai_update_step_environment.js",
-        "js/tarinai_update_step_movement.js",
-        "js/tarinai_update_step_health.js",
-        "js/update_step_pipeline_runner.js",
-        "js/tarinai_update_pipeline.js",
-    ]
-    for rel in required:
-        if rel not in js_files:
-            fail(f"Tarinai update pipeline module missing from manifest: {rel}")
-    expected_order = [
-        "js/tarinai_needs_items.js",
-        "js/tarinai_need_planner_system.js",
-        "js/tarinai_item_interaction_context.js",
-        "js/tarinai_food_interaction_system.js",
-        "js/tarinai_contact_item_system.js",
-        "js/tarinai_item_interaction_system.js",
-        "js/tarinai_sunbath_system.js",
-        "js/tarinai_cursor_care_system.js",
-        "js/tarinai_local_environment_system.js",
-        "js/tarinai_social_move_life.js",
-        "js/tarinai_update_step_frame.js",
-        "js/tarinai_update_step_ai.js",
-        "js/tarinai_update_step_environment.js",
-        "js/tarinai_update_step_movement.js",
-        "js/tarinai_update_step_health.js",
-        "js/tarinai_update_pipeline.js",
-        "js/tarinai_runtime.js",
-    ]
-    if [rel for rel in js_files if rel in expected_order] != expected_order:
-        fail("Tarinai update pipeline load order is invalid")
-    exports = {
-        "js/tarinai_sunbath_system.js": "global.TarinaiSunbathSystem",
-        "js/tarinai_cursor_care_system.js": "global.TarinaiCursorCareSystem",
-        "js/tarinai_local_environment_system.js": "global.TarinaiLocalEnvironmentSystem",
-        "js/tarinai_need_planner_system.js": "global.TarinaiNeedPlannerSystem",
-        "js/tarinai_item_interaction_context.js": "global.TarinaiItemInteractionContext",
-        "js/tarinai_food_interaction_system.js": "global.TarinaiFoodInteractionSystem",
-        "js/tarinai_contact_item_system.js": "global.TarinaiContactItemSystem",
-        "js/tarinai_item_interaction_system.js": "global.TarinaiItemInteractionSystem",
-        "js/tarinai_update_step_frame.js": "global.TarinaiFrameUpdateStep",
-        "js/tarinai_update_step_ai.js": "global.TarinaiAiUpdateStep",
-        "js/tarinai_update_step_environment.js": "global.TarinaiEnvironmentUpdateStep",
-        "js/tarinai_update_step_movement.js": "global.TarinaiMovementUpdateStep",
-        "js/tarinai_update_step_health.js": "global.TarinaiHealthUpdateStep",
-        "js/update_step_pipeline_runner.js": "global.TarinaiUpdateStepPipelineRunner",
-        "js/tarinai_update_pipeline.js": "global.TarinaiUpdatePipeline",
-    }
-    for rel, token in exports.items():
-        if token not in read_text(ROOT / rel):
-            fail(f"Tarinai update pipeline export missing: {rel}")
-    runtime = read_text(ROOT / "js/tarinai_runtime.js")
-    if "TarinaiUpdatePipeline?.updateOne" not in runtime and "TarinaiUpdatePipeline.updateOne" not in runtime:
-        fail("Tarinai runtime does not route through TarinaiUpdatePipeline")
-
-    needs_items = read_text(ROOT / "js/tarinai_needs_items.js")
-    sunbath_system = read_text(ROOT / "js/tarinai_sunbath_system.js")
-    cursor_system = read_text(ROOT / "js/tarinai_cursor_care_system.js")
-    local_env_system = read_text(ROOT / "js/tarinai_local_environment_system.js")
-    interaction_system = read_text(ROOT / "js/tarinai_item_interaction_system.js")
-    if "  update(dt)" in needs_items or "const minute = dt / 60" in needs_items:
-        fail("Tarinai.prototype.update residue remains in needs mixin")
-    if "TarinaiItemInteractionSystem.updateOne" not in needs_items or "const foodNeed = Number(this.needRaw?.food" in needs_items:
-        fail("Tarinai.prototype.interactWithItems is not a thin facade over the interaction system")
-    # These subsystems are now routed by the split update steps rather than the prototype needs mixin.
-    interaction_context = read_text(ROOT / "js/tarinai_item_interaction_context.js")
-    food_interaction = read_text(ROOT / "js/tarinai_food_interaction_system.js")
-    contact_interaction = read_text(ROOT / "js/tarinai_contact_item_system.js")
-    for source, token in [
-        (sunbath_system, "this.sunbathFrameTimer"),
-        (cursor_system, "this.nextCursorHeartAt"),
-        (local_env_system, "grassComfort"),
-        (interaction_context, "const foodNeed = Number(tarinai.needRaw?.food"),
-        (food_interaction, "tarinai.applyParamItemEffect"),
-        (contact_interaction, "tarinai.applyWaterEffect(dt, it.type)"),
-    ]:
-        if token not in source:
-            fail(f"Tarinai update subsystem missing extracted token: {token}")
-    if "TarinaiItemInteractionContext.create" not in interaction_system or "TarinaiFoodInteractionSystem.updateCandidate" not in interaction_system or "TarinaiContactItemSystem.updateCandidate" not in interaction_system:
-        fail("Tarinai item interaction orchestrator does not delegate to context/food/contact candidate subsystems")
-    if "for (const item of ctx.foodCandidates" not in interaction_system:
-        fail("Tarinai item interaction orchestrator does not preserve per-candidate interaction order")
-    if "TarinaiNeedPlannerSystem.updateOne" not in needs_items or "function resolveNeedsCore" not in needs_items:
-        fail("Tarinai resolveNeeds is not routed through planner system")
-    if "TarinaiNeedPlannerCoreSystem" not in needs_items:
-        fail("Tarinai need planner core system export missing")
-    if "TarinaiItemInteractionSystem.updateOne" not in read_text(ROOT / "js/tarinai_update_step_ai.js"):
-        fail("Tarinai AI step does not delegate item interactions to subsystem")
-    if "TarinaiCursorCareSystem.updateOne" not in read_text(ROOT / "js/tarinai_update_step_frame.js"):
-        fail("Tarinai frame step does not delegate cursor care to subsystem")
-    if "TarinaiLocalEnvironmentSystem.updateOne" not in read_text(ROOT / "js/tarinai_update_step_environment.js"):
-        fail("Tarinai environment step does not delegate local environment to subsystem")
-    if "TarinaiSunbathSystem.updateOne" not in read_text(ROOT / "js/tarinai_update_step_movement.js"):
-        fail("Tarinai movement step does not delegate sunbath to subsystem")
-
-    pipeline = read_text(ROOT / "js/tarinai_update_pipeline.js")
-    for token in ["TarinaiFrameUpdateStep", "TarinaiAiUpdateStep", "TarinaiEnvironmentUpdateStep", "TarinaiMovementUpdateStep", "TarinaiHealthUpdateStep"]:
-        if token not in pipeline:
-            fail(f"Tarinai update pipeline missing step token: {token}")
-    js = f"""
-const vm = require('vm');
-const fs = require('fs');
-const context = {{ console, globalThis: null }};
-context.globalThis = context;
-context.window = context;
-context.CONFIG = {{ hungerPerMinute: 60, lonelinessPerMinute: 60, energyPerMinute: 60 }};
-context.clamp = (v, a, b) => Math.max(a, Math.min(b, v));
-context.rand = (a, b) => (a + b) / 2;
-context.pick = (arr) => arr[0];
-context.stableUnit = () => 0.5;
-context.deterministicRange = (world, salt, min, max) => (min + max) / 2;
-context.deterministicSigned = () => 0;
-context.deterministicChance = () => false;
-context.applyNeedShock = () => undefined;
-context.applyNeedRelief = () => undefined;
-context.calculateStressFromNeeds = () => 0;
-context.applyGroundStressModifier = (t, v) => v;
-context.createDefaultNeeds = () => ({{ food: 0, sleep: 0, health: 0, safety: 0, social: 0, fulfill: 0 }});
-context.tarinaiMaxEnergy = () => 100;
-context.tarinaiMetabolicHungerScale = () => 1;
-vm.createContext(context);
-for (const file of {required!r}) {{
-  vm.runInContext(fs.readFileSync(file, 'utf8'), context, {{ filename: file }});
-}}
-const calls = [];
-const world = {{
-  time: 1,
-  groundType: 'soil',
-  weather: 'cloudy',
-  colonyMood: {{ id: 'relaxed' }},
-  selected: null,
-  spendScheduledWork() {{ return true; }},
-  temperatureAt() {{ return 0.62; }},
-  lightLevel() {{ return 0.5; }},
-  spawnBleedEffect() {{ calls.push('bleed'); }},
-  resolveFenceCollision() {{ calls.push('fence'); }},
-}};
-const t = {{
-  world, dead: false, x: 10, y: 12, vx: 0, vy: 0, radius: 20,
-  age: 0, reproductionTimer: 10, eatTimer: 0, eatCooldown: 0, foodReactTimer: 0,
-  surpriseTimer: 0, fearTimer: 0, intimidateTimer: 0, intimidatedTimer: 0, stress: 0,
-  hpBarTimer: 0, stressBarTimer: 0, loveMochiTimer: 0, fightMochiTimer: 0,
-  birthRitualTimer: 0, pokeFlashTimer: 0, cursorPetting: 0, pinchThoughtTimer: 0,
-  sunbathCooldown: 0, fightTimer: 0, fightCooldown: 0, defeatedTimer: 0, stretchTimer: 0,
-  grassEatTimer: 0, hurtTimer: 0, fallTimer: 0, tempTimer: 0, tempComfort: 0.62,
-  hunger: 10, loneliness: 0, energy: 100, trait: {{ hunger: 1, social: 1, sleep: 1 }},
-  state: 'idle', aiTimer: 0, envTimer: 0, needs: context.createDefaultNeeds(), needRaw: context.createDefaultNeeds(),
-  updateZunchiDisease() {{ calls.push('zunchiDisease'); }},
-  updateSpecialDiseases() {{ calls.push('specialDisease'); }},
-  freezeSleepDiseaseMotion() {{ return false; }},
-  personalityProfile() {{ return {{ fear: 1 }}; }},
-  updateFacing() {{ calls.push('facing'); }},
-  maintainTargetProgress() {{ calls.push('targetProgress'); }},
-  move() {{ calls.push('move'); }},
-  updateNestBoxPresence() {{ calls.push('nestBox'); }},
-  checkLife() {{ calls.push('checkLife'); }},
-}};
-if (!context.TarinaiUpdatePipeline.updateOne(t, 0.016, {{ legacyUpdate() {{ throw new Error('legacy should not run'); }} }})) throw new Error('pipeline update failed');
-for (const expected of ['zunchiDisease', 'specialDisease', 'facing', 'targetProgress', 'move', 'nestBox', 'fence', 'checkLife']) {{
-  if (!calls.includes(expected)) throw new Error('missing pipeline call: ' + expected);
-}}
-"""
-    with tempfile.NamedTemporaryFile("w", encoding="utf-8", suffix=".js", delete=False) as f:
-        f.write(js)
-        tmp = Path(f.name)
-    try:
-        result = subprocess.run(["node", str(tmp)], cwd=ROOT, text=True, capture_output=True)
-    finally:
-        tmp.unlink(missing_ok=True)
-    if result.returncode != 0:
-        sys.stderr.write(result.stdout)
-        sys.stderr.write(result.stderr)
-        fail("Tarinai update pipeline smoke test failed")
-    ok("Tarinai update pipeline boundary present")
-
-
-
-def check_item_lifecycle_pipeline_boundary() -> None:
-    data = manifest()
-    js_files = data["js"]
-    dynamic_required = [
-        "js/item_dynamic_tool_system.js",
-        "js/item_dynamic_ball_system.js",
-        "js/item_dynamic_duplicator_system.js",
-        "js/item_dynamic_pin_system.js",
-        "js/item_dynamic_zunchi_system.js",
-        "js/item_dynamic_system.js",
-    ]
-    required = [
-        "js/item_lifecycle_support.js",
-        "js/physics_helpers.js",
-        "js/pin_attachment_system.js",
-        *dynamic_required,
-        "js/item_lifecycle_decay_system.js",
-        "js/item_lifecycle_growth_system.js",
-        "js/item_lifecycle_step_frame.js",
-        "js/item_lifecycle_step_decay.js",
-        "js/item_lifecycle_step_dynamic.js",
-        "js/item_lifecycle_step_growth.js",
-        "js/update_step_pipeline_runner.js",
-        "js/item_lifecycle_pipeline.js",
-    ]
-    for rel in required:
-        if rel not in js_files:
-            fail(f"Item lifecycle pipeline module missing from manifest: {rel}")
-    expected_order = [
-        "js/physics_helpers.js",
-        "js/pin_attachment_system.js",
-        "js/item_lifecycle_support.js",
-        "js/item_update_policy.js",
-        *dynamic_required,
-        "js/item_lifecycle_decay_system.js",
-        "js/item_lifecycle_growth_system.js",
-        "js/item_lifecycle_step_frame.js",
-        "js/item_lifecycle_step_decay.js",
-        "js/item_lifecycle_step_dynamic.js",
-        "js/item_lifecycle_step_growth.js",
-        "js/update_step_pipeline_runner.js",
-        "js/item_lifecycle_pipeline.js",
-        "js/item_runtime.js",
-    ]
-    if [rel for rel in js_files if rel in expected_order] != expected_order:
-        fail("Item lifecycle pipeline load order is invalid")
-    exports = {
-        "js/item_lifecycle_support.js": "global.TarinaiItemLifecycleRuntimeSupport",
-        "js/item_dynamic_tool_system.js": "global.TarinaiItemDynamicToolSystem",
-        "js/item_dynamic_ball_system.js": "global.TarinaiItemDynamicBallSystem",
-        "js/item_dynamic_duplicator_system.js": "global.TarinaiItemDynamicDuplicatorSystem",
-        "js/item_dynamic_pin_system.js": "global.TarinaiItemDynamicPinSystem",
-        "js/item_dynamic_zunchi_system.js": "global.TarinaiItemDynamicZunchiSystem",
-        "js/item_dynamic_system.js": "global.TarinaiItemDynamicSystem",
-        "js/item_lifecycle_decay_system.js": "global.TarinaiItemDecaySystem",
-        "js/item_lifecycle_growth_system.js": "global.TarinaiItemGrowthSystem",
-        "js/item_lifecycle_step_frame.js": "global.TarinaiItemFrameLifecycleStep",
-        "js/item_lifecycle_step_decay.js": "global.TarinaiItemDecayLifecycleStep",
-        "js/item_lifecycle_step_dynamic.js": "global.TarinaiItemDynamicLifecycleStep",
-        "js/item_lifecycle_step_growth.js": "global.TarinaiItemGrowthLifecycleStep",
-        "js/update_step_pipeline_runner.js": "global.TarinaiUpdateStepPipelineRunner",
-        "js/item_lifecycle_pipeline.js": "global.TarinaiItemLifecyclePipeline",
-    }
-    for rel, token in exports.items():
-        if token not in read_text(ROOT / rel):
-            fail(f"Item lifecycle pipeline export missing: {rel}")
-    runtime = read_text(ROOT / "js/item_runtime.js")
-    if "TarinaiItemLifecyclePipeline?.updateOne" not in runtime and "TarinaiItemLifecyclePipeline.updateOne" not in runtime:
-        fail("item runtime does not route through TarinaiItemLifecyclePipeline")
-    pipeline = read_text(ROOT / "js/item_lifecycle_pipeline.js")
-    for token in ["TarinaiItemFrameLifecycleStep", "TarinaiItemDecayLifecycleStep", "TarinaiItemDynamicLifecycleStep", "TarinaiItemGrowthLifecycleStep"]:
-        if token not in pipeline:
-            fail(f"Item lifecycle pipeline missing step token: {token}")
-    dynamic_step = read_text(ROOT / "js/item_lifecycle_step_dynamic.js")
-    dynamic_system = read_text(ROOT / "js/item_dynamic_system.js")
-    if "TarinaiItemDynamicSystem.update" not in dynamic_step:
-        fail("Item dynamic lifecycle step does not delegate to TarinaiItemDynamicSystem")
-    for token in ["TarinaiItemDynamicToolSystem", "TarinaiItemDynamicBallSystem", "TarinaiItemDynamicDuplicatorSystem", "TarinaiItemDynamicPinSystem", "TarinaiItemDynamicZunchiSystem"]:
-        if token not in dynamic_system:
-            fail(f"Item dynamic system missing subsystem token: {token}")
-    for rel in ["js/item_dynamic_tool_system.js", "js/item_dynamic_ball_system.js", "js/item_dynamic_duplicator_system.js", "js/item_dynamic_pin_system.js", "js/item_dynamic_zunchi_system.js"]:
-        body = read_text(ROOT / rel)
-        for token in ["item.updateFan", "item.updateRotator", "item.updateBall", "item.updateDuplicator", "item.updatePushpin", "item.updateZunchiMotion", "item.updateZunchi"]:
-            if token in body:
-                fail(f"dynamic subsystem still delegates to prototype method {token} in {rel}")
-    lifecycle_support = read_text(ROOT / "js/item_lifecycle_support.js")
-    lifecycle_decay = read_text(ROOT / "js/item_lifecycle_step_decay.js")
-    lifecycle_growth = read_text(ROOT / "js/item_lifecycle_step_growth.js")
-    if "TarinaiItemLifecycleRuntimeSupport" not in lifecycle_support:
-        fail("item lifecycle support export missing")
-    if "TarinaiDuplicatorRuntime" in lifecycle_support:
-        fail("duplicate duplicator runtime export still present")
-    if "TarinaiItemDecaySystem.update" not in lifecycle_decay or "TarinaiItemGrowthSystem.update" not in lifecycle_growth:
-        fail("item lifecycle decay/growth steps are not thin system adapters")
-    js = f"""
-const vm = require('vm');
-const fs = require('fs');
-const context = {{ console, globalThis: null }};
-context.globalThis = context;
-context.window = context;
-context.isServingFoodType = (type) => type === 'food';
-context.passiveFoodDecayInterval = () => 0.5;
-context.passiveFoodDecayRate = () => 0.1;
-context.updateServingFoodVisualSize = (item) => {{ item.r = (item.r || 12) - 0.1; return true; }};
-context.TarinaiItemRegistry = {{ food: {{ }} }};
-context.isPinType = (type) => type === 'pushpin';
-context.normalizeGrassStage = (item) => {{ item.normalized = true; }};
-context.stableUnit = () => 0.5;
-vm.createContext(context);
-for (const file of {required!r}) {{
-  vm.runInContext(fs.readFileSync(file, 'utf8'), context, {{ filename: file }});
-}}
-const events = [];
-const world = {{
-  itemDropImpact(item) {{ events.push(['drop', item.type]); }},
-  markTerrainDirty(reason) {{ events.push(['terrain', reason]); }},
-  markItemBucketsDirty(reason) {{ events.push(['buckets', reason]); }},
-  markSpatialDirty(reason) {{ events.push(['spatial', reason]); }},
-  emit(type, payload) {{ events.push(['emit', type, payload.type]); }},
-}};
-const food = {{ type: 'food', dead: false, age: 0, dropTimer: 0.1, dropImpactDone: false, foodServingsRemaining: 1, amount: 1, passiveFoodDecayTimer: 0 }};
-if (!context.TarinaiItemLifecyclePipeline.updateOne(food, 0.6, world, {{ legacyUpdate() {{ throw new Error('legacy should not run'); }} }})) throw new Error('food update failed');
-if (food.age !== 0.6 || !food.dropImpactDone || !(food.foodServingsRemaining < 1) || !events.some(([kind, value]) => kind === 'buckets' && value === 'food-passive-resize') || !events.some(([kind, value]) => kind === 'spatial' && value === 'food-passive-resize')) throw new Error('frame/decay step did not run');
-context.CONFIG = {{ worldPadding: 30 }};
-context.clamp = (v, min, max) => Math.max(min, Math.min(max, v));
-context.distXY = (ax, ay, bx, by) => Math.hypot(ax - bx, ay - by);
-const dynamic = {{
-  type: 'ball', dead: false, age: 0, x: 80, y: 80, prevX: 80, prevY: 80,
-  vx: 12, vy: 0, r: 18, spin: 0, spinVelocity: 0
-}};
-const ballWorld = {{ ...world, w: 500, h: 500, nearbyItems() {{ return []; }} }};
-context.TarinaiItemLifecyclePipeline.updateOne(dynamic, 0.25, ballWorld, {{ legacyUpdate() {{ throw new Error('legacy should not run'); }} }});
-if (!(dynamic.x > 80) || !(dynamic.spin > 0)) throw new Error('dynamic step did not run');
-const grass = {{ type: 'grass', dead: false, age: 0 }};
-context.TarinaiItemLifecyclePipeline.updateOne(grass, 0.1, world, {{ legacyUpdate() {{ throw new Error('legacy should not run'); }} }});
-if (grass.normalized) throw new Error('grass should not be normalized by per-item growth step');
-"""
-    with tempfile.NamedTemporaryFile("w", encoding="utf-8", suffix=".js", delete=False) as f:
-        f.write(js)
-        tmp = Path(f.name)
-    try:
-        result = subprocess.run(["node", str(tmp)], cwd=ROOT, text=True, capture_output=True)
-    finally:
-        tmp.unlink(missing_ok=True)
-    if result.returncode != 0:
-        sys.stderr.write(result.stdout)
-        sys.stderr.write(result.stderr)
-        fail("Item lifecycle pipeline smoke test failed")
-    ok("Item lifecycle pipeline boundary present")
-
-
-
-def mechanical_collision_and_editor_smoke() -> None:
-    footprints = read_text(ROOT / "js/collision_footprint_system.js")
-    editor_source = read_text(ROOT / "js/physics_shape_editor_system.js")
-    placement_source = read_text(ROOT / "js/world_placement_log.js")
-    for token in ("rectCorners,", "rectAxes,", "projectPoints,", "aabbOverlap,", "rectOverlapInfo,", "rectsOverlap,"):
-        if token not in footprints:
-            fail(f"mechanical SAT primitive is not exported: {token}")
-    if "const DEFAULT_GRID_SIZE = 20;" not in editor_source:
-        fail("mechanical shape editor grid must use coarse 20px snapping")
-    if editor_source.count("snapPoint(") < 2 or "gridSize: DEFAULT_GRID_SIZE" not in editor_source:
-        fail("mechanical shape editor does not route pointer coordinates through grid snapping")
-    if placement_source.count("20px\\u9593\\u9694") < 2:
-        fail("mechanical editor hints do not disclose 20px grid snapping")
-
-    js = f"""
-const vm = require('vm');
-const fs = require('fs');
-const context = {{ console, globalThis: null }};
-context.globalThis = context;
-context.window = context;
-context.TarinaiPerf = {{ begin() {{ return null; }} }};
-context.TarinaiConstraintSystem = {{ updateWorld() {{ return 0; }} }};
-context.normalizedItemAngle = angle => angle;
-context.isRotatableItemType = type => ['rotator', 'poison_block', 'reciprocator'].includes(String(type || ''));
-context.defaultItemAngle = type => String(type || '') === 'reciprocator' ? Math.PI / 2 : 0;
-context.itemRadiusFor = (_type, fallback = 12) => fallback;
-context.toolItemType = tool => tool;
-vm.createContext(context);
-for (const path of {repr([str(ROOT / rel) for rel in [
-    'js/math.js', 'js/geometry_helpers.js', 'js/collision_footprint_system.js',
-    'js/physics_world_system.js', 'js/mechanical_system.js', 'js/placement_preview_system.js', 'js/physics_shape_editor_system.js'
-]])}) vm.runInContext(fs.readFileSync(path, 'utf8'), context, {{ filename: path }});
-
-const fp = context.TarinaiCollisionFootprints;
-for (const key of ['rectCorners', 'rectAxes', 'projectPoints', 'aabbOverlap', 'rectOverlapInfo', 'rectsOverlap']) {{
-  if (typeof fp[key] !== 'function') throw new Error(`missing footprint primitive: ${{key}}`);
-}}
-
-const editor = context.TarinaiPhysicsShapeEditorSystem;
-if (editor.gridSize !== 20) throw new Error('editor grid size mismatch');
-const snapped = editor.snapPoint({{ x: 13, y: 31 }});
-if (snapped.x !== 20 || snapped.y !== 40) throw new Error('pointer did not snap to grid');
-const cleaned = editor.cleanSegments([[13, 31, 91, 44], [-52, -20, 52, -20]], {{ fallback: [-80, 0, 80, 0] }});
-if (!cleaned.length || cleaned.some(seg => seg.some(value => Math.abs(value % 20) > 1e-9))) throw new Error('segment endpoints are not grid aligned');
-if (cleaned.some(seg => Math.hypot(seg[2] - seg[0], seg[3] - seg[1]) < 20)) throw new Error('editor retained sub-grid segments');
-
-let serial = 0;
-function makeItem(type, x, y) {{
-  return {{ id: `m${{++serial}}`, type, x, y, angle: 0, r: 64, amount: 999, dead: false }};
-}}
-function activate(item) {{
-  const api = context.TarinaiPhysicsBodySystem;
-  api.setSegments(item, [[-80, 0, 80, 0]], 'test-shape');
-  api.setScalar(item, 'solid', true, 'test-solid');
-  if (item.type === 'rotator') {{ api.setScalar(item, 'motorOn', true, 'test'); api.setScalar(item, 'motorSpeed', 1.4, 'test'); }}
-  if (item.type === 'reciprocator') {{ api.setScalar(item, 'railOn', true, 'test'); api.setScalar(item, 'railAxis', 0, 'test'); api.setScalar(item, 'railMotorSpeed', 80, 'test'); }}
-  if (item.type === 'poison_block') {{ api.setScalar(item, 'xv', 24, 'test'); api.setScalar(item, 'awakeUntil', 10, 'test'); }}
-}}
-const reverseRotator = makeItem('rotator', 80, 80);
-reverseRotator.world = {{ time: 0 }};
-context.TarinaiPhysicsBodySystem.ensureBody(reverseRotator, reverseRotator.world);
-context.TarinaiPhysicsBodySystem.setScalar(reverseRotator, 'motorSpeed', -1.25, 'reverse-test');
-if (Math.abs(context.TarinaiPhysicsBodySystem.scalar(reverseRotator, 'motorSpeed', 0) + 1.25) > 1e-9) throw new Error('negative rotator motor speed was clamped');
-reverseRotator.angle = 1.0;
-reverseRotator.world = {{ time: 0, drawListDirty: false, markSpatialDirty() {{}}, nearbyItems() {{ return []; }}, nearbyObstacles() {{ return []; }}, items: [], tarinai: [] }};
-context.TarinaiMechanicalSystem.updateRotator(reverseRotator, 0.1, reverseRotator.world, {{ skipInteractions: true }});
-if (!(reverseRotator.angle < 0.99)) throw new Error('negative rotator speed did not rotate backward');
-
-function pairResult(typeA, typeB, disableB = false) {{
-  const a = makeItem(typeA, 120, 120);
-  const b = makeItem(typeB, 120, 128);
-  const items = [a, b];
-  const world = {{
-    items, tarinai: [], time: 1, frameCount: 1, w: 900, h: 700, drawListDirty: false,
-    itemCounts: {{ rotator: 0, poison_block: 0, reciprocator: 0 }},
-    ensureItemBuckets() {{}}, markSpatialDirty() {{}}, markItemBucketsDirty() {{}},
-    nearbyObstacles() {{ return items; }}, nearbyItems() {{ return items; }},
-    itemsOfType(type) {{ return items.filter(item => item.type === type && !item.dead); }},
-  }};
-  for (const item of items) {{ item.world = world; world.itemCounts[item.type] += 1; context.TarinaiPhysicsBodySystem.ensureBody(item, world); activate(item); }}
-  if (disableB) context.TarinaiPhysicsBodySystem.setScalar(b, 'solid', false, 'test-disabled');
-  const solved = context.TarinaiMechanicalSystem.resolveMechanicalPairs(world, 0.016, {{ maxPairs: 40 }});
-  return {{ solved, a, b }};
-}}
-for (const [a, b] of [['rotator', 'rotator'], ['rotator', 'reciprocator'], ['rotator', 'poison_block'], ['reciprocator', 'reciprocator'], ['reciprocator', 'poison_block'], ['poison_block', 'poison_block']]) {{
-  const result = pairResult(a, b, false);
-  if (!(result.solved > 0)) throw new Error(`${{a}}/${{b}} collision-on pair did not interact`);
-  const disabled = pairResult(a, b, true);
-  if (disabled.solved !== 0) throw new Error(`${{a}}/${{b}} collision-off pair still interacted`);
-}}
-
-const orientationWorld = {{ toolAngleFor() {{ return 0; }} }};
-const previewReciprocator = makeItem('reciprocator', 40, 40);
-context.TarinaiPlacementPreviewSystem.applyToolOrientation(orientationWorld, previewReciprocator, 0);
-if (Math.abs(previewReciprocator.physicsBody.pose.angle - Math.PI / 2) > 1e-9) throw new Error('reciprocator placement body angle mismatch');
-if (Math.abs(previewReciprocator.physicsBody.rail.axisAngle) > 1e-9) throw new Error('reciprocator placement rail angle mismatch');
-
-const rail = makeItem('reciprocator', 0, 0);
-context.TarinaiPlacementPreviewSystem.applyToolOrientation(orientationWorld, rail, 0);
-activate(rail);
-const fence = {{ id: 'fence', type: 'fence_v', x: 8, y: 0, amount: 999, dead: false }};
-const collisionWorld = {{
-  items: [rail, fence], tarinai: [], time: 1, frameCount: 1, w: 900, h: 700, drawListDirty: false, itemBucketRebuildsTotal: 0,
-  ensureItemBuckets() {{}}, markSpatialDirty() {{}},
-  nearbyObstacles() {{ return this.items; }}, nearbyItems() {{ return this.items; }},
-  itemsOfType(type) {{ return this.items.filter(item => item.type === type && !item.dead); }},
-  isFenceType(type) {{ return type === 'fence_v'; }},
-  solidObstacleRects(item) {{
-    if (item !== fence) return [];
-    return [{{ left: 4, right: 12, top: -100, bottom: 100, cx: 8, cy: 0, halfW: 4, halfH: 100, angle: 0, cos: 1, sin: 0, oriented: true, type: 'fence_v', item }}];
-  }},
-}};
-rail.world = collisionWorld; fence.world = collisionWorld;
-context.TarinaiMechanicalSystem.updateWorld(collisionWorld, 0.016, {{ maxSubsteps: 1 }});
-if (context.TarinaiPhysicsBodySystem.scalar(rail, 'railDir', 1) !== -1) throw new Error('reciprocator did not reverse at a solid obstacle');
-
-const oneWayRail = makeItem('reciprocator', 0, 0);
-context.TarinaiPlacementPreviewSystem.applyToolOrientation(orientationWorld, oneWayRail, 0);
-activate(oneWayRail);
-const oneWayFence = {{ id: 'one-way-fence', type: 'one_way_fence', x: 8, y: 0, amount: 999, dead: false }};
-const oneWayWorld = {{
-  items: [oneWayRail, oneWayFence], tarinai: [], time: 1, frameCount: 2, w: 900, h: 700, drawListDirty: false, itemBucketRebuildsTotal: 0,
-  ensureItemBuckets() {{}}, markSpatialDirty() {{}},
-  nearbyObstacles() {{ return this.items; }}, nearbyItems() {{ return this.items; }},
-  itemsOfType(type) {{ return this.items.filter(item => item.type === type && !item.dead); }},
-  isFenceType(type) {{ return type === 'one_way_fence'; }},
-  solidObstacleRects(item) {{
-    if (item !== oneWayFence) return [];
-    return [{{ left: 4, right: 12, top: -100, bottom: 100, cx: 8, cy: 0, halfW: 4, halfH: 100, angle: 0, cos: 1, sin: 0, oriented: true, type: 'one_way_fence', item, oneWay: true, oneWayNx: 1, oneWayNy: 0 }}];
-  }},
-}};
-oneWayRail.world = oneWayWorld; oneWayFence.world = oneWayWorld;
-context.TarinaiMechanicalSystem.updateWorld(oneWayWorld, 0.016, {{ maxSubsteps: 1 }});
-if (!Number.isFinite(context.TarinaiPhysicsBodySystem.scalar(oneWayRail, 'railDir', 0))) throw new Error('one-way mechanical fence update produced an invalid rail direction');
-
-
-const cargoRail = makeItem('reciprocator', 0, 0);
-context.TarinaiPlacementPreviewSystem.applyToolOrientation(orientationWorld, cargoRail, 0);
-activate(cargoRail);
-const ball = {{ id: 'ball', type: 'ball', x: 8, y: 0, r: 18, radius: 18, vx: 0, vy: 0, dead: false }};
-const cargoWorld = {{
-  items: [cargoRail, ball], tarinai: [], time: 2, frameCount: 2, w: 900, h: 700, drawListDirty: false, itemBucketRebuildsTotal: 0,
-  ensureItemBuckets() {{}}, markSpatialDirty() {{}},
-  nearbyObstacles() {{ return this.items; }}, nearbyItems() {{ return this.items; }},
-  itemsOfType(type) {{ return this.items.filter(item => item.type === type && !item.dead); }},
-  isFenceType() {{ return false; }}, solidObstacleRects() {{ return []; }},
-}};
-cargoRail.world = cargoWorld; ball.world = cargoWorld;
-context.TarinaiMechanicalSystem.updateWorld(cargoWorld, 0.016, {{ maxSubsteps: 1 }});
-if (context.TarinaiPhysicsBodySystem.scalar(cargoRail, 'railDir', 1) !== 1) throw new Error('reciprocator reversed on movable cargo');
-if (!(ball.x > 8 || Math.abs(ball.vx) > 0.01 || Math.abs(ball.vy) > 0.01)) throw new Error('reciprocator did not push movable cargo');
-"""
-    with tempfile.NamedTemporaryFile("w", encoding="utf-8", suffix=".js", delete=False) as f:
-        f.write(js)
-        tmp = Path(f.name)
-    try:
-        result = subprocess.run(["node", str(tmp)], cwd=ROOT, text=True, capture_output=True)
-    finally:
-        tmp.unlink(missing_ok=True)
-    if result.returncode != 0:
-        sys.stderr.write(result.stdout)
-        sys.stderr.write(result.stderr)
-        fail("mechanical collision/editor smoke test failed")
-    ok("mechanical pairs, obstacle-only reciprocator reversal, cargo pushing, placement orientation, and 20px editor snapping verified")
-
-def colony_limits_and_defaults_smoke() -> None:
-    tool_defs = read_text(ROOT / "js/item_tool_definitions.js")
-    initializer = read_text(ROOT / "js/item_type_initializers.js")
-    world_budget = read_text(ROOT / "js/world_spatial_budget.js")
-    world_family = read_text(ROOT / "js/world_family_social.js")
-    needs = read_text(ROOT / "js/tarinai_needs_items.js")
-    social = read_text(ROOT / "js/tarinai_social_action_runtime.js")
-    snapshot = read_text(ROOT / "js/snapshot_system.js")
-    codec = read_text(ROOT / "js/save_codec.js")
-    index = read_text(ROOT / "index.html")
-    if 't === "reciprocator") return Math.PI / 2' not in tool_defs:
-        fail("reciprocator default angle is not 90 degrees")
-    small = "[[-52, -20, 52, -20], [52, -20, 52, 20], [52, 20, -52, 20], [-52, 20, -52, -20]]"
-    poison_files = [
-        "js/item_type_initializers.js", "js/physics_world_system.js", "js/item_render_runtime.js",
-        "js/mechanical_system.js", "js/world_placement_log.js",
-    ]
-    for rel in poison_files:
-        body = read_text(ROOT / rel)
-        if not all(token in body for token in ("-52", "-20", "52", "20")):
-            fail(f"small poison-block shape missing from {rel}")
-        if "[-82, -28, 82, -28]" in body:
-            fail(f"legacy large poison-block shape remains in {rel}")
-    if 'radius: 44' not in tool_defs or 'thickness: 11' not in initializer:
-        fail("small poison-block radius/thickness defaults are not synchronized")
-    for token in ("canAddTarinai(count = 1)", "canAddObjects(count = 1)", "setTarinaiPopulationLimit", "setObjectLimit"):
-        if token not in world_budget:
-            fail(f"colony limit runtime missing: {token}")
-    if "if (!(this.canAddTarinai?.(1) ?? true)) return null;" not in world_family:
-        fail("tarinai creation/birth is not unconditionally guarded by population limit")
-    if "if (!this.canAddObjects(1)) return null;" not in world_budget:
-        fail("object creation is not unconditionally guarded by object limit")
-    if "ignoreColonyLimit" in world_family or "ignoreColonyLimit" in world_budget:
-        fail("colony limit bypass option remains in central creation APIs")
-    unsafe_fallback = re.compile(r"addItem\?\.[^\n;]+\|\|[^\n;]*items\.push")
-    for rel in (ROOT / "js").glob("*.js"):
-        if unsafe_fallback.search(read_text(rel)):
-            fail(f"object-limit bypass fallback remains in {rel.name}")
-    direct_item_pushes = []
-    direct_tarinai_pushes = []
-    for rel in (ROOT / "js").glob("*.js"):
-        body = read_text(rel)
-        if re.search(r"\b(?:this|worldRef|world)\.items\.push\(", body):
-            direct_item_pushes.append(rel.name)
-        if re.search(r"\b(?:this|worldRef|world)\.tarinai\.push\(", body):
-            direct_tarinai_pushes.append(rel.name)
-    if sorted(direct_item_pushes) != ["snapshot_system.js", "world_spatial_budget.js"]:
-        fail("unexpected direct world item insertion can bypass object limit: " + ", ".join(sorted(direct_item_pushes)))
-    if sorted(direct_tarinai_pushes) != ["snapshot_system.js", "world_family_social.js"]:
-        fail("unexpected direct tarinai insertion can bypass population limit: " + ", ".join(sorted(direct_tarinai_pushes)))
-    guarded_sources = {
-        "js/item_dynamic_ball_system.js": "if (!addedDrop) continue;",
-        "js/fire_runtime_system.js": "if (!addedFire) return null;",
-        "js/tarinai_building_behavior.js": "canAddObjects?.(1)",
-        "js/world_combat_effects.js": "if (!spawned) return 0;",
-    }
-    for rel, token in guarded_sources.items():
-        if token not in read_text(ROOT / rel):
-            fail(f"object-limit guard missing from {rel}: {token}")
-    if "championMate" not in needs or "championPair" not in social or "mateWeight *= 4.0" not in social:
-        fail("champion-pair breeding preference is incomplete")
-    charts = read_text(ROOT / "js/ui_charts.js")
-    family_social = read_text(ROOT / "js/world_family_social.js")
-    if 'key: "births"' not in charts or 'key: "deaths"' not in charts or "birthEventCount" not in charts:
-        fail("colony population chart birth/death series are missing")
-    if "inheritedChampionPersonality" not in family_social or "parent.isTarinaiChampion" not in family_social or "* 0.70" not in family_social:
-        fail("champion personality inheritance is missing")
-    inheritance_block = family_social.split("function inheritedChampionPersonality", 1)[1].split("(function (global)", 1)[0]
-    if "isZunchiSlave" in inheritance_block or "zunchiSlaveLocked" in inheritance_block:
-        fail("champion inheritance must not alter zunchi-slave handling")
-    for token in ("tarinaiPopulationLimit", "objectLimit"):
-        if token not in snapshot or token not in codec:
-            fail(f"colony limit persistence missing: {token}")
-    for element_id in ("tarinaiPopulationLimitInput", "objectLimitInput", "colonyLimitStatus"):
-        if f'id="{element_id}"' not in index:
-            fail(f"colony limit UI missing: {element_id}")
-
-    js = f"""
-const vm = require('vm');
-const fs = require('fs');
-class World {{
-  constructor() {{
-    this.items = [];
-    this.tarinai = [];
-    this.itemCounts = {{}};
-    this.tarinaiPopulationLimit = 0;
-    this.objectLimit = 0;
-  }}
-  markItemBucketsDirty() {{}}
-  markSpatialDirty() {{}}
-  markTerrainDirty() {{}}
-  markTerrainDirtyAt() {{}}
-}}
-const context = {{ console, World, CONFIG: {{ grassLimit: Infinity }}, globalThis: null }};
-context.globalThis = context;
-context.window = context;
-context.TarinaiGround = {{ grassLimit() {{ return Infinity; }} }};
-context.TarinaiPerf = {{ snapshot() {{ return null; }}, begin() {{ return null; }} }};
-vm.createContext(context);
-vm.runInContext(fs.readFileSync({str(ROOT / 'js/world_spatial_budget.js')!r}, 'utf8'), context);
-const world = new context.World();
-if (world.tarinaiPopulationLimit !== 0 || world.objectLimit !== 0) throw new Error('limits must default to unlimited');
-world.setObjectLimit(2.9);
-if (world.objectLimit !== 2) throw new Error('object limit must normalize to a positive integer');
-if (!world.canAddObjects(2) || world.canAddObjects(3)) throw new Error('object capacity query is incorrect');
-if (!world.addItem({{ type: 'stone' }}, 'test-1')) throw new Error('first object rejected');
-if (!world.addItem({{ type: 'stone' }}, 'test-2')) throw new Error('second object rejected');
-if (world.addItem({{ type: 'stone' }}, 'test-3') !== null) throw new Error('object limit not enforced');
-world.items[0].dead = true;
-if (!world.addItem({{ type: 'stone' }}, 'test-4')) throw new Error('dead object should free capacity');
-world.setObjectLimit(1);
-if (world.addItem({{ type: 'stone' }}, 'over-limit-existing') !== null) throw new Error('existing over-limit world must reject new objects');
-for (const item of world.items) item.dead = true;
-if (!world.addItem({{ type: 'stone' }}, 'capacity-restored')) throw new Error('capacity was not restored after all live objects died');
-world.setTarinaiPopulationLimit(1.8);
-if (world.tarinaiPopulationLimit !== 1) throw new Error('tarinai limit must normalize to a positive integer');
-world.tarinai.push({{ dead: false }});
-if (world.canAddTarinai(1)) throw new Error('tarinai limit not enforced');
-world.tarinai[0].dead = true;
-if (!world.canAddTarinai(1)) throw new Error('dead tarinai should free capacity');
-world.setObjectLimit('');
-if (world.objectLimit !== 0 || !world.canAddObjects(1000)) throw new Error('blank/zero must mean unlimited');
-context.TarinaiSnapshot = {{ version: 27 }};
-context.TarinaiSaveSchema = {{ BINARY_SCHEMA_VERSION: 33, FIELD_IDS: ['garden'], itemTypeValue(i, fallback = '') {{ return fallback; }} }};
-context.CONFIG.dayLength = 120;
-context.TextEncoder = TextEncoder;
-context.TextDecoder = TextDecoder;
-vm.runInContext(fs.readFileSync({str(ROOT / 'js/save_codec.js')!r}, 'utf8'), context);
-(async () => {{
-  const source = {{ v: 27, a: 'tj1', m: [1, 0, 'garden'], w: [0, 0, 0, 120, 0, -9990, 1, 0, 'seed', 0, 12, 345], t: [], i: [] }};
-  const encoded = await context.TarinaiSaveCodec.encodeSnapshot(source);
-  const decoded = await context.TarinaiSaveCodec.decodeSnapshot(encoded);
-  if (decoded.w[10] !== 12 || decoded.w[11] !== 345) throw new Error('colony limits did not survive save roundtrip');
-}})().catch(error => {{ console.error(error); process.exitCode = 1; }});
-"""
-    with tempfile.NamedTemporaryFile("w", encoding="utf-8", suffix=".js", delete=False) as f:
-        f.write(js)
-        tmp = Path(f.name)
-    try:
-        result = subprocess.run(["node", str(tmp)], cwd=ROOT, text=True, capture_output=True)
-    finally:
-        tmp.unlink(missing_ok=True)
-    if result.returncode != 0:
-        sys.stderr.write(result.stdout)
-        sys.stderr.write(result.stderr)
-        fail("colony limit runtime smoke test failed")
-    ok("champion breeding, mechanical defaults, and colony limits are wired")
-
-
-def physics_tuning_smoke() -> None:
-    editor = read_text(ROOT / "js/physics_shape_editor_system.js")
-    environment = read_text(ROOT / "js/world_environment.js")
-    helpers = read_text(ROOT / "js/physics_helpers.js")
-    constraints = read_text(ROOT / "js/constraint_system.js")
-    dynamic_tools = read_text(ROOT / "js/item_dynamic_tool_system.js")
-    initializer = read_text(ROOT / "js/item_type_initializers.js")
-
-    for token in ("BOUNCE_FENCE_RESTITUTION = 4.20", "BOUNCE_FENCE_MIN_SPEED = 820", "BOUNCE_FENCE_MAX_SPEED = 1680"):
-        if token not in environment:
-            fail(f"strong bounce-fence tuning missing: {token}")
-    if "const iterations = 8" not in constraints or "const compliance = mode === \"rod\" ? 0.085 / (step * 60) : 0" not in constraints:
-        fail("rope endpoint constraint is still compliant/stretchable")
-    if "STICKY_BOMB_BLAST_SCALE = 0.68" not in dynamic_tools or "item.blastScale = 0.68" not in initializer:
-        fail("sticky bomb is not synchronized with small-firecracker blast scale")
-
-    js = f"""
-const vm = require('vm');
-const editorSource = {editor!r};
-const helperSource = {helpers!r};
-const constraintSource = {constraints!r};
-const dynamicSource = {dynamic_tools!r};
-
-const context = {{ console, globalThis: null }};
-context.globalThis = context;
-context.window = context;
-context.clamp = (v, lo, hi) => Math.max(lo, Math.min(hi, v));
-context.distXY = (x1, y1, x2, y2) => Math.hypot(x2 - x1, y2 - y1);
-context.CONFIG = {{ worldPadding: 0 }};
-context.Effect = function Effect() {{}};
-context.TarinaiGeometry = {{
-  pointSegmentDistance(px, py, x1, y1, x2, y2) {{
-    const dx = x2 - x1, dy = y2 - y1;
-    const den = dx * dx + dy * dy || 1;
-    const t = Math.max(0, Math.min(1, ((px - x1) * dx + (py - y1) * dy) / den));
-    return Math.hypot(px - (x1 + dx * t), py - (y1 + dy * t));
-  }},
-  rectLocalPoint(rect, x, y) {{ return {{ x: x - (rect.cx || 0), y: y - (rect.cy || 0) }}; }},
-  rectWorldVector(_rect, x, y) {{ return {{ x, y }}; }},
-  rectWorldNormal(_rect, x, y) {{ return {{ x, y }}; }},
-}};
-context.TarinaiMechanicalSystem = {{
-  isMechanicalType() {{ return false; }},
-  isPowered() {{ return false; }},
-  applySurfaceVelocityToCircle() {{}},
-  wakeItem() {{}},
-}};
-context.TarinaiPhysicsProjectionSystem = {{ markSpatialDirty() {{ return false; }} }};
-context.TarinaiMovementUpdateStep = {{ markSleepExternalMotion() {{}} }};
-context.itemAngleFor = item => Number(item?.angle || 0) || 0;
-context.normalizedItemAngle = angle => Number(angle || 0) || 0;
-vm.createContext(context);
-
-vm.runInContext(editorSource, context, {{ filename: 'physics_shape_editor_system.js' }});
-const circle = context.TarinaiPhysicsShapeEditorSystem.templateSegments('circle');
-if (!Array.isArray(circle) || circle.length !== 24) throw new Error('circle template is not a 24-sided contour');
-for (const segment of circle) {{
-  if (segment.length !== 4 || segment.some(value => value % 20 !== 0)) throw new Error('circle template left the 20px grid');
-}}
-for (let i = 0; i < circle.length; i += 1) {{
-  const next = circle[(i + 1) % circle.length];
-  if (circle[i][2] !== next[0] || circle[i][3] !== next[1]) throw new Error('circle contour is not closed');
-}}
-
-vm.runInContext(helperSource, context, {{ filename: 'physics_helpers.js' }});
-const ball = {{ x: -4, y: 5, prevX: -14, prevY: 5, vx: 100, vy: 0, r: 5, spinVelocity: 0 }};
-const fence = {{ left: 0, right: 10, top: 0, bottom: 10, bounce: true, restitution: 2.40, minBounceSpeed: 520 }};
-if (!context.TarinaiPhysics.bounceCircleOffRect(ball, fence, 5, fence.restitution, null, {{ minBounceSpeed: fence.minBounceSpeed }})) throw new Error('bounce-fence collision did not resolve');
-if (ball.vx > -519) throw new Error('bounce-fence launch is not substantially stronger');
-
-context.TarinaiPhysicsBodySystem = {{
-  scalar(item, key, fallback) {{ return Number(item.physicsBody?.[key] ?? fallback); }},
-  setScalar(item, key, value) {{ item.physicsBody ||= {{}}; item.physicsBody[key] = value; return true; }},
-  linkScalar(item, key, fallback) {{
-    const c = item.physicsConstraint || {{}};
-    const map = {{ len: 'length', midX: 'midX', midY: 'midY', midVx: 'midVx', midVy: 'midVy', awakeUntil: 'awakeUntil' }};
-    return Number(c[map[key] || key] ?? fallback);
-  }},
-  setLinkScalar(item, key, value) {{
-    const c = item.physicsConstraint ||= {{}};
-    const map = {{ len: 'length', midX: 'midX', midY: 'midY', midVx: 'midVx', midVy: 'midVy', awakeUntil: 'awakeUntil' }};
-    c[map[key] || key] = value;
-    return true;
-  }},
-  endpoint(item, index) {{ return item.physicsConstraint?.endpoints?.[index] || null; }},
-  particles(item) {{ return item.physicsConstraint?.particles || null; }},
-  setParticles(item, list) {{ item.physicsConstraint.particles = list; return true; }},
-  ensureConstraint(item) {{ return item.physicsConstraint; }},
-  applyConstraintState() {{ return true; }},
-  syncPoseFromItem() {{ return true; }},
-}};
-vm.runInContext(constraintSource, context, {{ filename: 'constraint_system.js' }});
-const a = {{ id: 'a', type: 'ball', x: 0, y: 0, r: 10, dead: false }};
-const b = {{ id: 'b', type: 'ball', x: 200, y: 0, r: 10, dead: false }};
-const objects = new Map([[a.id, a], [b.id, b]]);
-const world = {{
-  time: 1,
-  items: [a, b],
-  tarinai: [],
-  itemCounts: {{ rope: 1 }},
-  itemById(id) {{ return objects.get(id) || null; }},
-  nearbyTarinai() {{ return []; }},
-  nearbySolidObstacleRects() {{ return []; }},
-  markSpatialDirty() {{}},
-  drawListDirty: false,
-}};
-const rope = {{
-  id: 'rope-1', type: 'rope', dead: false, amount: 999, world,
-  physicsConstraint: {{ endpoints: [{{ kind: 'item', id: 'a', x: 0, y: 0 }}, {{ kind: 'item', id: 'b', x: 200, y: 0 }}], length: 100, particles: null }},
-}};
-context.TarinaiConstraintSystem.updateFlexibleLink(rope, 1 / 60, world);
-const tautDistance = Math.hypot(b.x - a.x, b.y - a.y);
-if (tautDistance > 100.26) throw new Error(`rope stretched to ${{tautDistance}}px`);
-const beforeA = {{ x: a.x, y: a.y }}, beforeB = {{ x: b.x, y: b.y }};
-b.x = a.x + 60;
-context.TarinaiConstraintSystem.updateFlexibleLink(rope, 1 / 60, world);
-if (Math.hypot(a.x - beforeA.x, a.y - beforeA.y) > 0.01) throw new Error('slack rope pushed endpoint A');
-if (Math.abs((b.x - a.x) - 60) > 0.01) throw new Error('slack rope pushed endpoints apart');
-
-context.deterministicChance = () => false;
-context.Effect = function Effect() {{}};
-context.audio = {{ explode() {{}} }};
-vm.runInContext(dynamicSource, context, {{ filename: 'item_dynamic_tool_system.js' }});
-let capturedScale = null;
-const sticky = {{ type: 'sticky_bomb', dead: false, fuseTimer: 0, stickyBombCarrierId: '', stickyBombTransferCooldown: 0, spin: 0, spinVelocity: 0 }};
-const stickyWorld = {{ tarinai: [], explodeFirecracker(item) {{ capturedScale = item.blastScale; return true; }} }};
-context.TarinaiItemDynamicToolSystem.update(sticky, 1 / 60, stickyWorld);
-if (Math.abs(capturedScale - 0.68) > 1e-9) throw new Error('sticky bomb does not match small firecracker blast scale');
-"""
-    with tempfile.NamedTemporaryFile("w", encoding="utf-8", suffix=".js", delete=False) as f:
-        f.write(js)
-        tmp = Path(f.name)
-    try:
-        result = subprocess.run(["node", str(tmp)], cwd=ROOT, text=True, capture_output=True)
-    finally:
-        tmp.unlink(missing_ok=True)
-    if result.returncode != 0:
-        sys.stderr.write(result.stdout)
-        sys.stderr.write(result.stderr)
-        fail("physics tuning smoke test failed")
-    ok("round circle template, strong bounce fence, inextensible rope, and small sticky-bomb blast verified")
-
-
-
-
-def champion_inheritance_smoke() -> None:
-    source = read_text(ROOT / "js/world_family_social.js")
-    start = source.find("function inheritedChampionPersonality")
-    end = source.find("(function (global)", start)
-    if start < 0 or end < 0:
-        fail("champion inheritance helper not found")
-    helper = source[start:end]
-    js = f"""
-const vm = require('vm');
-const context = {{ console, globalThis: null }};
-context.globalThis = context;
-context.normalizePersonality = source => ({{
-  aggression: Math.max(-1, Math.min(1, Number(source?.aggression || 0))),
-  openness: Math.max(-1, Math.min(1, Number(source?.openness || 0))),
-  sociability: Math.max(-1, Math.min(1, Number(source?.sociability || 0))),
-  neuroticism: Math.max(-1, Math.min(1, Number(source?.neuroticism || 0))),
-}});
-context.clampPersonalityValue = value => Math.max(-1, Math.min(1, Number(value) || 0));
-context.TarinaiSeedFactory = {{ birthProfile() {{ return {{ birthPersonality: {{ aggression: 0, openness: 0, sociability: 0, neuroticism: 0 }} }}; }} }};
-vm.createContext(context);
-vm.runInContext({helper!r}, context, {{ filename: 'champion_inheritance.js' }});
-const normal = {{ birthSeed: 'normal', birthPersonality: {{ aggression: 0, openness: 0, sociability: 0, neuroticism: 0 }}, isTarinaiChampion: false }};
-const champion = {{ birthSeed: 'champion', birthPersonality: {{ aggression: 0, openness: 0, sociability: 0, neuroticism: 0 }}, isTarinaiChampion: true }};
-const child = context.inheritedChampionPersonality('child', [champion, normal], {{}});
-if (!child || child.aggression < 0.5 || child.openness < 0.5 || child.sociability < 0.5) throw new Error('champion boost was not inherited');
-if (Math.abs(child.neuroticism) > 1e-9) throw new Error('unboosted personality axis was inherited');
-const descendant = {{ birthSeed: 'descendant', birthPersonality: child, isTarinaiChampion: false }};
-const grandchild = context.inheritedChampionPersonality('grandchild', [descendant, normal], {{}});
-if (!grandchild || !(grandchild.aggression > 0 && grandchild.aggression < child.aggression)) throw new Error('champion lineage did not damp across generations');
-"""
-    with tempfile.NamedTemporaryFile("w", encoding="utf-8", suffix=".js", delete=False) as f:
-        f.write(js)
-        tmp = Path(f.name)
-    try:
-        result = subprocess.run(["node", str(tmp)], cwd=ROOT, text=True, capture_output=True)
-    finally:
-        tmp.unlink(missing_ok=True)
-    if result.returncode != 0:
-        sys.stderr.write(result.stdout)
-        sys.stderr.write(result.stderr)
-        fail("champion inheritance smoke test failed")
-    ok("champion personality inheritance and generational damping verified")
-
-def one_way_routing_smoke() -> None:
-    geometry_source = read_text(ROOT / "js/geometry_helpers.js")
-    source = read_text(ROOT / "js/world_environment.js")
-    render = read_text(ROOT / "js/render.js")
-    js = f"""
-const vm = require('vm');
-class World {{}}
-const context = {{ console, World, globalThis: null, window: null, CONFIG: {{}},
-  TarinaiMechanicalShapeSystem: {{ isMechanicalType() {{ return false; }}, reach() {{ return 0; }} }},
-  TarinaiMechanicalSystem: {{}}, TarinaiPhysicsBodySystem: {{}},
-}};
-context.globalThis = context; context.window = context;
-vm.createContext(context);
-vm.runInContext({geometry_source!r}, context, {{ filename: 'geometry_helpers.js' }});
-vm.runInContext({source!r}, context, {{ filename: 'world_environment.js' }});
-const world = new context.World();
-world.isFenceType = type => ['fence_h', 'one_way_fence'].includes(type);
-const oneWay = {{ type: 'one_way_fence', item: {{ type: 'one_way_fence' }}, oneWay: true, oneWayNx: 1, oneWayNy: 0, oriented: false, left: -4, right: 4, top: -20, bottom: 20 }};
-world.nearbySolidObstacleRects = () => [oneWay];
-if (world.pathBlockedByFence(-30, 0, 30, 0, 0)) throw new Error('one-way fence blocked arrow direction');
-if (!world.pathBlockedByFence(30, 0, -30, 0, 0)) throw new Error('one-way fence allowed reverse direction');
-if (world.pointBlockedByObstacle(0, 0, 0, {{ directionalOneWay: true }})) throw new Error('one-way fence permanently blocked grid point');
-if (!world.pointBlockedByObstacle(0, 0, 0)) throw new Error('one-way fence lost physical point occupancy');
-const normal = {{ type: 'fence_h', item: {{ type: 'fence_h' }}, oriented: false, left: -4, right: 4, top: -20, bottom: 20 }};
-world.nearbySolidObstacleRects = () => [normal];
-if (!world.pathBlockedByFence(-30, 0, 30, 0, 0)) throw new Error('ordinary fence stopped blocking routes');
-"""
-    with tempfile.NamedTemporaryFile("w", encoding="utf-8", suffix=".js", delete=False) as f:
-        f.write(js)
-        tmp = Path(f.name)
-    try:
-        result = subprocess.run(["node", str(tmp)], cwd=ROOT, text=True, capture_output=True)
-    finally:
-        tmp.unlink(missing_ok=True)
-    if result.returncode != 0:
-        sys.stderr.write(result.stdout)
-        sys.stderr.write(result.stderr)
-        fail("one-way fence routing smoke test failed")
-    if 'type === "one_way_fence"' not in render or "arrowLength" not in render:
-        fail("one-way fence placement direction overlay is missing")
-    ok("one-way fence preview and directional routing verified")
-
-def check_save_stream_deadlock_guard() -> None:
-    codec = read_text(ROOT / "js/save_codec.js")
-    ui = read_text(ROOT / "js/save_system.js")
-    read_task = codec.find("const readTask = (async () =>")
-    write_call = codec.find("await sink.write(")
-    if read_task < 0 or write_call < 0 or read_task > write_call:
-        fail("save compression output must be drained before awaiting writes")
-    if 'exportBtn.dataset.busy = "1"' not in ui or 'save text generation failed' not in ui:
-        fail("save export UI must recover from pending/error states")
-    ok("save compression stream backpressure guard present")
-
-
-def check_electrocution_gate_chart_and_ascii() -> None:
-    health = read_text(ROOT / "js/health.js")
-    combat_effects = read_text(ROOT / "js/world_combat_effects.js")
-    action_state = read_text(ROOT / "js/tarinai_action_state.js")
-    signal = read_text(ROOT / "js/signal_system.js")
-    charts = read_text(ROOT / "js/ui_charts.js")
-    bind = read_text(ROOT / "js/ui_bind.js")
-    panel = read_text(ROOT / "css/panel.css")
-
-    if '\\u611f\\u96fb' not in health or '\\u901a\\u96fb\\u4e2d\\u306e\\u96fb\\u7dda' not in health:
-        fail("electrocution cause normalization is missing")
-    if '"gate_fence"' not in signal or 'node.gateOpen = nextOpen' not in signal or 'signal-gate-toggle' not in signal:
-        fail("gate fence signal output handling is missing")
-    if '<button type="button" class="chart-series-toggle' not in charts or 'data-series-key="${s.key}"' not in charts:
-        fail("chart legend text and icon are not wrapped by a shared button")
-    if 'closest?.("[data-series-key]")' not in bind or 'i[data-series-key]' in bind:
-        fail("chart legend click delegation still targets only the icon")
-    if '.colony-chart-legend .chart-series-toggle' not in panel:
-        fail("chart legend button styling is missing")
-
-    runtime = f"""
-const vm = require('vm');
-const context = {{
-  console, globalThis: null, window: null,
-  clamp: (v, lo, hi) => Math.max(lo, Math.min(hi, Number(v) || 0)),
-  TarinaiGeometry: {{
-    pointSegmentDistance(px, py, ax, ay, bx, by) {{
-      const sx = bx - ax, sy = by - ay;
-      const len2 = sx * sx + sy * sy;
-      if (len2 <= 1e-12) return Math.hypot(px - ax, py - ay);
-      const t = Math.max(0, Math.min(1, ((px - ax) * sx + (py - ay) * sy) / len2));
-      return Math.hypot(px - (ax + sx * t), py - (ay + sy * t));
-    }},
-  }},
-  audio: {{ damage() {{}}, play() {{}}, death() {{}} }},
-}};
-context.globalThis = context;
-context.window = context;
-vm.createContext(context);
-vm.runInContext({health!r}, context, {{ filename: 'health.js' }});
-const victim = {{
-  energy: 2, maxEnergy: 100, world: {{ time: 10, items: [], effects: [], effectCounts: {{}}, ownedItemsFor() {{ return []; }} }},
-  recentDamageWindow: [], nextDamageZunchiAt: Infinity, hunger: 0, stress: 0, mood: 100,
-  showHpBar() {{}},
-  die(reason, opts) {{ this.deathReason = context.HEALTH.normalizeDeathReason(this, reason, opts); }},
-}};
-context.HEALTH.applyDamage(victim, 2.4, '\u901a\u96fb\u4e2d\u306e\u96fb\u7dda\u306b\u89e6\u308c\u305f');
-if (victim.deathReason !== '\u611f\u96fb') throw new Error(`electrocution death cause mismatch: ${{victim.deathReason}}`);
-
-context.TarinaiPhysicsBodySystem = {{ endpoint(item, index) {{ return item.physicsConstraint.endpoints[index]; }} }};
-context.TarinaiLinkRuntime = {{ endpointWorld(endpoint) {{ return {{ x: endpoint.x || 0, y: endpoint.y || 0 }}; }} }};
-context.TarinaiEffect = function(type, x, y, opts) {{ Object.assign(this, {{ type, x, y }}, opts); }};
-vm.runInContext({signal!r}, context, {{ filename: 'signal_system.js' }});
-const pressure = {{ id: 'pressure', type: 'pressure_switch', x: 0, y: 0, pressureThreshold: 1, pressureWidth: 100, pressureHeight: 100 }};
-const gate = {{ id: 'gate', type: 'gate_fence', x: 80, y: 0, gateOpen: false }};
-const wire = {{
-  id: 'wire', type: 'wire', x: 40, y: 0, r: 40,
-  physicsConstraint: {{ endpoints: [
-    {{ kind: 'item', id: 'pressure', x: 0, y: 0 }},
-    {{ kind: 'item', id: 'gate', x: 80, y: 0 }},
-  ] }},
-}};
-let occupied = true;
-const world = {{
-  items: [pressure, gate, wire], tarinai: [], ants: [], effects: [], time: 1, spatialMarks: 0, drawListDirty: false,
-  itemsOfType(type) {{ return this.items.filter(item => item.type === type); }},
-  itemById(id) {{ return this.items.find(item => item.id === id) || null; }},
-  nearbyTarinai() {{ return occupied ? [{{ x: 0, y: 0, radius: 10, dead: false }}] : []; }},
-  nearbyAnts() {{ return []; }},
-  isTarinaiHiddenInNestBox() {{ return false; }},
-  markSpatialDirty(reason) {{ if (reason === 'signal-gate-toggle') this.spatialMarks += 1; }},
-}};
-context.TarinaiSignalSystem.updateWorld(world);
-if (!gate.gateOpen || !gate._signalDriven || !gate._signalOn || world.spatialMarks !== 1) throw new Error('powered gate did not open');
-occupied = false;
-world.time += 1;
-context.TarinaiSignalSystem.updateWorld(world);
-if (gate.gateOpen || !gate._signalDriven || gate._signalOn || world.spatialMarks !== 2) throw new Error('unpowered gate did not close');
-context.TarinaiSignalSystem.updateWorld(world);
-if (world.spatialMarks !== 2) throw new Error('unchanged gate state dirtied spatial cache again');
-"""
-    with tempfile.NamedTemporaryFile("w", encoding="utf-8", suffix=".js", delete=False) as f:
-        f.write(runtime)
-        tmp = Path(f.name)
-    try:
-        result = subprocess.run(["node", str(tmp)], cwd=ROOT, text=True, capture_output=True)
-    finally:
-        tmp.unlink(missing_ok=True)
-    if result.returncode != 0:
-        sys.stderr.write(result.stdout)
-        sys.stderr.write(result.stderr)
-        fail("electrocution/gate signal runtime smoke test failed")
-
-    ascii_paths = [*(ROOT / "js").glob("*.js"), ROOT / "service-worker.js", ROOT / "index.html"]
-    raw = []
-    for path in ascii_paths:
-        body = read_text(path)
-        if any(ord(ch) > 127 for ch in body):
-            raw.append(path.relative_to(ROOT).as_posix())
-    if raw:
-        fail("unescaped non-ASCII characters remain in application source: " + ", ".join(raw))
-    ok("electrocution cause, powered gate, chart legend buttons, and ASCII-only application source verified")
-
-
-def check_connection_overlay_and_time_detector() -> None:
-    placement = read_text(ROOT / "js/world_placement_log.js")
-    signal = read_text(ROOT / "js/signal_system.js")
-    snapshot = read_text(ROOT / "js/snapshot_system.js")
-    styles = read_text(ROOT / "css/base.css")
-    render = read_text(ROOT / "js/render.js")
-
-    if 'const CONNECTION_ITEM_TYPES = new Set(["rope", "rod", "spring", "wire", "insulated_wire"])' not in placement:
-        fail("connection item grab exclusion set is missing")
-    if 'CONNECTION_ITEM_TYPES.has(it.type)' not in placement:
-        fail("connection items can still become pinch hover/grab targets")
-    if '<option value="time">\\u6642\\u523b</option>' not in placement:
-        fail("detector editor time target option is missing")
-    for control_id in ("pressureSwitchTimeStart", "pressureSwitchTimeEnd", "pressureSwitchTimeTrack"):
-        if control_id not in placement:
-            fail(f"detector dual time slider is missing {control_id}")
-    if '.pressure-time-thumb-start' not in styles or '.pressure-time-thumb-end' not in styles:
-        fail("detector dual-thumb slider styling is missing")
-    if 'const targets = ["tarinai", "item", "time", "hunger_avg"' not in snapshot or 'item.pressureTimeStart' not in snapshot or 'item.pressureTimeEnd' not in snapshot:
-        fail("expanded detector snapshot persistence is missing")
-    if 'data.pressureTarget = item.pressureTarget || "tarinai"' not in placement or 'targets.has(data.pressureTarget)' not in placement or 'data.pressureMin' not in placement or 'data.pressureMax' not in placement:
-        fail("expanded detector copy persistence is missing")
-    if 'item.pressureTarget === "time" || item.pressureTarget === "temperature"' not in render:
-        fail("non-spatial detectors still render a detection rectangle")
-    removed = ["bio_sensor", "power_relay", "automationItemEditor"]
-    for token in removed:
-        if token in placement or token in snapshot or token in signal:
-            fail(f"removed automation item remains in runtime source: {token}")
-
-    runtime = f"""
-const vm = require('vm');
-const context = {{ console, globalThis: null, window: null, CONFIG: {{ dayLength: 120 }} }};
-context.globalThis = context;
-context.window = context;
-context.TarinaiEffect = function() {{}};
-vm.createContext(context);
-vm.runInContext({signal!r}, context, {{ filename: 'signal_system.js' }});
-const detector = {{
-  id: 'clock', type: 'pressure_switch', pressureTarget: 'time',
-  pressureTimeStart: 1320, pressureTimeEnd: 360,
-  pressureThreshold: 1, pressureWidth: 220, pressureHeight: 160,
-  signalActive: false,
-}};
-let minute = 1380;
-const world = {{
-  items: [detector], tarinai: [], ants: [], effects: [], drawListDirty: false,
-  itemsOfType(type) {{ return this.items.filter(item => item.type === type); }},
-  dayProgress() {{ return minute / 1440; }},
-  nearbyTarinai() {{ return []; }}, nearbyAnts() {{ return []; }},
-  isTarinaiHiddenInNestBox() {{ return false; }}, markSpatialDirty() {{}},
-}};
-context.TarinaiSignalSystem.updateWorld(world);
-if (!detector.signalActive) throw new Error('overnight range inactive at 23:00');
-minute = 355;
-context.TarinaiSignalSystem.updateWorld(world);
-if (!detector.signalActive) throw new Error('overnight range inactive before 06:00');
-minute = 720;
-context.TarinaiSignalSystem.updateWorld(world);
-if (detector.signalActive) throw new Error('overnight range active at noon');
-detector.pressureTimeStart = 480;
-detector.pressureTimeEnd = 480;
-context.TarinaiSignalSystem.updateWorld(world);
-if (!detector.signalActive) throw new Error('equal time handles must mean all day');
-if (!context.TarinaiSignalSystem.isMinuteInRange(600, 480, 720)) throw new Error('daytime range helper rejected inside time');
-if (context.TarinaiSignalSystem.isMinuteInRange(800, 480, 720)) throw new Error('daytime range helper accepted outside time');
-"""
-    with tempfile.NamedTemporaryFile("w", encoding="utf-8", suffix=".js", delete=False) as f:
-        f.write(runtime)
-        tmp = Path(f.name)
-    try:
-        result = subprocess.run(["node", str(tmp)], cwd=ROOT, text=True, capture_output=True)
-    finally:
-        tmp.unlink(missing_ok=True)
-    if result.returncode != 0:
-        sys.stderr.write(result.stdout)
-        sys.stderr.write(result.stderr)
-        fail("time detector runtime smoke test failed")
-    ok("connection pinch overlay exclusion and dual-range time detector verified")
-
-
-
-def check_link_dependency_and_plushie_recovery() -> None:
-    placement = read_text(ROOT / "js/world_placement_log.js")
-    tools = read_text(ROOT / "js/item_tool_definitions.js")
-    lifecycle = read_text(ROOT / "js/structure_lifecycle.js")
-    maintenance = read_text(ROOT / "js/simulation_maintenance_system.js")
-    styles = read_text(ROOT / "css/base.css")
-
-    if 'pressure-time-hint' in placement or 'pressure-time-hint' in styles or '\\u958b\\u59cb\\u304c\\u7d42\\u4e86\\u3088\\u308a\\u5f8c' in placement:
-        fail("detector overnight/all-day explanatory hint still exists")
-    expected_tooltip = 'tooltip: "\\u69d8\\u3005\\u306a\\u72b6\\u6cc1\\u3092\\u691c\\u77e5\\u3057\\u3066\\u96fb\\u7dda\\u306b\\u4fe1\\u53f7\\u3092\\u9001\\u308b\\u3002\\u30af\\u30ea\\u30c3\\u30af\\u3067\\u8a73\\u7d30\\u8a2d\\u5b9a\\u3002"'
-    if expected_tooltip not in tools:
-        fail("detector tooltip does not match the requested description")
-    if 'maintainDependencies?.(worldRef)' not in maintenance:
-        fail("link/plushie dependency maintenance is not called each simulation frame")
-    for token in ('function removeOrphanedLinks', 'function reconcilePlushies', 'maintainDependencies,'):
-        if token not in lifecycle:
-            fail(f"dependency lifecycle implementation missing: {token}")
-
-    runtime = f"""
-const vm = require('vm');
-const context = {{ console, globalThis: null, window: null }};
-context.globalThis = context;
-context.window = context;
-context.TarinaiPhysicsBodySystem = {{ endpoint(item, index) {{ return item.physicsConstraint?.endpoints?.[index] || null; }} }};
-vm.createContext(context);
-vm.runInContext({lifecycle!r}, context, {{ filename: 'structure_lifecycle.js' }});
-const item = (id, type = 'stone') => ({{ id, type, amount: 1, hp: 1, dead: false, x: 0, y: 0 }});
-const link = (id, type, a, b) => ({{ id, type, amount: 999, hp: 999, dead: false, physicsConstraint: {{ endpoints: [a, b] }} }});
-const supportA = item('support-a');
-const supportB = item('support-b');
-const supportC = item('support-c');
-const intact = link('intact', 'rod', {{ kind: 'item', id: 'support-b' }}, {{ kind: 'item', id: 'support-c' }});
-const orphan = link('orphan', 'rope', {{ kind: 'item', id: 'support-a' }}, {{ kind: 'item', id: 'support-b' }});
-const dependent = link('dependent', 'wire', {{ kind: 'item', id: 'orphan' }}, {{ kind: 'item', id: 'support-c' }});
-const deadTarinai = {{ id: 'dead-t', liveToken: 9, dead: true, x: 0, y: 0 }};
-const tarinaiLink = link('tarinai-link', 'spring', {{ kind: 'tarinai', id: 'dead-t', liveToken: 9 }}, {{ kind: 'item', id: 'support-b' }});
-const deadAnt = {{ id: 'dead-ant', dead: true, x: 0, y: 0 }};
-const antLink = link('ant-link', 'insulated_wire', {{ kind: 'ant', id: 'dead-ant' }}, {{ kind: 'item', id: 'support-b' }});
-const owner = {{ id: 'owner', dead: false, x: 120, y: 90, radius: 20 }};
-const restoredPlushie = {{ id: 'plush-restored', type: 'plushie', isStructure: true, ownerId: 'owner', carriedById: '', onHead: false, amount: 1, hp: 1, dead: false, x: 10, y: 20, vx: 8, vy: 4, spinVelocity: 3 }};
-const flyingPlushie = {{ id: 'plush-flying', type: 'plushie', isStructure: true, ownerId: 'owner', carriedById: '', onHead: false, amount: 1, hp: 1, dead: false, x: 30, y: 40, plushieFlingTimer: 1.2 }};
-const orphanPlushie = {{ id: 'plush-orphan', type: 'plushie', isStructure: true, ownerId: 'missing-owner', carriedById: '', onHead: false, amount: 1, hp: 1, dead: false, x: 50, y: 60 }};
-const world = {{
-  items: [supportA, supportB, supportC, intact, orphan, dependent, tarinaiLink, antLink, restoredPlushie, flyingPlushie, orphanPlushie],
-  tarinai: [owner, deadTarinai], ants: [deadAnt], pendingLinkEndpoint: {{ kind: 'item', id: 'support-a' }},
-  itemById(id) {{ return this.items.find(value => value.id === id) || null; }},
-  itemsOfType(type) {{ return this.items.filter(value => value.type === type); }},
-  liveTarinaiById(id, token = null) {{ return this.tarinai.find(value => !value.dead && value.id === id && (token == null || value.liveToken === token)) || null; }},
-  markItemBucketsDirty() {{ this.bucketDirty = true; }}, markSpatialDirty() {{ this.spatialDirty = true; }},
-}};
-supportA.amount = 0;
-const result = context.TarinaiStructureLifecycle.maintainDependencies(world);
-if (result.linksRemoved !== 4) throw new Error(`unexpected removed link count: ${{result.linksRemoved}}`);
-if (orphan.amount !== 0 || dependent.amount !== 0 || tarinaiLink.amount !== 0 || antLink.amount !== 0) throw new Error('orphaned links were not removed');
-if (intact.amount <= 0) throw new Error('intact link was removed');
-if (world.pendingLinkEndpoint !== null) throw new Error('pending endpoint survived support removal');
-if (restoredPlushie.carriedById !== owner.id || !restoredPlushie.onHead) throw new Error('detached owned plushie was not restored');
-if (restoredPlushie.x !== owner.x || restoredPlushie.y !== owner.y - 22 || restoredPlushie.vx !== 0 || restoredPlushie.vy !== 0) throw new Error('restored plushie pose was not normalized');
-if (flyingPlushie.carriedById || flyingPlushie.onHead || flyingPlushie.dead) throw new Error('active flying plushie was incorrectly reclaimed');
-if (!orphanPlushie.dead || orphanPlushie.amount !== 0) throw new Error('ownerless plushie remained on the ground');
-if (!world.bucketDirty || !world.spatialDirty) throw new Error('dependency repair did not invalidate world caches');
-"""
-    with tempfile.NamedTemporaryFile("w", encoding="utf-8", suffix=".js", delete=False) as f:
-        f.write(runtime)
-        tmp = Path(f.name)
-    try:
-        result = subprocess.run(["node", str(tmp)], cwd=ROOT, text=True, capture_output=True)
-    finally:
-        tmp.unlink(missing_ok=True)
-    if result.returncode != 0:
-        sys.stderr.write(result.stdout)
-        sys.stderr.write(result.stderr)
-        fail("link dependency/plushie recovery runtime smoke test failed")
-    ok("detector copy, orphan-link cascade, and plushie recovery verified")
-
-
-def check_splat_link_target_and_appetite_label() -> None:
-    tools = read_text(ROOT / "js/world_tool_actions.js")
-    needs = read_text(ROOT / "js/tarinai_needs_core.js")
-    charts = read_text(ROOT / "js/ui_charts.js")
-
-    if 'if (!it || it.dead || it.type === "splat") continue;' not in tools:
-        fail("transient splat items are still eligible as connection endpoints")
-    appetite = "\\u98df\\u6b32"
-    feeding = "\\u6442\\u990c"
-    if f'food: "{appetite}"' not in needs:
-        fail("food need label was not changed to appetite")
-    if f'key: "need_food", label: "{appetite}"' not in charts:
-        fail("food need chart label was not changed to appetite")
-    if f'food: "{feeding}"' in needs or f'key: "need_food", label: "{feeding}"' in charts:
-        fail("legacy feeding need label remains in a user-facing need label")
-
-    runtime = f"""
-const vm = require('vm');
-class World {{}}
-const context = {{
-  console, World, globalThis: null, window: null,
-  distXY(x1, y1, x2, y2) {{ return Math.hypot(x2 - x1, y2 - y1); }},
-  itemAngleFor() {{ return 0; }},
-  toolLabel(type) {{ return type; }},
-  TarinaiPhysicsSoftClear: {{ isSoftPlacementType() {{ return false; }} }},
-  TarinaiMechanicalSystem: {{ isMechanicalType() {{ return false; }} }},
-  TarinaiCollisionFootprints: {{ hitTestItem(world, item, x, y) {{ return {{ hit: true, distance: 0 }}; }} }},
-  TarinaiGeometry: {{ pointSegmentDistance() {{ return 0; }} }},
-}};
-context.globalThis = context;
-context.window = context;
-vm.createContext(context);
-vm.runInContext({tools!r}, context, {{ filename: 'world_tool_actions.js' }});
-const world = new context.World();
-world.tool = 'rope';
-world.tarinai = [];
-world.items = [{{ id: 'splat-1', type: 'splat', x: 40, y: 50, r: 26, dead: false }}];
-world.nearbyItems = () => world.items;
-world.isFenceType = () => false;
-const endpoint = world.findLinkEndpointAt(40, 50);
-if (endpoint !== null) throw new Error('splat was returned as a connection endpoint');
-"""
-    with tempfile.NamedTemporaryFile("w", encoding="utf-8", suffix=".js", delete=False) as f:
-        f.write(runtime)
-        tmp = Path(f.name)
-    try:
-        result = subprocess.run(["node", str(tmp)], cwd=ROOT, text=True, capture_output=True)
-    finally:
-        tmp.unlink(missing_ok=True)
-    if result.returncode != 0:
-        sys.stderr.write(result.stdout)
-        sys.stderr.write(result.stderr)
-        fail("splat connection endpoint runtime smoke test failed")
-    ok("splat endpoint exclusion and appetite labels verified")
-
-
-def check_habitat_food_medicine_additions():
-    tool_defs = read_text(ROOT / "js/item_tool_definitions.js")
-    metadata = read_text(ROOT / "js/item_tool_metadata.js")
-    food_defs = read_text(ROOT / "js/item_food_definitions.js")
-    effect_defs = read_text(ROOT / "js/item_effect_definitions.js")
-    needs_items = read_text(ROOT / "js/tarinai_needs_items.js")
-    local_env = read_text(ROOT / "js/tarinai_local_environment_system.js")
-    update_frame = read_text(ROOT / "js/tarinai_update_step_frame.js")
-    disease_nest = read_text(ROOT / "js/tarinai_disease_nest.js")
-    item_effects = read_text(ROOT / "js/tarinai_item_effects.js")
-    consumable = read_text(ROOT / "js/tarinai_consumable_behavior.js")
-    interaction = read_text(ROOT / "js/tarinai_food_interaction_system.js")
-    render_runtime = read_text(ROOT / "js/item_render_runtime.js")
-    render_source = read_text(ROOT / "js/render.js")
-    ball_system = read_text(ROOT / "js/item_dynamic_ball_system.js")
-    initializers = read_text(ROOT / "js/item_type_initializers.js")
-    items = read_text(ROOT / "js/items.js")
-    temperature_system = read_text(ROOT / "js/world_temperature_system.js")
-    health = read_text(ROOT / "js/health.js")
-    combat_effects = read_text(ROOT / "js/world_combat_effects.js")
-    action_state = read_text(ROOT / "js/tarinai_action_state.js")
-
-    def contains(text: str, needle: str, message: str) -> None:
-        if needle not in text:
-            fail(message)
-
-    def excludes(text: str, needle: str, message: str) -> None:
-        if needle in text:
-            fail(message)
-
-    required_tools = ["toilet", "rain_shelter", "food", "first_aid", "sedative"]
-    for key in required_tools:
-        contains(tool_defs, f'{key}: {{ id: "{key}"', f"missing tool definition for {key}")
-    contains(metadata, 'toolIds: ["food", "sweet"', "pet food must be exposed in food category")
-    contains(metadata, 'toolIds: ["first_aid", "sedative", "sleep_drug"', "new medicines must be exposed before legacy medicines")
-    contains(metadata, 'toolIds: ["zunchi", "toilet", "rain_shelter"', "new habitat tools must be exposed")
-    contains(food_defs, 'food: { label: "\\u30da\\u30c3\\u30c8\\u30d5\\u30fc\\u30c9"', "pet food label must replace generic food label")
-    contains(food_defs, 'first_aid: { label: "\\u6551\\u6025\\u85ac", nutrition: 1.0, hungerRelief: 0', "first aid must not provide nutrition or hunger relief")
-    contains(food_defs, 'sedative: { label: "\\u93ae\\u9759\\u85ac"', "sedative food definition missing")
-    contains(effect_defs, 'Object.assign(rawDefinitions.first_aid', "first aid effect behavior missing")
-    contains(effect_defs, 'tarinai.recoverHealth?.(amount);', "first aid must immediately recover HP")
-    excludes(effect_defs, 'applyNeedRelief(tarinai, { health: -22, safety: -4 });', "first aid must not modify needs")
-    contains(effect_defs, 'tarinai.setTimedItemEffect?.("sedative", duration);', "sedative timed effect missing")
-    contains(effect_defs, 'speedMultiplier: 0.72', "sedative speed modifier missing")
-    contains(item_effects, 'this.hasItemEffect("sedative")', "sedative speed modifier is not applied")
-    contains(consumable, 'const hpOnlyMedicine = foodType === "first_aid";', "behavior consumption lacks first-aid isolation")
-    contains(interaction, 'const hpOnlyMedicine = foodType === "first_aid";', "contact consumption lacks first-aid isolation")
-    excludes(needs_items, 'nearestUsableToilet', "toilet sand must not be sought as an action target")
-    excludes(needs_items, 'beginToiletUrge', "toilet waiting behavior must be removed")
-    excludes(needs_items, 'tryUseToiletForPoop', "toilet-specific defecation routing must be removed")
-    excludes(action_state, 'seek_toilet: "use_toilet"', "legacy toilet action mapping remains active")
-    contains(needs_items, 'if (this.state === "seek_toilet" || this.toiletUrgeTargetId)', "legacy saved toilet behavior is not cleared")
-    contains(combat_effects, 'toiletSandAt(x, y)', "toilet sand footprint lookup missing")
-    contains(combat_effects, 'const sand = this.toiletSandAt?.(spawnX, spawnY) || null;', "zunchi spawn is not intercepted by toilet sand")
-    contains(combat_effects, 'return null;', "toilet sand must suppress zunchi creation")
-    excludes(metadata, '"stove", "toilet", "rain_shelter"', "toilet sand must be walkable")
-    contains(tool_defs, 'label: \"\\u30c8\\u30a4\\u30ec\\u306e\\u7802\"', "toilet was not renamed to toilet sand")
-    contains(tool_defs, 'tooltip: \"\\u4e0a\\u306b\\u6392\\u6cc4\\u3055\\u308c\\u305f\\u305a\\u3093\\u3061\\u304c\\u76f4\\u3061\\u306b\\u6d88\\u6ec5\\u3059\\u308b\\u3002\"', "toilet sand description mismatch")
-    contains(initializers, 'if (type === "toilet")', "toilet sand initializer missing")
-    contains(initializers, 'if (type === "rain_shelter")', "rain shelter initializer missing")
-    if initializers.index('if (type === "toilet")') > initializers.index('if (type === "bed")'):
-        fail("toilet initializer is incorrectly nested after bed initialization")
-    contains(local_env, 'global.TarinaiParasolSystem', "parasol geometry system missing")
-    contains(local_env, 'global.TarinaiRainShelterSystem = parasolSystem', "parasol compatibility alias missing")
-    contains(tool_defs, 'label: "\\u30d1\\u30e9\\u30bd\\u30eb"', "rain shelter was not renamed to parasol")
-    contains(tool_defs, 'tooltip: "\\u96e8\\u3068\\u65e5\\u5dee\\u3057\\u3092\\u9632\\u304e\\u3001\\u4f53\\u611f\\u6c17\\u6e29\\u3092\\u7a4f\\u3084\\u304b\\u306b\\u3059\\u308b\\u3002"', "parasol description mismatch")
-    contains(temperature_system, 'if (weather === "sunny") return 3.5;', "sunny felt-temperature increase missing")
-    contains(temperature_system, 'if (weather === "light_rain") return -3.5;', "rain felt-temperature decrease missing")
-    contains(temperature_system, 'weatherBlocked ? 0', "parasol does not neutralize weather felt-temperature correction")
-    contains(temperature_system, 'types.push("rain_shelter")', "parasol is not a temperature-comfort target")
-    contains(temperature_system, 'c.tempOverride != null && Number.isFinite', "null temperature override still collapses candidates to zero degrees")
-    contains(update_frame, 'shelteredFromRain', "rain exposure is not blocked by shelter")
-    contains(disease_nest, '&& !shelteredFromRain', "rain washing still occurs under shelter")
-    contains(render_runtime, 'this.type === "toilet"', "toilet renderer missing")
-    contains(render_runtime, 'this.type === "rain_shelter"', "rain shelter renderer missing")
-    contains(initializers, 'globalThis.TarinaiToiletSandSystem', "shared toilet-sand geometry system missing")
-    contains(combat_effects, 'TarinaiToiletSandSystem?.contains?.(item, x, y)', "toilet absorption does not use the visible sand footprint")
-    contains(render_runtime, 'TarinaiToiletSandSystem?.footprint?.(this)', "toilet renderer does not use the absorption footprint")
-    contains(render_source, 'it.type === "grass_bed" || it.type === "toilet"', "toilet sand is not layered with the grass bed")
-    contains(local_env, 'centerY: Number(item.y || 0) + r * 0.84', "parasol shade is not centered on the pole foot")
-    contains(local_env, 'radiusX: r * 1.58', "parasol shade footprint width mismatch")
-    contains(ball_system, 'fanWindAt,', "fan wind geometry is not exported for temperature calculations")
-    contains(temperature_system, 'fanWindAt?.(it, x, y, { range: fanRange })', "fan felt-temperature effect does not use the visible wind cone")
-    contains(render_runtime, 'ctx.ellipse(footprint.centerX - this.x, footprint.centerY - this.y, footprint.radiusX, footprint.radiusY', "parasol ground shadow missing")
-    contains(items, 'if (key === "food")', "pet food bowl renderer missing")
-
-    # New item types must be appended after all pre-existing item IDs so current-schema saves keep their old indices.
-    ant_pos = tool_defs.index('ant_corpse: { id: "ant_corpse"')
-    for key in ("toilet", "rain_shelter", "first_aid", "sedative"):
-        if tool_defs.index(f'{key}: {{ id: "{key}"') < ant_pos:
-            fail(f"{key} was inserted into the middle of the save item-type ordering")
-
-    runtime = f"""
-const vm = require('vm');
-const context = {{ console, globalThis: null, window: null, Math, Object }};
-context.globalThis = context;
-context.window = context;
-context.clamp = (v, lo, hi) => Math.max(lo, Math.min(hi, v));
-context.distXY = (x1, y1, x2, y2) => Math.hypot(x2 - x1, y2 - y1);
-context.rand = (a, b) => (a + b) / 2;
-context.setGrassStage = () => false;
-context.isServingFoodType = () => false;
-context.isParamEffectItemType = () => false;
-context.isPinType = () => false;
-context.isPinType = () => false;
-context.isRotatableItemType = () => false;
-context.defaultItemAngle = () => 0;
-context.foodServingsForSize = () => 3;
-context.passiveFoodDecayInterval = () => 60;
-context.globalThis.TarinaiItemDynamicToolSystem = {{ robotCleanerDefaultMask() {{ return 3; }}, robotCleanerMoveSpeed: 60 }};
-context.globalThis.TarinaiPhysicsBodySystem = {{ isPhysicsType() {{ return false; }}, invalidateItem() {{}} }};
-vm.createContext(context);
-vm.runInContext({initializers!r}, context, {{ filename: 'item_type_initializers.js' }});
-const toilet = {{ roles: {{}}, type: 'toilet', x: 0, y: 0, r: 48, dead: false }};
-context.initializeItemTypeState(toilet, 'toilet', 0, 0);
-if (toilet.amount !== 999) throw new Error('toilet sand initializer failed');
-const shelter = {{ roles: {{}}, r: 50 }};
-context.initializeItemTypeState(shelter, 'rain_shelter', 0, 0);
-if (shelter.amount !== 999 || !(shelter.rainShelterRange >= 76)) throw new Error('rain shelter initializer failed');
-
-const localContext = {{ console, globalThis: null, window: null, Math, Object }};
-localContext.globalThis = localContext;
-localContext.window = localContext;
-localContext.distXY = context.distXY;
-localContext.clamp = context.clamp;
-localContext.applyNeedRelief = () => {{}};
-vm.createContext(localContext);
-vm.runInContext({local_env!r}, localContext, {{ filename: 'tarinai_local_environment_system.js' }});
-const shelterItem = {{ type: 'rain_shelter', x: 100, y: 100, r: 50, dead: false }};
-const world = {{ weather: 'light_rain', itemsOfType(type) {{ return type === 'rain_shelter' ? [shelterItem] : []; }} }};
-const shelterFootprint = localContext.TarinaiParasolSystem.parasolFootprint(shelterItem);
-if (!localContext.TarinaiRainShelterSystem.isSheltered(world, shelterFootprint.centerX, shelterFootprint.centerY)) throw new Error('parasol did not cover its shadow center');
-if (localContext.TarinaiRainShelterSystem.isSheltered(world, shelterItem.x, shelterItem.y - 10)) throw new Error('parasol covered a point outside the visible shadow');
-if (localContext.TarinaiRainShelterSystem.isSheltered(world, 500, 500)) throw new Error('parasol covered a distant point');
-if (!localContext.TarinaiParasolSystem.blocksWeatherAt(world, shelterFootprint.centerX, shelterFootprint.centerY)) throw new Error('parasol did not block weather in its shadow');
-
-const tempContext = {{ console, globalThis: null, window: null, Math, Object }};
-tempContext.globalThis = tempContext;
-tempContext.window = tempContext;
-tempContext.World = class World {{}};
-tempContext.CONFIG = {{ standardTemperature: 15, temperatureItemRange: 190, climateTemperatureMin: -20, climateTemperatureMax: 50 }};
-tempContext.clamp = context.clamp;
-tempContext.distXY = context.distXY;
-tempContext.itemAngleFor = () => 0;
-tempContext.TarinaiParasolSystem = localContext.TarinaiParasolSystem;
-tempContext.TarinaiRainShelterSystem = localContext.TarinaiRainShelterSystem;
-tempContext.TarinaiItemDynamicBallSystem = {{ fanWindAt(fan, x, y, opts = {{}}) {{
-  const range = opts.range || 320; const dx = x - fan.x; const dy = y - fan.y; const a = fan.angle || 0;
-  const along = dx * Math.cos(a) + dy * Math.sin(a); if (along < 8 || along > range) return null;
-  const lateral = Math.abs(-dx * Math.sin(a) + dy * Math.cos(a)); const halfWidth = 26 + along * Math.tan(0.62);
-  if (lateral > halfWidth) return null; return {{ falloff: Math.pow(Math.max(0, 1 - along / range), 0.64) * Math.pow(Math.max(0, 1 - lateral / halfWidth), 0.34) }};
-}} }};
-vm.createContext(tempContext);
-vm.runInContext({temperature_system!r}, tempContext, {{ filename: 'world_temperature_system.js' }});
-const tempWorld = new tempContext.World();
-tempWorld.currentTemperature = 15;
-tempWorld.temperatureAuto = true;
-tempWorld.groundType = 'soil';
-tempWorld.weather = 'sunny';
-tempWorld.nearbyItems = () => [];
-tempWorld.itemsOfType = () => [];
-const actor = {{ x: 0, y: 0, state: 'idle', sunbathTimer: 0 }};
-if (Math.abs(tempWorld.temperatureAt(0, 0, actor) - 18.5) > 0.001) throw new Error('sunny felt temperature did not rise');
-tempWorld.weather = 'light_rain';
-if (Math.abs(tempWorld.temperatureAt(0, 0, actor) - 11.5) > 0.001) throw new Error('rain felt temperature did not fall');
-const localShelter = {{ type: 'rain_shelter', x: 0, y: 0, r: 50, dead: false }};
-const localShade = localContext.TarinaiParasolSystem.parasolFootprint(localShelter);
-tempWorld.itemsOfType = type => type === 'rain_shelter' ? [localShelter] : [];
-if (Math.abs(tempWorld.temperatureAt(localShade.centerX, localShade.centerY, actor) - 15) > 0.001) throw new Error('parasol did not neutralize rain felt-temperature correction');
-tempWorld.weather = 'sunny';
-if (Math.abs(tempWorld.temperatureAt(localShade.centerX, localShade.centerY, actor) - 15) > 0.001) throw new Error('parasol did not neutralize sunny felt-temperature correction');
-tempWorld.weather = 'cloudy';
-tempWorld.currentTemperature = 30;
-const fan = {{ type: 'fan', x: 0, y: 0, r: 26, angle: 0, dead: false }};
-tempWorld.itemsOfType = () => [];
-tempWorld.nearbyItems = (x, y, radius) => Math.hypot(fan.x - x, fan.y - y) <= radius ? [fan] : [];
-const fanNear = tempWorld.temperatureAt(100, 0, actor);
-const fanFar = tempWorld.temperatureAt(280, 0, actor);
-const fanOutside = tempWorld.temperatureAt(330, 0, actor);
-if (!(fanNear < 30 && fanFar < 30 && Math.abs(fanOutside - 30) < 0.001)) throw new Error('fan felt-temperature cone does not match the 320px wind range');
-tempWorld.nearbyItems = () => [];
-tempWorld.w = 1000;
-tempWorld.h = 720;
-tempWorld.currentTemperature = 24;
-tempWorld.weather = 'sunny';
-tempWorld.itemsOfType = type => type === 'rain_shelter' ? [{{ type: 'rain_shelter', x: 300, y: 300, r: 50, dead: false }}] : [];
-tempWorld.pointBlockedByObstacle = () => false;
-tempWorld.pathBlockedByFence = () => false;
-const hotActor = {{ x: 100, y: 300, radius: 20, dead: false, state: 'idle', sunbathTimer: 0, genetics: {{ temperatureOffset: 0 }} }};
-const sunnyTarget = tempWorld.findComfortTemperatureSpot(hotActor, {{ force: true, requireComfort: false }});
-if (!sunnyTarget || !localContext.TarinaiParasolSystem.isSheltered(tempWorld, sunnyTarget.x, sunnyTarget.y)) throw new Error('hot sunny actor did not choose parasol shade');
-if (sunnyTarget.temperature === 0) throw new Error('null temperature override was interpreted as zero');
-tempWorld.currentTemperature = 9;
-tempWorld.weather = 'light_rain';
-const coldTarget = tempWorld.findComfortTemperatureSpot(hotActor, {{ force: true, requireComfort: false }});
-if (!coldTarget || !localContext.TarinaiParasolSystem.isSheltered(tempWorld, coldTarget.x, coldTarget.y)) throw new Error('cold rainy actor did not choose parasol cover');
-"""
-    with tempfile.NamedTemporaryFile("w", encoding="utf-8", suffix=".js", delete=False) as f:
-        f.write(runtime)
-        tmp = Path(f.name)
-    try:
-        result = subprocess.run(["node", str(tmp)], cwd=ROOT, text=True, capture_output=True)
-    finally:
-        tmp.unlink(missing_ok=True)
-    if result.returncode != 0:
-        sys.stderr.write(result.stdout)
-        sys.stderr.write(result.stderr)
-        fail("new habitat item runtime smoke test failed")
-
-    method_start = needs_items.index("  dropPoopNow(source = \"normal\") {")
-    method_end = needs_items.index("  interactWithItems(dt) {", method_start)
-    poop_methods = needs_items[method_start:method_end]
-    toilet_runtime = f"""
-const vm = require('vm');
-const context = {{ console, globalThis: null, window: null, Math, Object }};
-context.globalThis = context;
-context.window = context;
-context.NORMAL_POOP_MEAL_THRESHOLD = 4;
-context.distXY = (x1, y1, x2, y2) => Math.hypot(x2 - x1, y2 - y1);
-context.rand = (a, b) => (a + b) / 2;
-context.clamp = (v, lo, hi) => Math.max(lo, Math.min(hi, v));
-context.applyNeedShock = () => false;
-vm.createContext(context);
-const methods = vm.runInContext('({{' + {poop_methods!r} + '}})', context);
-let spawned = 0;
-const actor = {{
-  ...methods,
-  world: {{ spawnZunchi() {{ spawned += 1; }}, log() {{}} }},
-  name: 'A', x: 100, y: 100, radius: 20, facing: 1, digest: 0, poopCount: 0, state: 'idle', target: null,
-  facingDir() {{ return 1; }}, bubble() {{}}, hasLodgedPinEffect() {{ return false; }},
-}};
-if (!actor.makePoop(4)) throw new Error('ordinary poop did not occur');
-if (spawned !== 1 || actor.digest !== 0 || actor.poopCount !== 1) throw new Error('ordinary poop accounting failed');
-if (actor.state !== 'idle' || actor.target !== null) throw new Error('toilet sand caused special movement behavior');
-
-const combatContext = {{ console, globalThis: null, window: null, Math, Object }};
-combatContext.globalThis = combatContext;
-combatContext.window = combatContext;
-combatContext.World = class World {{}};
-combatContext.Item = class Item {{ constructor(type, x, y) {{ this.type = type; this.x = x; this.y = y; }} }};
-combatContext.Effect = class Effect {{}};
-combatContext.audio = {{ place() {{}} }};
-combatContext.clamp = context.clamp;
-combatContext.distXY = context.distXY;
-combatContext.TarinaiToiletSandSystem = {{ contains(item, x, y) {{
-  const r = Math.max(24, Number(item.r || 48) || 48); const cx = item.x; const cy = item.y + r * 0.08;
-  const lx = x - cx; const ly = y - cy; const hw = r * 1.55; const hh = r * 0.72; const cr = r * 0.18;
-  const qx = Math.max(0, Math.abs(lx) - (hw - cr)); const qy = Math.max(0, Math.abs(ly) - (hh - cr));
-  return qx * qx + qy * qy <= cr * cr;
-}} }};
-vm.createContext(combatContext);
-vm.runInContext({combat_effects!r}, combatContext, {{ filename: 'world_combat_effects.js' }});
-const world = new combatContext.World();
-world.w = 800; world.h = 600; world.time = 12;
-const sand = {{ id: 'sand-1', type: 'toilet', x: 200, y: 200, r: 48, dead: false, angle: 0, toiletFlash: 0 }};
-world.itemsOfType = type => type === 'toilet' ? [sand] : [];
-let added = 0;
-world.addItem = item => {{ added += 1; return item; }};
-world.markTerrainDirtyAt = () => {{}};
-if (world.spawnZunchi(200, 200, null) !== null || added !== 0 || sand.toiletFlash !== 1) throw new Error('toilet sand did not immediately remove poop');
-const insideEdge = world.spawnZunchi(270, 200, null);
-if (insideEdge !== null || added !== 0) throw new Error('toilet sand visible rectangle did not absorb poop near its edge');
-const outside = world.spawnZunchi(278, 200, null);
-if (!outside || added !== 1) throw new Error('toilet sand removed poop outside its footprint');
-"""
-    with tempfile.NamedTemporaryFile("w", encoding="utf-8", suffix=".js", delete=False) as f:
-        f.write(toilet_runtime)
-        tmp = Path(f.name)
-    try:
-        result = subprocess.run(["node", str(tmp)], cwd=ROOT, text=True, capture_output=True)
-    finally:
-        tmp.unlink(missing_ok=True)
-    if result.returncode != 0:
-        sys.stderr.write(result.stdout)
-        sys.stderr.write(result.stderr)
-        fail("toilet sand runtime smoke test failed")
-    ok("toilet sand footprint/layering, parasol shade geometry, fan felt-temperature, weather targeting, pet food, first aid, and sedative additions verified")
-
-
-def check_parasol_rain_and_preset_updates() -> None:
-    placement = read_text(ROOT / "js/placement_preview_system.js")
-    render = read_text(ROOT / "js/render.js")
-    ambient = read_text(ROOT / "js/simulation_ambient_system.js")
-    weather = read_text(ROOT / "js/weather_system.js")
-    presets = read_text(ROOT / "js/world_reset_presets.js")
-
-    required = [
-        (placement, 'overlay: overlayForItem(tmp)', "parasol placement preview overlay is not exported"),
-        (placement, 'shape: "roundedRect", centerX: footprint.centerX, centerY: footprint.centerY', "parasol preview does not reuse shade geometry"),
-        (render, 'overlay?.shape === "roundedRect"', "shape-matched placement overlays are not rendered"),
-        (weather, 'drop.rainDrop = opts?.rainDrop === true || (!hasX && !hasY);', "rain-created water is not tagged"),
-        (ambient, 'const sand = worldRef.toiletSandAt?.(drop.x, drop.y) || null;', "toilet sand does not intercept rain water"),
-        (ambient, '"toilet-sand-rain-absorb"', "rain absorption does not invalidate toilet sand rendering"),
-        (presets, 'segments: [[-66, 0, 66, 0]]', "athletic rotator was not simplified"),
-        (presets, 'rotationEnvelope: true', "athletic rotator does not reserve its full rotation envelope"),
-        (presets, '"preset-athletic-water-balloon"', "athletic preset lacks water balloons"),
-        (presets, '"preset-happy-parasol"', "happy preset lacks parasols"),
-        (presets, '"preset-happy-water-balloon"', "happy preset lacks water balloons"),
-        (presets, '"preset-happy-toilet-sand"', "happy preset lacks toilet sand"),
-        (presets, '"preset-war-rotating-fan"', "war preset lacks rotating fans"),
-        (presets, 'fanSwingOn: true', "war preset fans do not rotate/swing"),
-    ]
-    for text, needle, message in required:
-        if needle not in text:
-            fail(message)
-
-    js = f"""
-const vm = require('vm');
-const fs = require('fs');
-
-const overlayContext = {{ console, globalThis: null, window: null, Math, Object }};
-overlayContext.globalThis = overlayContext; overlayContext.window = overlayContext;
-overlayContext.clamp = (v, a, b) => Math.max(a, Math.min(b, v));
-overlayContext.distXY = (a, b, x, y) => Math.hypot(x - a, y - b);
-overlayContext.applyNeedRelief = () => {{}};
-overlayContext.itemRadiusFor = (type, fallback) => type === 'rain_shelter' ? 50 : fallback;
-overlayContext.toolItemType = tool => tool;
-overlayContext.isRotatableItemType = () => false;
-overlayContext.defaultItemAngle = () => 0;
-overlayContext.foodServingsForSize = () => 3;
-overlayContext.isServingFoodType = () => false;
-overlayContext.CONFIG = {{ worldPadding: 30 }};
-overlayContext.TarinaiCollisionFootprints = {{ placementRectsFor() {{ return []; }}, itemFootprintRadius(_world, item) {{ return item.r; }} }};
-overlayContext.TarinaiMechanicalSystem = {{ isMechanicalType() {{ return false; }} }};
-overlayContext.TarinaiPhysicsSoftClear = {{ collectForPlacement() {{ return []; }} }};
-vm.createContext(overlayContext);
-vm.runInContext({read_text(ROOT / 'js/tarinai_local_environment_system.js')!r}, overlayContext, {{ filename: 'tarinai_local_environment_system.js' }});
-vm.runInContext({placement!r}, overlayContext, {{ filename: 'placement_preview_system.js' }});
-const previewWorld = {{ tool: 'rain_shelter', pointer: {{ inside: true, x: 100, y: 120 }}, toolSizeScale() {{ return 1; }}, toolSizeFor() {{ return 'medium'; }}, placementBlocked() {{ return false; }}, w: 800, h: 600 }};
-const preview = overlayContext.TarinaiPlacementPreviewSystem.forWorld(previewWorld);
-const shade = overlayContext.TarinaiParasolSystem.parasolFootprint(preview.item);
-if (!preview.overlay || preview.overlay.centerX !== shade.centerX || preview.overlay.centerY !== shade.centerY || preview.overlay.halfWidth !== shade.radiusX || preview.overlay.halfHeight !== shade.radiusY || preview.overlay.shape !== 'roundedRect') throw new Error('parasol preview overlay and shade diverged');
-
-const ambientContext = {{ console, globalThis: null, window: null, Math, Object }};
-ambientContext.globalThis = ambientContext; ambientContext.window = ambientContext;
-ambientContext.TarinaiWeatherSystem = {{ shouldDropRainWater() {{ return true; }}, createRainWaterItem() {{ return {{ type: 'water', x: 20, y: 30, rainDrop: true }}; }} }};
-vm.createContext(ambientContext);
-vm.runInContext({ambient!r}, ambientContext, {{ filename: 'simulation_ambient_system.js' }});
-let rainAdded = 0, rainDirty = 0;
-const sand = {{ type: 'toilet', x: 20, y: 30, r: 48, toiletFlash: 0 }};
-ambientContext.TarinaiAmbientSimulationSystem.phases.spawnRainWater({{ time: 1, toiletSandAt() {{ return sand; }}, addItem() {{ rainAdded += 1; }}, markTerrainDirtyAt() {{ rainDirty += 1; }} }}, 1);
-if (rainAdded !== 0 || rainDirty !== 1 || sand.toiletFlash !== 1) throw new Error('toilet sand did not absorb ambient rain water');
-
-const presetContext = {{ console, globalThis: null, window: null, Math, Object }};
-presetContext.globalThis = presetContext; presetContext.window = presetContext;
-let serial = 0;
-presetContext.rand = (a, b) => {{ serial = (serial + 0.371) % 1; return a + (b - a) * serial; }};
-presetContext.clamp = (v, a, b) => Math.max(a, Math.min(b, v));
-presetContext.CONFIG = {{ initialPopulation: 8 }};
-presetContext.toolLabel = type => type;
-presetContext.stableUnit = () => 0.42;
-presetContext.TarinaiGrass = {{ setStage() {{}} }};
-presetContext.Item = class Item {{
-  constructor(type, x, y) {{
-    this.id = `i${{++serial}}`; this.type = type; this.x = x; this.y = y; this.amount = 999; this.dead = false; this.roles = {{}}; this.angle = 0;
-    this.r = type === 'rain_shelter' ? 50 : (type === 'toilet' ? 48 : (type === 'fan' ? 26 : 20));
-    if (type === 'rotator' || type === 'reciprocator') this.physicsBody = {{ pose: {{ x, y, angle: 0 }}, velocity: {{}}, shape: {{}}, motor: {{}}, rail: {{}} }};
-  }}
-}};
-presetContext.TarinaiPhysicsBodySystem = {{ invalidateItem() {{}} }};
-presetContext.TarinaiMechanicalSystem = {{ invalidateGeometry() {{}}, reach(item) {{ let reach = 0; for (const seg of item.physicsBody?.shape?.segments || []) reach = Math.max(reach, Math.hypot(seg[0], seg[1]), Math.hypot(seg[2], seg[3])); return reach; }} }};
-presetContext.TarinaiCollisionFootprints = {{ itemFootprintRadius(_world, item) {{ return item.r || 20; }}, placementRectsFor() {{ return []; }}, rectCircleOverlap() {{ return false; }}, rectsOverlap() {{ return false; }} }};
-function makeWorld() {{ return {{ w: 1000, h: 720, items: [], tarinai: [], addItem(item) {{ this.items.push(item); return item; }}, addTarinai(t) {{ this.tarinai.push(t); return t; }}, nearbyItems() {{ return []; }}, placementBlocked() {{ return false; }}, solidObstacleRects() {{ return []; }}, isFenceType(type) {{ return String(type).includes('fence'); }}, placementClampPointFor(_item, x, y) {{ return {{ x, y }}; }} }}; }}
-vm.createContext(presetContext);
-vm.runInContext({presets!r}, presetContext, {{ filename: 'world_reset_presets.js' }});
-let presetWorld = makeWorld();
-presetContext.TarinaiResetPresets.generatePresetWorld(presetWorld, {{ id: 'garden' }}, 'happy');
-const duplicators = presetWorld.items.filter(item => item.type === 'duplicator');
-const toilets = presetWorld.items.filter(item => item.type === 'toilet');
-if (!duplicators.length || toilets.length !== duplicators.length || !duplicators.every(dup => toilets.some(sandItem => sandItem.x === dup.x && sandItem.y === dup.y))) throw new Error('happy toilet sand is not colocated with duplicators');
-if (!presetWorld.items.some(item => item.type === 'rain_shelter') || !presetWorld.items.some(item => item.type === 'balloon')) throw new Error('happy preset additions missing');
-presetWorld = makeWorld();
-presetContext.TarinaiResetPresets.generatePresetWorld(presetWorld, {{ id: 'garden' }}, 'athletic');
-const rotators = presetWorld.items.filter(item => item.type === 'rotator');
-if (!rotators.length || rotators.some(item => item.physicsBody?.shape?.segments?.length !== 1) || !presetWorld.items.some(item => item.type === 'balloon')) throw new Error('athletic preset shape/balloon additions missing');
-presetWorld = makeWorld();
-presetContext.TarinaiResetPresets.generatePresetWorld(presetWorld, {{ id: 'garden' }}, 'war');
-const fans = presetWorld.items.filter(item => item.type === 'fan');
-if (!fans.length || fans.some(item => !item.fanSwingOn || !(item.fanSwingRange > 0) || !(item.fanSwingSpeed > 0))) throw new Error('war preset rotating fans missing');
-const warBounceFences = presetWorld.items.filter(item => item.type === 'bounce_fence' || item.type === 'bounce_fence_v');
-if (warBounceFences.length < 2) throw new Error('war preset bounce fences missing');
-"""
-    with tempfile.NamedTemporaryFile("w", encoding="utf-8", suffix=".js", delete=False) as f:
-        f.write(js)
-        tmp = Path(f.name)
-    try:
-        result = subprocess.run(["node", str(tmp)], cwd=ROOT, text=True, capture_output=True)
-    finally:
-        tmp.unlink(missing_ok=True)
-    if result.returncode != 0:
-        sys.stderr.write(result.stdout)
-        sys.stderr.write(result.stderr)
-        fail("parasol/rain/preset runtime smoke test failed")
-    ok("parasol preview alignment, rain absorption, and happy/athletic/war preset additions verified")
-
-def check_war_fence_sleep_placement_delete_fixes() -> None:
-    def contains_local(text: str, needle: str, message: str) -> None:
-        if needle not in text:
-            fail(message)
-
-    metadata = read_text(ROOT / "js/item_tool_metadata.js")
-    footprints = read_text(ROOT / "js/collision_footprint_system.js")
-    placement = read_text(ROOT / "js/world_placement_log.js")
-    environment = read_text(ROOT / "js/world_environment.js")
-    collisions = read_text(ROOT / "js/collision_response_system.js")
-    render = read_text(ROOT / "js/render.js")
-    tools = read_text(ROOT / "js/world_tool_actions.js")
-    presets = read_text(ROOT / "js/world_reset_presets.js")
-
-    contains_local(metadata, 'freeStackingMovable: new Set(["ball", "balloon", "pushpin", "oshibyo"', "movable placement stacking trait missing")
-    contains_local(footprints, 'freeStacking?.has(item.type) && freeStacking.has(other.type)', "movable-vs-movable placement overlap is not ignored")
-    if "function ballPlacementBlocked" in placement or "ballPlacementBlocked(this, item)" in placement:
-        fail("legacy ball-on-ball placement rejection remains")
-    contains_local(environment, "const ORDINARY_FENCE_RESTITUTION = 0.38;", "ordinary fence restitution was not reduced")
-    contains_local(environment, "restitution: bounce ? BOUNCE_FENCE_RESTITUTION : ORDINARY_FENCE_RESTITUTION", "ordinary fence restitution is not exported through fence geometry")
-    contains_local(collisions, 'const sleepingContact = t.state === "sleep" || t.sleeping;', "sleeping Tarinai are still excluded from ball collision candidates")
-    contains_local(collisions, 'markSleepExternalMotion?.(t, frameDt, "ball-contact")', "sleeping ball collision does not enter passive physical motion")
-    contains_local(render, 'const targetGapScale = 1.45;', "world tooltips do not share the closer offset")
-    contains_local(presets, 'reason: "preset-war-bounce-fence"', "war preset bounce fences missing")
-    delete_section = tools[tools.find("findDeleteToolTargetAt"):tools.find("deleteItemAt")]
-    if "wireTool" in delete_section:
-        fail("delete target lookup still references undefined wireTool")
-
-    js = f"""
-const fs = require('fs');
-const vm = require('vm');
-
-const collisionContext = {{ console, Math, Object, globalThis: null, window: null }};
-collisionContext.globalThis = collisionContext; collisionContext.window = collisionContext;
-collisionContext.TarinaiImpactCoreSystem = {{ PHYSICAL_DAMAGE_SPEED_THRESHOLD: 165, physicalDamageFromImpactSpeed() {{ return 5; }}, itemHasAttachedLink() {{ return false; }} }};
-collisionContext.clamp = (v, a, b) => Math.max(a, Math.min(b, v));
-collisionContext.distXY = (ax, ay, bx, by) => Math.hypot(ax - bx, ay - by);
-collisionContext.deterministicRange = () => 0;
-collisionContext.deterministicAngle = () => 0;
-collisionContext.pick = values => values[0];
-collisionContext.CONFIG = {{ worldPadding: 0 }};
-collisionContext.Effect = class Effect {{ constructor(...args) {{ this.args = args; }} }};
-collisionContext.tarinaiMaxEnergy = () => 100;
-collisionContext.applyNeedRelief = () => {{}};
-collisionContext.applyNeedShock = () => {{}};
-let sleepMotionMarks = 0;
-collisionContext.TarinaiMovementUpdateStep = {{ markSleepExternalMotion() {{ sleepMotionMarks += 1; }} }};
-collisionContext.TarinaiItemDynamicPinSystem = {{ transferBallPinsToTarinai() {{ return 0; }} }};
-vm.createContext(collisionContext);
-vm.runInContext({collisions!r}, collisionContext, {{ filename: 'collision_response_system.js' }});
-const ball = {{ id: 'ball', type: 'ball', x: 9, y: 0, prevX: -9, prevY: 0, r: 10, vx: 100, vy: 0, spinVelocity: 0, dead: false }};
-const sleeper = {{ id: 'sleeper', name: 'sleeper', x: 20, y: 0, radius: 20, vx: 0, vy: 0, state: 'sleep', sleeping: true, dead: false, energy: 100 }};
-const collisionWorld = {{ time: 1, w: 500, h: 500, itemCounts: {{ ball: 1, balloon: 0 }}, items: [ball], effects: [], spawnEffect() {{ return null; }}, itemsOfType(type) {{ return type === 'ball' ? [ball] : []; }}, nearbyTarinai() {{ return [sleeper]; }}, isTarinaiHiddenInNestBox() {{ return false; }}, markSpatialDirty() {{}}, relationNotice() {{ return false; }}, applyImpulse() {{}}, applyImpactDamage() {{}} }};
-collisionContext.TarinaiCollisionResponseSystem.resolveBallInteractions(collisionWorld, 0.016);
-if (!(ball.vx < 0) || !(sleeper.vx > 0) || sleepMotionMarks < 1) throw new Error('sleeping Tarinai did not physically collide with ball');
-
-const placementContext = {{ console, Math, Object, globalThis: null, window: null }};
-placementContext.globalThis = placementContext; placementContext.window = placementContext;
-placementContext.TarinaiGeometry = {{ num(v, fallback = 0) {{ const n = Number(v); return Number.isFinite(n) ? n : fallback; }}, rectLocalPoint() {{}}, rectWorldVector() {{}}, rectCorners() {{ return []; }}, rectAxes() {{ return []; }}, projectPoints() {{}}, aabbOverlap() {{ return false; }}, rectOverlapInfo() {{}}, rectsOverlap() {{ return false; }} }};
-placementContext.TarinaiMechanicalSystem = {{ isMechanicalType() {{ return false; }} }};
-placementContext.isFenceItemType = () => false;
-placementContext.itemRadiusFor = () => 14;
-placementContext.TarinaiItemToolMetadata = {{ ITEM_TRAITS: {{ freeStackingMovable: new Set(['ball', 'balloon', 'pushpin', 'oshibyo', 'zunchi']) }} }};
-vm.createContext(placementContext);
-vm.runInContext({footprints!r}, placementContext, {{ filename: 'collision_footprint_system.js' }});
-const stackedWorld = {{ nearbyItems() {{ return [{{ type: 'zunchi', x: 0, y: 0, r: 14, dead: false }}]; }}, solidObstacleRects() {{ return []; }} }};
-if (placementContext.TarinaiCollisionFootprints.itemPlacementOverlapBlocked(stackedWorld, {{ type: 'zunchi', x: 0, y: 0, r: 14, dead: false }})) throw new Error('movable items still block movable placement');
-
-const toolContext = {{ console, Math, Object, globalThis: null, window: null }};
-toolContext.globalThis = toolContext; toolContext.window = toolContext;
-toolContext.World = class World {{ constructor() {{ this.items = [{{ id: 'i1', type: 'ball', x: 10, y: 10, r: 18, dead: false }}]; }} nearbyItems() {{ return this.items; }} compactItems() {{}} updateItemCounts() {{}} rebuildSpatial() {{}} log() {{}} }};
-toolContext.distXY = (ax, ay, bx, by) => Math.hypot(ax - bx, ay - by);
-toolContext.TarinaiCollisionFootprints = {{ hitTestItem(_world, item, x, y) {{ return {{ hit: Math.hypot(item.x - x, item.y - y) < 30, distance: Math.hypot(item.x - x, item.y - y) }}; }} }};
-toolContext.TarinaiGeometry = {{ pointSegmentDistance() {{ return 999; }} }};
-toolContext.TarinaiStructureLifecycle = {{ deleteItem(_world, item) {{ item.dead = true; return true; }} }};
-toolContext.showToast = () => {{}};
-toolContext.toolLabel = type => type;
-toolContext.isPinType = () => false;
-toolContext.itemRadiusFor = () => 18;
-toolContext.audio = {{ delete() {{}} }};
-toolContext.render = () => {{}};
-vm.createContext(toolContext);
-vm.runInContext({tools!r}, toolContext, {{ filename: 'world_tool_actions.js' }});
-const deleteWorld = new toolContext.World();
-const found = deleteWorld.findDeleteToolTargetAt(10, 10);
-if (!found || found.type !== 'ball') throw new Error('delete tool target lookup failed');
-deleteWorld.deleteItemAt(10, 10);
-if (!deleteWorld.items[0].dead) throw new Error('delete tool did not delete target item');
-"""
-    with tempfile.NamedTemporaryFile("w", encoding="utf-8", suffix=".js", delete=False) as f:
-        f.write(js)
-        tmp = Path(f.name)
-    try:
-        result = subprocess.run(["node", str(tmp)], cwd=ROOT, text=True, capture_output=True)
-    finally:
-        tmp.unlink(missing_ok=True)
-    if result.returncode != 0:
-        sys.stderr.write(result.stdout)
-        sys.stderr.write(result.stderr)
-        fail("war/fence/sleep/placement/delete runtime smoke test failed")
-    ok("war bounce fences, modest ordinary restitution, sleeping ball collision, closer nest tooltip, movable stacking, and delete tool verified")
-
-
-def check_hair_trigger_tooltips_and_physics_icons() -> None:
-    def contains_local(text: str, needle: str, message: str) -> None:
-        if needle not in text:
-            fail(message)
-
-    render = read_text(ROOT / "js/render.js")
-    presets = read_text(ROOT / "js/world_reset_presets.js")
-    layout = read_text(ROOT / "js/ui_layout_dialogs.js")
-    tools = read_text(ROOT / "js/ui_tools.js")
-    index = read_text(ROOT / "index.html")
-
-    contains_local(render, 'const targetGapScale = 1.45;', "all world tooltips were not moved to the nest-box offset")
-    if 'info?.kind === "nest_box" ?' in render:
-        fail("nest-box-only tooltip offset remains")
-    contains_local(presets, 'hair_trigger: { label: "\\u4E00\\u89E6\\u5373\\u767A" }', "hair-trigger preset definition missing")
-    contains_local(presets, 'function addPresetBounceFenceBox', "hair-trigger bounce enclosure helper missing")
-    contains_local(presets, 'storedFoodType: "food"', "hair-trigger duplicators are not loaded with pet food")
-    contains_local(layout, '"hair_trigger"', "field dialog preset fallback omits hair-trigger preset")
-    contains_local(index, 'data-reset-preset="hair_trigger"', "hair-trigger preset button missing")
-    contains_local(tools, 'function drawPhysicsToolIcon(canvas, toolId)', "dedicated physics icon renderer missing")
-    contains_local(tools, 'const hasPhysicsIcon = attachPhysicsToolIcon(btn, toolId);', "dedicated item silhouettes are not attached across categories")
-    for tool_id in ["rope", "rod", "spring", "wire", "insulated_wire", "pressure_switch", "glass_wall", "bounce_fence", "gate_fence", "rotator", "poison_block", "reciprocator", "one_way_fence", "fence_h"]:
-        contains_local(tools, f'toolId === "{tool_id}"', f"distinct physics icon branch missing: {tool_id}")
-
-    js = f"""
-const fs = require('fs');
-const vm = require('vm');
-const source = {presets!r};
-let idCounter = 0;
-const ctx = {{ console, Math, Object, globalThis: null, window: null }};
-ctx.globalThis = ctx; ctx.window = ctx;
-ctx.CONFIG = {{ initialPopulation: 16 }};
-ctx.clamp = (v, a, b) => Math.max(a, Math.min(b, v));
-ctx.rand = (a, b) => (Number(a) + Number(b)) / 2;
-ctx.Item = class Item {{ constructor(type, x, y) {{ this.id = `i${{++idCounter}}`; this.type = type; this.x = x; this.y = y; this.r = type === 'bounce_fence' ? 42 : type === 'ball' ? 18 : 22; this.amount = 999; this.roles = {{}}; }} }};
-ctx.toolLabel = id => id;
-ctx.TarinaiGrass = {{ setStage() {{}} }};
-ctx.TarinaiPhysicsBodySystem = {{ invalidateItem() {{}} }};
-ctx.TarinaiMechanicalSystem = {{ invalidateGeometry() {{}}, reach() {{ return 0; }} }};
-vm.createContext(ctx);
-vm.runInContext(source, ctx, {{ filename: 'world_reset_presets.js' }});
-const world = {{
-  w: 1000, h: 700, items: [], tarinai: [],
-  addItem(item) {{ this.items.push(item); return item; }},
-  addTarinai(data) {{ const t = {{ ...data, id: `t${{this.tarinai.length + 1}}` }}; this.tarinai.push(t); return t; }},
-  nearbyItems() {{ return []; }},
-  placementClampPointFor(_item, x, y) {{ return {{ x, y }}; }},
-  placementBlocked() {{ return false; }},
-  isFenceType(type) {{ return type.includes('fence'); }},
-}};
-ctx.TarinaiResetPresets.generatePresetWorld(world, {{ id: 'garden' }}, 'hair_trigger', 16);
-const cx = world.w * 0.5, cy = world.h * 0.5;
-const halfW = Math.max(132, Math.min(238, world.w * 0.18));
-const halfH = Math.max(104, Math.min(182, world.h * 0.18));
-const fences = world.items.filter(item => item.type === 'bounce_fence');
-const balls = world.items.filter(item => item.type === 'ball');
-const duplicators = world.items.filter(item => item.type === 'duplicator');
-if (fences.length < 8) throw new Error('hair-trigger enclosure has too few bounce fences');
-if (balls.length < 4 || !balls.every(item => Math.abs(item.x - cx) < halfW && Math.abs(item.y - cy) < halfH)) throw new Error('hair-trigger balls are not inside enclosure');
-if (!world.tarinai.length || !world.tarinai.every(t => Math.abs(t.x - cx) > halfW + 20 || Math.abs(t.y - cy) > halfH + 20)) throw new Error('hair-trigger Tarinai are not outside enclosure');
-if (!duplicators.length || !duplicators.every(item => item.storedFoodType === 'food' && (Math.abs(item.x - cx) > halfW + 20 || Math.abs(item.y - cy) > halfH + 20))) throw new Error('hair-trigger pet-food duplicators are not outside enclosure');
-"""
-    with tempfile.NamedTemporaryFile("w", encoding="utf-8", suffix=".js", delete=False) as f:
-        f.write(js)
-        tmp = Path(f.name)
-    try:
-        result = subprocess.run(["node", str(tmp)], cwd=ROOT, text=True, capture_output=True)
-    finally:
-        tmp.unlink(missing_ok=True)
-    if result.returncode != 0:
-        sys.stderr.write(result.stdout)
-        sys.stderr.write(result.stderr)
-        fail("hair-trigger preset runtime smoke test failed")
-    ok("uniform tooltip spacing, hair-trigger preset, and distinct physics icons verified")
-
-def main() -> None:
-    data = manifest()
-    check_files_exist(data)
-    check_unified_item_registry()
-    check_docs_removed()
-    check_versions(data)
-    check_index_order(data)
-    check_service_worker_order(data)
-    node_check([*(ROOT / "js").glob("*.js"), ROOT / "service-worker.js"])
-    action_spec_smoke()
-    behavior_state_smoke()
-    need_action_runtime_bridge_smoke()
-    mechanical_collision_and_editor_smoke()
-    physics_tuning_smoke()
-    champion_inheritance_smoke()
-    one_way_routing_smoke()
-    colony_limits_and_defaults_smoke()
-    check_basic_action_spec_runtime()
-    check_social_action_spec_runtime()
-    check_action_spec_no_legacy_hooks()
-    check_runtime_diagnostics_hooks()
-    check_social_balance_guards()
-    check_item_bucket_polish()
-    check_current_save_format()
-    check_save_stream_deadlock_guard()
-    check_phase_and_input_split()
-    check_system_order_boundary()
-    simulation_boundary_smoke()
-    check_entity_runtime_boundary()
-    check_item_lifecycle_pipeline_boundary()
-    check_tarinai_update_pipeline_boundary()
-    check_update_policy_boundaries()
-    check_processing_split()
-    command_dispatcher_smoke()
-    check_legacy_behavior_refs()
-    check_legacy_physics_props_removed()
-    check_redundant_correction_paths_removed()
-    check_collision_reason_and_projection_dirty_removed()
-    direct_feeding_smoke()
-    check_electrocution_gate_chart_and_ascii()
-    check_connection_overlay_and_time_detector()
-    check_link_dependency_and_plushie_recovery()
-    check_splat_link_target_and_appetite_label()
-    check_habitat_food_medicine_additions()
-    check_parasol_rain_and_preset_updates()
-    check_war_fence_sleep_placement_delete_fixes()
-    check_hair_trigger_tooltips_and_physics_icons()
-
-
-if __name__ == "__main__":
-    main()
diff --git a/scripts/render_stack_regression_audit.js b/scripts/render_stack_regression_audit.js
deleted file mode 100644
index 54e3b06..0000000
--- a/scripts/render_stack_regression_audit.js
+++ /dev/null
@@ -1,16 +0,0 @@
-const fs = require("fs");
-const path = require("path");
-const root = path.resolve(__dirname, "..");
-const render = fs.readFileSync(path.join(root, "js", "render.js"), "utf8");
-const spatial = fs.readFileSync(path.join(root, "js", "sim_core.js"), "utf8");
-const budget = fs.readFileSync(path.join(root, "js", "world_spatial_budget.js"), "utf8");
-function ok(cond, msg) { if (!cond) throw new Error(msg); console.log(`[OK] ${msg}`); }
-ok(render.includes("_renderStaticVisibleCache") && render.includes("renderStaticVersion"), "static visible render stacks are version-cached");
-ok(!render.includes("insertionSortNearPrevious") && render.includes("dynamicLayered.sort(compareRenderEntries)"), "dynamic sorting uses native sort without previous-order bookkeeping");
-ok(render.includes("mergeSortedRenderEntries") && render.includes("mergeSortedBackItems"), "static and dynamic sorted stacks are merged linearly");
-ok(spatial.includes("linkRenderCells") && spatial.includes("addLinkRenderItem") && spatial.includes("rebuildLinkRenderItems"), "links use dedicated AABB render spatial cells");
-ok(!render.includes("for (const type of LINK_RENDER_TYPES)"), "per-frame full link type fallback scan is removed");
-ok(render.includes("drawCarriedPlushieAtOwner") && !render.includes("syncCarriedPlushieToOwner"), "carried plushie rendering no longer synchronizes simulation coordinates");
-ok(render.includes("entity._renderCullRadius = value"), "eligible fixed cull radii are cached");
-ok(render.includes("it._renderSortY = renderLayerSortY(it)"), "back-layer sort keys are computed before sorting");
-ok(budget.includes("this.renderStaticVersion = (this.renderStaticVersion || 0) + 1"), "static spatial rebuilds invalidate the render cache");
diff --git a/scripts/secondary_achievement_regression_audit.js b/scripts/secondary_achievement_regression_audit.js
deleted file mode 100644
index d4f0a77..0000000
--- a/scripts/secondary_achievement_regression_audit.js
+++ /dev/null
@@ -1,106 +0,0 @@
-"use strict";
-
-const fs = require("fs");
-const vm = require("vm");
-const path = require("path");
-const root = path.join(__dirname, "..");
-const achievementSource = fs.readFileSync(path.join(root, "js", "achievements.js"), "utf8");
-
-class ClassList { add() {} remove() {} contains() { return false; } toggle() { return false; } }
-class Element {
-  constructor() { this.classList = new ClassList(); this.children = []; this.dataset = {}; this.style = { setProperty() {}, removeProperty() {} }; this.hidden = true; }
-  append(...children) { this.children.push(...children); }
-  replaceChildren(...children) { this.children = children; }
-  addEventListener() {} focus() {} setAttribute() {}
-  getBoundingClientRect() { return { left: 0, top: 0, width: 100, height: 30 }; }
-  get offsetWidth() { return 100; }
-}
-function harness() {
-  const storage = new Map();
-  const ids = ["achievementsBtn","achievementButtonCount","achievementsDialog","achievementDialogCount","achievementsCloseBtn","achievementsCloseIconBtn","achievementRefreshBtn","achievementResetBtn","achievementUnlockAllBtn","achievementList","achievementSharedStatus","achievementToast","achievementToastTitle","pauseBtn"];
-  const elements = new Map(ids.map(id => [id, new Element()]));
-  let timer = 0;
-  const c = {
-    console, Date, Intl, Math, JSON, Object, Array, Map, Set, WeakMap, Promise, Number, String, Boolean, Error, AbortController, encodeURIComponent, URLSearchParams,
-    location: { protocol: "file:", search: "" }, crypto: { randomUUID: () => "11111111-1111-4111-8111-111111111111" },
-    localStorage: { getItem: k => storage.get(k) ?? null, setItem: (k, v) => storage.set(k, String(v)), removeItem: k => storage.delete(k) },
-    document: { hidden: false, getElementById: id => elements.get(id) || null, createElement: () => new Element(), addEventListener() {} },
-    TarinaiEvents: { emit() {} }, TarinaiGameDialogs: { confirm: async () => true }, showToast() {}, audio: { uiClick() {} },
-    setTimeout() { return ++timer; }, clearTimeout() {}, setInterval() { return ++timer; }, clearInterval() {}, fetch: async () => { throw new Error("offline"); },
-    TARINAI_VERSION: "39.16.77",
-  };
-  c.window = c; c.globalThis = c;
-  vm.createContext(c); vm.runInContext(achievementSource, c, { filename: "achievements.js" });
-  return { c, api: c.TarinaiAchievements };
-}
-function assert(value, message) { if (!value) throw new Error(message); }
-
-(async function run() {
-  // Sauna timing must start on entering the hot state, not refresh every hot frame.
-  let h = harness();
-  let temperature = 40;
-  const t = { dead: false, x: 0, y: 0 };
-  const world = {
-    time: 0, tarinai: [t], ants: [], items: [],
-    feltTemperatureFor() { return temperature; },
-    temperatureStatusFor(v) { return { direction: v > 25 ? "hot" : (v < 10 ? "cold" : "comfort"), comfortable: v >= 10 && v <= 25 }; },
-  };
-  h.api.evaluateWorld(world, {});
-  world.time = 20; h.api.evaluateWorld(world, {}); // Still hot: must not restart the timer.
-  world.time = 20.1; temperature = 0; h.api.evaluateWorld(world, {});
-  assert(!h.api.isUnlocked("sauna_cold_plunge"), "sauna timer refreshed while continuously hot");
-  world.time = 30; temperature = 40; h.api.evaluateWorld(world, {}); // New hot entry.
-  world.time = 40; temperature = 0; h.api.evaluateWorld(world, {});
-  assert(h.api.isUnlocked("sauna_cold_plunge"), "sauna timer did not restart on a genuine new hot entry");
-
-  // Achievement reset must clear per-world/per-object hidden progress.
-  h = harness();
-  const tarinai = {
-    dead: false,
-    _achievementDirectFeedCount: 9,
-    _achievementDirectTreatmentCount: 3,
-    _achievementSaunaHotAt: 12,
-    _achievementSaunaWasHot: true,
-    _achievementHeldStartedAt: 1234,
-  };
-  const bomb = { type: "sticky_bomb", stickyBombPassCount: 14, _achievementPlayerPlaced: true, _achievementPlacedAt: 9 };
-  const resetWorld = { time: 100, tarinai: [tarinai], items: [bomb] };
-  h.c.world = resetWorld;
-  await h.api.reset();
-  assert(tarinai._achievementDirectFeedCount === 0 && tarinai._achievementDirectTreatmentCount === 0, "care progress survived achievement reset");
-  assert(tarinai._achievementSaunaHotAt == null && tarinai._achievementHeldStartedAt == null, "timed per-tarinai progress survived achievement reset");
-  assert(bomb.stickyBombPassCount === 0, "sticky-bomb relay progress survived achievement reset");
-  assert(bomb._achievementPlayerPlaced === true && bomb._achievementPlacedAt == null, "reset should preserve placement identity but clear quick-delete timing");
-
-  // World-changing history/ground operations are interventions, so passive observation must restart.
-  h = harness();
-  const observerWorld = { time: 0, tarinai: [], ants: [], items: [], fieldType: "garden", groundType: "soil" };
-  h.api.evaluateWorld(observerWorld, {});
-  observerWorld.time = 359.9; h.api.evaluateWorld(observerWorld, {});
-  assert(!h.api.isUnlocked("idle_observer_5_minutes"), "observer unlocked before three game days");
-  h.api.recordHistoryAction("undo", { world: observerWorld, deadRestored: 0 });
-  observerWorld.time = 360; h.api.evaluateWorld(observerWorld, {});
-  assert(!h.api.isUnlocked("idle_observer_5_minutes"), "undo did not reset passive-observation progress");
-  observerWorld.time = 500;
-  h.api.recordGroundChange({ world: observerWorld, previous: "soil", next: "ice", now: 1000 });
-  observerWorld.time = 859.9; h.api.evaluateWorld(observerWorld, {});
-  assert(!h.api.isUnlocked("idle_observer_5_minutes"), "ground change did not reset passive-observation progress");
-  observerWorld.time = 860; h.api.evaluateWorld(observerWorld, {});
-  assert(h.api.isUnlocked("idle_observer_5_minutes"), "observer did not unlock after three uninterrupted game days");
-
-  // Minimalist needs player-placement identity even after Unplanned City is already unlocked.
-  const snapshotSource = fs.readFileSync(path.join(root, "js", "snapshot_system.js"), "utf8");
-  assert(snapshotSource.includes('const needPlayerPlacedMetadata = needQuickDelete || needMinimalist;'), "minimalist placement metadata is not retained independently of quick-delete progress");
-  assert(snapshotSource.includes('needPlayerPlacedMetadata && rec?.item?._achievementPlayerPlaced ? 1 : 0'), "snapshot does not serialize minimalist placement identity");
-
-  // Lethal shocks must count before damage can mark the target dead.
-  const signalSource = fs.readFileSync(path.join(root, "js", "signal_system.js"), "utf8");
-  const shockStart = signalSource.indexOf("function shockTarget");
-  const shockEnd = signalSource.indexOf("function damageFromWires", shockStart);
-  const shockBody = signalSource.slice(shockStart, shockEnd);
-  const recordAt = shockBody.indexOf("recordWireShock");
-  const damageAt = shockBody.indexOf("target.damage?.");
-  assert(recordAt >= 0 && damageAt >= 0 && recordAt < damageAt, "wire-shock achievement is still recorded after potentially lethal damage");
-
-  console.log("[OK] secondary achievement regressions: sauna onset, reset cleanup, observer interventions, minimalist save metadata, and lethal wire shocks passed");
-})();
diff --git a/scripts/self_zunchi_regression_audit.js b/scripts/self_zunchi_regression_audit.js
deleted file mode 100644
index 1bbb14c..0000000
--- a/scripts/self_zunchi_regression_audit.js
+++ /dev/null
@@ -1,129 +0,0 @@
-#!/usr/bin/env node
-"use strict";
-
-const fs = require("fs");
-const vm = require("vm");
-const path = require("path");
-
-function assert(condition, message) {
-  if (!condition) throw new Error(message);
-}
-
-function createHarness({ owner = true, lethal = true, neverStopped = true, clearedOwner = true } = {}) {
-  let unlocks = 0;
-  let damageCalls = 0;
-  const ownerId = "t-owner";
-  const tarinai = {
-    id: owner ? ownerId : "t-other",
-    releasedLiveId: "",
-    dead: false,
-    x: 100,
-    y: 100,
-    radius: 20,
-    vx: 0,
-    vy: 0,
-    fallTimer: 0,
-    fallMax: 0,
-    enterPanic() {},
-  };
-  const item = {
-    type: "zunchi",
-    dead: false,
-    x: 100,
-    y: 100,
-    prevX: 100,
-    prevY: 100,
-    r: 14,
-    amount: 240,
-    vx: 200,
-    vy: 0,
-    achievementBurstOwnerId: ownerId,
-    achievementBurstNeverStopped: neverStopped,
-    achievementBurstClearedOwner: clearedOwner,
-  };
-  const world = {
-    time: 10,
-    w: 1000,
-    h: 1000,
-    tarinai: [tarinai],
-    drawListDirty: false,
-    liveTarinaiById(id) { return tarinai.id === id && !tarinai.dead ? tarinai : null; },
-    nearbyTarinai() { return [tarinai]; },
-    isTarinaiHiddenInNestBox() { return false; },
-    applyImpactDamage(target) {
-      damageCalls += 1;
-      if (!lethal) return true;
-      target.dead = true;
-      target.releasedLiveId = target.id;
-      target.id = "";
-      return true;
-    },
-    spawnFallEffect() {},
-    effects: [],
-  };
-
-  const context = {
-    console,
-    globalThis: null,
-    window: undefined,
-    CONFIG: { worldPadding: 30 },
-    clamp: (value, min, max) => Math.max(min, Math.min(max, value)),
-    distXY: (ax, ay, bx, by) => Math.hypot(ax - bx, ay - by),
-    rand: () => 0,
-    Effect: function Effect() {},
-    TarinaiPhysics: { applyKinematicItemMotion() {} },
-    TarinaiItemDynamicBallSystem: { resolveObstacleCollisions() {} },
-    TarinaiAchievements: {
-      recordSelfZunchiDeath() { unlocks += 1; },
-    },
-  };
-  context.globalThis = context;
-  vm.createContext(context);
-  const source = fs.readFileSync(path.join(__dirname, "..", "js", "item_dynamic_zunchi_system.js"), "utf8");
-  vm.runInContext(source, context, { filename: "item_dynamic_zunchi_system.js" });
-  return { context, world, tarinai, item, get unlocks() { return unlocks; }, get damageCalls() { return damageCalls; } };
-}
-
-function runOne(options = {}) {
-  const h = createHarness(options);
-  h.context.TarinaiItemDynamicZunchiSystem.updateMotion(h.item, 0.016, h.world);
-  return h;
-}
-
-let result = runOne({ owner: true, lethal: true, neverStopped: true, clearedOwner: true });
-assert(result.unlocks === 1, "fatal owner return collision should unlock even after live ID release");
-
-result = runOne({ owner: true, lethal: false, neverStopped: true, clearedOwner: true });
-assert(result.unlocks === 0, "nonfatal owner collision must not unlock");
-
-result = runOne({ owner: false, lethal: true, neverStopped: true, clearedOwner: true });
-assert(result.unlocks === 0, "fatal collision with another tarinai must not unlock");
-
-result = runOne({ owner: true, lethal: true, neverStopped: false, clearedOwner: true });
-assert(result.unlocks === 0, "stopped or player-held burst zunchi must remain disqualified");
-
-// Exact route prerequisite: the emitted zunchi begins inside its owner, but that
-// spawn overlap must neither damage the owner nor consume the later return hit.
-result = runOne({ owner: true, lethal: true, neverStopped: true, clearedOwner: false });
-assert(result.unlocks === 0, "spawn overlap must not unlock");
-assert(result.damageCalls === 0, "spawn overlap must not damage or slow the owner collision path");
-assert(result.item.achievementBurstClearedOwner === false, "spawn overlap must remain uncleared while still inside owner");
-
-// Move outside once (the route's outbound leg / bounce-fence approach), then
-// return at lethal speed. This must unlock.
-result = createHarness({ owner: true, lethal: true, neverStopped: true, clearedOwner: false });
-result.item.x = 180;
-result.item.prevX = 100;
-result.item.vx = 320;
-result.context.TarinaiItemDynamicZunchiSystem.updateMotion(result.item, 0.016, result.world);
-assert(result.item.achievementBurstClearedOwner === true, "burst zunchi must arm after clearing its owner");
-assert(result.damageCalls === 0, "outbound leg must not damage the owner");
-result.item.x = 100;
-result.item.prevX = 180;
-result.item.vx = -900; // representative accelerated return after a bounce fence
-result.item.vy = 0;
-result.world.time += 0.2;
-result.context.TarinaiItemDynamicZunchiSystem.updateMotion(result.item, 0.016, result.world);
-assert(result.unlocks === 1, "cleared, accelerated return collision with owner must unlock when fatal");
-
-console.log("[OK] self-zunchi spawn-clear-return regression cases passed");
diff --git a/scripts/social_interaction_regression_audit.js b/scripts/social_interaction_regression_audit.js
deleted file mode 100644
index eda29a3..0000000
--- a/scripts/social_interaction_regression_audit.js
+++ /dev/null
@@ -1,22 +0,0 @@
-"use strict";
-const fs = require("fs");
-const moveSrc = fs.readFileSync("js/tarinai_social_move_life.js", "utf8");
-const needSrc = fs.readFileSync("js/tarinai_needs_items.js", "utf8");
-const actionSrc = fs.readFileSync("js/tarinai_action_definitions.js", "utf8");
-const colonySrc = fs.readFileSync("js/colony_situation_system.js", "utf8");
-function ok(cond, msg) { if (!cond) { console.error(`[FAIL] ${msg}`); process.exitCode = 1; } else console.log(`[OK] ${msg}`); }
-ok(!moveSrc.includes('this.socialCrowdSample = {'), "contact scan no longer records crowd density");
-ok(!needSrc.includes('const crowdSample = tarinai.socialCrowdSample'), "relation need no longer consumes crowd pressure");
-ok(!actionSrc.includes('createCrowdEscapeActionSpec(),'), "crowd retreat action is not registered");
-ok(!colonySrc.includes('nearestAverage('), "colony status no longer performs O(N^2) crowd distance scans");
-ok(!colonySrc.includes('add("overcrowded"'), "overcrowded colony status is no longer selected");
-ok(!moveSrc.includes('const candidateBudget = Math.max(20, scanLimit + 8)'), "contact candidates are no longer truncated by spatial bucket order");
-ok(!moveSrc.includes('if (inspected >= candidateBudget) break'), "contact scans do not stop before considering nearer later candidates");
-ok(moveSrc.includes('if (pos < scanLimit)'), "contact scan keeps a bounded nearest-candidate list");
-ok(moveSrc.includes('if (detailed.length > scanLimit) detailed.pop()'), "nearest-candidate list remains bounded under dense populations");
-ok(moveSrc.includes('const pairLeader = String(this.id) < String(o.id)'), "symmetric pair work has one deterministic leader");
-ok(moveSrc.includes('const d2 = dx * dx + dy * dy'), "distance-squared prefilter is used");
-ok(moveSrc.includes('const selfProfile = this.personalityProfile()'), "self personality profile is cached per scan");
-ok(!moveSrc.includes('open.sort('), "social interaction does not introduce full sorting");
-ok(moveSrc.includes('const combinedStartChance = 1 - (1 - oneDirectionChance) * (1 - oneDirectionChance)'), "single-pass pair processing preserves old start probability");
-if (process.exitCode) process.exit(process.exitCode);
diff --git a/scripts/ui_grass_limits_regression_audit.py b/scripts/ui_grass_limits_regression_audit.py
deleted file mode 100644
index 56afb03..0000000
--- a/scripts/ui_grass_limits_regression_audit.py
+++ /dev/null
@@ -1,85 +0,0 @@
-from pathlib import Path
-import re
-
-ROOT = Path(__file__).resolve().parents[1]
-
-def text(rel):
-    return (ROOT / rel).read_text(encoding='utf-8')
-
-def must(cond, msg):
-    if not cond:
-        raise AssertionError(msg)
-
-index = text('index.html')
-ui_bind = text('js/ui_bind.js')
-ui_mouse = text('js/ui_input_mouse.js')
-ui_shared = text('js/ui_input_shared.js')
-view = text('js/world_view.js')
-data = text('js/data.js')
-temp = text('js/world_temperature_system.js')
-disease = text('js/tarinai_item_effects.js')
-spatial = text('js/sim_core.js')
-spatial_budget = text('js/world_spatial_budget.js')
-targeting = text('js/tarinai_item_targeting.js')
-ach = text('js/achievements.js')
-
-# Tool mode survives ordinary controls, but blank UI space explicitly clears it.
-must('isInteractiveUiTarget' in ui_bind and 'clearSelectedToolSilently' in ui_bind,
-     'blank-UI tool cancellation helpers are missing')
-must('!canvas?.contains?.(target) && !isInteractiveUiTarget(target)' in ui_bind,
-     'blank UI space is not the exclusive document-click cancellation path')
-must('target.closest("button, a, input, select, textarea, label, summary' in ui_bind,
-     'ordinary UI controls are not protected from tool cancellation')
-
-# Limits: 300, next slot 301 = infinity, default infinity.
-must('COLONY_LIMIT_MAX = 300' in ui_bind, 'colony limit max is not 300')
-must('COLONY_LIMIT_INFINITY_SLOT = 301' in ui_bind, 'infinity slot is not 301')
-must(re.search(r'max="301"[^>]*value="301"', index) is not None, 'limit slider does not default to infinity slot')
-
-# Right-drag context-menu suppression.
-must('suppressContextMenuUntil' in ui_mouse and 'contextmenu' in ui_mouse, 'right-pan context-menu suppression missing')
-must('suppressContextMenuUntil' in ui_shared, 'right-pan suppression timestamp is not set on pan end')
-
-# Zoom.
-must(re.search(r'BASE_ZOOM_MAX\s*=\s*4\.5', view) is not None, 'zoom maximum is not 4.5')
-
-# Disease probability reduced to one-third at the shared helper.
-must(re.search(r'Number\(base\)[^\n]*/\s*3', disease) is not None or '/ 3' in disease[disease.find('diseaseChance'):disease.find('diseaseChance')+240], 'diseaseChance is not reduced to one-third')
-
-# Summer correction removed completely.
-must(re.search(r'summerTemperatureBoost\s*:\s*0\b', data) is not None, 'summerTemperatureBoost is not zero')
-body = re.search(r'(?:function\s+)?seasonTemperatureBias\s*\([^)]*\)\s*\{([\s\S]*?)\n\s*\}', temp)
-must(body is not None and re.search(r'\breturn\s+0\s*;', body.group(1)), 'seasonTemperatureBias does not return zero')
-
-# Grass: dedicated spatial index and no global grass fallback re-add in food search.
-must('grassCells = new Map()' in spatial, 'dedicated grassCells index missing')
-must('nearbyGrass(' in spatial_budget and 'spatial.grassCells' in spatial_budget, 'nearbyGrass spatial query missing')
-must('type === "grass"' in targeting and 'nearbyFood' in targeting, 'grass global-bucket skip guard missing')
-# Ensure the hot-path global type bucket explicitly skips grass when nearbyFood exists.
-must(re.search(r'if\s*\(\s*type\s*===\s*["\']grass["\'][^)]*nearbyFood', targeting) is not None,
-     'food targeting does not skip the global grass bucket')
-
-# Achievements 73-75 and persistent Memento Mori progress.
-for aid in ('well_informed', 'lively_making', 'memento_mori'):
-    must(aid in ach, f'achievement {aid} missing')
-must('memento_mori' in ach and 'PRE_UNLOCK_DESCRIPTION_IDS' in ach, 'Memento Mori pre-unlock condition visibility missing')
-must('totalDeathCount' in ach, 'persistent total death counter missing')
-
-
-# Current UI/achievement/colony changes.
-placement_preview = text('js/placement_preview_system.js')
-placement_log = text('js/world_placement_log.js')
-colony = text('js/colony_situation_system.js')
-components = text('css/components.css')
-
-must('achievementToastCondition' in index and 'achievement-toast-condition' in components, 'achievement unlock toast condition line missing')
-must('if (dom.toastCondition) dom.toastCondition.textContent = definition.description || "";' in ach, 'achievement toast does not render the completion condition')
-must('lively_making' in ach and 'PRE_UNLOCK_DESCRIPTION_IDS' in ach and 'manualTarinaiAddedCount' in ach, 'Lively Making persistent/pre-unlock progress is missing')
-must(r'title: "\u7e41\u6b96\u30fb\u4eba\u53e3"' in ach and r'title: "\u64cd\u4f5c"' in ach and 'id: "other"' in ach, 'six-category achievement reorganization missing')
-must('num(rect.bottom) > (worldRef.h || 0)' in placement_preview, 'placement preview still reserves an artificial bottom padding')
-must('rect.bottom > this.h' in placement_log, 'confirmed placement still reserves an artificial bottom padding')
-must('Math.max(5, Math.ceil(m.n * 0.10))' in colony, 'crisis mortality threshold is still too loose')
-must('criticalRatio' in colony and 'crisisMortalitySignal && crisisSystemicStress' in colony and 'crisisCollapseSignal' in colony, 'crisis no longer requires compound severe conditions')
-must('!m.populationIncreasing' in colony, 'crisis population-growth exclusion was lost')
-
-print('[OK] UI/limits/input/zoom/disease/grass/summer/achievement/placement/crisis regression audit passed')
diff --git a/service-worker.js b/service-worker.js
index 25719a8..29450c2 100644
--- a/service-worker.js
+++ b/service-worker.js
@@ -1,11 +1,132 @@
 "use strict";
 
-const APP_VERSION = "39.16.98";
+const APP_VERSION = "39.18.18";
 const CACHE_NAME = `tarinai-colony-${APP_VERSION}`;
 const v = `v=${APP_VERSION}`;
-// Generated from app_manifest.json. Run scripts/generate_app_files.py after changing static files.
+// Static runtime list synchronized with app_manifest.json for this release.
 const coreScriptNames = [
-  "version", "event_bus", "domain_ids", "registry_base", "disease_registry", "sound_pack", "deterministic_helpers", "item_tool_metadata", "item_tool_definitions", "item_visual_definitions", "item_food_definitions", "item_effect_definitions", "item_registry", "data", "ground_types", "input_mode_manager", "math", "geometry_helpers", "collision_footprint_system", "physics_helpers", "placement_preview_system", "pin_attachment_system", "physics_shape_editor_system", "mechanical_system", "mechanical_shape_bridge", "constraint_system", "physics_world_system", "physics_projection_system", "circuit_board_system", "signal_system", "assets", "audio", "perf_profiler", "display_helpers", "render", "sim_core", "tarinai_seed_factory", "structures", "item_type_catalog", "items", "item_type_initializers", "item_lifecycle_support", "item_update_policy", "fire_runtime_system", "robot_cleaner_system", "item_dynamic_tool_system", "item_dynamic_ball_system", "item_dynamic_duplicator_system", "item_dynamic_pin_system", "item_dynamic_zunchi_system", "item_dynamic_system", "item_lifecycle_decay_system", "item_lifecycle_growth_system", "item_lifecycle_step_frame", "item_lifecycle_step_decay", "item_lifecycle_step_dynamic", "item_lifecycle_step_growth", "update_step_pipeline_runner", "item_lifecycle_pipeline", "item_runtime", "structure_lifecycle", "item_render_helpers", "item_render_runtime", "burn_motion_util", "ants", "health", "tarinai", "tarinai_action_spec", "tarinai_behavior_state", "tarinai_identity_social", "tarinai_action_state", "tarinai_disease_nest", "tarinai_item_effects", "tarinai_needs_core", "tarinai_behavior_text", "tarinai_forced_behavior", "tarinai_nest_sleep_system", "tarinai_item_targeting", "tarinai_consumable_behavior", "tarinai_social_action_runtime", "tarinai_building_behavior", "seesaw_system", "tarinai_action_definitions", "tarinai_needs_items", "tarinai_food_prototype_mixin", "tarinai_direct_feeding_system", "tarinai_need_planner_system", "tarinai_item_interaction_context", "tarinai_food_interaction_system", "tarinai_contact_item_system", "tarinai_item_interaction_system", "tarinai_sunbath_system", "tarinai_cursor_care_system", "tarinai_local_environment_system", "tarinai_social_move_life", "tarinai_update_step_frame", "tarinai_update_step_ai", "tarinai_update_step_environment", "tarinai_update_step_movement", "tarinai_update_step_health", "tarinai_update_pipeline", "tarinai_runtime", "tarinai_render", "world", "world_view", "family_graph", "world_reset_presets", "world_family_social", "impact_core_system", "impact_response_system", "collision_response_system", "world_combat_effects", "world_environment", "world_temperature_system", "world_pathfinding_system", "world_grass_placement_system", "world_spatial_budget", "world_ants_system", "weather_system", "item_update_scheduler", "simulation_runtime_helpers", "tarinai_update_policy", "simulation_environment_system", "simulation_item_ant_system", "simulation_effects_system", "simulation_creature_system", "simulation_maintenance_system", "simulation_ambient_system", "simulation_systems", "system_order", "simulation", "colony_situation_system", "world_update", "world_tool_actions", "world_placement_log", "world_event_effects", "command_dispatcher", "text_catalog", "ui", "game_dialogs", "achievements", "ui_helpers", "ui_log", "ui_selected", "save_schema", "snapshot_system", "restore_coordinator", "history_system", "save_codec", "save_storage", "save_system", "ui_tooltips", "ui_layout_dialogs", "ui_ground", "ui_tools", "ui_input_shared", "ui_pointer_action_system", "ui_input_touch", "ui_input_mouse", "ui_bind", "ui_charts", "ui_family_data", "ui_family_async", "ui_family_layout", "ui_family_paths", "ui_family_render", "main", "debug_tools"
+  "version", "event_bus", "domain_ids", "registry_base", "disease_registry", "sound_pack", "deterministic_helpers", "item_tool_metadata", "item_tool_definitions", "item_visual_definitions", "item_food_definitions", "item_effect_definitions", "item_registry", "data", "ground_types", "input_mode_manager", "math", "geometry_helpers", "collision_footprint_system", "physics_helpers", "placement_preview_system", "pin_attachment_system", "physics_shape_editor_system", "mechanical_system", "mechanical_shape_bridge", "constraint_system", "physics_world_system", "physics_projection_system", "circuit_board_system", "signal_system", "assets", "audio", "perf_profiler", "display_helpers", "render", "sim_core", "tarinai_seed_factory", "structures", "item_type_catalog", "items", "item_type_initializers", "item_lifecycle_support", "item_update_policy", "fire_runtime_system", "robot_cleaner_system", "item_dynamic_tool_system", "item_dynamic_ball_system", "item_dynamic_duplicator_system", "item_dynamic_pin_system", "item_dynamic_zunchi_system", "item_environment_hazard_system", "item_dynamic_system", "item_lifecycle_decay_system", "item_lifecycle_growth_system", "item_lifecycle_step_frame", "item_lifecycle_step_decay", "item_lifecycle_step_dynamic", "item_lifecycle_step_growth", "update_step_pipeline_runner", "item_lifecycle_pipeline", "item_runtime", "structure_lifecycle", "memorial_bell_system", "item_render_helpers", "item_render_runtime", "burn_motion_util", "ants", "health", "tarinai", "tarinai_action_spec", "tarinai_behavior_state", "tarinai_identity_social", "tarinai_action_state", "tarinai_disease_nest", "tarinai_item_effects", "tarinai_needs_core", "tarinai_behavior_text", "tarinai_forced_behavior", "tarinai_nest_sleep_system", "tarinai_item_targeting", "tarinai_consumable_behavior", "tarinai_social_action_runtime", "tarinai_building_behavior", "seesaw_system", "tarinai_action_definitions", "tarinai_needs_items", "tarinai_food_prototype_mixin", "tarinai_direct_feeding_system", "tarinai_need_planner_system", "tarinai_item_interaction_context", "tarinai_food_interaction_system", "tarinai_contact_item_system", "tarinai_item_interaction_system", "tarinai_sunbath_system", "tarinai_cursor_care_system", "tarinai_local_environment_system", "tarinai_social_move_life", "tarinai_update_step_frame", "tarinai_update_step_ai", "tarinai_update_step_environment", "tarinai_update_step_movement", "tarinai_update_step_health", "tarinai_update_pipeline", "tarinai_runtime", "tarinai_render", "world", "world_view", "family_graph", "world_reset_presets", "world_family_social", "impact_core_system", "impact_response_system", "collision_response_system", "world_combat_effects", "world_environment", "world_temperature_system", "world_pathfinding_system", "world_grass_placement_system", "world_spatial_budget", "world_ants_system", "weather_system", "item_update_scheduler", "simulation_runtime_helpers", "tarinai_update_policy", "simulation_environment_system", "simulation_item_ant_system", "simulation_effects_system", "simulation_creature_system", "simulation_maintenance_system", "simulation_ambient_system", "simulation_systems", "system_order", "simulation", "colony_situation_system", "world_update", "world_tool_actions", "world_placement_log", "world_event_effects", "command_dispatcher", "text_catalog", "ui", "game_dialogs", "achievement_catalog", "achievements", "ui_helpers", "ui_log", "ui_selected", "save_schema", "snapshot_system", "restore_coordinator", "history_system", "save_codec", "save_storage", "save_system", "ui_tooltips", "ui_layout_dialogs", "ui_ground", "ui_tools", "ui_input_shared", "ui_pointer_action_system", "ui_input_touch", "ui_input_mouse", "ui_bind", "ui_charts", "ui_family_data", "ui_family_async", "ui_family_layout", "ui_family_paths", "ui_family_render", "main", "debug_tools"
+];
+const mediaAssetNames = [
+  "assets/objects/ant_queen.webp",
+  "assets/objects/ant_worker.webp",
+  "assets/objects/genkotsu.webp",
+  "assets/objects/oshibyo.webp",
+  "assets/objects/oshibyo_stuck.webp",
+  "assets/objects/plushie_bear.png",
+  "assets/objects/pushpin.webp",
+  "assets/objects/pushpin_stuck.webp",
+  "assets/objects/zunchi.webp",
+  "assets/objects/zunchi_02.webp",
+  "assets/sounds/achievement_unlock.mp3",
+  "assets/sounds/acquired_stress_001.wav",
+  "assets/sounds/acquired_stress_002.wav",
+  "assets/sounds/acquired_stress_003.wav",
+  "assets/sounds/acquired_stress_004.wav",
+  "assets/sounds/acquired_stress_005.wav",
+  "assets/sounds/acquired_stress_006.wav",
+  "assets/sounds/bicycle_bell.mp3",
+  "assets/sounds/firecracker_explosion.mp3",
+  "assets/sounds/major_damage_01.wav",
+  "assets/sounds/major_damage_02.wav",
+  "assets/sounds/major_damage_03.wav",
+  "assets/sounds/major_damage_04.wav",
+  "assets/sounds/shoot_bolt_action.mp3",
+  "assets/sounds/shoot_pistol.mp3",
+  "assets/sounds/voice_001_hau.wav",
+  "assets/sounds/voice_002_flee.wav",
+  "assets/sounds/voice_003_po.wav",
+  "assets/sounds/voice_004_eat.wav",
+  "assets/sounds/voice_005_stress.wav",
+  "assets/sounds/voice_006_sleep.wav",
+  "assets/sounds/voice_007_sunbath_pokapoka.wav",
+  "assets/sounds/voice_008_temperature_buruburu.wav",
+  "assets/sounds/voice_009_temperature_achui.wav",
+  "assets/sounds/intimidate_alt_001.wav",
+  "assets/sounds/ochibi_sleep_002.wav",
+  "assets/sounds/ochibi_sleep_003.wav",
+  "assets/sounds/ochibi_fight_hit_004.wav",
+  "assets/sounds/ochibi_panic_005.wav",
+  "assets/sounds/ochibi_electric_006.wav",
+  "assets/sounds/ochibi_hot_007.wav",
+  "assets/sounds/ochibi_stress_008.wav",
+  "assets/sprites/tarinai_01_smile.webp",
+  "assets/sprites/tarinai_02_angry.webp",
+  "assets/sprites/tarinai_03_teary.webp",
+  "assets/sprites/tarinai_04_jito.webp",
+  "assets/sprites/tarinai_05_drool.webp",
+  "assets/sprites/tarinai_06_cry.webp",
+  "assets/sprites/tarinai_07_sleep.webp",
+  "assets/sprites/tarinai_08_pokan.webp",
+  "assets/sprites/tarinai_09_stretch.webp",
+  "assets/sprites/tarinai_10_hurt.webp",
+  "assets/sprites/tarinai_11_weak.webp",
+  "assets/sprites/tarinai_12_back.webp",
+  "assets/sprites/tarinai_13_flee.webp",
+  "assets/sprites/tarinai_14_zunda_eat.webp",
+  "assets/sprites/tarinai_15_hurt2.webp",
+  "assets/sprites/tarinai_16_normal_smirk.webp",
+  "assets/sprites/tarinai_17_normal_tongue.webp",
+  "assets/sprites/tarinai_18_fear.webp",
+  "assets/sprites/tarinai_19_flee_fear2.webp",
+  "assets/sprites/tarinai_20_sleep2.webp",
+  "assets/sprites/tarinai_21_normal_happy.webp",
+  "assets/sprites/tarinai_22_fear_blue.webp",
+  "assets/sprites/tarinai_23_fear_cry.webp",
+  "assets/sprites/tarinai_24_stress_dizzy.webp",
+  "assets/sprites/tarinai_25_stress_sweat.webp",
+  "assets/sprites/tarinai_26_intimidate.webp",
+  "assets/sprites/tarinai_27_birth_ritual.webp",
+  "assets/sprites/tarinai_28_zunchi_slave.webp",
+  "assets/sprites/tarinai_29_hungry_70.webp",
+  "assets/sprites/tarinai_30_zunchi_slave_alt.webp",
+  "assets/sprites/tarinai_31_sunbath_01.webp",
+  "assets/sprites/tarinai_32_sunbath_02.webp",
+  "assets/sprites/tarinai_33_sunbath_03.webp",
+  "assets/sprites/tarinai_34_hot_01.webp",
+  "assets/sprites/tarinai_35_hot_02.webp",
+  "assets/sprites/tarinai_36_hot_03.webp",
+  "assets/sprites/tarinai_37_cold_01.webp",
+  "assets/sprites/tarinai_38_cold_02.webp",
+  "assets/sprites/tarinai_39_cold_03.webp",
+  "assets/sprites/tarinai_40_intimidate_alt.webp",
+  "assets/sprites/tarinai_acquired_overlay.png",
+  "assets/ui/apple-touch-icon.png",
+  "assets/ui/ecology_hp_stress.webp",
+  "assets/ui/favicon.png",
+  "assets/ui/tool_acquired_tarinai.webp",
+  "assets/ui/tool_ammo.webp",
+  "assets/ui/tool_ant_nest.webp",
+  "assets/ui/tool_ball.webp",
+  "assets/ui/tool_bed.webp",
+  "assets/ui/tool_delete.webp",
+  "assets/ui/tool_duplicator.webp",
+  "assets/ui/tool_dwarf_drug.webp",
+  "assets/ui/tool_fence_h.webp",
+  "assets/ui/tool_fence_v.webp",
+  "assets/ui/tool_fight_mochi.webp",
+  "assets/ui/tool_firecracker.webp",
+  "assets/ui/tool_genkotsu.webp",
+  "assets/ui/tool_giant_drug.webp",
+  "assets/ui/tool_grass.webp",
+  "assets/ui/tool_laxative.webp",
+  "assets/ui/tool_love_mochi.webp",
+  "assets/ui/tool_mercury.webp",
+  "assets/ui/tool_mystery_drug.webp",
+  "assets/ui/tool_nest_box.webp",
+  "assets/ui/tool_new.webp",
+  "assets/ui/tool_niteropu.webp",
+  "assets/ui/tool_observe.webp",
+  "assets/ui/tool_oshibyo.webp",
+  "assets/ui/tool_protein.webp",
+  "assets/ui/tool_pushpin.webp",
+  "assets/ui/tool_shoot.png",
+  "assets/ui/tool_signboard.webp",
+  "assets/ui/tool_sleep_drug.webp",
+  "assets/ui/tool_stone.webp",
+  "assets/ui/tool_sweet.webp",
+  "assets/ui/tool_zunchi.webp",
+  "assets/ui/tool_zunda_juice.webp"
 ];
 const CORE_ASSETS = [
   "./",
@@ -16,49 +137,71 @@ const CORE_ASSETS = [
   `./css/components.css?${v}`,
   `./css/mobile.css?${v}`,
   ...coreScriptNames.map(name => `./js/${name}.js?${v}`),
+  "./app_manifest.json",
+  "./manifest.webmanifest",
+  "./favicon.ico",
+  "./assets/ui/pwa-icon-192.png",
+  "./assets/ui/pwa-icon-512.png",
+  ...mediaAssetNames.map(name => `./${name}`),
 ];
 
-self.addEventListener("install", (event) => {
-  event.waitUntil(caches.open(CACHE_NAME).then(cache => cache.addAll(CORE_ASSETS)).catch(() => undefined));
-  self.skipWaiting();
+self.addEventListener("install", event => {
+  event.waitUntil((async () => {
+    const cache = await caches.open(CACHE_NAME);
+    await cache.addAll(CORE_ASSETS);
+    await self.skipWaiting();
+  })());
 });
 
-self.addEventListener("activate", (event) => {
-  event.waitUntil(caches.keys().then(keys => Promise.all(keys.filter(key => key !== CACHE_NAME).map(key => caches.delete(key)))));
-  self.clients.claim();
+self.addEventListener("activate", event => {
+  event.waitUntil((async () => {
+    const keys = await caches.keys();
+    await Promise.all(keys
+      .filter(key => key.startsWith("tarinai-colony-") && key !== CACHE_NAME)
+      .map(key => caches.delete(key)));
+    await self.clients.claim();
+  })());
 });
 
 function isStaticAsset(request) {
-  const url = new URL(request.url);
-  return /\.(?:js|css|webp|png|jpg|jpeg|gif|svg|mp3|wav|woff2?)$/i.test(url.pathname);
+  return /\.(?:js|css|json|webmanifest|ico|webp|png|jpg|jpeg|gif|svg|mp3|wav|woff2?)$/i.test(new URL(request.url).pathname);
 }
-
 function cacheableResponse(response) {
   return response && response.status === 200 && response.type !== "opaque";
 }
-
 function putCacheSafely(request, response) {
   if (!cacheableResponse(response)) return Promise.resolve(false);
   return caches.open(CACHE_NAME).then(cache => cache.put(request, response.clone())).then(() => true).catch(() => false);
 }
 
-self.addEventListener("fetch", (event) => {
+self.addEventListener("fetch", event => {
   const request = event.request;
   if (request.method !== "GET") return;
   const url = new URL(request.url);
-  if (url.origin !== self.location.origin) return;
-  if (/service-worker\.js$/i.test(url.pathname)) return;
+  // PWA-04 intentionally remains unchanged: cross-origin Google Fonts are not cached.
+  if (url.origin !== self.location.origin || /service-worker\.js$/i.test(url.pathname)) return;
   if (request.mode === "navigate" || /index\.html$/i.test(url.pathname)) {
-    event.respondWith(fetch(request).then(response => {
-      putCacheSafely(request, response);
-      return response;
-    }).catch(() => caches.match(request).then(cached => cached || caches.match("./index.html"))));
+    const networkResponse = fetch(request);
+    const cacheWrite = networkResponse.then(response => putCacheSafely(request, response)).catch(() => false);
+    event.waitUntil(cacheWrite.then(() => undefined));
+    event.respondWith(networkResponse.catch(() => caches.match(request).then(cached => cached || caches.match("./index.html"))));
     return;
   }
   if (isStaticAsset(request)) {
-    event.respondWith(caches.match(request).then(cached => cached || fetch(request).then(response => {
-      putCacheSafely(request, response);
+    const responsePromise = caches.match(request).then(async cached => {
+      if (cached) return cached;
+      // Media are precached at their canonical URL. JS/CSS query versions must not
+      // resolve to an older cached file, otherwise UI fixes can remain stale.
+      const isCodeAsset = /\.(?:js|css)$/i.test(url.pathname);
+      if (!isCodeAsset) {
+        const canonical = await caches.match(request, { ignoreSearch: true });
+        if (canonical) return canonical;
+      }
+      const response = await fetch(request);
+      await putCacheSafely(request, response);
       return response;
-    })));
+    });
+    event.waitUntil(responsePromise.then(() => undefined, () => undefined));
+    event.respondWith(responsePromise);
   }
 });
diff --git a/start_server.bat b/start_server.bat
new file mode 100644
index 0000000..761f135
--- /dev/null
+++ b/start_server.bat
@@ -0,0 +1,6 @@
+@echo off
+setlocal
+set PORT=%~1
+if "%PORT%"=="" set PORT=8000
+cd /d "%~dp0"
+php -S 127.0.0.1:%PORT% -t "%~dp0" "%~dp0router.php"
diff --git a/start_server.sh b/start_server.sh
new file mode 100644
index 0000000..8391a83
--- /dev/null
+++ b/start_server.sh
@@ -0,0 +1,5 @@
+#!/usr/bin/env sh
+set -eu
+PORT="${1:-8000}"
+ROOT=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd)
+exec php -S "127.0.0.1:${PORT}" -t "$ROOT" "$ROOT/router.php"