c910457817
* feat(v0.4.0): vNext — closed-loop world model + settlement contract
Implements the vNext architecture from the research doc: demote the noisy
multi-rail planner in favour of a closed loop (world truth → invariant check)
plus a single utility-driven goal authority.
L1 services (fix no_drop / silent pathfinder hang first):
- InventoryLedger: diff-based "did I actually get it" verifier; acquire-food
now confirms via ledger.gainedSince instead of the unreliable count/event.
- MotionService.gotoSafe: wall-clock timeout + progress watchdog +
path_update(noPath/timeout) → structured {reached|stuck|timeout|nopath}.
L3 plan — unify the three competing rails (curriculum/manifesto/storyline):
- Settlement Contract: ordered M0–M9 milestones, each invariant-checked
against an authoritative world view (early steps delegate to the proven
curriculum; late game adds farming).
- InvariantChecker + predicate library; GoalManager selects the lowest unmet
milestone via utility argmax (food-urgency preempts, DEPS-style).
- Wired into the scheduler: bot.js precomputes snapshot.contract; reflex.js
consumes it in place of the storyline rail. Manifesto L0 still preempts.
Eval + robustness:
- Village Score (single 0..1 metric) on the snapshot + TUI "build" line.
- survive.dig-in skill + dusk_dig_in mode (exposed at night, no bed → cover).
- approach_block helper (GoalNear + lookAt, avoids GoalLookAtBlock #341).
+28 new tests (450 total green). LLM remains entirely off the tick path.
Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
* feat(v0.4.0): finish vNext plan — anti-loop, skill-graph, worldDelta diff, flee→motion
Completes the remaining v0.4.0 plan items and one fix motivated by a live
in-game observation (flee hanging 30s against a persistent zombie).
- flee → MotionService.gotoSafe: structured {stuck|timeout|nopath} in ~4s with
a blind-retreat fallback, instead of the observed 30s pathfinder hang + 3
watchdog replans. Movements setup guarded so it is unit-testable.
- QW5 anti-loop (runtime/anti-loop.js): same skill failing >=3x in 5min →
30min blacklist (reflex shouldSkip) + one-shot improvement_request
(bot.js drainFired -> writeProposal).
- 4.1 closed-loop worldDelta: runSkill snapshots inventory before execute and
attaches the real delta (_invObserved) to every successful result; opt-in
skill.expectGain asserts the claimed gain or returns world_unchanged.
- 3.6 skill-graph (Plan4MC): declarative requires/produces for ~20 skills;
prerequisitesMet/canRun/runnableFrontier; GoalManager annotates suggestions
with blockedBy when prereqs are unmet.
+22 tests (472 total green). Live smoke confirmed dig-in works and no new
errors; flee loop is what this commit's flee migration addresses.
Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
---------
Co-authored-by: Yuriy Mayatnikov <mayatnikov@me.com>
Co-authored-by: Claude Opus 4.7 <noreply@anthropic.com>
63 lines
2.1 KiB
JavaScript
63 lines
2.1 KiB
JavaScript
import { test } from "node:test";
|
|
import assert from "node:assert/strict";
|
|
|
|
import { skill } from "./flee.js";
|
|
|
|
function vec(x, y, z) {
|
|
return {
|
|
x, y, z,
|
|
clone() { return vec(x, y, z); },
|
|
distanceTo(o) { return Math.hypot(x - o.x, y - o.y, z - o.z); },
|
|
offset(dx, dy, dz) { return vec(x + dx, y + dy, z + dz); },
|
|
};
|
|
}
|
|
|
|
function fakeBot({ moveOnForward = 0 } = {}) {
|
|
const bot = {
|
|
entity: { position: vec(0, 64, 0), yaw: 0 },
|
|
entities: { z1: { name: "zombie", position: vec(2, 64, 0) } },
|
|
loadPlugin() {},
|
|
pathfinder: { goto: () => new Promise(() => {}), stop() {}, setMovements() {} },
|
|
setControlState(name, on) {
|
|
if (name === "forward" && on && moveOnForward) {
|
|
bot.entity.position = vec(moveOnForward, 64, 0);
|
|
}
|
|
},
|
|
async look() {},
|
|
};
|
|
return bot;
|
|
}
|
|
|
|
test("flee returns done when motion reaches the retreat point", async () => {
|
|
const bot = fakeBot();
|
|
const ctx = { bot, motion: { gotoSafe: async () => ({ ok: true, code: "reached", movedBlocks: 16 }) } };
|
|
const res = await skill.execute(ctx, {});
|
|
assert.equal(res.ok, true);
|
|
assert.equal(res.code, "done");
|
|
assert.ok(res.worldDelta.fledTo);
|
|
});
|
|
|
|
test("flee falls back to blind retreat and succeeds when it moves far enough", async () => {
|
|
const bot = fakeBot({ moveOnForward: 8 });
|
|
const ctx = { bot, motion: { gotoSafe: async () => ({ ok: false, code: "stuck", movedBlocks: 0 }) } };
|
|
const res = await skill.execute(ctx, { blindMs: 20 });
|
|
assert.equal(res.ok, true);
|
|
assert.equal(res.detail.mode, "blind-retreat");
|
|
});
|
|
|
|
test("flee surfaces the structured motion code when stuck and blind retreat fails", async () => {
|
|
const bot = fakeBot({ moveOnForward: 0 }); // never moves
|
|
const ctx = { bot, motion: { gotoSafe: async () => ({ ok: false, code: "stuck", movedBlocks: 0 }) } };
|
|
const res = await skill.execute(ctx, { blindMs: 20 });
|
|
assert.equal(res.ok, false);
|
|
assert.equal(res.code, "stuck");
|
|
});
|
|
|
|
test("flee precondition fails with no hostile", () => {
|
|
const bot = fakeBot();
|
|
bot.entities = {};
|
|
const pre = skill.preconditions({ bot }, {});
|
|
assert.equal(pre.ok, false);
|
|
assert.equal(pre.code, "no_hostile");
|
|
});
|