refactor: merge openwa-types and openwa-lib into unified openwa-core crate

The split between openwa-types (pure types/addresses) and openwa-lib
(rebase/wa_call/typed wrappers) was arbitrary and added friction when
deciding where new code belongs. Merged both into openwa-core.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

CLAUDE.md

@@ -19,13 +19,13 @@ cargo build -p openwa-wormkit --release
 cargo build -p openwa-validator --release
 
 # Run tests (openwa-types is pure Rust, works on any host)
-cargo test -p openwa-types
+cargo test -p openwa-core
 
 # Run harness tests (must be 32-bit, needs WA.exe on disk)
 cargo test --target i686-pc-windows-msvc -p openwa-harness
 
 # Single test
-cargo test -p openwa-types -- scheme_parse::parse_beginner_v2
+cargo test -p openwa-core -- scheme_parse::parse_beginner_v2
 ```
 
 ## Deploy to Game
@@ -70,7 +70,7 @@ Environment variables:
 
 ## Crate Architecture
 
-- **`openwa-types`** — Enums, structs, addresses, parsers (no_std compatible). The source of truth for all reverse-engineered type layouts and known addresses (`address.rs`). No game dependency.
+- **`openwa-core`** — Types, addresses, parsers, ASLR rebasing, and typed WA function wrappers. The source of truth for all reverse-engineered type layouts and known addresses (`address.rs`). Contains `rebase` (ASLR delta), `wa_call` (calling convention helpers), and `wa/` (typed handle wrappers like `DDGameWrapperHandle`, `CWndHandle`).
 - **`openwa-wormkit`** — Unified WormKit cdylib that replaces WA functions with Rust and optionally validates types against live memory. Logs to `OpenWA.log` (hooks) and `OpenWA_validation.log` (validation). Uses MinHook for inline hooking. Validation is enabled via `OPENWA_VALIDATE=1` env var.
 - **`openwa-harness`** — Offline test harness that loads WA.exe into process memory via `LoadLibraryExA(DONT_RESOLVE_DLL_REFERENCES)` for testing without running the game.
 
@@ -106,10 +106,11 @@ For `__usercall` functions, use a naked trampoline to capture register params be
 
 ## Key Files
 
-- `crates/openwa-types/src/address.rs` — All known WA.exe addresses with comments
+- `crates/openwa-core/src/address.rs` — All known WA.exe addresses with comments
+- `crates/openwa-core/src/wa_call.rs` — Helpers for calling WA functions (thiscall, stdcall wrappers)
+- `crates/openwa-core/src/rebase.rs` — ASLR delta computation
+- `crates/openwa-core/src/wa/` — Typed WA function wrappers (MFC, frontend, registry, DDGame)
 - `crates/openwa-wormkit/src/replacements/` — Function replacements (one file per subsystem)
-- `crates/openwa-wormkit/src/wa_call.rs` — Helpers for calling WA functions (thiscall, stdcall wrappers)
-- `crates/openwa-wormkit/src/rebase.rs` — ASLR delta computation
 - `docs/re-notes/` — Reverse engineering documentation (task hierarchy, memory map, frontend screens)
 - `docs/plans/` — Design docs and implementation plans
 

Cargo.lock

@@ -72,34 +72,28 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d"
 
 [[package]]
-name = "openwa-harness"
+name = "openwa-core"
 version = "0.1.0"
 dependencies = [
- "libc",
- "openwa-types",
  "windows-sys",
 ]
 
 [[package]]
-name = "openwa-lib"
+name = "openwa-harness"
 version = "0.1.0"
 dependencies = [
- "openwa-types",
+ "libc",
+ "openwa-core",
  "windows-sys",
 ]
 
-[[package]]
-name = "openwa-types"
-version = "0.1.0"
-
 [[package]]
 name = "openwa-wormkit"
 version = "0.1.0"
 dependencies = [
  "heapless",
  "minhook",
- "openwa-lib",
- "openwa-types",
+ "openwa-core",
  "windows-sys",
 ]
 

crates/{openwa-lib → openwa-core}/Cargo.toml

@@ -1,11 +1,8 @@
 [package]
-name = "openwa-lib"
+name = "openwa-core"
 version = "0.1.0"
 edition = "2021"
-description = "Shared library for calling WA.exe functions with typed wrappers"
-
-[dependencies]
-openwa-types = { path = "../openwa-types" }
+description = "Core library for Worms Armageddon reverse engineering — types, addresses, and runtime utilities"
 
 [target.'cfg(target_os = "windows")'.dependencies]
 windows-sys = { version = "0.59", features = [

crates/{openwa-types → openwa-core}/src/lib.rs

@@ -1,3 +1,5 @@
+#![allow(non_snake_case)]
+
 pub mod class_type;
 pub mod message;
 pub mod weapon;
@@ -16,3 +18,6 @@ pub mod game_info;
 pub mod scheme;
 pub mod speech;
 pub mod address;
+pub mod rebase;
+pub mod wa;
+pub mod wa_call;

crates/{openwa-lib → openwa-core}/src/rebase.rs

@@ -2,7 +2,7 @@
 
 use std::sync::atomic::{AtomicU32, Ordering};
 
-use openwa_types::address::va;
+use crate::address::va;
 
 /// Delta to add to Ghidra addresses to get runtime addresses.
 static REBASE_DELTA: AtomicU32 = AtomicU32::new(0);

crates/{openwa-lib → openwa-core}/src/wa/ddgame.rs

@@ -1,7 +1,7 @@
 //! Typed handle for DDGameWrapper — the main game engine wrapper object.
 
-use openwa_types::ddgame::DDGame;
-use openwa_types::game_info::GameInfo;
+use crate::ddgame::DDGame;
+use crate::game_info::GameInfo;
 
 /// Zero-cost handle to a DDGameWrapper instance (raw pointer as u32).
 ///

crates/{openwa-lib → openwa-core}/src/wa/frontend.rs

@@ -1,7 +1,7 @@
 //! WA-internal frontend function wrappers.
 
 use crate::rebase::rb;
-use openwa_types::address::va;
+use crate::address::va;
 
 /// Frontend__PaletteAnimation (0x422180)
 ///

crates/{openwa-lib → openwa-core}/src/wa/mfc.rs

@@ -2,7 +2,7 @@
 
 use crate::rebase::rb;
 use crate::wa_call;
-use openwa_types::address::va;
+use crate::address::va;
 
 /// Zero-cost handle to a CWnd-derived MFC window (raw pointer as u32).
 #[derive(Clone, Copy)]

crates/{openwa-types → openwa-core}/tests/scheme_parse.rs

@@ -1,6 +1,6 @@
 use std::path::Path;
 
-use openwa_types::scheme::{
+use openwa_core::scheme::{
     ExtendedOptions, SchemeFile, SchemeVersion, EXTENDED_OPTIONS_DEFAULTS,
     EXTENDED_OPTIONS_SIZE, SCHEME_PAYLOAD_V1, SCHEME_PAYLOAD_V2, WEAPONS_V1_COUNT,
 };

crates/openwa-harness/Cargo.toml

@@ -5,7 +5,7 @@ edition = "2021"
 description = "Offline test harness — loads WA.exe into process memory for validation"
 
 [dependencies]
-openwa-types = { path = "../openwa-types" }
+openwa-core = { path = "../openwa-core" }
 libc = "0.2"
 
 [target.'cfg(target_os = "windows")'.dependencies]

crates/openwa-harness/src/lib.rs

@@ -1,6 +1,6 @@
 #![allow(non_snake_case)]
 
-use openwa_types::address::va;
+use openwa_core::address::va;
 
 #[cfg(target_os = "windows")]
 use windows_sys::Win32::System::LibraryLoader::{LoadLibraryExA, DONT_RESOLVE_DLL_REFERENCES};

crates/openwa-lib/src/lib.rs

@@ -1,5 +0,0 @@
-#![allow(non_snake_case)]
-
-pub mod rebase;
-pub mod wa;
-pub mod wa_call;

crates/openwa-types/Cargo.toml

@@ -1,5 +0,0 @@
-[package]
-name = "openwa-types"
-version = "0.1.0"
-edition = "2021"
-description = "Type definitions for Worms Armageddon reverse engineering"

crates/openwa-wormkit/Cargo.toml

@@ -8,8 +8,7 @@ description = "WormKit DLL that replaces WA.exe functions with Rust reimplementa
 crate-type = ["cdylib"]
 
 [dependencies]
-openwa-types = { path = "../openwa-types" }
-openwa-lib = { path = "../openwa-lib" }
+openwa-core = { path = "../openwa-core" }
 heapless = "0.9"
 minhook = "0.9"
 

crates/openwa-wormkit/src/hook.rs

@@ -317,7 +317,7 @@ use std::ffi::c_void;
 use minhook::MinHook;
 
 use crate::log_line;
-use openwa_lib::rebase::rb;
+use openwa_core::rebase::rb;
 
 /// Install a MinHook inline hook on a WA.exe function.
 ///

crates/openwa-wormkit/src/lib.rs

@@ -54,7 +54,7 @@ fn clear_log() -> std::io::Result<()> {
 fn run() -> Result<(), String> {
     let _ = clear_log();
 
-    let delta = openwa_lib::rebase::init();
+    let delta = openwa_core::rebase::init();
     let _ = log_line(&format!(
         "=== OpenWA WormKit DLL loaded ===\n  ASLR delta: 0x{delta:08X}"
     ));

crates/openwa-wormkit/src/replacements/config.rs

@@ -9,9 +9,9 @@
 //! - GameInfo__LoadOptions (0x460AC0): game options from registry
 //! - Options__GetCrashReportURL (0x5A63F0): crash report URL from registry
 
-use openwa_types::address::va;
+use openwa_core::address::va;
 use crate::log_line;
-use openwa_lib::rebase::rb;
+use openwa_core::rebase::rb;
 
 const THEME_PATH: &str = "data\\current.thm";
 const CLEAN_ALL_FLAG_OFFSET: usize = 0xE0;
@@ -86,7 +86,7 @@ unsafe extern "stdcall" fn hook_delete_key_recursive(hkey: u32, subkey: u32) ->
 
     let _ = log_line(&format!("[Config] DeleteKeyRecursive: {subkey_str}"));
 
-    let result = openwa_lib::wa::registry::delete_key_recursive(
+    let result = openwa_core::wa::registry::delete_key_recursive(
         hkey as usize as HKEY,
         &subkey_str,
     );
@@ -114,7 +114,7 @@ unsafe extern "stdcall" fn hook_registry_clean_all(struct_ptr: u32) {
     ];
 
     for section in &sections {
-        openwa_lib::wa::registry::delete_key_recursive(HKEY_CURRENT_USER, section);
+        openwa_core::wa::registry::delete_key_recursive(HKEY_CURRENT_USER, section);
     }
 
     // Clear the NetSettings INI section
@@ -138,8 +138,8 @@ unsafe extern "stdcall" fn hook_registry_clean_all(struct_ptr: u32) {
 /// Reads game options from the Windows registry and copies various globals
 /// into the GameInfo struct at known offsets.
 unsafe extern "stdcall" fn hook_load_options(gi_ptr: u32) {
-    use openwa_lib::wa::registry::read_profile_int;
-    use openwa_types::game_info::GameInfo;
+    use openwa_core::wa::registry::read_profile_int;
+    use openwa_core::game_info::GameInfo;
 
     let gi = &mut *(gi_ptr as *mut GameInfo);
 
@@ -273,7 +273,7 @@ unsafe extern "cdecl" fn hook_get_crash_report_url() -> u32 {
     let buf = rb(va::G_CRASH_REPORT_URL) as *mut u8;
     let buf_slice = core::slice::from_raw_parts_mut(buf, CRASH_REPORT_URL_BUF_SIZE);
 
-    let len = openwa_lib::wa::registry::read_profile_string(
+    let len = openwa_core::wa::registry::read_profile_string(
         "Options",
         "CrashReportURL",
         buf_slice,

crates/openwa-wormkit/src/replacements/frontend.rs

@@ -6,10 +6,10 @@
 use std::sync::atomic::{AtomicU32, Ordering};
 
 use crate::log_line;
-use openwa_lib::wa::mfc::{CDialogHandle, CWndHandle};
-use openwa_lib::wa_call;
-use openwa_types::address::va;
-use openwa_types::frontend::ScreenId;
+use openwa_core::wa::mfc::{CDialogHandle, CWndHandle};
+use openwa_core::wa_call;
+use openwa_core::address::va;
+use openwa_core::frontend::ScreenId;
 
 // Frontend dialog struct offsets (MFC CDialog-derived)
 const DIALOG_FLAGS: usize = 0x3C;
@@ -52,7 +52,7 @@ unsafe extern "cdecl" fn frontend_change_screen_impl(dialog: u32, screen_id: u32
 
         let palette_param = *((dialog as usize + DIALOG_PALETTE_PARAM) as *const u32);
         let eax_value = *((dialog as usize + DIALOG_PALETTE_OBJ) as *const u32);
-        openwa_lib::wa::frontend::palette_animation(eax_value, palette_param);
+        openwa_core::wa::frontend::palette_animation(eax_value, palette_param);
 
         for i in 1u32..=2 {
             let vtable = *(dialog as *const u32);

crates/openwa-wormkit/src/replacements/input.rs

@@ -14,10 +14,10 @@ use std::sync::atomic::{AtomicU32, Ordering};
 
 use crate::hook;
 use crate::log_line;
-use openwa_lib::rebase::rb;
-use openwa_types::address::va;
-use openwa_types::ddgame::DDGame;
-use openwa_types::ddgame_wrapper::DDGameWrapper;
+use openwa_core::rebase::rb;
+use openwa_core::address::va;
+use openwa_core::ddgame::DDGame;
+use openwa_core::ddgame_wrapper::DDGameWrapper;
 
 /// Trampoline to the original TurnManager_ProcessFrame.
 static ORIG_TURN_MANAGER: AtomicU32 = AtomicU32::new(0);

crates/openwa-wormkit/src/replacements/render.rs

@@ -3,10 +3,10 @@
 //! All functions enqueue commands to the RenderQueue's downward-growing buffer.
 //! Calling conventions are __usercall variants with register + stack params.
 
-use openwa_lib::rebase::rb;
-use openwa_types::address::va;
-use openwa_types::render::*;
-use openwa_types::task::{BungeeTrailTask, WeaponAimTask};
+use openwa_core::rebase::rb;
+use openwa_core::address::va;
+use openwa_core::render::*;
+use openwa_core::task::{BungeeTrailTask, WeaponAimTask};
 
 use crate::hook::{self, usercall_trampoline};
 

crates/openwa-wormkit/src/replacements/scheme.rs

@@ -15,9 +15,9 @@ use std::path::Path;
 use std::sync::atomic::{AtomicU32, Ordering};
 
 use crate::log_line;
-use openwa_lib::rebase::rb;
-use openwa_types::address::va;
-use openwa_types::scheme::{
+use openwa_core::rebase::rb;
+use openwa_core::address::va;
+use openwa_core::scheme::{
     ExtendedOptions, SchemeFile, SchemeVersion, EXTENDED_OPTIONS_DEFAULTS, EXTENDED_OPTIONS_SIZE,
     SCHEME_PAYLOAD_V1, SCHEME_PAYLOAD_V2, SCHEME_PAYLOAD_V3,
 };
@@ -355,7 +355,7 @@ unsafe extern "fastcall" fn hook_init_from_data(
     dest: u32,
     name_cstring: u32,
 ) {
-    use openwa_lib::wa::mfc::{cstring_release, CStringRef};
+    use openwa_core::wa::mfc::{cstring_release, CStringRef};
 
     // Step 1: Copy 0xD8 bytes (V1 payload) from src_data to dest+0x14
     core::ptr::copy_nonoverlapping(
@@ -440,7 +440,7 @@ unsafe extern "stdcall" fn hook_scan_directory(cstring_param: u32) {
     let _ = log_line("[Scheme] ScanDirectory completed (Rust)");
 
     // Release the CString parameter's refcount (caller transferred ownership)
-    openwa_lib::wa::mfc::cstring_release(cstring_param);
+    openwa_core::wa::mfc::cstring_release(cstring_param);
 }
 
 /// Parse a scheme filename matching the pattern `{{DD}} name.wsc`.
@@ -530,7 +530,7 @@ const BUILTIN_SCHEME_NAMES: [&str; 14] = [
 /// Zeros slot flags, scans for existing scheme files, then extracts missing
 /// built-in schemes from PE resources (type "SCHEMES") to User\Schemes\.
 unsafe extern "stdcall" fn hook_extract_builtins() {
-    use openwa_lib::wa::resource;
+    use openwa_core::wa::resource;
 
     // Step 1: Zero 16 bytes of slot flags (4 DWORDs covering slots 0-15)
     let slot_flags = rb(va::SCHEME_SLOT_FLAGS) as *mut u8;

crates/openwa-wormkit/src/replacements/sound.rs

@@ -9,10 +9,10 @@
 
 use std::sync::atomic::Ordering;
 
-use openwa_types::address::va;
-use openwa_types::ddgame::{DDGame, SoundQueueEntry};
-use openwa_types::sound::SoundId;
-use openwa_types::task::CGameTask;
+use openwa_core::address::va;
+use openwa_core::ddgame::{DDGame, SoundQueueEntry};
+use openwa_core::sound::SoundId;
+use openwa_core::task::CGameTask;
 
 use crate::hook;
 use crate::log_line;

crates/openwa-wormkit/src/replacements/speech.rs

@@ -12,10 +12,10 @@ use std::sync::atomic::{AtomicU32, Ordering};
 
 use heapless::CString;
 
-use openwa_lib::rebase::rb;
-use openwa_lib::wa::ddgame::DDGameWrapperHandle;
-use openwa_types::address::va::{self, game_info_offsets};
-use openwa_types::speech::SpeechLineTableEntry;
+use openwa_core::rebase::rb;
+use openwa_core::wa::ddgame::DDGameWrapperHandle;
+use openwa_core::address::va::{self, game_info_offsets};
+use openwa_core::speech::SpeechLineTableEntry;
 
 use crate::hook::{self, usercall_trampoline};
 use crate::log_line;

crates/openwa-wormkit/src/replacements/team.rs

@@ -10,8 +10,8 @@
 //! - CheckAnyWormState0x8b (0x522970): scan all teams for state 0x8b
 //! - SetActiveWorm_Maybe (0x522500): update team active state and counters
 
-use openwa_types::address::va;
-use openwa_types::ddgame::{self, TeamArenaRef};
+use openwa_core::address::va;
+use openwa_core::ddgame::{self, TeamArenaRef};
 
 use crate::hook::{self, usercall_trampoline};
 

crates/openwa-wormkit/src/replacements/weapon.rs

@@ -6,9 +6,9 @@
 //! - SubtractAmmo (0x522680): decrement ammo count
 //! - CountAliveWorms (0x5225A0): check if >1 worm alive on team
 
-use openwa_types::address::va;
-use openwa_types::ddgame::{self, TeamArenaRef};
-use openwa_types::weapon::Weapon;
+use openwa_core::address::va;
+use openwa_core::ddgame::{self, TeamArenaRef};
+use openwa_core::weapon::Weapon;
 
 use crate::hook::{self, usercall_trampoline};