@liangmi/mo 0.0.5 → 1.0.1

package/dist/mo-inner.mjs

@@ -1,5 +1,7 @@
-import { S as cac, _ as buildAliasLines, c as supportedShells, l as error, o as getDefaultConfigPath, s as loadConfig, t as innerBinName } from "./runner-BDAeQY-R.mjs";
-import { existsSync } from "node:fs";
+import { c as getDefaultConfigPath, d as error, l as loadConfig, n as getRestartFlagPath, r as innerBinName, u as supportedShells, w as cac, y as buildAliasLines } from "./runner-DW0Q4OMK.mjs";
+import { existsSync, readFileSync, rmSync } from "node:fs";
+import { tmpdir } from "node:os";
+import path from "node:path";
 //#region src/inner/shell.ts
 function generateShellIntegration(shell) {
 	if (!isValidShell(shell)) error(`Invalid shell "${shell}". Supported: ${supportedShells.join(", ")}`);
@@ -8,53 +10,40 @@ function generateShellIntegration(shell) {
 	else return generateFishIntegration(aliases);
 }
 function generateBashZshIntegration(aliases) {
+	const lines = buildAliasLines(aliases, (name, target) => `alias ${name}='${target}'`);
 	return [
 		"# mo shell integration script",
+		`# Clear restart flag if present (setup completed in previous shell)`,
+		`rm -f "${getRestartFlagPath()}" 2>/dev/null || true`,
 		"mo() {",
-		"  if [ \"$1\" = \"cd\" ] || [ \"$1\" = \"d\" ]; then",
-		"    shift",
-		"    local mo_cd_target",
-		"    mo_cd_target=\"$(command mo cd \"$@\")\" || return $?",
-		"    export MO_CD_TARGET=\"$mo_cd_target\"",
-		"  else",
-		"    command mo \"$@\" || return $?",
-		"  fi",
-		"",
+		"  command mo \"$@\" || return $?",
 		"  local mo_cd_result",
 		"  mo_cd_result=\"$(mo-inner cd)\" || return $?",
 		"  if [ -n \"$mo_cd_result\" ] && [ \"$mo_cd_result\" != \".\" ]; then",
 		"    cd \"$mo_cd_result\" || return $?",
 		"  fi",
-		"",
-		"  unset MO_CD_TARGET",
 		"}",
-		...buildAliasLines(aliases, (name, target) => `alias ${name}='${target}'`),
+		...lines,
 		""
 	].join("\n");
 }
 function generateFishIntegration(aliases) {
+	const lines = buildAliasLines(aliases, (name, target) => `alias ${name} '${target}'`);
 	return [
 		"# mo shell integration script",
+		"# Clear restart flag if present (setup completed in previous shell)",
+		`rm -f "${getRestartFlagPath()}" 2>/dev/null; or true`,
 		"function mo",
-		"  if test (count $argv) -gt 0; and begin; test \"$argv[1]\" = \"cd\"; or test \"$argv[1]\" = \"d\"; end",
-		"    set -l mo_cd_target (command mo cd $argv[2..-1])",
-		"    or return $status",
-		"    set -gx MO_CD_TARGET \"$mo_cd_target\"",
-		"  else",
-		"    command mo $argv",
-		"    or return $status",
-		"  end",
-		"",
+		"  command mo $argv",
+		"  or return $status",
 		"  set -l mo_cd_result (mo-inner cd)",
 		"  or return $status",
 		"  if test -n \"$mo_cd_result\"; and test \"$mo_cd_result\" != \".\"",
 		"    cd \"$mo_cd_result\"",
 		"    or return $status",
 		"  end",
-		"",
-		"  set -e MO_CD_TARGET",
 		"end",
-		...buildAliasLines(aliases, (name, target) => `alias ${name} '${target}'`),
+		...lines,
 		""
 	].join("\n");
 }
@@ -70,17 +59,20 @@ function loadAliasConfig() {
 	}
 }
 //#endregion
+//#region src/inner/cd.ts
+function getCdPath() {
+	const targetFile = path.join(tmpdir(), "mo-cd-target");
+	if (!existsSync(targetFile)) return ".";
+	const pending = readFileSync(targetFile, "utf8").trim();
+	rmSync(targetFile);
+	if (!pending) return ".";
+	return pending;
+}
+//#endregion
 //#region src/mo-inner.ts
 const cli = cac(innerBinName);
 cli.command("shell <shell>", "Generate shell integration code").action((shell) => console.log(generateShellIntegration(shell)));
-cli.command("cd", "Print pending directory path from shell state").action(() => {
-	const pending = process.env.MO_CD_TARGET;
-	if (typeof pending !== "string" || !pending.trim()) {
-		console.log(".");
-		return;
-	}
-	console.log(pending);
-});
+cli.command("cd", "Print pending directory path from shell state").action(() => console.log(getCdPath()));
 cli.parse();
 //#endregion
 export {};