@metaobjectsdev/cli 0.15.2 → 0.15.4-rc.1

package/dist/src/lib/load-metaobjects-config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"load-metaobjects-config.d.ts","sourceRoot":"","sources":["../../../src/lib/load-metaobjects-config.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,4BAA4B,CAAC;AAmFvE,wBAAsB,qBAAqB,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAgC9F"}
+{"version":3,"file":"load-metaobjects-config.d.ts","sourceRoot":"","sources":["../../../src/lib/load-metaobjects-config.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,4BAA4B,CAAC;AA8IvE,wBAAsB,qBAAqB,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,oBAAoB,CAAC,CA8E9F"}

package/dist/src/lib/load-metaobjects-config.js

@@ -1,9 +1,16 @@
-import { existsSync } from "node:fs";
+import { existsSync, readdirSync, unlinkSync } from "node:fs";
+import { readFile, writeFile } from "node:fs/promises";
 import { createRequire } from "node:module";
-import { resolve } from "node:path";
+import { dirname, resolve } from "node:path";
 import { fileURLToPath } from "node:url";
+import { randomBytes } from "node:crypto";
 import { createJiti } from "jiti";
 const CONFIG_FILE = "metaobjects.config.ts";
+// Prefix for the transient, pre-processed config the loader writes next to the
+// user's config (see the rewrite step below). Normally deleted in a finally
+// block; the prefix is also used to sweep any copies stranded by an abnormal
+// exit so a consumer's `git status` never surfaces one.
+const PROC_TEMP_PREFIX = ".metaobjects-config-proc-";
 // Resolve @metaobjectsdev/codegen-ts from the CLI's own node_modules so that
 // metaobjects.config.ts (which lives in the user's project) can import it even
 // when the user's project has no direct dependency on the package.
@@ -53,8 +60,8 @@ const CLI_PKG_PATHS = {
         src: "src/index.ts",
     },
 };
-// Resolve a codegen specifier to an absolute path for jiti's alias map, so a
-// user's metaobjects.config.ts can import @metaobjectsdev/codegen-ts* without
+// Resolve a codegen specifier to an absolute path, so a user's
+// metaobjects.config.ts can import @metaobjectsdev/codegen-ts* without
 // declaring it directly — the CLI's own copy is used.
 //
 // Standard module resolution is tried first: it follows whatever node_modules
@@ -62,6 +69,12 @@ const CLI_PKG_PATHS = {
 // NOT nested under the CLI dir), or bun — and honors the package's export
 // conditions. The CLI_PKG_PATHS fallback only kicks in when a specifier isn't
 // require-resolvable from the CLI module.
+//
+// Under Bun's native loader `require.resolve` returns the TypeScript source
+// path (via the "bun" export condition, e.g. `src/index.ts`). When a `.ts`
+// path is returned, we prefer the compiled dist path (always a plain JS file)
+// so the pre-processed config source references a deterministic artifact that
+// won't be intercepted by stale ancestor node_modules directories.
 function resolveCliPkg(specifier) {
     const paths = CLI_PKG_PATHS[specifier];
     // The cli self-reference always points at this package's own entry, never a
@@ -70,7 +83,17 @@ function resolveCliPkg(specifier) {
         return resolve(_cliDir, _isCompiled ? paths.dist : paths.src);
     }
     try {
-        return _require.resolve(specifier);
+        const resolved = _require.resolve(specifier);
+        // When Bun's native "bun" export condition returns a `.ts` source path,
+        // prefer the compiled dist path so the pre-processed config references a
+        // stable JS artifact that the loader can load without the "bun" condition
+        // redirecting it to a different module instance.
+        if (resolved.endsWith(".ts") && paths !== undefined) {
+            const distCandidate = resolve(_cliDir, paths.dist);
+            if (existsSync(distCandidate))
+                return distCandidate;
+        }
+        return resolved;
     }
     catch {
         if (paths !== undefined) {
@@ -81,35 +104,114 @@ function resolveCliPkg(specifier) {
         throw new Error(`metaobjects: could not resolve ${specifier} from the CLI — try reinstalling @metaobjectsdev/cli.`);
     }
 }
+/**
+ * Rewrite `from "specifier"` / `export … from "specifier"` / bare
+ * `import "specifier"` occurrences for a known set of package specifiers.
+ * Returns the original string unchanged when no substitutions are needed.
+ *
+ * This is necessary because jiti 2.x under Bun's native ESM loader does not
+ * apply its `alias` map — Bun intercepts the `import()` call and resolves
+ * modules itself, ignoring jiti's alias configuration. By rewriting the
+ * specifiers in the source text before loading, we guarantee that absolute
+ * paths are used regardless of which loader takes over.
+ *
+ * Relative imports (`./foo`, `../bar`) are intentionally NOT rewritten; they
+ * must continue to resolve relative to the config file's own directory.
+ *
+ * Dynamic `import("specifier")` calls are NOT rewritten either — configs are
+ * loaded eagerly and none of the scaffolded templates use them; a dynamic
+ * import of an aliased package falls back to normal module resolution (and to
+ * jiti's alias map on non-Bun runtimes).
+ */
+function rewriteImportSpecifiers(source, aliasMap) {
+    let result = source;
+    for (const [specifier, resolvedPath] of Object.entries(aliasMap)) {
+        const esc = specifier.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+        // Rewrite: from "specifier" or from 'specifier'
+        // Covers: import { X } from "pkg", export { X } from "pkg"
+        result = result.replace(new RegExp(`(\\bfrom\\s+)(['"])${esc}\\2`, "g"), (_m, prefix, quote) => `${prefix}${quote}${resolvedPath}${quote}`);
+        // Rewrite: import "specifier" or import 'specifier' (side-effect imports)
+        result = result.replace(new RegExp(`(\\bimport\\s+)(['"])${esc}\\2`, "g"), (_m, prefix, quote) => `${prefix}${quote}${resolvedPath}${quote}`);
+    }
+    return result;
+}
 export async function loadMetaobjectsConfig(projectRoot) {
     const fullPath = resolve(projectRoot, CONFIG_FILE);
     if (!existsSync(fullPath)) {
         throw new Error(`metaobjects.config.ts not found at ${fullPath}. Run 'meta init' to scaffold one.`);
     }
-    // Use import.meta.url as base so jiti resolves workspace deps (@metaobjectsdev/*)
-    // from the CLI's own node_modules, not from the user's project root.
-    // The alias map redirects codegen-ts imports to the CLI's own copy so that
-    // user projects don't need @metaobjectsdev/codegen-ts as a direct dependency.
+    // Self-heal: a SIGKILL mid-load can strand a pre-processed temp config
+    // (PROC_TEMP_PREFIX*.ts) next to the user's config, since deletion normally
+    // happens in the finally block below. Sweep any stale ones before loading so
+    // an abnormal exit never pollutes the consumer's working tree.
+    const configDir = dirname(fullPath);
+    for (const entry of readdirSync(configDir)) {
+        if (entry.startsWith(PROC_TEMP_PREFIX) && entry.endsWith(".ts")) {
+            try {
+                unlinkSync(resolve(configDir, entry));
+            }
+            catch { /* best-effort */ }
+        }
+    }
+    // Build the canonical alias map: specifier → resolved absolute path.
+    const aliasMap = {};
+    for (const specifier of Object.keys(CLI_PKG_PATHS)) {
+        aliasMap[specifier] = resolveCliPkg(specifier);
+    }
+    // Pre-process the config file content to rewrite @metaobjectsdev/* import
+    // specifiers to resolved absolute paths. This is the primary mechanism that
+    // ensures the CLI's own copies are used: jiti's `alias` map is kept below as
+    // a belt-and-suspenders fallback for runtimes where jiti's transformer IS
+    // active, but under Bun the pre-processed source is the operative fix.
+    const original = await readFile(fullPath, "utf8");
+    const processed = rewriteImportSpecifiers(original, aliasMap);
+    // When any specifiers were rewritten, write the modified source to a temp
+    // file in the SAME directory as the original so that relative imports inside
+    // the config (e.g. `from "./codegen/generators/entity"`) still resolve
+    // correctly. The file is deleted in the finally block below.
+    let loadPath = fullPath;
+    let tempCreated = false;
+    if (processed !== original) {
+        const tempName = `${PROC_TEMP_PREFIX}${randomBytes(4).toString("hex")}.ts`;
+        const tempPath = resolve(dirname(fullPath), tempName);
+        try {
+            await writeFile(tempPath, processed, "utf8");
+            loadPath = tempPath;
+            tempCreated = true;
+        }
+        catch {
+            // Temp write failed — fall back to the original file and let the loader
+            // attempt its own resolution (best-effort; may still fail in hostile envs).
+            loadPath = fullPath;
+        }
+    }
+    // jiti's alias map is a belt-and-suspenders fallback for runtimes where
+    // jiti's own transformer is active (non-Bun, or a future jiti version that
+    // re-enables alias under Bun). Under Bun the pre-processed file above is the
+    // operative fix.
     const jiti = createJiti(import.meta.url, {
         interopDefault: true,
-        alias: {
-            "@metaobjectsdev/codegen-ts": resolveCliPkg("@metaobjectsdev/codegen-ts"),
-            "@metaobjectsdev/metadata": resolveCliPkg("@metaobjectsdev/metadata"),
-            "@metaobjectsdev/codegen-ts/generators": resolveCliPkg("@metaobjectsdev/codegen-ts/generators"),
-            "@metaobjectsdev/codegen-ts-react": resolveCliPkg("@metaobjectsdev/codegen-ts-react"),
-            "@metaobjectsdev/codegen-ts-tanstack": resolveCliPkg("@metaobjectsdev/codegen-ts-tanstack"),
-            "@metaobjectsdev/cli": resolveCliPkg("@metaobjectsdev/cli"),
-        },
+        alias: aliasMap,
     });
-    const raw = (await jiti.import(fullPath));
-    // jiti's interopDefault doesn't always unwrap the default export when accessed
-    // across module boundaries — explicitly unwrap if present.
-    const cfg = (raw && typeof raw === "object" && "default" in raw && raw.default
-        ? raw.default
-        : raw);
-    if (!cfg || typeof cfg !== "object" || !Array.isArray(cfg.generators)) {
-        throw new Error(`metaobjects.config.ts at ${fullPath} did not export a valid MetaobjectsGenConfig (missing 'generators' array).`);
+    try {
+        const raw = (await jiti.import(loadPath));
+        // jiti's interopDefault doesn't always unwrap the default export when accessed
+        // across module boundaries — explicitly unwrap if present.
+        const cfg = (raw && typeof raw === "object" && "default" in raw && raw.default
+            ? raw.default
+            : raw);
+        if (!cfg || typeof cfg !== "object" || !Array.isArray(cfg.generators)) {
+            throw new Error(`metaobjects.config.ts at ${fullPath} did not export a valid MetaobjectsGenConfig (missing 'generators' array).`);
+        }
+        return cfg;
+    }
+    finally {
+        if (tempCreated) {
+            try {
+                unlinkSync(loadPath);
+            }
+            catch { /* best-effort cleanup */ }
+        }
     }
-    return cfg;
 }
 //# sourceMappingURL=load-metaobjects-config.js.map

package/dist/src/lib/load-metaobjects-config.js.map

@@ -1 +1 @@
-{"version":3,"file":"load-metaobjects-config.js","sourceRoot":"","sources":["../../../src/lib/load-metaobjects-config.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"load-metaobjects-config.js","sourceRoot":"","sources":["../../../src/lib/load-metaobjects-config.ts"],"names":[],"mappings":"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"}

package/dist/src/lib/pm-detect.d.ts

@@ -1,10 +1,24 @@
 export type PackageManager = "npm" | "pnpm" | "yarn" | "bun";
+/**
+ * Options for `detectPackageManager`.
+ */
+export interface DetectPackageManagerOptions {
+    /**
+     * Stop walking up the directory tree at this path (inclusive). Useful in
+     * tests or isolated environments where walking above the project root would
+     * accidentally find a lockfile in an unrelated ancestor directory (e.g. a
+     * stale `/tmp/package-lock.json` on a shared CI machine).
+     *
+     * If omitted the walk continues all the way to the filesystem root.
+     */
+    stopAt?: string;
+}
 /**
  * Detect the package manager in use by looking for the lockfile closest to
- * `dir`. Walks up to the root. Returns "bun" as the default when no lockfile
- * is found.
+ * `dir`. Walks up to the filesystem root (or `options.stopAt`, if supplied).
+ * Returns "bun" as the default when no lockfile is found.
  */
-export declare function detectPackageManager(dir: string): Promise<PackageManager>;
+export declare function detectPackageManager(dir: string, options?: DetectPackageManagerOptions): Promise<PackageManager>;
 /**
  * Returns the install command for a missing package, using the detected PM.
  */

package/dist/src/lib/pm-detect.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"pm-detect.d.ts","sourceRoot":"","sources":["../../../src/lib/pm-detect.ts"],"names":[],"mappings":"AAGA,MAAM,MAAM,cAAc,GAAG,KAAK,GAAG,MAAM,GAAG,MAAM,GAAG,KAAK,CAAC;AAE7D;;;;GAIG;AACH,wBAAsB,oBAAoB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,CAAC,CAyB/E;AAED;;GAEG;AACH,wBAAsB,cAAc,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAY9E"}
+{"version":3,"file":"pm-detect.d.ts","sourceRoot":"","sources":["../../../src/lib/pm-detect.ts"],"names":[],"mappings":"AAGA,MAAM,MAAM,cAAc,GAAG,KAAK,GAAG,MAAM,GAAG,MAAM,GAAG,KAAK,CAAC;AAE7D;;GAEG;AACH,MAAM,WAAW,2BAA2B;IAC1C;;;;;;;OAOG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED;;;;GAIG;AACH,wBAAsB,oBAAoB,CACxC,GAAG,EAAE,MAAM,EACX,OAAO,CAAC,EAAE,2BAA2B,GACpC,OAAO,CAAC,cAAc,CAAC,CA2BzB;AAED;;GAEG;AACH,wBAAsB,cAAc,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAY9E"}

package/dist/src/lib/pm-detect.js

@@ -2,11 +2,11 @@ import { access } from "node:fs/promises";
 import { join } from "node:path";
 /**
  * Detect the package manager in use by looking for the lockfile closest to
- * `dir`. Walks up to the root. Returns "bun" as the default when no lockfile
- * is found.
+ * `dir`. Walks up to the filesystem root (or `options.stopAt`, if supplied).
+ * Returns "bun" as the default when no lockfile is found.
  */
-export async function detectPackageManager(dir) {
-    // Check in the given dir first, then parent dirs up to the FS root.
+export async function detectPackageManager(dir, options) {
+    // Check in the given dir first, then parent dirs up to the FS root (or stopAt).
     let current = dir;
     while (true) {
         const candidates = [
@@ -25,9 +25,12 @@ export async function detectPackageManager(dir) {
                 // not found, try next
             }
         }
+        // Honor the stopAt boundary before walking up further.
+        if (options?.stopAt !== undefined && current === options.stopAt)
+            break;
         const parent = join(current, "..");
         if (parent === current)
-            break; // reached root
+            break; // reached filesystem root
         current = parent;
     }
     // Default: bun (most common for this toolchain)

package/dist/src/lib/pm-detect.js.map

@@ -1 +1 @@
-{"version":3,"file":"pm-detect.js","sourceRoot":"","sources":["../../../src/lib/pm-detect.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAC1C,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAIjC;;;;GAIG;AACH,MAAM,CAAC,KAAK,UAAU,oBAAoB,CAAC,GAAW;IACpD,oEAAoE;IACpE,IAAI,OAAO,GAAG,GAAG,CAAC;IAClB,OAAO,IAAI,EAAE,CAAC;QACZ,MAAM,UAAU,GAA+B;YAC7C,CAAC,IAAI,CAAC,OAAO,EAAE,mBAAmB,CAAC,EAAE,KAAK,CAAC;YAC3C,CAAC,IAAI,CAAC,OAAO,EAAE,gBAAgB,CAAC,EAAE,MAAM,CAAC;YACzC,CAAC,IAAI,CAAC,OAAO,EAAE,WAAW,CAAC,EAAE,MAAM,CAAC;YACpC,CAAC,IAAI,CAAC,OAAO,EAAE,WAAW,CAAC,EAAE,KAAK,CAAC;YACnC,CAAC,IAAI,CAAC,OAAO,EAAE,UAAU,CAAC,EAAE,KAAK,CAAC;SACnC,CAAC;QACF,KAAK,MAAM,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,UAAU,EAAE,CAAC;YACpC,IAAI,CAAC;gBACH,MAAM,MAAM,CAAC,IAAI,CAAC,CAAC;gBACnB,OAAO,EAAE,CAAC;YACZ,CAAC;YAAC,MAAM,CAAC;gBACP,sBAAsB;YACxB,CAAC;QACH,CAAC;QACD,MAAM,MAAM,GAAG,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;QACnC,IAAI,MAAM,KAAK,OAAO;YAAE,MAAM,CAAC,eAAe;QAC9C,OAAO,GAAG,MAAM,CAAC;IACnB,CAAC;IACD,gDAAgD;IAChD,OAAO,KAAK,CAAC;AACf,CAAC;AAED;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,cAAc,CAAC,GAAW,EAAE,GAAW;IAC3D,MAAM,EAAE,GAAG,MAAM,oBAAoB,CAAC,GAAG,CAAC,CAAC;IAC3C,QAAQ,EAAE,EAAE,CAAC;QACX,KAAK,KAAK;YACR,OAAO,eAAe,GAAG,EAAE,CAAC;QAC9B,KAAK,MAAM;YACT,OAAO,YAAY,GAAG,EAAE,CAAC;QAC3B,KAAK,MAAM;YACT,OAAO,YAAY,GAAG,EAAE,CAAC;QAC3B,KAAK,KAAK;YACR,OAAO,WAAW,GAAG,EAAE,CAAC;IAC5B,CAAC;AACH,CAAC"}
+{"version":3,"file":"pm-detect.js","sourceRoot":"","sources":["../../../src/lib/pm-detect.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAC1C,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAmBjC;;;;GAIG;AACH,MAAM,CAAC,KAAK,UAAU,oBAAoB,CACxC,GAAW,EACX,OAAqC;IAErC,gFAAgF;IAChF,IAAI,OAAO,GAAG,GAAG,CAAC;IAClB,OAAO,IAAI,EAAE,CAAC;QACZ,MAAM,UAAU,GAA+B;YAC7C,CAAC,IAAI,CAAC,OAAO,EAAE,mBAAmB,CAAC,EAAE,KAAK,CAAC;YAC3C,CAAC,IAAI,CAAC,OAAO,EAAE,gBAAgB,CAAC,EAAE,MAAM,CAAC;YACzC,CAAC,IAAI,CAAC,OAAO,EAAE,WAAW,CAAC,EAAE,MAAM,CAAC;YACpC,CAAC,IAAI,CAAC,OAAO,EAAE,WAAW,CAAC,EAAE,KAAK,CAAC;YACnC,CAAC,IAAI,CAAC,OAAO,EAAE,UAAU,CAAC,EAAE,KAAK,CAAC;SACnC,CAAC;QACF,KAAK,MAAM,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,UAAU,EAAE,CAAC;YACpC,IAAI,CAAC;gBACH,MAAM,MAAM,CAAC,IAAI,CAAC,CAAC;gBACnB,OAAO,EAAE,CAAC;YACZ,CAAC;YAAC,MAAM,CAAC;gBACP,sBAAsB;YACxB,CAAC;QACH,CAAC;QACD,uDAAuD;QACvD,IAAI,OAAO,EAAE,MAAM,KAAK,SAAS,IAAI,OAAO,KAAK,OAAO,CAAC,MAAM;YAAE,MAAM;QACvE,MAAM,MAAM,GAAG,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;QACnC,IAAI,MAAM,KAAK,OAAO;YAAE,MAAM,CAAC,0BAA0B;QACzD,OAAO,GAAG,MAAM,CAAC;IACnB,CAAC;IACD,gDAAgD;IAChD,OAAO,KAAK,CAAC;AACf,CAAC;AAED;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,cAAc,CAAC,GAAW,EAAE,GAAW;IAC3D,MAAM,EAAE,GAAG,MAAM,oBAAoB,CAAC,GAAG,CAAC,CAAC;IAC3C,QAAQ,EAAE,EAAE,CAAC;QACX,KAAK,KAAK;YACR,OAAO,eAAe,GAAG,EAAE,CAAC;QAC9B,KAAK,MAAM;YACT,OAAO,YAAY,GAAG,EAAE,CAAC;QAC3B,KAAK,MAAM;YACT,OAAO,YAAY,GAAG,EAAE,CAAC;QAC3B,KAAK,KAAK;YACR,OAAO,WAAW,GAAG,EAAE,CAAC;IAC5B,CAAC;AACH,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@metaobjectsdev/cli",
-  "version": "0.15.2",
+  "version": "0.15.4-rc.1",
   "description": "CLI for MetaObjects: scaffold, codegen, migrate, and drift-detection commands.",
   "type": "module",
   "main": "./dist/src/index.js",
@@ -49,14 +49,14 @@
   ],
   "dependencies": {
     "@libsql/kysely-libsql": "^0.4.0",
-    "@metaobjectsdev/codegen-ts": "0.15.2",
-    "@metaobjectsdev/codegen-ts-react": "0.15.2",
-    "@metaobjectsdev/codegen-ts-tanstack": "0.15.2",
-    "@metaobjectsdev/metadata": "0.15.2",
-    "@metaobjectsdev/migrate-ts": "0.15.2",
-    "@metaobjectsdev/render": "0.15.2",
-    "@metaobjectsdev/runtime-ts": "0.15.2",
-    "@metaobjectsdev/sdk": "0.15.2",
+    "@metaobjectsdev/codegen-ts": "0.15.4-rc.1",
+    "@metaobjectsdev/codegen-ts-react": "0.15.4-rc.1",
+    "@metaobjectsdev/codegen-ts-tanstack": "0.15.4-rc.1",
+    "@metaobjectsdev/metadata": "0.15.4-rc.1",
+    "@metaobjectsdev/migrate-ts": "0.15.4-rc.1",
+    "@metaobjectsdev/render": "0.15.4-rc.1",
+    "@metaobjectsdev/runtime-ts": "0.15.4-rc.1",
+    "@metaobjectsdev/sdk": "0.15.4-rc.1",
     "@toon-format/toon": "^2.3.0",
     "jiti": "^2.4.0"
   },

package/src/lib/load-metaobjects-config.ts

@@ -1,12 +1,20 @@
-import { existsSync } from "node:fs";
+import { existsSync, readdirSync, unlinkSync } from "node:fs";
+import { readFile, writeFile } from "node:fs/promises";
 import { createRequire } from "node:module";
-import { resolve } from "node:path";
+import { dirname, resolve } from "node:path";
 import { fileURLToPath } from "node:url";
+import { randomBytes } from "node:crypto";
 import { createJiti } from "jiti";
 import type { MetaobjectsGenConfig } from "@metaobjectsdev/codegen-ts";
 
 const CONFIG_FILE = "metaobjects.config.ts";
 
+// Prefix for the transient, pre-processed config the loader writes next to the
+// user's config (see the rewrite step below). Normally deleted in a finally
+// block; the prefix is also used to sweep any copies stranded by an abnormal
+// exit so a consumer's `git status` never surfaces one.
+const PROC_TEMP_PREFIX = ".metaobjects-config-proc-";
+
 // Resolve @metaobjectsdev/codegen-ts from the CLI's own node_modules so that
 // metaobjects.config.ts (which lives in the user's project) can import it even
 // when the user's project has no direct dependency on the package.
@@ -57,8 +65,8 @@ const CLI_PKG_PATHS: Record<string, { dist: string; src: string }> = {
   },
 };
 
-// Resolve a codegen specifier to an absolute path for jiti's alias map, so a
-// user's metaobjects.config.ts can import @metaobjectsdev/codegen-ts* without
+// Resolve a codegen specifier to an absolute path, so a user's
+// metaobjects.config.ts can import @metaobjectsdev/codegen-ts* without
 // declaring it directly — the CLI's own copy is used.
 //
 // Standard module resolution is tried first: it follows whatever node_modules
@@ -66,6 +74,12 @@ const CLI_PKG_PATHS: Record<string, { dist: string; src: string }> = {
 // NOT nested under the CLI dir), or bun — and honors the package's export
 // conditions. The CLI_PKG_PATHS fallback only kicks in when a specifier isn't
 // require-resolvable from the CLI module.
+//
+// Under Bun's native loader `require.resolve` returns the TypeScript source
+// path (via the "bun" export condition, e.g. `src/index.ts`). When a `.ts`
+// path is returned, we prefer the compiled dist path (always a plain JS file)
+// so the pre-processed config source references a deterministic artifact that
+// won't be intercepted by stale ancestor node_modules directories.
 function resolveCliPkg(specifier: string): string {
   const paths = CLI_PKG_PATHS[specifier];
   // The cli self-reference always points at this package's own entry, never a
@@ -74,7 +88,16 @@ function resolveCliPkg(specifier: string): string {
     return resolve(_cliDir, _isCompiled ? paths.dist : paths.src);
   }
   try {
-    return _require.resolve(specifier);
+    const resolved = _require.resolve(specifier);
+    // When Bun's native "bun" export condition returns a `.ts` source path,
+    // prefer the compiled dist path so the pre-processed config references a
+    // stable JS artifact that the loader can load without the "bun" condition
+    // redirecting it to a different module instance.
+    if (resolved.endsWith(".ts") && paths !== undefined) {
+      const distCandidate = resolve(_cliDir, paths.dist);
+      if (existsSync(distCandidate)) return distCandidate;
+    }
+    return resolved;
   } catch {
     if (paths !== undefined) {
       const candidate = resolve(_cliDir, _isCompiled ? paths.dist : paths.src);
@@ -86,6 +109,44 @@ function resolveCliPkg(specifier: string): string {
   }
 }
 
+/**
+ * Rewrite `from "specifier"` / `export … from "specifier"` / bare
+ * `import "specifier"` occurrences for a known set of package specifiers.
+ * Returns the original string unchanged when no substitutions are needed.
+ *
+ * This is necessary because jiti 2.x under Bun's native ESM loader does not
+ * apply its `alias` map — Bun intercepts the `import()` call and resolves
+ * modules itself, ignoring jiti's alias configuration. By rewriting the
+ * specifiers in the source text before loading, we guarantee that absolute
+ * paths are used regardless of which loader takes over.
+ *
+ * Relative imports (`./foo`, `../bar`) are intentionally NOT rewritten; they
+ * must continue to resolve relative to the config file's own directory.
+ *
+ * Dynamic `import("specifier")` calls are NOT rewritten either — configs are
+ * loaded eagerly and none of the scaffolded templates use them; a dynamic
+ * import of an aliased package falls back to normal module resolution (and to
+ * jiti's alias map on non-Bun runtimes).
+ */
+function rewriteImportSpecifiers(source: string, aliasMap: Record<string, string>): string {
+  let result = source;
+  for (const [specifier, resolvedPath] of Object.entries(aliasMap)) {
+    const esc = specifier.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+    // Rewrite: from "specifier" or from 'specifier'
+    // Covers: import { X } from "pkg", export { X } from "pkg"
+    result = result.replace(
+      new RegExp(`(\\bfrom\\s+)(['"])${esc}\\2`, "g"),
+      (_m, prefix, quote) => `${prefix}${quote}${resolvedPath}${quote}`,
+    );
+    // Rewrite: import "specifier" or import 'specifier' (side-effect imports)
+    result = result.replace(
+      new RegExp(`(\\bimport\\s+)(['"])${esc}\\2`, "g"),
+      (_m, prefix, quote) => `${prefix}${quote}${resolvedPath}${quote}`,
+    );
+  }
+  return result;
+}
+
 export async function loadMetaobjectsConfig(projectRoot: string): Promise<MetaobjectsGenConfig> {
   const fullPath = resolve(projectRoot, CONFIG_FILE);
   if (!existsSync(fullPath)) {
@@ -93,29 +154,75 @@ export async function loadMetaobjectsConfig(projectRoot: string): Promise<Metaob
       `metaobjects.config.ts not found at ${fullPath}. Run 'meta init' to scaffold one.`,
     );
   }
-  // Use import.meta.url as base so jiti resolves workspace deps (@metaobjectsdev/*)
-  // from the CLI's own node_modules, not from the user's project root.
-  // The alias map redirects codegen-ts imports to the CLI's own copy so that
-  // user projects don't need @metaobjectsdev/codegen-ts as a direct dependency.
+
+  // Self-heal: a SIGKILL mid-load can strand a pre-processed temp config
+  // (PROC_TEMP_PREFIX*.ts) next to the user's config, since deletion normally
+  // happens in the finally block below. Sweep any stale ones before loading so
+  // an abnormal exit never pollutes the consumer's working tree.
+  const configDir = dirname(fullPath);
+  for (const entry of readdirSync(configDir)) {
+    if (entry.startsWith(PROC_TEMP_PREFIX) && entry.endsWith(".ts")) {
+      try { unlinkSync(resolve(configDir, entry)); } catch { /* best-effort */ }
+    }
+  }
+
+  // Build the canonical alias map: specifier → resolved absolute path.
+  const aliasMap: Record<string, string> = {};
+  for (const specifier of Object.keys(CLI_PKG_PATHS)) {
+    aliasMap[specifier] = resolveCliPkg(specifier);
+  }
+
+  // Pre-process the config file content to rewrite @metaobjectsdev/* import
+  // specifiers to resolved absolute paths. This is the primary mechanism that
+  // ensures the CLI's own copies are used: jiti's `alias` map is kept below as
+  // a belt-and-suspenders fallback for runtimes where jiti's transformer IS
+  // active, but under Bun the pre-processed source is the operative fix.
+  const original = await readFile(fullPath, "utf8");
+  const processed = rewriteImportSpecifiers(original, aliasMap);
+
+  // When any specifiers were rewritten, write the modified source to a temp
+  // file in the SAME directory as the original so that relative imports inside
+  // the config (e.g. `from "./codegen/generators/entity"`) still resolve
+  // correctly. The file is deleted in the finally block below.
+  let loadPath = fullPath;
+  let tempCreated = false;
+  if (processed !== original) {
+    const tempName = `${PROC_TEMP_PREFIX}${randomBytes(4).toString("hex")}.ts`;
+    const tempPath = resolve(dirname(fullPath), tempName);
+    try {
+      await writeFile(tempPath, processed, "utf8");
+      loadPath = tempPath;
+      tempCreated = true;
+    } catch {
+      // Temp write failed — fall back to the original file and let the loader
+      // attempt its own resolution (best-effort; may still fail in hostile envs).
+      loadPath = fullPath;
+    }
+  }
+
+  // jiti's alias map is a belt-and-suspenders fallback for runtimes where
+  // jiti's own transformer is active (non-Bun, or a future jiti version that
+  // re-enables alias under Bun). Under Bun the pre-processed file above is the
+  // operative fix.
   const jiti = createJiti(import.meta.url, {
     interopDefault: true,
-    alias: {
-      "@metaobjectsdev/codegen-ts": resolveCliPkg("@metaobjectsdev/codegen-ts"),
-      "@metaobjectsdev/metadata": resolveCliPkg("@metaobjectsdev/metadata"),
-      "@metaobjectsdev/codegen-ts/generators": resolveCliPkg("@metaobjectsdev/codegen-ts/generators"),
-      "@metaobjectsdev/codegen-ts-react": resolveCliPkg("@metaobjectsdev/codegen-ts-react"),
-      "@metaobjectsdev/codegen-ts-tanstack": resolveCliPkg("@metaobjectsdev/codegen-ts-tanstack"),
-      "@metaobjectsdev/cli": resolveCliPkg("@metaobjectsdev/cli"),
-    },
+    alias: aliasMap,
   });
-  const raw = (await jiti.import(fullPath)) as MetaobjectsGenConfig | { default: MetaobjectsGenConfig };
-  // jiti's interopDefault doesn't always unwrap the default export when accessed
-  // across module boundaries — explicitly unwrap if present.
-  const cfg = (raw && typeof raw === "object" && "default" in raw && raw.default
-    ? (raw as { default: MetaobjectsGenConfig }).default
-    : raw) as MetaobjectsGenConfig;
-  if (!cfg || typeof cfg !== "object" || !Array.isArray(cfg.generators)) {
-    throw new Error(`metaobjects.config.ts at ${fullPath} did not export a valid MetaobjectsGenConfig (missing 'generators' array).`);
+
+  try {
+    const raw = (await jiti.import(loadPath)) as MetaobjectsGenConfig | { default: MetaobjectsGenConfig };
+    // jiti's interopDefault doesn't always unwrap the default export when accessed
+    // across module boundaries — explicitly unwrap if present.
+    const cfg = (raw && typeof raw === "object" && "default" in raw && raw.default
+      ? (raw as { default: MetaobjectsGenConfig }).default
+      : raw) as MetaobjectsGenConfig;
+    if (!cfg || typeof cfg !== "object" || !Array.isArray(cfg.generators)) {
+      throw new Error(`metaobjects.config.ts at ${fullPath} did not export a valid MetaobjectsGenConfig (missing 'generators' array).`);
+    }
+    return cfg;
+  } finally {
+    if (tempCreated) {
+      try { unlinkSync(loadPath); } catch { /* best-effort cleanup */ }
+    }
   }
-  return cfg;
 }

package/src/lib/pm-detect.ts

@@ -3,13 +3,31 @@ import { join } from "node:path";
 
 export type PackageManager = "npm" | "pnpm" | "yarn" | "bun";
 
+/**
+ * Options for `detectPackageManager`.
+ */
+export interface DetectPackageManagerOptions {
+  /**
+   * Stop walking up the directory tree at this path (inclusive). Useful in
+   * tests or isolated environments where walking above the project root would
+   * accidentally find a lockfile in an unrelated ancestor directory (e.g. a
+   * stale `/tmp/package-lock.json` on a shared CI machine).
+   *
+   * If omitted the walk continues all the way to the filesystem root.
+   */
+  stopAt?: string;
+}
+
 /**
  * Detect the package manager in use by looking for the lockfile closest to
- * `dir`. Walks up to the root. Returns "bun" as the default when no lockfile
- * is found.
+ * `dir`. Walks up to the filesystem root (or `options.stopAt`, if supplied).
+ * Returns "bun" as the default when no lockfile is found.
  */
-export async function detectPackageManager(dir: string): Promise<PackageManager> {
-  // Check in the given dir first, then parent dirs up to the FS root.
+export async function detectPackageManager(
+  dir: string,
+  options?: DetectPackageManagerOptions,
+): Promise<PackageManager> {
+  // Check in the given dir first, then parent dirs up to the FS root (or stopAt).
   let current = dir;
   while (true) {
     const candidates: [string, PackageManager][] = [
@@ -27,8 +45,10 @@ export async function detectPackageManager(dir: string): Promise<PackageManager>
         // not found, try next
       }
     }
+    // Honor the stopAt boundary before walking up further.
+    if (options?.stopAt !== undefined && current === options.stopAt) break;
     const parent = join(current, "..");
-    if (parent === current) break; // reached root
+    if (parent === current) break; // reached filesystem root
     current = parent;
   }
   // Default: bun (most common for this toolchain)