@dimi-agent/cli 0.5.2 → 0.5.4

package/dist/main.mjs

@@ -6,6 +6,9 @@ const __dirname = __cjsShimDirname(__filename);
 import { createRequire } from "node:module";
 import * as nodeFs from "node:fs";
 import Vt, { ReadStream, accessSync, appendFileSync, chmodSync, closeSync, constants, copyFileSync, createReadStream, createWriteStream, existsSync, fstatSync, lstatSync, mkdirSync, openSync, promises, readFileSync, readSync, readdirSync, realpathSync, renameSync, rmSync, statSync, unlinkSync, writeFileSync } from "node:fs";
+import * as nodePath from "node:path";
+import path, { basename, dirname, extname, isAbsolute, join, normalize, parse, posix, relative, resolve, sep, win32 } from "node:path";
+import { fileURLToPath, format, pathToFileURL } from "node:url";
 import jn, { access, appendFile, chmod, copyFile, cp, lstat, mkdir, mkdtemp, open, readFile, readdir, realpath, rename, rm, stat, unlink, writeFile } from "node:fs/promises";
 import so from "node:assert";
 import net, { BlockList, isIP } from "node:net";
@@ -18,10 +21,7 @@ import * as zlib$14 from "node:zlib";
 import zlib from "node:zlib";
 import { performance as performance$1 } from "node:perf_hooks";
 import crypto$1, { createHash, createHmac, getRandomValues, randomBytes, randomInt, randomUUID, timingSafeEqual } from "node:crypto";
-import { fileURLToPath, format, pathToFileURL } from "node:url";
 import { AsyncLocalStorage } from "node:async_hooks";
-import * as nodePath from "node:path";
-import path, { basename, dirname, extname, isAbsolute, join, normalize, parse, posix, relative, resolve, sep, win32 } from "node:path";
 import { lookup } from "node:dns";
 import Kr, { EventEmitter as EventEmitter$1 } from "events";
 import { Buffer as Buffer$2 } from "buffer";
@@ -99274,18 +99274,34 @@ var init_loginShellPath = __esmMin((() => {
 * live in `dimi-wire` (Rust) and `@dimi-agent/transcript` (zod) and are
 * cross-checked by the differential test suite.
 */
+function loadPlatformSubpackage() {
+	try {
+		return nodeRequire$4(PLATFORM_SUBPACKAGE);
+	} catch {
+		return null;
+	}
+}
 /**
-* Loads the native binding, building nothing. Throws with a pointer to the
-* build command when `dist/dimi_bridge.node` is missing.
+* Loads the native binding, building nothing. Resolution order:
+*  1. `dist/dimi_bridge.node` next to the package — the dev / workspace
+*     layout (local cargo builds always win).
+*  2. the npm platform subpackage (`@dimi-agent/dimi-native-<platform>-<arch>`)
+*     — npm installs >=0.5.4; the SEA binary's module hook redirects the same
+*     specifier into the embedded native-asset cache.
+* Throws with a pointer to the build command when neither exists.
 */
 function loadNative() {
 	if (binding) return binding;
 	try {
-		binding = require$1("../dist/dimi_bridge.node");
-	} catch (error) {
-		throw new Error("dimi-native: native binding not found; run `pnpm --filter @dimi-agent/dimi-native run build:native`", { cause: error });
+		binding = nodeRequire$4("../dist/dimi_bridge.node");
+		return binding;
+	} catch {}
+	const platformBinding = loadPlatformSubpackage();
+	if (platformBinding !== null) {
+		binding = platformBinding;
+		return binding;
 	}
-	return binding;
+	throw new Error("dimi-native: native binding not found; run `pnpm --filter @dimi-agent/dimi-native run build:native`");
 }
 /** Full cold rebuild: wire records JSON array → snapshot JSON. */
 function coldRebuild(recordsJson) {
@@ -99321,9 +99337,10 @@ function rustHostEnvironmentProbe() {
 function rustTerminalSpawn(options) {
 	return loadNative().RustTerminal.spawn(options);
 }
-var require$1, binding, RustAgentTranscript, RustFileSystem;
+var nodeRequire$4, binding, PLATFORM_SUBPACKAGE, RustAgentTranscript, RustFileSystem;
 var init_src$7 = __esmMin((() => {
-	require$1 = createRequire(import.meta.url);
+	nodeRequire$4 = createRequire(import.meta.url);
+	PLATFORM_SUBPACKAGE = `@dimi-agent/dimi-native-${process.platform}-${process.arch}`;
 	RustAgentTranscript = class {
 		#inner;
 		constructor(agentId) {
@@ -99601,7 +99618,6 @@ function toRustOptions$1(options) {
 }
 var ERRNO_PREFIX, RustHostFileSystem;
 var init_rustHostFileSystemService = __esmMin((() => {
-	init_scope();
 	init_src$7();
 	init_hostFileSystem();
 	init_hostFsErrors();
@@ -393981,6 +393997,20 @@ var init_upgrade = __esmMin((() => {
 }));
 //#endregion
 //#region src/native/module-hook.ts
+/**
+* The cached dimi_bridge.node for the requested binding subpackage, or null
+* when the package resolves normally (dev / npm installs — the real package
+* wins) or the native-asset tree has no such package.
+*/
+function dimiNativeBindingPath(request) {
+	try {
+		nodeRequire.resolve(request);
+		return null;
+	} catch {}
+	const pkgRoot = getNativePackageRoot(request);
+	if (pkgRoot === null) return null;
+	return join(pkgRoot, "dimi_bridge.node");
+}
 function installNativeModuleHook() {
 	if (installed) return;
 	installed = true;
@@ -393988,28 +394018,38 @@ function installNativeModuleHook() {
 	const originalLoad = moduleBuiltin._load;
 	if (originalLoad === void 0) return;
 	moduleBuiltin._load = function loadWithNativeAssets(request, parent, isMain) {
-		if (typeof request === "string" && PI_TUI_NATIVE_PATTERN.test(request) && !existsSync(request)) {
-			const pkgRoot = getNativePackageRoot("@dimi-agent/pi-tui");
-			if (pkgRoot !== null) {
-				const match = request.match(PI_TUI_NATIVE_PATTERN);
-				if (match !== null) {
-					const redirected = join(pkgRoot, match[0]);
-					return originalLoad.call(this, redirected, parent, isMain);
+		if (typeof request === "string") {
+			if (PI_TUI_NATIVE_PATTERN.test(request) && !existsSync(request)) {
+				const pkgRoot = getNativePackageRoot("@dimi-agent/pi-tui");
+				if (pkgRoot !== null) {
+					const match = request.match(PI_TUI_NATIVE_PATTERN);
+					if (match !== null) {
+						const redirected = join(pkgRoot, match[0]);
+						return originalLoad.call(this, redirected, parent, isMain);
+					}
 				}
+			} else if (DIMI_NATIVE_SUBPACKAGE.test(request)) {
+				const redirected = dimiNativeBindingPath(request);
+				if (redirected !== null) return originalLoad.call(this, redirected, parent, isMain);
 			}
 		}
 		return originalLoad.call(this, request, parent, isMain);
 	};
 }
-var nodeRequire, installed, PI_TUI_NATIVE_PATTERN;
+var nodeRequire, installed, PI_TUI_NATIVE_PATTERN, DIMI_NATIVE_SUBPACKAGE;
 var init_module_hook = __esmMin((() => {
 	init_native_assets();
 	nodeRequire = createRequire(import.meta.url);
 	installed = false;
 	PI_TUI_NATIVE_PATTERN = /native[\\/](?:win32|darwin)[\\/]prebuilds[\\/].+\.node$/;
+	DIMI_NATIVE_SUBPACKAGE = /^@dimi-agent\/dimi-native-(?:darwin|linux|win32)-(?:arm64|x64)$/;
 }));
 //#endregion
 //#region src/native/smoke.ts
+function smokeDimiNativeLoad() {
+	const info = createRequire(import.meta.url)(dimiNativePackage)?.RustHostEnvironment?.probe?.();
+	if (typeof info !== "object" || info === null || typeof info.osKind !== "string") throw new Error("dimi-native binding loaded but probe() returned an unexpected shape");
+}
 function smokePiTuiNativeLoad() {
 	const platform = process.platform;
 	const arch = process.arch;
@@ -394027,6 +394067,7 @@ function runNativeAssetSmokeIfRequested() {
 		if (manifest === null) throw new Error("Native asset manifest is not available.");
 		for (const packageName of smokePackages) if (getNativePackageRoot(packageName, { manifest }) === null) throw new Error(`Native package is not available: ${packageName}`);
 		smokePiTuiNativeLoad();
+		smokeDimiNativeLoad();
 		process.stdout.write(`Native asset smoke passed: ${manifest.target}\n`);
 		process.exit(0);
 	} catch (error) {
@@ -394035,10 +394076,15 @@ function runNativeAssetSmokeIfRequested() {
 		process.exit(1);
 	}
 }
-var smokePackages;
+var dimiNativePackage, smokePackages;
 var init_smoke = __esmMin((() => {
 	init_native_assets();
-	smokePackages = ["@mariozechner/clipboard", "@dimi-agent/pi-tui"];
+	dimiNativePackage = `@dimi-agent/dimi-native-${process.platform}-${process.arch}`;
+	smokePackages = [
+		"@mariozechner/clipboard",
+		"@dimi-agent/pi-tui",
+		dimiNativePackage
+	];
 }));
 //#endregion
 //#region src/main-app.ts
@@ -394174,14 +394220,38 @@ var init_main_app = __esmMin((() => {
 /**
 * Dimi process entry point.
 *
-* This file must stay dependency-free (no static imports): ESM static
-* imports resolve and evaluate *before* any top-level code here runs, and
-* the agent-core-v2 OS backend modules read the legacy switch at module
+* This file must stay dependency-free (no static project imports): ESM
+* static imports resolve and evaluate *before* any top-level code here runs,
+* and the agent-core-v2 OS backend modules read the legacy switch at module
 * load time. The process-wide `--legacy` flag therefore has to be set from
 * argv before anything else loads, then the real entry (`main-app`) is
-* loaded dynamically.
+* loaded dynamically. Only node built-ins are imported here.
 */
 if (process.argv.includes("--legacy")) process.env["DIMI_LEGACY"] = "1";
-await Promise.resolve().then(() => (init_main_app(), main_app_exports));
+if (process.env["DIMI_LEGACY"] !== "1" && !nativeBindingAvailable()) {
+	process.env["DIMI_LEGACY"] = "1";
+	process.stderr.write("dimi: native runtime unavailable (dimi_bridge.node not found); falling back to the legacy TypeScript backend. Reinstall or run \"dimi upgrade\" to get the Rust runtime.\n");
+}
+Promise.resolve().then(() => (init_main_app(), main_app_exports)).catch((error) => {
+	process.stderr.write(`dimi: failed to start: ${error instanceof Error ? error.message : String(error)}\n`);
+	process.exit(1);
+});
+/** Locate the napi binding without loading it. */
+function nativeBindingAvailable() {
+	const nodeRequire = createRequire(import.meta.url);
+	try {
+		const sea = nodeRequire("node:sea");
+		if (typeof sea?.isSea === "function" && sea.isSea()) return true;
+	} catch {}
+	if (existsSync(resolve(dirname(fileURLToPath(import.meta.url)), "../dist/dimi_bridge.node"))) return true;
+	try {
+		nodeRequire.resolve(`@dimi-agent/dimi-native-${process.platform}-${process.arch}`);
+		return true;
+	} catch {}
+	try {
+		if (existsSync(resolve(dirname(nodeRequire.resolve("@dimi-agent/dimi-native/package.json")), "dist/dimi_bridge.node"))) return true;
+	} catch {}
+	return false;
+}
 //#endregion
 export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dimi-agent/cli",
-  "version": "0.5.2",
+  "version": "0.5.4",
   "description": "The Starting Point for Next-Gen Agents",
   "keywords": [
     "agent",
@@ -27,6 +27,7 @@
   },
   "files": [
     "dist",
+    "!dist/dimi_bridge.node",
     "dist-web",
     "native",
     "README.md"
@@ -60,17 +61,23 @@
     "yazl": "^3.3.1",
     "zod": "^4.3.6",
     "@dimi-agent/agent-core-v2": "^0.1.0",
+    "@dimi-agent/dimi-oauth": "^0.1.0",
     "@dimi-agent/dimi-sdk": "^0.2.0",
     "@dimi-agent/dimi-telemetry": "^0.1.0",
     "@dimi-agent/dimi-web": "^0.1.0",
-    "@dimi-agent/dimi-oauth": "^0.1.0",
     "@dimi-agent/kap-server": "^0.1.0",
     "@dimi-agent/remote": "^0.1.0",
     "@dimi-agent/pi-tui": "^0.1.0"
   },
   "optionalDependencies": {
     "@mariozechner/clipboard": "^0.3.9",
-    "node-pty": "^1.1.0"
+    "node-pty": "^1.1.0",
+    "@dimi-agent/dimi-native-darwin-arm64": ">=0.5.3 <1",
+    "@dimi-agent/dimi-native-darwin-x64": ">=0.5.3 <1",
+    "@dimi-agent/dimi-native-linux-x64": ">=0.5.3 <1",
+    "@dimi-agent/dimi-native-linux-arm64": ">=0.5.3 <1",
+    "@dimi-agent/dimi-native-win32-x64": ">=0.5.3 <1",
+    "@dimi-agent/dimi-native-win32-arm64": ">=0.5.3 <1"
   },
   "engines": {
     "node": ">=22.19.0"