@@ -4,6 +4,7 @@ node_modules/
 # Build outputs
 dist/
 build/
+.build/
 prebuilds/
 coverage/
 ctrf/
@@ -71,3 +72,8 @@ packages/morsel/.react-router/
 !packages/tree-sitter-modelica/tree-sitter-modelica.wasm
 packages/tree-sitter-modelica/examples/*/
 packages/ide/vscode-web/
+
+# COIN-OR build artifacts
+Couenne/
+ThirdParty/
+f2ctmp/
@@ -53,36 +53,60 @@ if [ ! -d "$COIN_INSTALL/include/coin-or" ]; then
   export CXX=em++
   export AR=emar
   export RANLIB=emranlib
-
-  # Build CLP (includes CoinUtils)
-  "$COINBREW" fetch Clp
-  "$COINBREW" build Clp \
-    --prefix="$COIN_INSTALL" \
-    --no-prompt \
-    --static \
-    --disable-shared \
-    --enable-static \
-    --tests=none
-
-  # Build CBC (includes CGL)
-  "$COINBREW" fetch Cbc
-  "$COINBREW" build Cbc \
-    --prefix="$COIN_INSTALL" \
-    --no-prompt \
-    --static \
-    --disable-shared \
-    --enable-static \
-    --tests=none
-
-  # Build IPOPT with MUMPS
-  "$COINBREW" fetch Ipopt
-  "$COINBREW" build Ipopt \
-    --prefix="$COIN_INSTALL" \
-    --no-prompt \
-    --static \
-    --disable-shared \
-    --enable-static \
-    --tests=none
+  export F77="fort77"
+  export FC="fort77"
+  export FFLAGS="-O2 -fPIC"
+  export FCFLAGS="-O2 -fPIC"
+  export LDFLAGS="-L$EMSDK/upstream/emscripten/cache/sysroot/lib/wasm32-emscripten"
+
+  # 1. Shallow clone repositories explicitly to avoid slow complete fetches
+  # and network drops from coinbrew, while remaining in batch mode.
+  echo "Shallow cloning COIN-OR packages (latest master)..."
+  fetch_shallow() {
+    local proj=$1
+    if [ ! -d "$BUILD_DIR/$proj" ]; then
+      echo "--> Cloning $proj..."
+      git clone --depth 1 "https://github.com/coin-or/$proj.git" "$BUILD_DIR/$proj"
+    else
+      echo "--> $proj already cloned."
+    fi
+  }
+
+  fetch_shallow Clp
+  fetch_shallow Cbc
+  fetch_shallow Ipopt
+  fetch_shallow Bonmin
+  fetch_shallow Couenne
+
+  # 2. Build solvers sequentially.
+  # We do NOT use --reconfigure here, because it cascades and forces
+  # coinbrew to redundantly rebuild all shared dependencies!
+  # Pass the -L path to ALL builds uniformly so that Mumps (a transitive
+  # dependency via Ipopt) can find libf2c.a in the Emscripten sysroot.
+  COIN_LDFLAGS="-static -L$EMSDK/upstream/emscripten/cache/sysroot/lib/wasm32-emscripten"
+
+  for pkg in Clp Cbc Ipopt Bonmin Couenne; do
+    echo "--- Building $pkg ---"
+
+    # Ipopt and MINLP solvers need built-in LAPACK (no system LAPACK for WASM)
+    EXTRA_FLAGS=""
+    if [ "$pkg" = "Ipopt" ] || [ "$pkg" = "Bonmin" ] || [ "$pkg" = "Couenne" ]; then
+      EXTRA_FLAGS="--with-lapack=BUILD"
+    fi
+
+    "$COINBREW" build "$pkg" \
+      --prefix="$COIN_INSTALL" \
+      --disable-shared \
+      --host=wasm32-unknown-emscripten \
+      --enable-static \
+      --tests=none \
+      --reconfigure \
+      LDFLAGS="$COIN_LDFLAGS" \
+      LT_LDFLAGS="-all-static" \
+      --no-prompt \
+      --verbosity=2 \
+      $EXTRA_FLAGS
+  done
 
   cd "$PACKAGE_DIR"
 fi
@@ -91,19 +115,24 @@ fi
 echo "Compiling COIN-OR WASM module..."
 mkdir -p "$WASM_DIR"
 
-cat > "$BUILD_DIR/coinor_wasm_entry.c" << 'ENTRY_EOF'
+cat > "$BUILD_DIR/coinor_wasm_entry.cpp" << 'ENTRY_EOF'
 /*
  * COIN-OR WASM entry points.
- * Provides simplified C functions callable from JavaScript via Emscripten ccall().
+ * Provides simplified C/C++ functions callable from JavaScript via Emscripten ccall().
  */
 #include <stdlib.h>
 #include <string.h>
 
 #define HAVE_IPOPT
 #define HAVE_CLP
 #define HAVE_CBC
+#define HAVE_BONMIN
+#define HAVE_COUENNE
 
 #include "coinor-interface.c"
+#include "coinor-minlp-interface.cpp"
+
+extern "C" {
 
 /* IPOPT callback types from addFunction() */
 typedef int (*wasm_eval_f)(int n, double* x, int new_x, double* obj, void* ud);
@@ -238,23 +267,28 @@ int coinor_cbc_wasm(
     coinor_result_free(&result);
     return result.status;
 }
+} // extern "C"
 ENTRY_EOF
 
-emcc -O2 \
+em++ -O2 \
+  -std=c++14 \
   -I"$COIN_INSTALL/include/coin-or" \
   -I"$SRC_DIR" \
-  "$BUILD_DIR/coinor_wasm_entry.c" \
+  "$BUILD_DIR/coinor_wasm_entry.cpp" \
   -L"$COIN_INSTALL/lib" \
+  -lcouenne \
+  -lbonmin \
   -lipopt \
   -lClp \
   -lCbc \
-  -lCoinUtils \
-  -lOsiClp \
   -lCgl \
+  -lOsi \
+  -lOsiClp \
+  -lCoinUtils \
   -lm \
   -s MODULARIZE=1 \
   -s EXPORT_ES6=1 \
-  -s EXPORTED_FUNCTIONS='["_coinor_ipopt_wasm","_coinor_clp_wasm","_coinor_cbc_wasm","_malloc","_free"]' \
+  -s EXPORTED_FUNCTIONS='["_coinor_ipopt_wasm","_coinor_clp_wasm","_coinor_cbc_wasm","_coinor_bonmin_wasm","_coinor_couenne_wasm","_malloc","_free"]' \
   -s EXPORTED_RUNTIME_METHODS='["addFunction","removeFunction","ccall","cwrap"]' \
   -s ALLOW_TABLE_GROWTH=1 \
   -s ALLOW_MEMORY_GROWTH=1 \
 
@@ -25,8 +25,8 @@ import type { SolverOptions } from "./solver-options.js";
 export interface CoinorCodegenOptions {
   /** Model identifier (from FMU codegen). */
   modelIdentifier: string;
-  /** Solver to use: "clp", "cbc", or "ipopt". */
-  solver: "clp" | "cbc" | "ipopt";
+  /** Solver to use: "clp", "cbc", "ipopt", "bonmin", or "couenne". */
+  solver: "clp" | "cbc" | "ipopt" | "bonmin" | "couenne";
   /** NLP convergence tolerance (default: 1e-8). */
   tolerance?: number;
   /** Maximum iterations (default: 3000). */
@@ -212,6 +212,12 @@ export function generateLpMainC(problem: LpProblemDef, options: CoinorCodegenOpt
  */
 export function generateNlpMainC(problem: NlpProblemDef, options: CoinorCodegenOptions): CoinorCodegenResult {
   const overrides = options.solverOptions;
+  const solver =
+    overrides?.optimizer === "bonmin" || overrides?.optimizer === "couenne" || overrides?.optimizer === "ipopt"
+      ? overrides.optimizer
+      : options.solver === "bonmin" || options.solver === "couenne"
+        ? options.solver
+        : "ipopt";
   const tolerance = overrides?.atol ?? options.tolerance ?? 1e-8;
   const maxIter = overrides?.maxNonlinearIterations ?? options.maxIterations ?? 3000;
   const printLevel = options.printLevel ?? 0;
@@ -244,9 +250,12 @@ export function generateNlpMainC(problem: NlpProblemDef, options: CoinorCodegenO
 
   const lines: string[] = [];
 
-  lines.push("/* Auto-generated by ModelScript — COIN-OR IPOPT NLP driver */");
-  lines.push("#define HAVE_IPOPT");
+  lines.push(`/* Auto-generated by ModelScript — COIN-OR ${solver.toUpperCase()} NLP driver */`);
+  lines.push(`#define HAVE_${solver.toUpperCase()}`);
   lines.push('#include "coinor-interface.c"');
+  if (solver === "bonmin" || solver === "couenne") {
+    lines.push('#include "coinor-minlp-interface.cpp"');
+  }
   lines.push("#include <stdio.h>");
   lines.push("#include <stdlib.h>");
   lines.push("");
@@ -402,7 +411,7 @@ export function generateNlpMainC(problem: NlpProblemDef, options: CoinorCodegenO
   lines.push("");
 
   lines.push("  CoinorResult result;");
-  lines.push("  coinor_ipopt_solve(&cb, x0, &opts, &result);");
+  lines.push(`  coinor_${solver}_solve(&cb, x0, &opts, &result);`);
   lines.push("");
 
   lines.push('  printf("Status: %d (%s)\\n", result.status, result.message);');
@@ -446,6 +455,20 @@ find_package(PkgConfig REQUIRED)
 pkg_check_modules(IPOPT REQUIRED ipopt)
 target_include_directories(\${PROJECT_NAME} PRIVATE \${IPOPT_INCLUDE_DIRS})
 target_link_libraries(\${PROJECT_NAME} PRIVATE \${IPOPT_LIBRARIES})
+`;
+    case "bonmin":
+      return `# BONMIN dependency
+find_package(PkgConfig REQUIRED)
+pkg_check_modules(BONMIN REQUIRED bonmin)
+target_include_directories(\${PROJECT_NAME} PRIVATE \${BONMIN_INCLUDE_DIRS})
+target_link_libraries(\${PROJECT_NAME} PRIVATE \${BONMIN_LIBRARIES})
+`;
+    case "couenne":
+      return `# COUENNE dependency
+find_package(PkgConfig REQUIRED)
+pkg_check_modules(COUENNE REQUIRED couenne)
+target_include_directories(\${PROJECT_NAME} PRIVATE \${COUENNE_INCLUDE_DIRS})
+target_link_libraries(\${PROJECT_NAME} PRIVATE \${COUENNE_LIBRARIES})
 `;
     default:
       return "";