@h-rig/core 0.0.6-alpha.148 → 0.0.6-alpha.149

package/dist/src/load-config.js

@@ -211,9 +211,9 @@ function resolvedFilePath(path, rootPath) {
     return null;
   return rootPath && !isWithinDir(resolved, rootPath) ? null : resolved;
 }
-function resolveProjectRigPackageImport(specifier, configDir) {
+function resolveProjectPackageImport(specifier, configDir) {
   const parsed = packageNameAndSubpath(specifier);
-  if (!parsed?.packageName.startsWith("@rig/"))
+  if (!parsed)
     return null;
   const nodeModulesDir = join(configDir, "node_modules");
   const directPackageDir = join(nodeModulesDir, parsed.packageName);
@@ -225,6 +225,7 @@ async function importConfigViaRuntimeBundleUnserialized(configPath) {
   if (!bun?.build) {
     throw new Error(`Failed to import ${configPath}: bare imports could not be resolved and no Bun.build runtime bundler is available.`);
   }
+  const RUNTIME_ONLY_EXTERNAL_PACKAGES = new Set(["mupdf", "fastembed", "onnxruntime-node", "markit-ai"]);
   const configDir = dirname(configPath);
   const UNRESOLVED_NAMESPACE = "rig-config-unresolved";
   const unresolvedLocalPlugin = {
@@ -234,11 +235,16 @@ async function importConfigViaRuntimeBundleUnserialized(configPath) {
         const directFilePath = resolvedFilePath(args.path, configDir);
         if (directFilePath)
           return { path: directFilePath };
-        const projectRigPackagePath = resolveProjectRigPackageImport(args.path, configDir);
-        if (projectRigPackagePath)
-          return { path: projectRigPackagePath, external: true };
-        if (/^(?:node|bun):/.test(args.path) || isBuiltin(args.path) || packageNameAndSubpath(args.path))
+        const packageImport = packageNameAndSubpath(args.path);
+        if (packageImport && RUNTIME_ONLY_EXTERNAL_PACKAGES.has(packageImport.packageName))
+          return { path: args.path, external: true };
+        const projectPackagePath = resolveProjectPackageImport(args.path, configDir);
+        if (projectPackagePath)
+          return packageImport?.packageName.startsWith("@oh-my-pi/") ? { path: projectPackagePath, external: true } : { path: projectPackagePath };
+        if (/^(?:node|bun):/.test(args.path) || isBuiltin(args.path))
           return;
+        if (packageImport)
+          return { path: args.path, external: true };
         const parentCandidates = args.path.startsWith(".") ? [args.importer && isAbsolute(args.importer) ? dirname(args.importer) : null, configDir].filter((value) => Boolean(value)) : [args.importer && isAbsolute(args.importer) ? dirname(args.importer) : configDir];
         for (const parent2 of parentCandidates) {
           const filePath = resolvedFilePath(resolve(parent2, args.path), configDir);
@@ -265,9 +271,10 @@ throw new Error(${JSON.stringify(`Failed to bundle ${configPath}: Could not reso
   const result = await bun.build({
     entrypoints: [configPath],
     target: "bun",
+    external: ["mupdf", "fastembed", "onnxruntime-node", "markit-ai"],
     format: "esm",
     throw: false,
-    packages: "external",
+    packages: "bundle",
     plugins: [unresolvedLocalPlugin]
   });
   if (!result.success || !result.outputs[0]) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@h-rig/core",
-  "version": "0.0.6-alpha.148",
+  "version": "0.0.6-alpha.149",
   "type": "module",
   "description": "Config and plugin composition library for Rig's OMP extension ecosystem; not a product host/runtime.",
   "license": "UNLICENSED",
@@ -49,7 +49,7 @@
   "module": "./dist/src/index.js",
   "types": "./dist/src/index.d.ts",
   "dependencies": {
-    "@rig/contracts": "npm:@h-rig/contracts@0.0.6-alpha.148",
+    "@rig/contracts": "npm:@h-rig/contracts@0.0.6-alpha.149",
     "effect": "4.0.0-beta.90"
   }
 }