@weotro/dx 0.1.19 → 0.2.0

package/bin/dx.js

@@ -1,187 +1,114 @@
 #!/usr/bin/env node
-
-import { existsSync } from 'node:fs'
-import { resolve, dirname, join } from 'node:path'
+import { statSync, lstatSync, readdirSync, openSync, readSync, closeSync, accessSync, constants } from 'node:fs'
+import { dirname, join } from 'node:path'
+import { spawn } from 'node:child_process'
 import { fileURLToPath } from 'node:url'
-
-function parseConfigDir(argv) {
-  const envValue = process.env.DX_CONFIG_DIR
-  if (envValue) return String(envValue)
-
-  const args = Array.isArray(argv) ? argv : []
-  const idx = args.indexOf('--config-dir')
-  if (idx !== -1 && idx + 1 < args.length) return String(args[idx + 1])
-  for (const token of args) {
-    if (token.startsWith('--config-dir=')) return String(token.slice('--config-dir='.length))
+import { logger } from '../lib/logger.js'
+import { getPackageVersion } from '../lib/version.js'
+import { loadEnvironment } from '../lib/env.js'
+import { runBaseSetup } from '../lib/setup.js'
+
+const [command, ...args] = process.argv.slice(2)
+function hasShebang(entry) {
+  const descriptor = openSync(entry, 'r')
+  try {
+    const prefix = Buffer.alloc(4096)
+    const length = readSync(descriptor, prefix, 0, prefix.length, 0)
+    const firstLine = prefix.subarray(0, length).toString().split('\n', 1)[0]
+    // Keep the header within Linux's exec limit to prevent shell fallback or truncation.
+    return Buffer.byteLength(firstLine) <= 255 && /^#![ \t]*\/[^\s\0]+(?:[ \t]|$)/.test(firstLine)
+  } finally {
+    closeSync(descriptor)
   }
-  return null
 }
-
-function stripConfigDirArgs(argv) {
-  const args = Array.isArray(argv) ? [...argv] : []
-  const out = []
-  for (let i = 0; i < args.length; i++) {
-    const token = args[i]
-    if (token === '--config-dir') {
-      i++
-      continue
-    }
-    if (token.startsWith('--config-dir=')) continue
-    out.push(token)
+try {
+  if (command === '--version') {
+    process.stdout.write(`${getPackageVersion()}\n`)
+    process.exit(0)
   }
-  return out
-}
-
-function isVersionInvocation(argv) {
-  const raw = Array.isArray(argv) ? argv : []
-  const filtered = stripConfigDirArgs(raw)
-
-  const flags = []
-  const positionals = []
-  for (const token of filtered) {
-    if (token === '--') break
-    if (token.startsWith('-')) flags.push(token)
-    else positionals.push(token)
-  }
-
-  // Keep current semantics:
-  // - -V/--version always prints version and exits.
-  // - -v is verbose in commands, but `dx -v` is commonly expected to show version.
-  const hasCanonicalVersionFlag = flags.includes('-V') || flags.includes('--version')
-  if (hasCanonicalVersionFlag) return true
-
-  const isBareLowerV = flags.length === 1 && flags[0] === '-v' && positionals.length === 0
-  if (isBareLowerV) return true
-
-  const isVersionCommand = positionals.length === 1 && positionals[0] === 'version'
-  if (isVersionCommand) return true
-
-  return false
-}
-
-function isInitialInvocation(argv) {
-  const raw = Array.isArray(argv) ? argv : []
-  const filtered = stripConfigDirArgs(raw)
-
-  for (const token of filtered) {
-    if (token === '--') break
-    if (token.startsWith('-')) continue
-    return token === 'initial'
-  }
-
-  return false
-}
-
-function findProjectRootFrom(startDir) {
-  let current = resolve(startDir)
-  while (true) {
-    const marker = join(current, 'dx', 'config', 'commands.json')
-    if (existsSync(marker)) return current
-
-    const parent = dirname(current)
-    if (parent === current) return null
-    current = parent
-  }
-}
-
-function findRepoRootFrom(startDir) {
-  let current = resolve(startDir)
-  while (true) {
-    // ai-monorepo style marker
-    if (existsSync(join(current, 'pnpm-workspace.yaml'))) return current
-    // fallback marker
-    if (existsSync(join(current, 'package.json'))) return current
-
-    const parent = dirname(current)
-    if (parent === current) return null
-    current = parent
+  if (command === 'initial') {
+    if (args.length === 1 && args[0] === '--help') {
+      process.stdout.write('用法：dx initial\n将包内 skills 同步到 ~/.agents/skills，并在 ~/.claude/skills 建立链接；更新托管技能并清理历史旧副本。无需应用工程。\n')
+    } else {
+      if (args.length) throw new Error('initial 不接受应用参数；请使用 dx initial 或 dx initial --help。')
+      const { runCodexInitial } = await import('../lib/codex-initial.js')
+      await runCodexInitial({ packageRoot: fileURLToPath(new URL('../', import.meta.url)) })
+    }
+    process.exit(0)
   }
-}
-
-function inferProjectRootFromConfigDir(configDir, startDir) {
-  const normalized = String(configDir).replace(/\\/g, '/')
-  if (normalized.endsWith('/dx/config')) return resolve(configDir, '..', '..')
-  if (normalized.endsWith('/scripts/config')) return resolve(configDir, '..', '..')
-
-  return findRepoRootFrom(configDir) || findRepoRootFrom(startDir) || resolve(startDir)
-}
-
-async function main() {
-  const rawArgs = process.argv.slice(2)
-
-  if (isVersionInvocation(rawArgs)) {
-    const { getPackageVersion } = await import('../lib/version.js')
-    console.log(getPackageVersion())
-    return
+  const help = command === undefined || command === '--help'
+  if (!help && !/^[a-z][a-z0-9-]*$/.test(command)) {
+    throw new Error('非法命令名：仅接受小写字母开头，后接小写字母、数字或连字符。')
   }
-
-  if (isInitialInvocation(rawArgs)) {
-    const packageRoot = resolve(dirname(fileURLToPath(import.meta.url)), '..')
-    const [{ logger }, { runCodexInitial }] = await Promise.all([
-      import('../lib/logger.js'),
-      import('../lib/codex-initial.js'),
-    ])
-
+  let root = process.cwd()
+  for (;;) {
+    const marker = join(root, 'dx/scripts')
+    let markerExists = false
     try {
-      await runCodexInitial({ packageRoot })
-      return
+      lstatSync(marker)
+      markerExists = true
+      if (!statSync(marker).isDirectory()) throw new Error(`工程标记 ${marker} 不是目录；请改为脚本目录。`)
+      accessSync(marker, constants.R_OK | constants.X_OK)
+      break
     } catch (error) {
-      logger.error('initial 执行失败')
-      logger.error(error?.message || String(error))
-      process.exit(1)
+      if (markerExists || error.code !== 'ENOENT') throw new Error(`无法读取工程标记 ${marker}：${error.message}；请检查目录类型、链接目标与读取、搜索权限。`)
     }
-  }
-
-  const overrideConfigDir = parseConfigDir(rawArgs)
-  const filteredArgs = stripConfigDirArgs(rawArgs)
-
-  const startDir = process.cwd()
-  let projectRoot
-  let configDir
-
-  if (overrideConfigDir) {
-    // When dx is installed globally, users may prefer providing DX_CONFIG_DIR/--config-dir.
-    // In that case, do not require dx/config marker discovery.
-    configDir = resolve(startDir, overrideConfigDir)
-    if (!existsSync(join(configDir, 'commands.json'))) {
-      console.error(`dx: 配置目录无效: ${configDir}`)
-      console.error('dx: 期望存在 commands.json')
-      process.exit(1)
+    const parent = dirname(root)
+    if (parent === root) {
+      if (help) { root = null; break }
+      throw new Error('未找到工程：请创建 dx/scripts/<command> 可执行脚本。')
     }
-    projectRoot = inferProjectRootFromConfigDir(configDir, startDir)
-  } else {
-    projectRoot = findProjectRootFrom(startDir)
-    if (!projectRoot) {
-      console.error('dx: 未找到项目配置目录: dx/config/commands.json')
-      console.error('dx: 请在项目目录内执行 dx，或先创建 dx/config 并放置 commands.json')
-      console.error('dx: 也可通过 DX_CONFIG_DIR 或 --config-dir 指定配置目录')
-      process.exit(1)
-    }
-    configDir = join(projectRoot, 'dx', 'config')
+    root = parent
   }
-
-  process.env.DX_PROJECT_ROOT = projectRoot
-  process.env.DX_CONFIG_DIR = configDir
-
-  process.chdir(projectRoot)
-
-  process.argv = [process.argv[0], process.argv[1], ...filteredArgs]
-
-  const [{ logger }, { DxCli }] = await Promise.all([
-    import('../lib/logger.js'),
-    import('../lib/cli/dx-cli.js'),
-  ])
-
-  const cli = new DxCli({ projectRoot, configDir: process.env.DX_CONFIG_DIR, invocation: 'dx' })
-  await cli.run().catch(error => {
-    logger.error('CLI启动失败')
-    logger.error(error?.message || String(error))
-    process.exit(1)
+  if (help) {
+    const entries = root ? readdirSync(join(root, 'dx/scripts')).filter(name => {
+      if (name === 'initial' || !/^[a-z][a-z0-9-]*$/.test(name)) return false
+      const entry = join(root, 'dx/scripts', name)
+      try {
+        if (!statSync(entry).isFile()) return false
+        accessSync(entry, constants.R_OK | constants.X_OK)
+        return hasShebang(entry)
+      } catch { return false }
+    }).sort() : []
+    process.stdout.write(`用法：dx <command> [args...]\n内置命令：initial（同步包内 skills，无需应用工程）\n标准入口：setup start build test db deploy\n当前工程入口：${entries.join(' ') || '无'}\n入口：dx/scripts/<command>，需可执行权限和 shebang。\n--help 显示帮助；--version 显示版本。应用命令后的参数原样传给应用脚本。\n`)
+    process.exit(0)
+  }
+  const entry = join(root, 'dx/scripts', command)
+  try {
+    if (!statSync(entry).isFile()) throw new Error('入口不是普通文件')
+    accessSync(entry, constants.R_OK | constants.X_OK)
+  } catch (error) {
+    throw new Error(`命令 ${command} 无法使用入口 ${entry}：${error.message}；请创建带 shebang 的脚本并执行 chmod +x "${entry}"，检查读取与执行权限。`)
+  }
+  if (!hasShebang(entry)) throw new Error(`命令 ${command} 的入口 ${entry} 缺少有效 shebang；请在首行指定解释器绝对路径，例如 #!/bin/sh，首行不得超过 255 字节（不含换行）。`)
+  if (command === 'setup') runBaseSetup(root)
+  const env = loadEnvironment(root, args)
+  const startupError = error => `命令 ${command} 启动失败，入口 ${entry}：${error.message}；请检查 shebang 解释器已安装、PATH 与执行权限。`
+  let child
+  try {
+    child = spawn(entry, args, { cwd: root, env, stdio: 'inherit' })
+  } catch (error) {
+    throw new Error(startupError(error))
+  }
+  const forwardInt = () => child.kill('SIGINT')
+  const forwardTerm = () => child.kill('SIGTERM')
+  process.on('SIGINT', forwardInt)
+  process.on('SIGTERM', forwardTerm)
+  const cleanup = () => {
+    process.removeListener('SIGINT', forwardInt)
+    process.removeListener('SIGTERM', forwardTerm)
+  }
+  child.on('error', error => {
+    cleanup()
+    logger.error(startupError(error))
+    process.exitCode = 1
+  })
+  child.on('exit', (code, signal) => {
+    cleanup()
+    if (signal) process.kill(process.pid, signal)
+    else process.exitCode = code
   })
+} catch (error) {
+  logger.error(error.message)
+  process.exitCode = 1
 }
-
-main().catch(error => {
-  console.error('dx: CLI启动失败')
-  console.error(error?.message || String(error))
-  process.exit(1)
-})

package/example/.env.development

@@ -0,0 +1 @@
+EXAMPLE_GREETING=开发环境演示

package/example/README.md

@@ -0,0 +1,24 @@
+# 应用脚本最小示例
+
+本目录展示目标 monorepo 如何提供 `dx/scripts/` 入口。脚本仅演示接口，不执行真实依赖安装、数据库写入或部署。
+
+在本目录执行：
+
+```bash
+node ../bin/dx.js --help
+node ../bin/dx.js setup
+node ../bin/dx.js start stack
+node ../bin/dx.js start admin
+node ../bin/dx.js build admin
+node ../bin/dx.js test
+node ../bin/dx.js db --help
+node ../bin/dx.js deploy --help
+```
+
+`setup` 演示 clone 或新 worktree 后显式进行准备。dx 默认加载工程根 `.env.development` 和可选的 `.env.development.local`；`start` 直接使用注入的环境。`stack` 对应示例定义的全部服务，`admin` 对应单个应用。
+
+在 linked worktree 中运行 setup 时，dx 先从主 Git 工作目录按相对路径复制所有缺失的 .local 文件，再加载环境并调用示例脚本；已有目标不覆盖。该公共步骤无需应用手动调用。这里的示例位于 Git 根的 example 子目录，因此其本地覆盖文件为 example/.env.development.local。
+
+实际工程应替换这些示例的应用逻辑。入口使用 shebang 和可执行权限，内部实现可以拆分到工程自己的其他文件。多服务并发启动、失败处理和子进程清理由工程自行决定。
+
+环境文件中的值只用于示例，不包含真实凭据。本地真实值放入被 Git 忽略的 `.env.development.local`。标准流和参数保留原样，应用自行提供 `--help`。可用 `node ../bin/dx.js start admin --prod` 选择 production 文件。

package/example/dx/scripts/build

@@ -0,0 +1,2 @@
+#!/bin/sh
+printf '演示构建，收到 %s 个参数。\n' "$#"

package/example/dx/scripts/db

@@ -0,0 +1,2 @@
+#!/bin/sh
+printf '演示数据库入口，收到 %s 个参数。\n' "$#"

package/example/dx/scripts/deploy

@@ -0,0 +1,2 @@
+#!/bin/sh
+printf '演示部署入口，实际确认、安全策略和恢复由应用负责。\n'

package/example/dx/scripts/setup

@@ -0,0 +1,2 @@
+#!/bin/sh
+printf '演示工程准备，具体安装和生成步骤由应用维护。\n'

package/example/dx/scripts/start

@@ -0,0 +1,12 @@
+#!/usr/bin/env node
+// dx 注入环境；应用定义启动目标及具体启动方式。
+const [target = 'stack'] = process.argv.slice(2)
+const environment = process.env.APP_ENV
+const applications = ['backend', 'admin']
+if (target !== 'stack' && !applications.includes(target)) {
+  console.error(`未知目标 ${target}，可选 stack、backend、admin。`)
+  process.exit(1)
+}
+const selected = target === 'stack' ? applications : [target]
+console.log(`${process.env.EXAMPLE_GREETING || '启动演示'}：environment=${environment} target=${target}`)
+for (const application of selected) console.log(`演示启动 ${application}`)

package/example/dx/scripts/test

@@ -0,0 +1,2 @@
+#!/bin/sh
+printf '演示测试，收到 %s 个参数。\n' "$#"

package/lib/env.js

@@ -1,261 +1,44 @@
-import { existsSync, readFileSync } from 'node:fs'
-import { isAbsolute, join } from 'node:path'
-
-function resolveProjectRoot() {
-  return process.env.DX_PROJECT_ROOT || process.cwd()
-}
-
-function resolveConfigDir() {
-  const projectRoot = resolveProjectRoot()
-  return process.env.DX_CONFIG_DIR || join(projectRoot, 'dx', 'config')
-}
-
-export class EnvManager {
-  constructor() {
-    this.projectRoot = resolveProjectRoot()
-    this.configDir = resolveConfigDir()
-    this.envLayers = this.loadEnvLayers()
-    this.latestEnvWarnings = []
-
-    // APP_ENV → NODE_ENV 映射（用于运行时行为和工具链，如 Nx/Next）
-    // 注意：'e2e' 在 dotenv 层使用独立层（.env.e2e），但在 NODE_ENV 上归并为 'test'
-    this.APP_TO_NODE_ENV = {
-      local: 'development',
-      development: 'development',
-      staging: 'production',
-      production: 'production',
-      e2e: 'test',
-      test: 'test',
-    }
-  }
-
-  // 加载环境层级配置
-  loadEnvLayers() {
+import { readFileSync } from 'node:fs'
+import { join } from 'node:path'
+import { parse } from 'dotenv'
+import { expand } from 'dotenv-expand'
+
+const flags = new Map([
+  ['--prod', 'production'], ['--staging', 'staging'], ['--dev', 'development'],
+  ['--test', 'test'], ['--e2e', 'e2e'],
+])
+const nodeEnvironments = new Map([
+  ['development', 'development'], ['staging', 'production'], ['production', 'production'],
+  ['test', 'test'], ['e2e', 'test'],
+])
+
+export function loadEnvironment(root, args, inherited = process.env) {
+  const separator = args.indexOf('--')
+  const selectors = separator < 0 ? args : args.slice(0, separator)
+  const explicit = [...flags].find(([flag]) => selectors.includes(flag))?.[1]
+  const requested = String(explicit || inherited.APP_ENV || inherited.NODE_ENV || 'development').toLowerCase()
+  const environment = requested === 'local' || requested === 'dev' ? 'development' : requested
+  if (!nodeEnvironments.has(environment)) {
+    throw new Error('无法选择环境；请使用 --dev、--prod、--staging、--test、--e2e，或设置有效的 APP_ENV / NODE_ENV。')
+  }
+
+  const env = { ...inherited, APP_ENV: environment, NODE_ENV: nodeEnvironments.get(environment) }
+  for (const name of [`.env.${environment}`, `.env.${environment}.local`]) {
+    const path = join(root, name)
+    let content
     try {
-      const configPath = join(this.configDir, 'env-layers.json')
-      return JSON.parse(readFileSync(configPath, 'utf8'))
+      content = readFileSync(path, 'utf8')
     } catch (error) {
-      // 使用默认配置（按环境 → 全局本地 → 环境本地 的优先级）
-      return {
-        development: ['.env.development', '.env.development.local'],
-        staging: ['.env.staging', '.env.staging.local'],
-        production: ['.env.production', '.env.production.local'],
-        test: ['.env.test', '.env.test.local'],
-        e2e: ['.env.e2e', '.env.e2e.local'],
-      }
-    }
-  }
-
-  // 将 APP_ENV 规范化为 dotenv 层（development/production/test/e2e）
-  mapAppEnvToLayerEnv(appEnv) {
-    const env = String(appEnv || '').toLowerCase()
-    if (env === 'e2e') return 'e2e'
-    if (env === 'staging') return 'staging'
-    if (env === 'production') return 'production'
-    if (env === 'test') return 'test'
-    return 'development'
-  }
-
-  // 将 APP_ENV 规范化为 NODE_ENV（development/production/test）
-  mapAppEnvToNodeEnv(appEnv) {
-    const env = String(appEnv || '').toLowerCase()
-    return this.APP_TO_NODE_ENV[env] || 'development'
-  }
-
-  // 同步 APP_ENV 与 NODE_ENV（不改变现有 APP_ENV；仅在缺失或需规范化时设置 NODE_ENV）
-  syncEnvironments(appEnv) {
-    const app = String(appEnv || process.env.APP_ENV || '').toLowerCase()
-    if (app) {
-      const node = this.mapAppEnvToNodeEnv(app)
-      process.env.APP_ENV = app
-      process.env.NODE_ENV = node
-      return { appEnv: app, nodeEnv: node }
-    }
-    // 若没有 APP_ENV，仍保证 NODE_ENV 有合理默认值
-    process.env.NODE_ENV = process.env.NODE_ENV || 'development'
-    return { appEnv: process.env.APP_ENV, nodeEnv: process.env.NODE_ENV }
-  }
-
-  // 检测当前环境（用于选择 dotenv 层，如 .env.production/.env.e2e）
-  detectEnvironment(flags = {}) {
-    if (flags.prod) return 'production'
-    if (flags.staging) return 'staging'
-    if (flags.dev) return 'development'
-    if (flags.test) return 'test'
-    if (flags.e2e) return 'e2e'
-
-    // 优先基于 APP_ENV 选择 dotenv 层
-    if (process.env.APP_ENV) {
-      return this.mapAppEnvToLayerEnv(process.env.APP_ENV)
-    }
-
-    // 回退到 NODE_ENV
-    return process.env.NODE_ENV || 'development'
-  }
-
-  // 获取解析后的 dotenv 层级路径
-  getResolvedEnvLayers(app, environment) {
-    const layers = this.envLayers[environment] || []
-    if (!app) return layers
-    return layers.map(layer => layer.replace('{app}', app))
-  }
-
-  // 构建dotenv命令参数
-  buildEnvFlags(app, environment, options = {}) {
-    const absolute = Boolean(options.absolute)
-    return this.getResolvedEnvLayers(app, environment)
-      .map(layer => {
-        const envFile = absolute && !isAbsolute(layer) ? join(this.projectRoot, layer) : layer
-        return `-e ${envFile}`
-      })
-      .join(' ')
-  }
-
-  // 检查必需环境变量
-  validateRequiredVars(requiredVars = [], sourceEnv = process.env) {
-    const missing = []
-    const placeholders = []
-
-    requiredVars.forEach(varName => {
-      const value = sourceEnv[varName]
-      if (value === undefined || value === null) {
-        missing.push(varName)
-        return
-      }
-
-      if (this.isPlaceholderEnvValue(value)) {
-        placeholders.push(varName)
-      }
-    })
-
-    if (missing.length > 0 || placeholders.length > 0) {
-      return { valid: false, missing, placeholders }
-    }
-    return { valid: true, missing: [], placeholders: [] }
-  }
-
-  // 判断环境变量值是否缺失或仅为占位内容
-  isMissingEnvValue(value) {
-    if (value === undefined || value === null) return true
-    return this.isPlaceholderEnvValue(value)
-  }
-
-  // 占位符判定：空串/空格/包裹引号但内容为空/null/undefined
-  isPlaceholderEnvValue(value) {
-    const stringValue = String(value)
-    const trimmed = stringValue.trim()
-    if (trimmed.length === 0) return true
-
-    let unwrapped = trimmed
-    const firstChar = trimmed[0]
-    const lastChar = trimmed[trimmed.length - 1]
-    const isQuotedPair =
-      (firstChar === '"' || firstChar === "'" || firstChar === '`') && firstChar === lastChar
-    if (trimmed.length >= 2 && isQuotedPair) {
-      unwrapped = trimmed.slice(1, -1).trim()
-      if (unwrapped.length === 0) return true
-    }
-
-    if (unwrapped.includes('__SET_IN_env.local__')) return true
-
-    const normalized = unwrapped.toLowerCase()
-    return normalized === 'null' || normalized === 'undefined'
-  }
-
-  collectEnvFromLayers(app, environment) {
-    const layers = this.getResolvedEnvLayers(app, environment)
-    const result = {}
-    const warnings = []
-
-    const interpolate = value =>
-      value.replace(/\$\{([^}]+)\}/g, (_, name) => {
-        const key = name.trim()
-        if (Object.prototype.hasOwnProperty.call(result, key)) return result[key]
-        if (process.env[key] !== undefined) return process.env[key]
-        return ''
-      })
-
-    layers.forEach(layer => {
-      const filePath = join(this.projectRoot, layer)
-      if (!existsSync(filePath)) return
-
-      try {
-        const content = readFileSync(filePath, 'utf8')
-        const lines = content.split(/\r?\n/)
-        for (const rawLine of lines) {
-          const line = rawLine.trim()
-          if (!line || line.startsWith('#')) continue
-          const eqIdx = line.indexOf('=')
-          if (eqIdx <= 0) continue
-          const key = line.slice(0, eqIdx).trim()
-          if (!key) continue
-          let value = line.slice(eqIdx + 1)
-
-          // 移除行末注释（仅当值未被引号包裹时处理）
-          let commentIndex = -1
-          if (!/^\s*['"`]/.test(value)) {
-            commentIndex = value.indexOf(' #')
-            if (commentIndex !== -1) {
-              value = value.slice(0, commentIndex)
-            }
-          }
-
-          value = value.trim()
-          const isSingleQuoted = value.startsWith("'") && value.endsWith("'")
-          const isDoubleQuoted = value.startsWith('"') && value.endsWith('"')
-          const isBacktickQuoted = value.startsWith('`') && value.endsWith('`')
-
-          if (isSingleQuoted || isDoubleQuoted || isBacktickQuoted) {
-            value = value.slice(1, -1)
-          }
-
-          if (!isSingleQuoted) {
-            value = interpolate(value)
-          }
-
-          const previous = result[key]
-          const previousIsNonEmpty = previous !== undefined && String(previous).trim().length > 0
-          if (previousIsNonEmpty && value.trim().length === 0) {
-            warnings.push(`环境文件 ${layer} 将 ${key} 覆盖为空值，请确认层级顺序是否正确`)
-          }
-
-          result[key] = value
-        }
-      } catch (error) {
-        throw new Error(`读取环境文件失败 (${filePath}): ${error.message}`)
-      }
-    })
-
-    this.latestEnvWarnings = warnings
-    return result
-  }
-
-  // 智能错误修复建议
-  suggestFixes(missing, environment) {
-    const env = environment || this.detectEnvironment()
-    return missing.map(varName => ({
-      var: varName,
-      suggestion: `请检查以下文件中的 ${varName} 配置:`,
-      files: [`.env.${env}`, `.env.${env}.local`],
-    }))
-  }
-
-  // 获取环境描述
-  getEnvironmentDescription(environment) {
-    const descriptions = {
-      development: '开发环境',
-      staging: '预发环境',
-      production: '生产环境',
-      test: '测试环境',
-      e2e: 'E2E测试环境',
+      if (error.code === 'ENOENT') continue
+      throw new Error(`无法读取环境文件 ${path}；请检查文件类型和读取权限（${error.code}）。`)
     }
-    return descriptions[environment] || environment
-  }
-
-  // 检查危险操作环境
-  isDangerousEnvironment(environment) {
-    return environment === 'production'
-  }
+    const parsed = parse(content)
+    delete parsed.APP_ENV
+    delete parsed.NODE_ENV
+    // File values override inherited values while expansion can reference earlier layers.
+    const context = { ...env }
+    for (const key of Object.keys(parsed)) delete context[key]
+    Object.assign(env, expand({ parsed, processEnv: context }).parsed)
+  }
+  return env
 }
-
-export const envManager = new EnvManager()