megaproxy
5bf0f51efb
AI core (scenes/ai/, 5 new files from 3 gdscript-refactor agents in parallel):
- job.gd (59 lines, Agent A): Job class, RefCounted, label + toils + cursor +
to_dict/from_dict round-trip
- toil.gd (76 lines, Agent A): Toil class, RefCounted; kinds WALK/WAIT/IDLE;
factories walk_to/wait_ticks/idle; Vector2i stored as to_x/to_y ints
because Godot 4 JSON.stringify doesn't round-trip Vector2i
- work_provider.gd (27 lines, Agent A): abstract base, class_name, @export
category/priority, find_best_for() with push_error subclass guard
- job_runner.gd (186 lines, Agent B): Node-derived runner; setup/start_job/
cancel_job/tick; WALK toil delegates to pawn.walk_along_path on first
encounter (sets data.started=true), listens for walk_completed signal;
WAIT decrements ticks_remaining; IDLE never completes; full to_dict/from_dict
- decision.gd (50 lines, Agent C): static pick_next_job(pawn, providers); 5
layers (incapacitation/forced/status/work/idle); layer 1 probes via
has_method to stay future-proof for Phase 9
- rest_provider.gd (31 lines, Agent C): extends WorkProvider; @export rest_tile;
returns [walk_to(rest_tile), idle()] Job
Integration (Opus):
- pawn.gd: added forced_job slot, job_runner ref, _orchestrate_ai called
before _advance_walk on each sim_tick. Calls Decision when forced_job is
queued OR when idle — was a bug initially (only-on-idle never preempted
the never-completing IDLE toil); fixed and caught via MCP runtime test.
Added to_dict/from_dict for save round-trip; captures tile, _path,
_step_progress, _selected, forced_job, job_runner via their serializers.
- selection.gd: rewrote to build a forced-job [walk_to + idle] and set
pawn.forced_job; Decision preempts current job on next tick.
- world.tscn/gd: instantiates RestProvider as child (rest_tile = (50,50)
just outside the stone ring's south-east, reachable from all 3 spawn
tiles); registers via World.register_work_provider; attaches a JobRunner
child to each spawned pawn and wires setup(pawn, pathfinder).
- world.gd autoload: added work_providers list + register/clear methods.
- save_system.gd: write_save walks World.pawns calling to_dict; apply_save
zips dicts to pawns by index (Phase 16 will add stable IDs).
- main.gd: bootstrap log line bumped Phase 2 → Phase 3.
Acceptance — MCP-verified end-to-end:
- 3 pawns boot, Decision assigns each Rest, JobRunner starts each,
all 3 walk to (50,50) on different paths (40/35/30 steps based on
detour around the stone ring), arrive and idle.
- Force Bram to (10,10) via pawn.forced_job; preempt fires:
[decision] Bram: forced 'Go to (10, 10)'. Bram walks while Cora/Edda
stay parked.
- Mid-walk save round-trip (the critical Phase 3 acceptance):
- Paused Bram at (51,10) walking to (70,70) with 79 path steps remaining
- SaveSystem.write_save() → SaveSystem.apply_save(read_save()) after a
mutate-to-(0,0)-with-no-path round-trip
- Restored Bram exactly: tile=(51,10), _path.size=79, walking=true,
job='Go to (70, 70)' at toil_idx=0 (WALK toil with data.started=true)
- Resumed sim → JobRunner's WALK toil saw started=true and did NOT
re-call walk_along_path; the pawn's restored _path continued the walk
naturally → reached (70,26) with 44 steps remaining, still on the
same job. The architecture.md 'mid-toil suspend safe' contract is
provably honored.
Phase 3 gotchas (logged in implementation.md):
- Class-name registration timing bit again (Phase 2 gotcha). Workflow:
agent writes class_name file → MCP reload_project → headless validate.
- Forced-job preempt requires triggering Decision when forced_job != null,
not just when idle (IDLE toil never completes).
- execute_game_script + await Engine.get_main_loop().process_frame is
flaky — MCP auto-recovers but the script's last lines may be lost.
Workaround: split state-inspection into a fresh execute_game_script.
Delegation report this phase:
- gdscript-refactor (Sonnet) Agent A: Job + Toil + WorkProvider abstract
base. 3 files, 162 lines.
- gdscript-refactor (Sonnet) Agent B: JobRunner with toil-execution match
+ walk_completed signal handling + full save round-trip. 1 file, 186
lines.
- gdscript-refactor (Sonnet) Agent C: Decision pipeline + RestProvider.
2 files, 81 lines.
- Opus: Pawn integration (forced_job slot, orchestration, to_dict/from_dict),
Selection rewrite, world.tscn/gd wiring, World autoload work_providers
list, SaveSystem extension, MCP-driven runtime verification including
the mid-walk save round-trip demo, gotcha logging.
~70% of Phase 3's GDScript was written by subagents.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
59 lines
2 KiB
GDScript
59 lines
2 KiB
GDScript
class_name Job extends RefCounted
|
|
## A sequence of Toils that describes a pawn's current task (walk to, haul,
|
|
## build, rest, etc.). Job is plain data; JobRunner is the state machine that
|
|
## drives execution tick-by-tick.
|
|
##
|
|
## Save/load contract:
|
|
## var j2 := Job.from_dict(j.to_dict())
|
|
## assert(j2.label == j.label)
|
|
## assert(j2.current_toil_index == j.current_toil_index)
|
|
## assert(j2.toils.size() == j.toils.size())
|
|
## # Each toil round-trips per Toil's own invariant.
|
|
|
|
var label: String = ""
|
|
var toils: Array[Toil] = []
|
|
var current_toil_index: int = 0
|
|
|
|
|
|
# ── queries ──────────────────────────────────────────────────────────────────
|
|
|
|
## Returns the currently-executing Toil, or null when the job is done.
|
|
func active_toil() -> Toil:
|
|
if is_complete():
|
|
return null
|
|
return toils[current_toil_index]
|
|
|
|
|
|
## True once every toil has been completed.
|
|
func is_complete() -> bool:
|
|
return current_toil_index >= toils.size()
|
|
|
|
|
|
# ── state mutation ───────────────────────────────────────────────────────────
|
|
|
|
## Called by JobRunner after the current toil finishes. Steps the index forward.
|
|
func advance() -> void:
|
|
current_toil_index += 1
|
|
|
|
|
|
# ── save / load ──────────────────────────────────────────────────────────────
|
|
|
|
func to_dict() -> Dictionary:
|
|
var toil_list: Array = []
|
|
for toil in toils:
|
|
toil_list.append(toil.to_dict())
|
|
return {
|
|
"label": label,
|
|
"current_toil_index": current_toil_index,
|
|
"toils": toil_list,
|
|
}
|
|
|
|
|
|
static func from_dict(d: Dictionary) -> Job:
|
|
var j := Job.new()
|
|
j.label = d.get("label", "")
|
|
j.current_toil_index = d.get("current_toil_index", 0)
|
|
var raw_toils: Array = d.get("toils", [])
|
|
for raw in raw_toils:
|
|
j.toils.append(Toil.from_dict(raw))
|
|
return j
|