refactor: flatten worker structure by moving rust_ai_core to worker root

- Converted workspace Cargo.toml to package manifest
- Moved src/, tests/, .cargo/ from rust_ai_core to worker/
- Updated package.json scripts with new paths
- Updated getAIVersion.ts source file paths
- Updated generate-types.sh and test-ai-comparison.sh paths
- Removed redundant rust_ai_core subdirectory

Author: rgilks

package.json

@@ -14,17 +14,17 @@
     "lint:fix": "eslint . --fix",
     "type-check": "tsc --noEmit",
     "generate:sw": "GITHUB_SHA=$GITHUB_SHA node scripts/generate-sw.js",
-    "build:wasm": "cd worker/rust_ai_core && wasm-pack build --release --target web --out-dir ../../public/wasm --features wasm",
+    "build:wasm": "cd worker && wasm-pack build --release --target web --out-dir ../public/wasm --features wasm",
     "build:wasm-assets": "npm run build:wasm && mkdir -p public/ml/data/genetic_params && cp resources/ai/evolved.json public/ml/data/genetic_params/ && mkdir -p public/ml/data/weights && cp public/ml/data/weights/ml_ai_weights_best.json public/ml/data/weights/ml_ai_weights_simple.json",
-    "build:rust-ai": "cd worker/rust_ai_core && cargo build --release",
+    "build:rust-ai": "cd worker && cargo build --release",
     "nuke": "rm -rf .next .open-next .wrangler node_modules package-lock.json && npm install && npm run dev",
-    "check": "npm run lint && npm run type-check && (cd worker/rust_ai_core && NUM_GAMES=4 cargo test test_ai_matrix -- --nocapture) && npm run test:coverage && npm run test:e2e",
-    "check:slow": "npm run lint && npm run type-check && (cd worker/rust_ai_core && RUN_SLOW_TESTS=1 cargo test --features slow_tests -- --nocapture) && npm run test:coverage && npm run test:e2e",
+    "check": "npm run lint && npm run type-check && (cd worker && NUM_GAMES=4 cargo test test_ai_matrix -- --nocapture) && npm run test:coverage && npm run test:e2e",
+    "check:slow": "npm run lint && npm run type-check && (cd worker && RUN_SLOW_TESTS=1 cargo test --features slow_tests -- --nocapture) && npm run test:coverage && npm run test:e2e",
     "test": "vitest run",
     "test:watch": "vitest",
     "test:coverage": "vitest run --coverage",
-    "test:rust": "cd worker/rust_ai_core && cargo test -- --nocapture",
-    "test:rust:slow": "cd worker/rust_ai_core && RUN_SLOW_TESTS=1 cargo test --features slow_tests -- --nocapture",
+    "test:rust": "cd worker && cargo test -- --nocapture",
+    "test:rust:slow": "cd worker && RUN_SLOW_TESTS=1 cargo test --features slow_tests -- --nocapture",
     "test:ai-comparison": "./scripts/test-ai-comparison.sh",
     "test:ai-comparison:default": "NUM_GAMES=50 ./scripts/test-ai-comparison.sh",
     "test:ai-comparison:fast": "NUM_GAMES=10 ./scripts/test-ai-comparison.sh",
@@ -39,7 +39,7 @@
     "migrate:generate": "drizzle-kit generate",
     "migrate:d1": "wrangler d1 migrations apply connect-four-db --remote",
     "migrate:local": "drizzle-kit push --config=drizzle.config.local.ts",
-    "test:ai-matrix:md": "cd worker/rust_ai_core && cargo test test_ai_matrix -- --nocapture | node ../../scripts/format-ai-matrix-md.cjs",
+    "test:ai-matrix:md": "cd worker && cargo test test_ai_matrix -- --nocapture | node ../scripts/format-ai-matrix-md.cjs",
     "deploy": "./scripts/deploy.sh",
     "deploy:quick": "npm run build:cf && wrangler deploy",
     "db:migrate": "wrangler d1 migrations apply connect-four-db --remote",

scripts/generate-types.sh

@@ -2,16 +2,16 @@
 set -e
 
 echo "🦀 Generating Types from Rust..."
-cd worker/rust_ai_core
+cd worker
 # Run the test that exports the bindings
 cargo test --test bindings_test --features wasm
 
 echo "📦 Bundling bindings to frontend..."
-DEST_FILE="../../src/lib/bindings.ts"
+DEST_FILE="../src/lib/bindings.ts"
 BINDINGS_DIR="bindings"
 
 # Remove the old directory if it exists (since we are switching to a single file)
-rm -rf ../../src/lib/bindings
+rm -rf ../src/lib/bindings
 
 echo "// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually." > "$DEST_FILE"
 

scripts/test-ai-comparison.sh

@@ -9,14 +9,14 @@ echo "🤖 Running AI Comparison Tests..."
 
 # Build the Rust core
 echo "🔨 Building Rust AI core..."
-cd worker/rust_ai_core
+cd worker
 cargo build
-cd ../..
+cd ..
 
 # Run the AI matrix test
 echo "🧪 Running AI Matrix Test..."
-cd worker/rust_ai_core
+cd worker
 cargo test test_ai_matrix -- --ignored --nocapture
-cd ../..
+cd ..
 
 echo "✅ AI Comparison Tests Complete!" 

src/lib/utils/getAIVersion.ts

@@ -8,17 +8,17 @@ export async function getClassicAIVersion(): Promise<string> {
       const { createHash } = await import('crypto');
 
       // Get the Rust crate version
-      const cargoTomlPath = 'worker/rust_ai_core/Cargo.toml';
+      const cargoTomlPath = 'worker/Cargo.toml';
       const cargoContent = readFileSync(cargoTomlPath, 'utf8');
       const versionMatch = cargoContent.match(/version = "([^"]+)"/);
       const crateVersion = versionMatch ? versionMatch[1] : '0.1.0';
 
       // Get a hash of the AI-specific source files to detect AI changes
       const aiSourceFiles = [
-        'worker/rust_ai_core/src/lib.rs',
-        'worker/rust_ai_core/src/features.rs',
-        'worker/rust_ai_core/src/ml_ai.rs',
-        'worker/rust_ai_core/src/neural_network.rs',
+        'worker/src/lib.rs',
+        'worker/src/features.rs',
+        'worker/src/ml_ai.rs',
+        'worker/src/neural_network.rs',
       ];
 
       const hash = createHash('sha256');

worker/rust_ai_core/.cargo/config.toml worker/.cargo/config.tomlworker/rust_ai_core/.cargo/config.toml renamed to worker/.cargo/config.toml

@@ -1,12 +1,55 @@
-[workspace]
-resolver = "2"
-members = [
-    "rust_ai_core"
+[package]
+name = "connect-four-ai-core"
+version = "1.0.0"
+edition = "2021"
+authors = ["Robert Gilks"]
+description = "Connect Four AI core logic"
+license = "MIT"
+repository = "https://github.com/robertgilks/connect-four"
+
+[package.metadata.wasm-pack.profile.release]
+wasm-opt = false
+
+[lib]
+crate-type = ["cdylib", "rlib"]
+
+[[bin]]
+name = "connect-four-ai-worker"
+path = "src/main.rs"
+
+[features]
+default = []
+wasm = [
+    "wasm-bindgen",
+    "console_error_panic_hook",
+    "getrandom/js",
+    "dep:js-sys",
+    "dep:web-sys",
+    "dep:serde-wasm-bindgen",
 ]
+training = []
+slow_tests = []
 
-[workspace.dependencies]
+[dependencies]
 serde = { version = "1.0", features = ["derive"] }
-wasm-bindgen = "0.2.100"
+serde_json = { version = "1.0", features = ["preserve_order"] }
+rand = { version = "0.8.5", features = ["getrandom"] }
+uuid = { version = "1.0", features = ["v4", "serde", "js"] }
+getrandom = { version = "0.2", features = ["js"] }
+wasm-bindgen = { version = "0.2.100", optional = true }
+serde-wasm-bindgen = { version = "0.6.5", optional = true }
+console_error_panic_hook = { version = "0.1.7", optional = true }
+js-sys = { version = "0.3", optional = true }
+web-sys = { version = "0.3", optional = true, features = ["console"] }
+lazy_static = "1.4"
+ndarray = "0.15"
+chrono = { version = "0.4", features = ["serde"] }
+rayon = "1.8"
+tempfile = "3.8"
+ts-rs = "7.0.0"
+
+[dev-dependencies]
+criterion = "0.6.0"
 
 [profile.release]
 opt-level = 3