@morphixai/mxenv-core 0.12.0 → 0.12.1

package/dist/index.d.ts

@@ -9,7 +9,11 @@ import * as keytar from 'keytar';
  */
 declare function warnDeprecatedBinInvocation(argv1?: string): boolean;
 
-/** 审计目录——读写单一事实源（随命名切换 `~/.mxenv/audit`，未迁移回落旧目录）；`audit` 命令读面共用本函数。 */
+/**
+ * 审计目录——读写单一事实源（0.12.1 起恒为 `~/.mxenv/audit`，写只落新名）。
+ * 旧 `~/.mx-env/audit` 的历史事件随 `mxenv migrate --home` 并入；迁移前
+ * `audit tail` 只看新目录（与 writeAudit 同源，避免读写两侧分裂）。
+ */
 declare function auditDir(homeDir?: string): string;
 /** Best-effort local audit that intentionally has no values or command arguments. */
 declare function writeAudit(event: AuditEvent, homeDir?: string): void;
@@ -57,19 +61,35 @@ declare function extractPublicVars(environment?: NodeJS.ProcessEnv): Record<stri
 
 /**
  * 全局目录兼容读取（home-migration）：`~/.mxenv/` 是命名切换后的家；兼容窗口内
- * 它不存在时读回落旧 `~/.mx-env/`（不断供），两目录并存只认新目录。迁移由
- * `mxenv migrate --home` 完成（copy → 备份改名 → 值级等价验证 → 失败回滚）。
+ * 旧 `~/.mx-env/` 仍作为数据读回落（不断供），两目录都有真实数据时只认新目录。
+ * 迁移由 `mxenv migrate --home` 完成（copy → 备份改名 → 值级等价验证 → 失败回滚）。
  *
- * 读写同一解析：兼容窗内写也落旧目录（否则审计/shim 写会先建出 `~/.mxenv/`，
- * 令 migrate --home 误判"目标已存在"）。未迁移回落触发一次性迁移提示（stderr，
- * 值不落输出），migrate --home 自身抑制。
+ * 写侧纪律（0.12.1 起）：**写只落新名**——audit/shim 一律写 `~/.mxenv/`，哪怕
+ * 数据读面还在回落旧目录。为防止"脚手架目录建出即翻转读面/卡死迁移"，判定
+ * 新目录是否生效改用 hasGlobalData（有无真实数据）而非存在性：
+ * - 只有 `audit/`/`shims/` 脚手架的新目录不翻转读面（数据仍在旧目录，不断供）；
+ * - `migrate --home` 对脚手架-only 目标不再误判 conflict，走合并迁移。
  */
 declare const LEGACY_GLOBAL_CONFIG_DIR = ".mx-env";
 /** migrate --home 自身（及其等价验证）不提示迁移。 */
 declare function suppressLegacyHomeHint(): void;
 /** 测试可观测：一次性提示是否已发出。 */
 declare function legacyHomeHintShown(): boolean;
-/** 解析当前生效的全局目录：新目录优先，旧目录兼容回落，皆无则返回新目录（新装）。 */
+/**
+ * 新目录是否持有真实数据（配置/值文件等，脚手架除外）。
+ * migrate --home 的目标存在性判定与读面翻转共用这一谓词。
+ */
+declare function hasGlobalData(homeDir?: string): boolean;
+/**
+ * 指定目录内是否持有真实数据。脚手架（audit/shims/迁移标记）、系统垃圾与
+ * 点文件（`.env` 除外——它是全局隐式值文件）都不算：`.DS_Store`/编辑器暂存
+ * 不得把读面翻转到空新目录（review F2）。
+ */
+declare function hasGlobalDataAt(dir: string): boolean;
+/**
+ * 解析当前生效的全局数据目录：新目录有真实数据 → 新目录；否则旧目录存在 →
+ * 旧目录（一次性迁移提示，每机一次）；皆无则返回新目录（新装/脚手架）。
+ */
 declare function resolveGlobalDir(homeDir?: string): string;
 
 interface InfisicalConfig {
@@ -176,8 +196,10 @@ declare class ReferenceResolver {
  * commands cannot drift past it.
  */
 declare const RESERVED_SHIM_NAMES: string[];
-/** Shims live under the renamed global dir `~/.mxenv/shims`; before `migrate --home` the legacy dir is the active library (home-migration compat read). */
+/** Shims live under the renamed global dir `~/.mxenv/shims`（0.12.1 起写只落新名，不随数据读面回落）。 */
 declare function shimsDir(homeDir?: string): string;
+/** 旧目录 shim 库（0.12.x 兼容窗）：PATH 剥离与 `--remove` 清扫仍须覆盖，防旧 shim 递归。 */
+declare function legacyShimsDir(homeDir?: string): string;
 /**
  * Validates one declared shim list. Command names are configuration, not
  * secrets, so echoing the offending entry is safe. Callers decide the blast
@@ -186,8 +208,9 @@ declare function shimsDir(homeDir?: string): string;
  */
 declare function validateShimList(list: unknown, label: string): string[];
 /**
- * Removes every PATH entry that resolves to the shims directory (filter-all,
- * so rc files that add it twice are both cleaned). Entries are compared after
+ * Removes every PATH entry that resolves to a shims directory — the current
+ * `~/.mxenv/shims` **and** the legacy `~/.mx-env/shims` (filter-all, so rc
+ * files that add it twice are both cleaned). Entries are compared after
  * realpath normalization on both sides, case-insensitively on macOS (whose
  * default filesystem would resolve `Run` to the `run` shim file).
  */
@@ -232,4 +255,4 @@ type KeytarModule = typeof keytar;
 declare function loadKeytar(): Promise<KeytarModule | null>;
 declare function loadSource(entry: SourceEntry, context: SourceContext): Promise<LoadedSource>;
 
-export { AuditEvent, ComposeOptions, ConfigLayers, EnvironmentComposition, GLOBAL_DOTENV_SOURCE, type InfisicalCliError, type InfisicalCliErrorKind, type InfisicalConfig, LEGACY_GLOBAL_CONFIG_DIR, LEGACY_RC_BLOCK_BEGIN, LEGACY_RC_BLOCK_END, LoadConfigOptions, LoadedConfig, LoadedSource, MxEnvConfig, RC_BLOCK_BEGIN, RC_BLOCK_END, RESERVED_SHIM_NAMES, ReferenceResolution, ReferenceResolver, type ResolvedSecrets, SecretSource, SourceContext, SourceEntry, SourceError, UnresolvedReference, auditDir, composeEnvironment, ensureCommand, expandHomePath, extractPublicVars, fetchInfisicalSecrets, fetchSecretsViaCLI, getInfisicalConfig, hasInfisicalCLI, hasRcBlock, isDotenvxEncrypted, isInfisicalLoggedIn, legacyHomeHintShown, loadConfig, loadConfigAt, loadConfigLayers, loadEnvFiles, loadKeytar, loadSource, parseEnvFile, rcBlock, rcBlockPattern, readInfisicalJson, replaceRcBlocks, resolveGlobalDir, resolveInfisicalSecrets, sanitizeBootEnv, shimsDir, stripShimsFromPath, suppressLegacyHomeHint, validateShimList, warnDeprecatedBinInvocation, writeAudit };
+export { AuditEvent, ComposeOptions, ConfigLayers, EnvironmentComposition, GLOBAL_DOTENV_SOURCE, type InfisicalCliError, type InfisicalCliErrorKind, type InfisicalConfig, LEGACY_GLOBAL_CONFIG_DIR, LEGACY_RC_BLOCK_BEGIN, LEGACY_RC_BLOCK_END, LoadConfigOptions, LoadedConfig, LoadedSource, MxEnvConfig, RC_BLOCK_BEGIN, RC_BLOCK_END, RESERVED_SHIM_NAMES, ReferenceResolution, ReferenceResolver, type ResolvedSecrets, SecretSource, SourceContext, SourceEntry, SourceError, UnresolvedReference, auditDir, composeEnvironment, ensureCommand, expandHomePath, extractPublicVars, fetchInfisicalSecrets, fetchSecretsViaCLI, getInfisicalConfig, hasGlobalData, hasGlobalDataAt, hasInfisicalCLI, hasRcBlock, isDotenvxEncrypted, isInfisicalLoggedIn, legacyHomeHintShown, legacyShimsDir, loadConfig, loadConfigAt, loadConfigLayers, loadEnvFiles, loadKeytar, loadSource, parseEnvFile, rcBlock, rcBlockPattern, readInfisicalJson, replaceRcBlocks, resolveGlobalDir, resolveInfisicalSecrets, sanitizeBootEnv, shimsDir, stripShimsFromPath, suppressLegacyHomeHint, validateShimList, warnDeprecatedBinInvocation, writeAudit };

package/dist/index.js

@@ -55,6 +55,8 @@ __export(src_exports, {
   fetchSecretsViaCLI: () => fetchSecretsViaCLI,
   findMxEnvReferences: () => findMxEnvReferences,
   getInfisicalConfig: () => getInfisicalConfig,
+  hasGlobalData: () => hasGlobalData,
+  hasGlobalDataAt: () => hasGlobalDataAt,
   hasInfisicalCLI: () => hasInfisicalCLI,
   hasMxEnvReference: () => hasMxEnvReference,
   hasRcBlock: () => hasRcBlock,
@@ -62,6 +64,7 @@ __export(src_exports, {
   isInfisicalLoggedIn: () => isInfisicalLoggedIn,
   isPublicKey: () => isPublicKey,
   legacyHomeHintShown: () => legacyHomeHintShown,
+  legacyShimsDir: () => legacyShimsDir,
   loadConfig: () => loadConfig,
   loadConfigAt: () => loadConfigAt,
   loadConfigLayers: () => loadConfigLayers,
@@ -265,50 +268,18 @@ var StreamingRedactor = class {
 };
 
 // src/audit.ts
-var import_fs2 = require("fs");
-var import_os2 = require("os");
-var import_path3 = require("path");
-
-// src/global-home.ts
 var import_fs = require("fs");
 var import_os = require("os");
 var import_path2 = require("path");
-var LEGACY_GLOBAL_CONFIG_DIR = ".mx-env";
-var legacyHintSuppressed = false;
-var legacyHintShown = false;
-function suppressLegacyHomeHint() {
-  legacyHintSuppressed = true;
+function auditDir(homeDir = (0, import_os.homedir)()) {
+  return (0, import_path2.join)(homeDir, GLOBAL_CONFIG_DIR, "audit");
 }
-function legacyHomeHintShown() {
-  return legacyHintShown;
-}
-function resolveGlobalDir(homeDir = (0, import_os.homedir)()) {
-  const next = (0, import_path2.resolve)(homeDir, GLOBAL_CONFIG_DIR);
-  const legacy = (0, import_path2.resolve)(homeDir, LEGACY_GLOBAL_CONFIG_DIR);
-  if ((0, import_fs.existsSync)(next)) return next;
-  if ((0, import_fs.existsSync)(legacy)) {
-    if (!legacyHintSuppressed && !legacyHintShown) {
-      legacyHintShown = true;
-      process.stderr.write(
-        `[mxenv] using legacy global directory ${legacy} \u2014 run \`mxenv migrate --home\` to move it to ${next}.
-`
-      );
-    }
-    return legacy;
-  }
-  return next;
-}
-
-// src/audit.ts
-function auditDir(homeDir = (0, import_os2.homedir)()) {
-  return (0, import_path3.join)(resolveGlobalDir(homeDir), "audit");
-}
-function writeAudit(event, homeDir = (0, import_os2.homedir)()) {
+function writeAudit(event, homeDir = (0, import_os.homedir)()) {
   try {
     const dir = auditDir(homeDir);
-    (0, import_fs2.mkdirSync)(dir, { recursive: true, mode: 448 });
+    (0, import_fs.mkdirSync)(dir, { recursive: true, mode: 448 });
     const day = event.timestamp.slice(0, 10);
-    (0, import_fs2.appendFileSync)((0, import_path3.join)(dir, `${day}.jsonl`), `${JSON.stringify(event)}
+    (0, import_fs.appendFileSync)((0, import_path2.join)(dir, `${day}.jsonl`), `${JSON.stringify(event)}
 `, { mode: 384 });
   } catch {
   }
@@ -318,17 +289,17 @@ function writeAudit(event, homeDir = (0, import_os2.homedir)()) {
 var import_os4 = require("os");
 
 // src/env.ts
-var import_fs3 = require("fs");
-var import_path4 = require("path");
+var import_fs2 = require("fs");
+var import_path3 = require("path");
 var import_dotenv = require("dotenv");
 function parseEnvFile(filePath) {
-  const absPath = (0, import_path4.resolve)(filePath);
-  if (!(0, import_fs3.existsSync)(absPath)) return {};
-  return (0, import_dotenv.parse)((0, import_fs3.readFileSync)(absPath, "utf8"));
+  const absPath = (0, import_path3.resolve)(filePath);
+  if (!(0, import_fs2.existsSync)(absPath)) return {};
+  return (0, import_dotenv.parse)((0, import_fs2.readFileSync)(absPath, "utf8"));
 }
 function isDotenvxEncrypted(filePath) {
   try {
-    const content = (0, import_fs3.readFileSync)((0, import_path4.resolve)(filePath), "utf8");
+    const content = (0, import_fs2.readFileSync)((0, import_path3.resolve)(filePath), "utf8");
     return content.includes("DOTENV_PUBLIC_KEY") && /^[A-Za-z_][A-Za-z0-9_.]*="?encrypted:/m.test(content);
   } catch {
     return false;
@@ -337,9 +308,9 @@ function isDotenvxEncrypted(filePath) {
 function loadEnvFiles(files) {
   const overrides = [];
   for (const file of files) {
-    const absPath = (0, import_path4.resolve)(file);
-    if (!(0, import_fs3.existsSync)(absPath)) continue;
-    const parsed = (0, import_dotenv.parse)((0, import_fs3.readFileSync)(absPath, "utf8"));
+    const absPath = (0, import_path3.resolve)(file);
+    if (!(0, import_fs2.existsSync)(absPath)) continue;
+    const parsed = (0, import_dotenv.parse)((0, import_fs2.readFileSync)(absPath, "utf8"));
     if (parsed) {
       Object.assign(process.env, parsed);
       for (const key of Object.keys(parsed)) {
@@ -370,6 +341,63 @@ var import_dotenv3 = require("dotenv");
 var import_fs4 = require("fs");
 var import_path5 = require("path");
 var import_os3 = require("os");
+
+// src/global-home.ts
+var import_fs3 = require("fs");
+var import_os2 = require("os");
+var import_path4 = require("path");
+var LEGACY_GLOBAL_CONFIG_DIR = ".mx-env";
+var GLOBAL_SCAFFOLDING = /* @__PURE__ */ new Set(["audit", "shims", ".mxenv-verify-pending"]);
+var JUNK_NAMES = /* @__PURE__ */ new Set(["Thumbs.db", "desktop.ini"]);
+var HINT_MARKER_NAME = ".mxenv-legacy-hint-shown";
+var legacyHintSuppressed = false;
+var legacyHintShown = false;
+function suppressLegacyHomeHint() {
+  legacyHintSuppressed = true;
+}
+function legacyHomeHintShown() {
+  return legacyHintShown;
+}
+function hasGlobalData(homeDir = (0, import_os2.homedir)()) {
+  return hasGlobalDataAt((0, import_path4.resolve)(homeDir, GLOBAL_CONFIG_DIR));
+}
+function hasGlobalDataAt(dir) {
+  let entries;
+  try {
+    entries = (0, import_fs3.readdirSync)(dir);
+  } catch {
+    return false;
+  }
+  return entries.some(
+    (name) => !GLOBAL_SCAFFOLDING.has(name) && !JUNK_NAMES.has(name) && (!name.startsWith(".") || name === ".env")
+  );
+}
+function resolveGlobalDir(homeDir = (0, import_os2.homedir)()) {
+  const next = (0, import_path4.resolve)(homeDir, GLOBAL_CONFIG_DIR);
+  const legacy = (0, import_path4.resolve)(homeDir, LEGACY_GLOBAL_CONFIG_DIR);
+  if (hasGlobalDataAt(next)) return next;
+  if ((0, import_fs3.existsSync)(legacy)) {
+    hintLegacyHomeOnce(legacy, next);
+    return legacy;
+  }
+  return next;
+}
+function hintLegacyHomeOnce(legacy, next) {
+  if (legacyHintSuppressed || legacyHintShown) return;
+  const marker = (0, import_path4.resolve)(legacy, HINT_MARKER_NAME);
+  try {
+    if ((0, import_fs3.existsSync)(marker)) return;
+    (0, import_fs3.writeFileSync)(marker, "", { mode: 384 });
+  } catch {
+  }
+  legacyHintShown = true;
+  process.stderr.write(
+    `[mxenv] using legacy global directory ${legacy} \u2014 run \`mxenv migrate --home\` to move it to ${next}.
+`
+  );
+}
+
+// src/config.ts
 function safeParseConfig(path) {
   try {
     const value = JSON.parse((0, import_fs4.readFileSync)(path, "utf8"));
@@ -1037,7 +1065,10 @@ var RESERVED_SHIM_NAMES = [
 ];
 var SHIM_NAME_PATTERN = /^[A-Za-z0-9][A-Za-z0-9._-]*$/;
 function shimsDir(homeDir = (0, import_os5.homedir)()) {
-  return (0, import_path8.join)(resolveGlobalDir(homeDir), "shims");
+  return (0, import_path8.join)(homeDir, GLOBAL_CONFIG_DIR, "shims");
+}
+function legacyShimsDir(homeDir = (0, import_os5.homedir)()) {
+  return (0, import_path8.join)(homeDir, LEGACY_GLOBAL_CONFIG_DIR, "shims");
 }
 function validateShimList(list, label) {
   if (list === void 0 || list === null) return [];
@@ -1068,13 +1099,16 @@ function validateShimList(list, label) {
 }
 function stripShimsFromPath(pathValue, homeDir = (0, import_os5.homedir)()) {
   if (!pathValue) return pathValue;
-  const target = shimsDir(homeDir);
-  let targetReal = target;
-  try {
-    targetReal = (0, import_fs7.realpathSync)(target);
-  } catch {
-  }
   const equal = (a, b) => process.platform === "darwin" ? a.toLowerCase() === b.toLowerCase() : a === b;
+  const targets = [shimsDir(homeDir), legacyShimsDir(homeDir)];
+  const targetPairs = targets.map((target) => {
+    let real = target;
+    try {
+      real = (0, import_fs7.realpathSync)(target);
+    } catch {
+    }
+    return [target, real];
+  });
   const entries = pathValue.split(import_path8.delimiter).filter((entry) => {
     if (!entry) return true;
     const literal = entry.replace(/\/+$/, "");
@@ -1083,7 +1117,7 @@ function stripShimsFromPath(pathValue, homeDir = (0, import_os5.homedir)()) {
       resolved = (0, import_fs7.realpathSync)(literal);
     } catch {
     }
-    return !equal(literal, target) && !equal(resolved, targetReal);
+    return !targetPairs.some(([target, real]) => equal(literal, target) || equal(resolved, real));
   });
   return entries.join(import_path8.delimiter);
 }
@@ -1156,6 +1190,8 @@ function escapeRegExp(text) {
   fetchSecretsViaCLI,
   findMxEnvReferences,
   getInfisicalConfig,
+  hasGlobalData,
+  hasGlobalDataAt,
   hasInfisicalCLI,
   hasMxEnvReference,
   hasRcBlock,
@@ -1163,6 +1199,7 @@ function escapeRegExp(text) {
   isInfisicalLoggedIn,
   isPublicKey,
   legacyHomeHintShown,
+  legacyShimsDir,
   loadConfig,
   loadConfigAt,
   loadConfigLayers,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@morphixai/mxenv-core",
-  "version": "0.12.0",
+  "version": "0.12.1",
   "description": "L0 contracts + L1 shared capabilities for mxenv — composition engine, providers, value-safe compose (revealSingle 归 Wave B).",
   "license": "MIT",
   "author": "MorphixAI <dev@morphixai.com>",