@h-rig/core 0.0.6-alpha.176 → 0.0.6-alpha.177

package/dist/src/kernel-entrypoint.js

@@ -37,7 +37,7 @@ function applyConfigEnv(config, env = process.env) {
 // packages/core/src/load-config.ts
 import { existsSync as existsSync2, mkdirSync, mkdtempSync, readFileSync as readFileSync2, readdirSync, rmSync, statSync } from "fs";
 import { isBuiltin } from "module";
-import { dirname, isAbsolute, join as join2, relative, resolve } from "path";
+import { basename, dirname, isAbsolute, join as join2, relative, resolve } from "path";
 import { pathToFileURL } from "url";
 import { Schema as Schema3 } from "effect";
 import { RigConfig as RigConfig3 } from "@rig/contracts";
@@ -104,8 +104,11 @@ function parseDeclarativeFile(path) {
 }
 function loadDeclarativeConfig(path) {
   const data = parseDeclarativeFile(path);
-  const standardSection = data.standard && typeof data.standard === "object" && !Array.isArray(data.standard) ? data.standard : {};
-  const useStandard = standardSection.enabled !== false;
+  const standardSection = data.standard && typeof data.standard === "object" && !Array.isArray(data.standard) ? data.standard : null;
+  if (standardSection?.enabled !== true && standardSection?.enabled !== false) {
+    throw new Error(`Declarative config ${path} must explicitly set [standard] enabled = true or false.`);
+  }
+  const useStandard = standardSection.enabled === true;
   let plugins = [];
   if (useStandard) {
     const resolver = getStandardPluginsResolver();
@@ -147,19 +150,27 @@ function packageNameAndSubpath(specifier) {
 function exportTargetFromEntry(entry) {
   if (typeof entry === "string")
     return entry;
-  if (entry && typeof entry === "object" && !Array.isArray(entry)) {
+  if (Array.isArray(entry)) {
+    for (const candidate of entry) {
+      const target = exportTargetFromEntry(candidate);
+      if (target)
+        return target;
+    }
+    return null;
+  }
+  if (entry && typeof entry === "object") {
     const conditions = entry;
-    for (const key of ["bun", "import", "default", "require"]) {
-      if (typeof conditions[key] === "string")
-        return conditions[key];
+    for (const key of ["bun", "node", "import", "default", "require"]) {
+      const target = exportTargetFromEntry(conditions[key]);
+      if (target)
+        return target;
     }
   }
   return null;
 }
 function patternExportTarget(record, subpath) {
-  for (const [pattern, entry] of Object.entries(record)) {
-    if (!pattern.includes("*"))
-      continue;
+  const entries = Object.entries(record).filter(([pattern]) => pattern.includes("*")).sort(([a], [b]) => b.replace("*", "").length - a.replace("*", "").length);
+  for (const [pattern, entry] of entries) {
     const [prefix = "", suffix = ""] = pattern.split("*");
     if (!subpath.startsWith(prefix) || !subpath.endsWith(suffix))
       continue;
@@ -184,6 +195,49 @@ function exportTargetFromPackageJson(pkg, subpath) {
     return target;
   return subpath === "." && typeof pkg.module === "string" ? pkg.module : subpath === "." && typeof pkg.main === "string" ? pkg.main : null;
 }
+function patternImportTarget(record, specifier) {
+  for (const [pattern, entry] of Object.entries(record)) {
+    if (!pattern.includes("*"))
+      continue;
+    const [prefix = "", suffix = ""] = pattern.split("*");
+    if (!specifier.startsWith(prefix) || !specifier.endsWith(suffix))
+      continue;
+    const replacement = specifier.slice(prefix.length, specifier.length - suffix.length);
+    const target = exportTargetFromEntry(entry);
+    if (target)
+      return target.replace("*", replacement);
+  }
+  return null;
+}
+function resolvePackagePrivateImport(specifier, importer, projectRoot) {
+  if (!specifier.startsWith("#") || !importer || !isAbsolute(importer))
+    return null;
+  let dir = dirname(importer);
+  const stop = resolve(projectRoot);
+  while (isWithinDir(dir, stop)) {
+    const packageJsonPath = join2(dir, "package.json");
+    if (existsSync2(packageJsonPath)) {
+      try {
+        const pkg = JSON.parse(readFileSync2(packageJsonPath, "utf8"));
+        const imports = pkg.imports;
+        if (imports && typeof imports === "object" && !Array.isArray(imports)) {
+          const record = imports;
+          const target = exportTargetFromEntry(record[specifier]) ?? patternImportTarget(record, specifier);
+          if (target)
+            return resolveModulePath(join2(dir, target));
+        }
+      } catch {
+        return null;
+      }
+      return null;
+    }
+    const parent = dirname(dir);
+    if (parent === dir)
+      return null;
+    dir = parent;
+  }
+  return null;
+}
 function resolvePackageDirFromBunStore(packageName, nodeModulesDir) {
   const storeDir = join2(nodeModulesDir, ".bun");
   if (!existsSync2(storeDir))
@@ -258,8 +312,15 @@ function resolvePackageExportFromDir(packageDir, subpath) {
   if (existsSync2(packageJsonPath)) {
     try {
       const pkg = JSON.parse(readFileSync2(packageJsonPath, "utf8"));
-      const target = exportTargetFromPackageJson(pkg, subpath);
-      if (target) {
+      const targets = [
+        exportTargetFromPackageJson(pkg, subpath),
+        ...subpath === "." ? [typeof pkg.module === "string" ? pkg.module : null, typeof pkg.main === "string" ? pkg.main : null] : []
+      ];
+      const seen = new Set;
+      for (const target of targets) {
+        if (!target || seen.has(target))
+          continue;
+        seen.add(target);
         const resolved = resolveModulePath(join2(packageDir, target));
         if (resolved)
           return resolved;
@@ -347,10 +408,17 @@ async function importConfigViaRuntimeBundleUnserialized(configPath) {
   }
   const RUNTIME_ONLY_EXTERNAL_PACKAGES = new Set(["effect", "mupdf", "fastembed", "onnxruntime-node", "markit-ai"]);
   const configDir = dirname(configPath);
+  const configProjectRoot = basename(configDir) === ".rig" ? dirname(configDir) : configDir;
   const UNRESOLVED_NAMESPACE = "rig-config-unresolved";
+  const ABSOLUTE_EXTERNAL_NAMESPACE = "rig-config-absolute-external";
   const unresolvedLocalPlugin = {
     name: "rig-config-unresolved-local",
     setup(build) {
+      build.onLoad({ filter: /[\\/]@oh-my-pi[\\/]pi-coding-agent[\\/]src[\\/]export[\\/]html[\\/](?:template\.css|template\.html|template\.js|tool-views\.generated\.js)$/ }, (args) => ({
+        loader: "js",
+        contents: `export default ${JSON.stringify(readFileSync2(args.path, "utf8"))};
+`
+      }));
       build.onLoad({ filter: /\.(?:html|txt)$/ }, (args) => ({
         loader: "js",
         contents: `export default ${JSON.stringify(readFileSync2(args.path, "utf8"))};
@@ -360,32 +428,77 @@ async function importConfigViaRuntimeBundleUnserialized(configPath) {
         const directFilePath = resolvedFilePath(args.path, configDir);
         if (directFilePath)
           return { path: directFilePath };
+        if (args.path.startsWith("#")) {
+          const packagePrivatePath = resolvePackagePrivateImport(args.path, args.importer, configProjectRoot);
+          if (packagePrivatePath)
+            return { path: packagePrivatePath };
+          try {
+            const parent2 = args.importer && isAbsolute(args.importer) ? dirname(args.importer) : configProjectRoot;
+            const resolved = bun.resolveSync?.(args.path, parent2);
+            const filePath = resolvedFilePath(resolved, configProjectRoot);
+            if (filePath)
+              return { path: filePath };
+          } catch {}
+          return;
+        }
         const packageImport = packageNameAndSubpath(args.path);
-        if (packageImport && (packageImport.packageName.startsWith("@rig/") || RUNTIME_ONLY_EXTERNAL_PACKAGES.has(packageImport.packageName))) {
-          return { path: args.path, external: true };
+        if (packageImport?.packageName === "uhyphen" && packageImport.subpath === ".") {
+          const uhyphenPath = resolveProjectPackageImport("uhyphen", configProjectRoot);
+          if (uhyphenPath)
+            return { path: uhyphenPath };
         }
-        const projectPackagePath = resolveProjectPackageImport(args.path, configDir);
+        if (packageImport && packageImport.packageName !== "uhyphen") {
+          try {
+            const parent2 = args.importer && isAbsolute(args.importer) ? dirname(args.importer) : configProjectRoot;
+            const resolved = bun.resolveSync?.(args.path, parent2);
+            const filePath = resolvedFilePath(resolved, configProjectRoot);
+            if (filePath)
+              return { path: filePath };
+          } catch {}
+        }
+        const projectPackagePath = packageImport ? resolveProjectPackageImport(args.path, configProjectRoot) : null;
         if (projectPackagePath)
           return { path: projectPackagePath };
+        if (packageImport && (packageImport.packageName.startsWith("@rig/") || RUNTIME_ONLY_EXTERNAL_PACKAGES.has(packageImport.packageName))) {
+          return { path: args.path, external: true };
+        }
         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];
+        const importerDir = args.importer && isAbsolute(args.importer) ? dirname(args.importer) : null;
+        if (args.path.startsWith(".") && importerDir) {
+          const fromImporter = resolveModulePath(resolve(importerDir, args.path));
+          if (fromImporter)
+            return { path: fromImporter };
+          if (/[\\/]node_modules[\\/]/.test(args.importer ?? ""))
+            return;
+        }
+        const parentCandidates = args.path.startsWith(".") ? [importerDir, configDir].filter((value) => Boolean(value)) : [importerDir ?? configDir];
         for (const parent2 of parentCandidates) {
-          const filePath = resolvedFilePath(resolve(parent2, args.path), configDir);
+          const filePath = resolvedFilePath(resolve(parent2, args.path), configProjectRoot);
           if (filePath)
             return { path: filePath };
         }
         const parent = parentCandidates[0] ?? configDir;
         try {
           const resolved = bun.resolveSync?.(args.path, parent) ?? resolve(parent, args.path);
-          const filePath = resolvedFilePath(resolved, configDir);
+          const filePath = resolvedFilePath(resolved, configProjectRoot);
           if (filePath)
             return { path: filePath };
         } catch {}
         return { path: args.path, namespace: UNRESOLVED_NAMESPACE };
       });
+      build.onLoad({ filter: /.*/, namespace: ABSOLUTE_EXTERNAL_NAMESPACE }, (args) => {
+        const href = pathToFileURL(args.path).href;
+        return {
+          loader: "js",
+          contents: `export * from ${JSON.stringify(href)};
+const mod = await import(${JSON.stringify(href)});
+export default (mod && "default" in mod) ? mod.default : mod;
+`
+        };
+      });
       build.onLoad({ filter: /.*/, namespace: UNRESOLVED_NAMESPACE }, (args) => ({
         loader: "js",
         contents: `module.exports = {};
@@ -397,7 +510,6 @@ throw new Error(${JSON.stringify(`Failed to bundle ${configPath}: Could not reso
   const result = await bun.build({
     entrypoints: [configPath],
     target: "bun",
-    external: ["effect", "mupdf", "fastembed", "onnxruntime-node", "markit-ai"],
     format: "esm",
     throw: false,
     packages: "bundle",
@@ -408,7 +520,7 @@ throw new Error(${JSON.stringify(`Failed to bundle ${configPath}: Could not reso
 `);
     throw new Error(`Failed to bundle ${configPath}: ${detail || "unknown bundler error"}`);
   }
-  const bundleParentDir = join2(configDir, ".rig", "tmp");
+  const bundleParentDir = join2(configProjectRoot, ".rig", "tmp");
   mkdirSync(bundleParentDir, { recursive: true });
   const dir = mkdtempSync(join2(bundleParentDir, "rig-config-bundle-"));
   try {

package/dist/src/layout.d.ts

@@ -1,9 +1,9 @@
-import { RIG_ARTIFACTS_DIRNAME, RIG_DEFINITION_DIRNAME, RIG_STATE_DIRNAME, type RigLayout, type RuntimeWorkspaceLayout } from "@rig/contracts";
+import { RIG_DEFINITION_DIRNAME, RIG_STATE_DIRNAME, type RigLayout, type RuntimeWorkspaceLayout } from "@rig/contracts";
 import { resolveCheckoutRoot } from "./checkout-root";
 declare const resolveMonorepoRoot: typeof resolveCheckoutRoot;
 export { resolveMonorepoRoot };
 export type { RigLayout, RuntimeWorkspaceLayout };
-export { RIG_ARTIFACTS_DIRNAME, RIG_DEFINITION_DIRNAME, RIG_STATE_DIRNAME };
+export { RIG_DEFINITION_DIRNAME, RIG_STATE_DIRNAME };
 export declare function resolveNearestRigProjectRoot(startDir: string): string;
 export declare function resolveRigDataRoot(projectRoot: string): string;
 export declare function resolveRuntimeWorkspaceLayout(workspaceDir: string): RuntimeWorkspaceLayout;

package/dist/src/layout.js

@@ -3,7 +3,6 @@
 import { existsSync as existsSync2 } from "fs";
 import { resolve as resolve2 } from "path";
 import {
-  RIG_ARTIFACTS_DIRNAME,
   RIG_DEFINITION_DIRNAME,
   RIG_STATE_DIRNAME
 } from "@rig/contracts";
@@ -44,14 +43,13 @@ function resolveNearestRigProjectRoot(startDir) {
   for (;; ) {
     const hasDefinition = existsSync2(resolve2(current, RIG_DEFINITION_DIRNAME));
     const hasState = existsSync2(resolve2(current, RIG_STATE_DIRNAME));
-    const hasTaskConfig = existsSync2(resolve2(current, RIG_STATE_DIRNAME, "task-config.json"));
     const hasConfig = existsSync2(resolve2(current, ".rig", "rig.config.ts")) || existsSync2(resolve2(current, ".rig", "rig.config.json"));
     const hasGit = existsSync2(resolve2(current, ".git"));
     const hasControlPlane = existsSync2(resolve2(current, "packages", "cli", "bin", "rig.ts")) || existsSync2(resolve2(current, "packages", "server"));
     if ((hasDefinition || hasState || hasConfig) && weakMarkerCandidate === null) {
       weakMarkerCandidate = current;
     }
-    if ((hasControlPlane || hasConfig || hasTaskConfig) && projectCandidate === null) {
+    if ((hasControlPlane || hasConfig) && projectCandidate === null) {
       projectCandidate = current;
     }
     if (hasGit) {
@@ -79,7 +77,6 @@ function resolveRuntimeWorkspaceLayout(workspaceDir) {
     rigRoot,
     stateDir,
     logsDir,
-    artifactsRoot: resolve2(root, RIG_ARTIFACTS_DIRNAME),
     runtimeDir,
     homeDir: resolve2(rigRoot, "home"),
     tmpDir: resolve2(rigRoot, "tmp"),
@@ -111,9 +108,7 @@ function resolveRigLayout(projectRoot) {
     definitionRoot,
     runtimeWorkspaceRoot,
     stateRoot: runtimeLayout.rigRoot,
-    artifactsRoot: runtimeLayout.artifactsRoot,
     configPath: resolve2(definitionRoot, "config.sh"),
-    taskConfigPath: resolve2(runtimeWorkspaceRoot, ".rig", "task-config.json"),
     policyDir,
     policyFile: resolve2(policyDir, "policy.json"),
     pluginsDir: resolve2(definitionRoot, "plugins"),
@@ -139,6 +134,5 @@ export {
   resolveNearestRigProjectRoot,
   resolveMonorepoRoot,
   RIG_STATE_DIRNAME,
-  RIG_DEFINITION_DIRNAME,
-  RIG_ARTIFACTS_DIRNAME
+  RIG_DEFINITION_DIRNAME
 };

package/dist/src/load-config.js

@@ -2,7 +2,7 @@
 // packages/core/src/load-config.ts
 import { existsSync as existsSync2, mkdirSync, mkdtempSync, readFileSync as readFileSync2, readdirSync, rmSync, statSync } from "fs";
 import { isBuiltin } from "module";
-import { dirname, isAbsolute, join as join2, relative, resolve } from "path";
+import { basename, dirname, isAbsolute, join as join2, relative, resolve } from "path";
 import { pathToFileURL } from "url";
 import { Schema as Schema3 } from "effect";
 import { RigConfig as RigConfig3 } from "@rig/contracts";
@@ -69,8 +69,11 @@ function parseDeclarativeFile(path) {
 }
 function loadDeclarativeConfig(path) {
   const data = parseDeclarativeFile(path);
-  const standardSection = data.standard && typeof data.standard === "object" && !Array.isArray(data.standard) ? data.standard : {};
-  const useStandard = standardSection.enabled !== false;
+  const standardSection = data.standard && typeof data.standard === "object" && !Array.isArray(data.standard) ? data.standard : null;
+  if (standardSection?.enabled !== true && standardSection?.enabled !== false) {
+    throw new Error(`Declarative config ${path} must explicitly set [standard] enabled = true or false.`);
+  }
+  const useStandard = standardSection.enabled === true;
   let plugins = [];
   if (useStandard) {
     const resolver = getStandardPluginsResolver();
@@ -112,19 +115,27 @@ function packageNameAndSubpath(specifier) {
 function exportTargetFromEntry(entry) {
   if (typeof entry === "string")
     return entry;
-  if (entry && typeof entry === "object" && !Array.isArray(entry)) {
+  if (Array.isArray(entry)) {
+    for (const candidate of entry) {
+      const target = exportTargetFromEntry(candidate);
+      if (target)
+        return target;
+    }
+    return null;
+  }
+  if (entry && typeof entry === "object") {
     const conditions = entry;
-    for (const key of ["bun", "import", "default", "require"]) {
-      if (typeof conditions[key] === "string")
-        return conditions[key];
+    for (const key of ["bun", "node", "import", "default", "require"]) {
+      const target = exportTargetFromEntry(conditions[key]);
+      if (target)
+        return target;
     }
   }
   return null;
 }
 function patternExportTarget(record, subpath) {
-  for (const [pattern, entry] of Object.entries(record)) {
-    if (!pattern.includes("*"))
-      continue;
+  const entries = Object.entries(record).filter(([pattern]) => pattern.includes("*")).sort(([a], [b]) => b.replace("*", "").length - a.replace("*", "").length);
+  for (const [pattern, entry] of entries) {
     const [prefix = "", suffix = ""] = pattern.split("*");
     if (!subpath.startsWith(prefix) || !subpath.endsWith(suffix))
       continue;
@@ -149,6 +160,49 @@ function exportTargetFromPackageJson(pkg, subpath) {
     return target;
   return subpath === "." && typeof pkg.module === "string" ? pkg.module : subpath === "." && typeof pkg.main === "string" ? pkg.main : null;
 }
+function patternImportTarget(record, specifier) {
+  for (const [pattern, entry] of Object.entries(record)) {
+    if (!pattern.includes("*"))
+      continue;
+    const [prefix = "", suffix = ""] = pattern.split("*");
+    if (!specifier.startsWith(prefix) || !specifier.endsWith(suffix))
+      continue;
+    const replacement = specifier.slice(prefix.length, specifier.length - suffix.length);
+    const target = exportTargetFromEntry(entry);
+    if (target)
+      return target.replace("*", replacement);
+  }
+  return null;
+}
+function resolvePackagePrivateImport(specifier, importer, projectRoot) {
+  if (!specifier.startsWith("#") || !importer || !isAbsolute(importer))
+    return null;
+  let dir = dirname(importer);
+  const stop = resolve(projectRoot);
+  while (isWithinDir(dir, stop)) {
+    const packageJsonPath = join2(dir, "package.json");
+    if (existsSync2(packageJsonPath)) {
+      try {
+        const pkg = JSON.parse(readFileSync2(packageJsonPath, "utf8"));
+        const imports = pkg.imports;
+        if (imports && typeof imports === "object" && !Array.isArray(imports)) {
+          const record = imports;
+          const target = exportTargetFromEntry(record[specifier]) ?? patternImportTarget(record, specifier);
+          if (target)
+            return resolveModulePath(join2(dir, target));
+        }
+      } catch {
+        return null;
+      }
+      return null;
+    }
+    const parent = dirname(dir);
+    if (parent === dir)
+      return null;
+    dir = parent;
+  }
+  return null;
+}
 function resolvePackageDirFromBunStore(packageName, nodeModulesDir) {
   const storeDir = join2(nodeModulesDir, ".bun");
   if (!existsSync2(storeDir))
@@ -223,8 +277,15 @@ function resolvePackageExportFromDir(packageDir, subpath) {
   if (existsSync2(packageJsonPath)) {
     try {
       const pkg = JSON.parse(readFileSync2(packageJsonPath, "utf8"));
-      const target = exportTargetFromPackageJson(pkg, subpath);
-      if (target) {
+      const targets = [
+        exportTargetFromPackageJson(pkg, subpath),
+        ...subpath === "." ? [typeof pkg.module === "string" ? pkg.module : null, typeof pkg.main === "string" ? pkg.main : null] : []
+      ];
+      const seen = new Set;
+      for (const target of targets) {
+        if (!target || seen.has(target))
+          continue;
+        seen.add(target);
         const resolved = resolveModulePath(join2(packageDir, target));
         if (resolved)
           return resolved;
@@ -312,10 +373,17 @@ async function importConfigViaRuntimeBundleUnserialized(configPath) {
   }
   const RUNTIME_ONLY_EXTERNAL_PACKAGES = new Set(["effect", "mupdf", "fastembed", "onnxruntime-node", "markit-ai"]);
   const configDir = dirname(configPath);
+  const configProjectRoot = basename(configDir) === ".rig" ? dirname(configDir) : configDir;
   const UNRESOLVED_NAMESPACE = "rig-config-unresolved";
+  const ABSOLUTE_EXTERNAL_NAMESPACE = "rig-config-absolute-external";
   const unresolvedLocalPlugin = {
     name: "rig-config-unresolved-local",
     setup(build) {
+      build.onLoad({ filter: /[\\/]@oh-my-pi[\\/]pi-coding-agent[\\/]src[\\/]export[\\/]html[\\/](?:template\.css|template\.html|template\.js|tool-views\.generated\.js)$/ }, (args) => ({
+        loader: "js",
+        contents: `export default ${JSON.stringify(readFileSync2(args.path, "utf8"))};
+`
+      }));
       build.onLoad({ filter: /\.(?:html|txt)$/ }, (args) => ({
         loader: "js",
         contents: `export default ${JSON.stringify(readFileSync2(args.path, "utf8"))};
@@ -325,32 +393,77 @@ async function importConfigViaRuntimeBundleUnserialized(configPath) {
         const directFilePath = resolvedFilePath(args.path, configDir);
         if (directFilePath)
           return { path: directFilePath };
+        if (args.path.startsWith("#")) {
+          const packagePrivatePath = resolvePackagePrivateImport(args.path, args.importer, configProjectRoot);
+          if (packagePrivatePath)
+            return { path: packagePrivatePath };
+          try {
+            const parent2 = args.importer && isAbsolute(args.importer) ? dirname(args.importer) : configProjectRoot;
+            const resolved = bun.resolveSync?.(args.path, parent2);
+            const filePath = resolvedFilePath(resolved, configProjectRoot);
+            if (filePath)
+              return { path: filePath };
+          } catch {}
+          return;
+        }
         const packageImport = packageNameAndSubpath(args.path);
-        if (packageImport && (packageImport.packageName.startsWith("@rig/") || RUNTIME_ONLY_EXTERNAL_PACKAGES.has(packageImport.packageName))) {
-          return { path: args.path, external: true };
+        if (packageImport?.packageName === "uhyphen" && packageImport.subpath === ".") {
+          const uhyphenPath = resolveProjectPackageImport("uhyphen", configProjectRoot);
+          if (uhyphenPath)
+            return { path: uhyphenPath };
         }
-        const projectPackagePath = resolveProjectPackageImport(args.path, configDir);
+        if (packageImport && packageImport.packageName !== "uhyphen") {
+          try {
+            const parent2 = args.importer && isAbsolute(args.importer) ? dirname(args.importer) : configProjectRoot;
+            const resolved = bun.resolveSync?.(args.path, parent2);
+            const filePath = resolvedFilePath(resolved, configProjectRoot);
+            if (filePath)
+              return { path: filePath };
+          } catch {}
+        }
+        const projectPackagePath = packageImport ? resolveProjectPackageImport(args.path, configProjectRoot) : null;
         if (projectPackagePath)
           return { path: projectPackagePath };
+        if (packageImport && (packageImport.packageName.startsWith("@rig/") || RUNTIME_ONLY_EXTERNAL_PACKAGES.has(packageImport.packageName))) {
+          return { path: args.path, external: true };
+        }
         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];
+        const importerDir = args.importer && isAbsolute(args.importer) ? dirname(args.importer) : null;
+        if (args.path.startsWith(".") && importerDir) {
+          const fromImporter = resolveModulePath(resolve(importerDir, args.path));
+          if (fromImporter)
+            return { path: fromImporter };
+          if (/[\\/]node_modules[\\/]/.test(args.importer ?? ""))
+            return;
+        }
+        const parentCandidates = args.path.startsWith(".") ? [importerDir, configDir].filter((value) => Boolean(value)) : [importerDir ?? configDir];
         for (const parent2 of parentCandidates) {
-          const filePath = resolvedFilePath(resolve(parent2, args.path), configDir);
+          const filePath = resolvedFilePath(resolve(parent2, args.path), configProjectRoot);
           if (filePath)
             return { path: filePath };
         }
         const parent = parentCandidates[0] ?? configDir;
         try {
           const resolved = bun.resolveSync?.(args.path, parent) ?? resolve(parent, args.path);
-          const filePath = resolvedFilePath(resolved, configDir);
+          const filePath = resolvedFilePath(resolved, configProjectRoot);
           if (filePath)
             return { path: filePath };
         } catch {}
         return { path: args.path, namespace: UNRESOLVED_NAMESPACE };
       });
+      build.onLoad({ filter: /.*/, namespace: ABSOLUTE_EXTERNAL_NAMESPACE }, (args) => {
+        const href = pathToFileURL(args.path).href;
+        return {
+          loader: "js",
+          contents: `export * from ${JSON.stringify(href)};
+const mod = await import(${JSON.stringify(href)});
+export default (mod && "default" in mod) ? mod.default : mod;
+`
+        };
+      });
       build.onLoad({ filter: /.*/, namespace: UNRESOLVED_NAMESPACE }, (args) => ({
         loader: "js",
         contents: `module.exports = {};
@@ -362,7 +475,6 @@ throw new Error(${JSON.stringify(`Failed to bundle ${configPath}: Could not reso
   const result = await bun.build({
     entrypoints: [configPath],
     target: "bun",
-    external: ["effect", "mupdf", "fastembed", "onnxruntime-node", "markit-ai"],
     format: "esm",
     throw: false,
     packages: "bundle",
@@ -373,7 +485,7 @@ throw new Error(${JSON.stringify(`Failed to bundle ${configPath}: Could not reso
 `);
     throw new Error(`Failed to bundle ${configPath}: ${detail || "unknown bundler error"}`);
   }
-  const bundleParentDir = join2(configDir, ".rig", "tmp");
+  const bundleParentDir = join2(configProjectRoot, ".rig", "tmp");
   mkdirSync(bundleParentDir, { recursive: true });
   const dir = mkdtempSync(join2(bundleParentDir, "rig-config-bundle-"));
   try {

package/dist/src/placement.d.ts

@@ -1,3 +1,11 @@
+/**
+ * Deprecated compatibility subpath. Placement behavior is owned by
+ * @rig/transport-plugin and exposed through PLACEMENT_SERVICE.
+ *
+ * Core intentionally does not implement read/list/select/add/remove placement
+ * state; callers should resolve the typed capability from their project plugin
+ * host. These stubs remain only to make accidental direct imports fail loudly.
+ */
 export type PlacementKind = "local" | "remote";
 export type Placement = {
     readonly alias: string;
@@ -24,24 +32,24 @@ export type AddPlacementInput = {
     readonly token?: string | null;
     readonly select?: boolean;
 };
-export declare function resolveRepoConnectionPath(projectRoot: string): string;
-export declare function readSelection(projectRoot: string): RepoConnectionState | null;
+export declare function resolveRepoConnectionPath(_projectRoot: string): string;
+export declare function readSelection(_projectRoot: string): RepoConnectionState | null;
 export declare const readRepoConnection: typeof readSelection;
-export declare function writeSelection(projectRoot: string, state: RepoConnectionState): void;
+export declare function writeSelection(_projectRoot: string, _state: RepoConnectionState): void;
 export declare const writeRepoConnection: typeof writeSelection;
-export declare function readPlacement(projectRoot: string, env?: NodeJS.ProcessEnv): Promise<Placement>;
+export declare function readPlacement(_projectRoot: string, _env?: NodeJS.ProcessEnv): Promise<Placement>;
 export declare const readSelectedTarget: typeof readPlacement;
-export declare function listPlacements(projectRoot: string): Placement[];
+export declare function listPlacements(_projectRoot: string): Placement[];
 export declare const listServerTargets: typeof listPlacements;
-export declare function selectPlacement(projectRoot: string, alias: string, options?: {
+export declare function selectPlacement(_projectRoot: string, _alias: string, _options?: {
     dryRun?: boolean;
 }): Placement;
 export declare const selectServerTarget: typeof selectPlacement;
-export declare function addPlacement(projectRoot: string, input: AddPlacementInput, options?: {
+export declare function addPlacement(_projectRoot: string, _input: AddPlacementInput, _options?: {
     dryRun?: boolean;
 }): Placement;
 export declare const addRemoteTarget: typeof addPlacement;
-export declare function removePlacement(projectRoot: string, alias: string, options?: {
+export declare function removePlacement(_projectRoot: string, _alias: string, _options?: {
     dryRun?: boolean;
 }): {
     readonly alias: string;