tomoaki/hakorune
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

JoinIR/SSA/Stage-3: sync CURRENT_TASK and dev env

Browse Source
This commit is contained in:
nyash-codex
2025-12-01 11:10:46 +09:00
parent a3d5bacc55
commit 8633224061
52 changed files with 974 additions and 256 deletions
Download Patch File Download Diff File Expand all files Collapse all files

152
src/runner_plugin_init.rs
View File

@ -40,80 +40,96 @@ pub fn init_bid_plugins() {
}
let cfg_path = resolve_plugin_toml();
if let Ok(()) = init_global_plugin_host(&cfg_path) {
if plugin_debug || cli_verbose {
eprintln!("🔌 plugin host initialized from {}", cfg_path);
// Show which plugin loader backend compiled in (enabled/stub)
println!(
"[plugin-loader] backend={}",
crate::runtime::plugin_loader_v2::backend_kind()
);
}
let host = get_global_plugin_host();
let host = host.read().unwrap();
if let Some(config) = host.config_ref() {
let registry = get_global_registry();
for (lib_name, lib_def) in &config.libraries {
for box_name in &lib_def.boxes {
if plugin_debug {
eprintln!(" 📦 Registering plugin provider for {}", box_name);
}
registry.apply_plugin_config(&PluginConfig {
plugins: [(box_name.clone(), lib_name.clone())].into(),
});
}
}
match init_global_plugin_host(&cfg_path) {
Ok(()) => {
if plugin_debug || cli_verbose {
eprintln!("✅ plugin host fully configured");
eprintln!("[plugin/init] plugin host initialized from {}", cfg_path);
// Show which plugin loader backend compiled in (enabled/stub)
println!(
"[plugin-loader] backend={}",
crate::runtime::plugin_loader_v2::backend_kind()
);
}
}
// Optional autoload for [using.*] kind="dylib" packages
if std::env::var("NYASH_USING_DYLIB_AUTOLOAD").ok().as_deref() == Some("1")
&& std::env::var("NYASH_DISABLE_PLUGINS").ok().as_deref() != Some("1")
{
if plugin_debug || cli_verbose {
eprintln!("[using.dylib/autoload] scanning nyash.toml packages …");
}
let mut using_paths: Vec<String> = Vec::new();
let mut pending_modules: std::vec::Vec<(String, String)> = Vec::new();
let mut aliases: std::collections::HashMap<String, String> =
std::collections::HashMap::new();
let mut packages: std::collections::HashMap<String, crate::using::spec::UsingPackage> =
std::collections::HashMap::new();
let _ = crate::using::resolver::populate_from_toml(
&mut using_paths,
&mut pending_modules,
&mut aliases,
&mut packages,
);
for (name, pkg) in packages.iter() {
if let crate::using::spec::PackageKind::Dylib = pkg.kind {
// Build library name from file stem (best-effort)
let lib_name = std::path::Path::new(&pkg.path)
.file_name()
.and_then(|s| s.to_str())
.unwrap_or(name)
.to_string();
let host = get_global_plugin_host();
let res = host
.read()
.unwrap()
.load_library_direct(&lib_name, &pkg.path, &[]);
if let Err(e) = res {
if plugin_debug || cli_verbose {
eprintln!("[using.dylib/autoload] failed '{}': {}", lib_name, e);
let host = get_global_plugin_host();
let host = host.read().unwrap();
if let Some(config) = host.config_ref() {
let registry = get_global_registry();
for (lib_name, lib_def) in &config.libraries {
for box_name in &lib_def.boxes {
if plugin_debug {
eprintln!(" 📦 Registering plugin provider for {}", box_name);
}
registry.apply_plugin_config(&PluginConfig {
plugins: [(box_name.clone(), lib_name.clone())].into(),
});
}
}
if plugin_debug || cli_verbose {
eprintln!("[plugin/init] ✅ plugin host fully configured");
}
}
// Optional autoload for [using.*] kind="dylib" packages
if std::env::var("NYASH_USING_DYLIB_AUTOLOAD").ok().as_deref() == Some("1")
&& std::env::var("NYASH_DISABLE_PLUGINS").ok().as_deref() != Some("1")
{
if plugin_debug || cli_verbose {
eprintln!("[using.dylib/autoload] scanning nyash.toml packages …");
}
let mut using_paths: Vec<String> = Vec::new();
let mut pending_modules: std::vec::Vec<(String, String)> = Vec::new();
let mut aliases: std::collections::HashMap<String, String> =
std::collections::HashMap::new();
let mut packages: std::collections::HashMap<
String,
crate::using::spec::UsingPackage,
> = std::collections::HashMap::new();
let _ = crate::using::resolver::populate_from_toml(
&mut using_paths,
&mut pending_modules,
&mut aliases,
&mut packages,
);
for (name, pkg) in packages.iter() {
if let crate::using::spec::PackageKind::Dylib = pkg.kind {
// Build library name from file stem (best-effort)
let lib_name = std::path::Path::new(&pkg.path)
.file_name()
.and_then(|s| s.to_str())
.unwrap_or(name)
.to_string();
let host = get_global_plugin_host();
let res =
host.read()
.unwrap()
.load_library_direct(&lib_name, &pkg.path, &[]);
if let Err(e) = res {
if plugin_debug || cli_verbose {
eprintln!("[using.dylib/autoload] failed '{}': {}", lib_name, e);
}
} else if plugin_debug || cli_verbose {
eprintln!(
"[using.dylib/autoload] loaded '{}' from {}",
lib_name, pkg.path
);
}
} else if plugin_debug || cli_verbose {
eprintln!(
"[using.dylib/autoload] loaded '{}' from {}",
lib_name, pkg.path
);
}
}
}
}
} else if plugin_debug || cli_verbose {
eprintln!("⚠️ Failed to load plugin config (hakorune.toml/nyash.toml) - plugins disabled");
Err(e) => {
if plugin_debug || cli_verbose {
eprintln!(
"[plugin/init] failed to initialize from {}: {}",
cfg_path, e
);
} else {
eprintln!(
"[plugin/init] plugins disabled (config={}): {}",
cfg_path, e
);
}
return;
}
}
}