Bind national friendly planning to engine offers and saved schedules (by Codex)
This commit is contained in:
1 parent
15d2ac0a4d
commit
d615f03e15
14 files changed
+259
-30
No files matched your search
@@ -10,19 +10,35 @@ using namespace bmh;
|
||||
using namespace bmh::modern_ui;
|
||||
int main(int argc, char **argv) {
|
||||
try {
|
||||
if (argc != 4 || (std::string(argv[1]) != "inspect-friendlies" && std::string(argv[1]) != "inspect" && std::string(argv[1]) != "prepare-two" && std::string(argv[1]) != "prepare" && std::string(argv[1]) != "verify" && std::string(argv[1]) != "verify-lineup" && std::string(argv[1]) != "verify-sports" && std::string(argv[1]) != "verify-bank" && std::string(argv[1]) != "verify-commerce" && std::string(argv[1]) != "verify-contracts" && std::string(argv[1]) != "verify-calendar" && std::string(argv[1]) != "verify-friendlies")) throw std::runtime_error("usage: modern_engine_bridge_probe inspect-friendlies|inspect|prepare|prepare-two|verify|verify-lineup|verify-sports|verify-bank|verify-commerce|verify-contracts|verify-calendar|verify-friendlies <world.obw> <new-output-directory>");
|
||||
if (argc != 4 || (std::string(argv[1]) != "prepare-national" && std::string(argv[1]) != "verify-national" && std::string(argv[1]) != "inspect-friendlies" && std::string(argv[1]) != "inspect" && std::string(argv[1]) != "prepare-two" && std::string(argv[1]) != "prepare" && std::string(argv[1]) != "verify" && std::string(argv[1]) != "verify-lineup" && std::string(argv[1]) != "verify-sports" && std::string(argv[1]) != "verify-bank" && std::string(argv[1]) != "verify-commerce" && std::string(argv[1]) != "verify-contracts" && std::string(argv[1]) != "verify-calendar" && std::string(argv[1]) != "verify-friendlies")) throw std::runtime_error("usage: modern_engine_bridge_probe prepare-national|verify-national|inspect-friendlies|inspect|prepare|prepare-two|verify|verify-lineup|verify-sports|verify-bank|verify-commerce|verify-contracts|verify-calendar|verify-friendlies <world.obw> <new-output-directory>");
|
||||
const fs::path world = argv[2], out = argv[3]; fs::create_directories(out);
|
||||
const auto write = [&](const char *file, const Json &j) { editor::write_atomic(out / file, j.dump(2)); };
|
||||
if (std::string(argv[1]) == "prepare" || std::string(argv[1]) == "prepare-two") {
|
||||
if (std::string(argv[1]) == "prepare-national" || std::string(argv[1]) == "prepare" || std::string(argv[1]) == "prepare-two") {
|
||||
auto package = modern::open_world_package(world);
|
||||
content::Mount mount(world, package.classic); modern::set_current_world(package.world);
|
||||
modern::app::ModernSession session(mount.root(), 17u);
|
||||
ui::SetupOptions options; options.mode = 3; options.managers = std::string(argv[1]) == "prepare-two" ? 2 : 1;
|
||||
ui::SetupOptions options; options.mode = 3; if (std::string(argv[1]) == "prepare-national") options.league = false; options.managers = std::string(argv[1]) == "prepare-two" ? 2 : 1;
|
||||
ui::ManagerChoice manager; manager.name = "Codex Engine QA"; manager.master_club = 0;
|
||||
std::string error; ui::CareerInitializationResult result;
|
||||
if (!session.confirm_manager(options, manager, error)) throw std::runtime_error(error);
|
||||
if (options.managers == 2) { manager.name = "Codex Opponent QA"; manager.master_club = 1; manager.portrait = 1; if (!session.confirm_manager(options, manager, error)) throw std::runtime_error(error); }
|
||||
if (!session.finish(result, error) || !session.save_game(out / "input.obs", 0, false, error)) throw std::runtime_error(error);
|
||||
if (!session.finish(result, error)) throw std::runtime_error(error);
|
||||
if (std::string(argv[1]) == "prepare-national") {
|
||||
uint64_t rev = 0; bool found = false; Json expiry = Json::object(), log = Json::array();
|
||||
for (int k = 0; k < 200; ++k) {
|
||||
const auto desk = Json::parse(cli::dump_json(session.ui_read(cli::Json::Object{{"kind","desktop"}},rev)));
|
||||
if (desk.at("meta").at("scope").at("role") == "national") { found = true; break; }
|
||||
const auto &meta = desk.at("meta");
|
||||
const Json command{{"messageType","command"},{"contractVersion",meta.at("contractVersion")},{"requestId","request:prepare-national-"+std::to_string(k)},{"careerId",meta.at("careerId")},{"expectedRevision",meta.at("stateRevision")},{"owner",{{"managerId",meta.at("scope").at("managerId")}}},{"kind","session.advance"},{"payload",{{"contractExpiry",expiry}}}};
|
||||
const auto reply = Json::parse(cli::dump_json(session.ui_command(cli::parse_json(command.dump()),rev))); log.push_back(reply);
|
||||
if (reply.value("messageType","") == "command_result") continue;
|
||||
if (reply.value("code","") == "decision_pending") { const auto id = reply.at("message").at("args").at("playerId").get<std::string>(); expiry[id]={{"action","release"}}; continue; }
|
||||
throw std::runtime_error(reply.dump());
|
||||
}
|
||||
write("preparation-advance.json",log);
|
||||
if (!found) throw std::runtime_error("no national desk reached through session.advance");
|
||||
}
|
||||
if (!session.save_game(out / "input.obs", 0, false, error)) throw std::runtime_error(error);
|
||||
modern::set_current_world(nullptr);
|
||||
}
|
||||
auto link = EngineBridge::open(world, out / "input.obs");
|
||||
@@ -213,6 +229,51 @@ int main(int argc, char **argv) {
|
||||
const auto after=link->snapshot();write("friendlies-after.json",after);write("friendlies-saved.json",link->save_copy(out/"friendlies.obs"));link.reset();link=EngineBridge::open(world,out/"friendlies.obs");const auto loaded=link->snapshot();write("friendlies-loaded.json",loaded);
|
||||
if(loaded.at("friendly-plan").at("data")!=after.at("friendly-plan").at("data")||loaded.at("calendar").at("data")!=after.at("calendar").at("data")||loaded.at("desktop").at("data").at("accounts")!=after.at("desktop").at("data").at("accounts"))throw std::runtime_error("bookings or money lost at OBS restart");
|
||||
}
|
||||
if (std::string(argv[1]) == "verify-national") {
|
||||
const auto plan=engine_friendly_plan(before);
|
||||
if(plan.at("national")!=true||plan.at("opponents").empty())throw std::runtime_error("national desk required");
|
||||
const auto own=before.at("desktop").at("meta").at("scope").at("teamId");
|
||||
for(const auto &row:plan.at("opponents")) {
|
||||
const auto opponent=row.at("team").at("id").get<std::string>();
|
||||
for(bool home:{true,false}) {
|
||||
const auto read=link->read({{"kind","friendly"},{"opponentId",opponent},{"home",home}});
|
||||
(void)engine_friendly_projection(before,read,opponent,home);
|
||||
if(link->read({{"kind","friendly"},{"opponentId",opponent},{"home",home}})!=read)throw std::runtime_error("national quote changed on repeat");
|
||||
}
|
||||
}
|
||||
if(link->snapshot()!=before)throw std::runtime_error("national previews changed source");
|
||||
write("national-preview-saved.json",link->save_copy(out/"preview.obs"));
|
||||
for(bool home:{true,false}) {
|
||||
const auto now=link->snapshot();const auto opponent=plan.at("opponents")[home?0:1].at("team").at("id").get<std::string>();
|
||||
const auto read=link->read({{"kind","friendly"},{"opponentId",opponent},{"home",home}});
|
||||
write(home?"home-quote.json":"away-quote.json",read);
|
||||
const auto quote=engine_friendly_projection(now,read,opponent,home);
|
||||
if(quote.at("dates").empty())throw std::runtime_error("no national date available");
|
||||
const auto command=engine_friendly_command(now,read,opponent,home,quote.at("dates")[0],true,false,home?"request:national-home":"request:national-away");
|
||||
if(home) {
|
||||
auto refused=command;refused["requestId"]="request:no-cost-consent";refused["payload"]["acceptCost"]=false;
|
||||
const auto reply=link->command(refused);write("no-cost-consent.json",reply);
|
||||
if(reply.value("messageType","")!="error"||link->snapshot()!=now)throw std::runtime_error("declined national booking changed source");
|
||||
auto unavailable=command;unavailable["requestId"]="request:unavailable-date";unavailable["payload"]["date"]=now.at("desktop").at("meta").at("date");
|
||||
const auto rejected=link->command(unavailable);write("unavailable-date.json",rejected);
|
||||
if(rejected.value("messageType","")!="error"||link->snapshot()!=now)throw std::runtime_error("unavailable date changed source");
|
||||
write("refused-saved.json",link->save_copy(out/"refused.obs"));
|
||||
}
|
||||
const auto reply=link->command(command);write(home?"home-command.json":"away-command.json",command);write(home?"home-response.json":"away-response.json",reply);
|
||||
if(reply.value("messageType","")!="command_result"||link->command(command)!=reply)throw std::runtime_error("national booking failed or replay differed");
|
||||
const auto after=link->snapshot();write(home?"home-after.json":"away-after.json",after);
|
||||
const auto &bookings=after.at("friendly-plan").at("data").at("bookings");
|
||||
if(bookings.size()!=now.at("friendly-plan").at("data").at("bookings").size()+1)throw std::runtime_error("national booking missing from saved plan");
|
||||
const auto delta=engine_money_minor(now.at("desktop").at("data").at("accounts").at("cash"))-engine_money_minor(after.at("desktop").at("data").at("accounts").at("cash"));
|
||||
if(delta!=(home?quote.at("cost").get<int64_t>():0))throw std::runtime_error("wrong national payer or amount");
|
||||
auto stale=command;stale["requestId"]=home?"request:stale-home":"request:stale-away";
|
||||
if(link->command(stale).value("code","")!="stale_revision"||link->snapshot()!=after)throw std::runtime_error("stale national quote changed source");
|
||||
}
|
||||
const auto after=link->snapshot();write("national-after.json",after);write("national-saved.json",link->save_copy(out/"national.obs"));link.reset();
|
||||
link=EngineBridge::open(world,out/"national.obs");const auto loaded=link->snapshot();write("national-loaded.json",loaded);
|
||||
for(const auto *kind:{"friendly-plan","calendar"})if(loaded.at(kind).at("data")!=after.at(kind).at("data"))throw std::runtime_error("national plan/calendar lost on restart");
|
||||
if(loaded.at("desktop").at("data").at("accounts")!=after.at("desktop").at("data").at("accounts"))throw std::runtime_error("national funds lost on restart");
|
||||
}
|
||||
std::cout << "engine bridge " << argv[1] << " passed\n"; return 0;
|
||||
} catch (const std::exception &e) { std::cerr << e.what() << '\n'; return 1; }
|
||||
}
|
||||
@@ -297,6 +297,29 @@ int main() {
|
||||
rejects([&]{engine_friendly_command(hp,hq,"club:7",false,"2026-07-03",true,false,"r");});
|
||||
require(engine_friendly_command(hp,hq,"club:7",false,"2026-07-03",true,true,"r").at("payload").at("opponentConsent")==true,"explicit hotseat consent lost");
|
||||
auto bad_payer=hq;bad_payer["data"]["payerManagerId"]="manager:99";rejects([&]{engine_friendly_projection(hp,bad_payer,"club:7",false);});
|
||||
// National planning has no league/ranking or pre-rolled strengths. Both
|
||||
// quote identity and the engine's explicit day whitelist remain mandatory.
|
||||
auto np=fp;
|
||||
for(auto &[kind,r]:np.items()) {r["meta"]["scope"]["role"]="national";r["meta"]["scope"]["teamId"]="nt:one";r["meta"]["scope"]["allowedCommands"]={"friendly.book"};}
|
||||
const Json nown={{"id","nt:one"},{"kind","national"},{"name","One"},{"nationId","nation:one"}};
|
||||
const Json nopp={{"id","nt:two"},{"kind","national"},{"name","Two"},{"nationId","nation:two"}};
|
||||
np["desktop"]["data"]["team"]=nown;np["session"]["data"]["humanOwnership"][0]["teamId"]="nt:one";
|
||||
np["calendar"]["data"]["fixtures"]=Json::array();
|
||||
np["calendar"]["data"]["days"]={{{"date","2026-07-21"},{"seasonDay",20},{"eventKinds",{"national","league"}},{"fixtureIds",Json::array()}}};
|
||||
np["friendly-plan"]["data"].update({{"national",true},{"teamId","nt:one"},{"opponents",{{{"team",nopp},{"competitionId",nullptr},{"strength",nullptr}}}}});
|
||||
auto nq=fq;nq["meta"]=np["desktop"]["meta"];nq["data"].update({{"national",true},{"ratings",{73,81}},{"home",nown},{"away",nopp}});
|
||||
const auto nv=engine_friendly_projection(np,nq,"nt:two",true),nc=engine_calendar_projection(np);
|
||||
require(nv.at("national")==true && nv.at("ratings")==Json::array({73,81}) && nv.at("days")==Json::array({2,20}),"national quote/rating/date lost");
|
||||
require(nc.at("league").is_null() && nc.at("events").at("20").at("kinds")==Json::array({"national"}),"national calendar leaked club events");
|
||||
require(engine_friendly_command(np,nq,"nt:two",true,"2026-07-21",true,false,"r").at("owner").at("managerId")=="manager:99","national command lost owner");
|
||||
rejects([&]{engine_friendly_command(np,nq,"nt:two",true,"2026-07-21",false,false,"r");});
|
||||
rejects([&]{engine_friendly_command(np,nq,"nt:two",true,"2026-07-04",true,false,"r");});
|
||||
auto bad_nation=np;bad_nation["friendly-plan"]["data"]["opponents"][0]["team"]["kind"]="club";rejects([&]{engine_friendly_plan(bad_nation);});
|
||||
bad_nation=np;bad_nation["friendly-plan"]["data"]["opponents"][0]["strength"]=81;rejects([&]{engine_friendly_plan(bad_nation);});
|
||||
auto bad_nq=nq;bad_nq["data"]["national"]=false;rejects([&]{engine_friendly_projection(np,bad_nq,"nt:two",true);});
|
||||
bad_nq=nq;bad_nq["data"]["ratings"]={73};rejects([&]{engine_friendly_projection(np,bad_nq,"nt:two",true);});
|
||||
bad_nq=nq;bad_nq["data"]["ratings"]={73,-1};rejects([&]{engine_friendly_projection(np,bad_nq,"nt:two",true);});
|
||||
bad_nq=nq;bad_nq["meta"]["stateRevision"]="0";rejects([&]{engine_friendly_projection(np,bad_nq,"nt:two",true);});
|
||||
std::cout << "engine DTO, exact money, scope and booking tests passed\n";
|
||||
return 0;
|
||||
} catch (const std::exception &e) { std::cerr << e.what() << '\n'; return 1; }
|
||||
|
||||
Reference in new issue
Block a user