@ranger1/dx 0.1.75 → 0.1.77

package/codex/skills/doctor/scripts/doctor.sh

@@ -136,6 +136,46 @@ install_pnpm() {
   fi
 }
 
+persist_user_local_bin_path() {
+  local line='export PATH="$HOME/.local/bin:$PATH"'
+  local rc
+  for rc in "$HOME/.zshrc" "$HOME/.bashrc" "$HOME/.profile"; do
+    if [[ -f "$rc" ]]; then
+      if ! grep -F "$line" "$rc" >/dev/null 2>&1; then
+        printf '\n%s\n' "$line" >>"$rc"
+      fi
+    fi
+  done
+}
+
+expose_dx_globally() {
+  local source_dx="$1"
+  local target_dir target_path
+
+  if [[ ! -x "$source_dx" ]]; then
+    echo "dx 源可执行文件不存在：$source_dx" >&2
+    return 1
+  fi
+
+  target_dir=""
+  if [[ -w "/usr/local/bin" ]]; then
+    target_dir="/usr/local/bin"
+  elif [[ -w "/opt/homebrew/bin" ]]; then
+    target_dir="/opt/homebrew/bin"
+  else
+    target_dir="$HOME/.local/bin"
+    mkdir -p "$target_dir"
+    if [[ ":$PATH:" != *":$HOME/.local/bin:"* ]]; then
+      export PATH="$HOME/.local/bin:$PATH"
+    fi
+    persist_user_local_bin_path
+  fi
+
+  target_path="$target_dir/dx"
+  ln -sf "$source_dx" "$target_path"
+  command -v dx >/dev/null 2>&1
+}
+
 ensure_agent_browser() {
   # 优先使用用户态 pnpm，减少全局权限问题。
   if command -v pnpm >/dev/null 2>&1; then
@@ -423,7 +463,7 @@ check_codex_config() {
 }
 
 force_dx() {
-  local pnpm_bin dx_cmd
+  local pnpm_bin dx_installed dx_cmd
   if ! install_pnpm; then
     DX_FORCE_OK=0
     DX_FORCE_MSG="pnpm 不可用，无法执行 dx 强制初始化"
@@ -432,21 +472,34 @@ force_dx() {
 
   if pnpm add -g @ranger1/dx@latest >/dev/null 2>&1; then
     pnpm_bin="$(pnpm bin -g 2>/dev/null || true)"
-    dx_cmd=""
+    dx_installed=""
     if [[ -n "$pnpm_bin" && -x "$pnpm_bin/dx" ]]; then
-      dx_cmd="$pnpm_bin/dx"
+      dx_installed="$pnpm_bin/dx"
     elif command -v dx >/dev/null 2>&1; then
-      dx_cmd="$(command -v dx)"
+      dx_installed="$(command -v dx)"
+    fi
+
+    if [[ -z "$dx_installed" ]]; then
+      DX_FORCE_OK=0
+      DX_FORCE_MSG="dx 安装后未找到可执行文件（pnpm bin: ${pnpm_bin:-N/A}）"
+      return 1
+    fi
+
+    if ! expose_dx_globally "$dx_installed"; then
+      DX_FORCE_OK=0
+      DX_FORCE_MSG="dx 已安装但未能暴露为全局命令（pnpm bin: ${pnpm_bin:-N/A}）"
+      return 1
     fi
 
-    if [[ -n "$dx_cmd" ]] && "$dx_cmd" initial >/dev/null 2>&1; then
+    dx_cmd="$(command -v dx || true)"
+    if [[ -n "$dx_cmd" ]] && dx initial >/dev/null 2>&1; then
       DX_FORCE_OK=1
-      DX_FORCE_MSG="已执行 pnpm add -g @ranger1/dx@latest && ${dx_cmd} initial"
+      DX_FORCE_MSG="已安装并暴露全局 dx（${dx_cmd}），并执行 dx initial"
       return 0
     fi
 
     DX_FORCE_OK=0
-    DX_FORCE_MSG="dx 已安装但无法调用（请检查 PATH，pnpm bin: ${pnpm_bin:-N/A}）"
+    DX_FORCE_MSG="dx 已暴露为全局命令但 dx initial 执行失败（dx: ${dx_cmd:-N/A}）"
     return 1
   fi
 

package/lib/cli/commands/deploy.js

@@ -8,6 +8,7 @@ export function mergeLayeredDeployEnv(layeredEnv, manager, runtimeEnv = process.
     'VERCEL_ORG_ID',
     'VERCEL_PROJECT_ID_FRONT',
     'VERCEL_PROJECT_ID_ADMIN',
+    'VERCEL_PROJECT_ID_MERCHANT',
     'VERCEL_PROJECT_ID_TELEGRAM_BOT',
   ])
 
@@ -57,7 +58,7 @@ export function parseTelegramWebhookFlags(argv = []) {
 export async function handleDeploy(cli, args) {
   const target = args[0]
   if (!target) {
-    logger.error('请指定部署目标: front, admin, all')
+    logger.error('请指定部署目标: front, admin, merchant, telegram-bot, all')
     logger.info(`用法: ${cli.invocation} deploy <target> [环境标志]`)
     logger.info(`示例: ${cli.invocation} deploy front --staging`)
     process.exitCode = 1

package/lib/cli/help.js

@@ -21,7 +21,7 @@ export function showHelp() {
     '    环境标志: --dev, --staging, --prod, --test, --e2e（未指定时默认 --dev）',
     '',
     '  deploy <target> [环境标志]  部署前端到 Vercel',
-    '    target: front, admin, telegram-bot, all',
+    '    target: front, admin, merchant, telegram-bot, all',
     '    环境标志: --dev, --staging, --prod（默认 --staging）',
     '',
     '  install                  安装依赖（使用 frozen-lockfile 确保版本一致）',
@@ -188,7 +188,7 @@ script 子命令:
   dx deploy <target> [环境标志] [选项]
 
   参数说明:
-  target: front, admin, telegram-bot, all
+  target: front, admin, merchant, telegram-bot, all
   环境标志: --dev、--staging、--prod（默认 --staging）
 
   Telegram Webhook（仅 target=telegram-bot 生效）:
@@ -200,11 +200,12 @@ script 子命令:
   常见示例:
   dx deploy front --staging           # 部署用户前端（staging）
   dx deploy admin --prod              # 部署管理后台（生产）
+  dx deploy merchant --staging        # 部署商家前端（staging）
   dx deploy telegram-bot --staging    # 部署 Telegram Bot + 自动配置 Webhook
   dx deploy telegram-bot --staging --webhook-path /webhook    # 使用短路径（rewrite 到 /api/webhook）
   dx deploy telegram-bot --prod --webhook-dry-run             # 仅打印，不实际调用 Telegram
   dx deploy telegram-bot --dev --no-strict-webhook            # 开发环境显式降级为仅告警
-  dx deploy all --staging             # 串行部署 front + admin
+  dx deploy all --staging             # 串行部署 front + admin + merchant
 `)
       return
 

package/lib/vercel-deploy.js

@@ -5,7 +5,7 @@ import { envManager } from './env.js'
 import { logger } from './logger.js'
 
 const ALLOWED_ENVIRONMENTS = ['development', 'staging', 'production']
-const VALID_TARGETS = ['front', 'admin', 'telegram-bot']
+const VALID_TARGETS = ['front', 'admin', 'merchant', 'telegram-bot']
 
 const TARGET_CONFIGS = {
   front: {
@@ -22,6 +22,13 @@ const TARGET_CONFIGS = {
     deployMode: 'prebuilt',
     prebuiltCwd: '.'
   },
+  merchant: {
+    configFile: 'vercel.merchant.json',
+    projectIdEnvVar: 'VERCEL_PROJECT_ID_MERCHANT',
+    deployCwd: '.',
+    deployMode: 'prebuilt',
+    prebuiltCwd: '.'
+  },
   'telegram-bot': {
     configFile: 'vercel.telegram-bot.json',
     projectIdEnvVar: 'VERCEL_PROJECT_ID_TELEGRAM_BOT',
@@ -229,31 +236,10 @@ export async function deployPrebuiltWithFallback(options) {
     baseArgs,
     env,
     cwd,
-    run = runVercel,
-    cleanupArchiveParts = () => {
-      try {
-        execSync('rm -f .vercel/source.tgz.part*', { stdio: 'ignore', cwd: cwd || process.cwd() })
-      } catch {
-        // ignore
-      }
-    },
-    onMissingFiles = () => {
-      logger.warn('检测到 missing_files，自动使用 --archive=tgz 重试一次')
-    }
+    run = runVercel
   } = options || {}
-
-  try {
-    const result = await run(baseArgs, { env, cwd })
-    return { usedArchive: false, result }
-  } catch (e) {
-    if (!isMissingFilesError(e)) throw e
-    onMissingFiles(e)
-    cleanupArchiveParts()
-    const archiveArgs = baseArgs.slice()
-    archiveArgs.splice(2, 0, '--archive=tgz')
-    const result = await run(archiveArgs, { env, cwd })
-    return { usedArchive: true, result }
-  }
+  const result = await run(baseArgs, { env, cwd })
+  return { usedArchive: false, result }
 }
 
 export async function deployToVercel(target, options = {}) {
@@ -274,14 +260,14 @@ export async function deployToVercel(target, options = {}) {
   }
 
   const normalizedTarget = String(target || '').toLowerCase()
-  const targets = normalizedTarget === 'all' ? ['front', 'admin'] : [normalizedTarget]
+  const targets = normalizedTarget === 'all' ? ['front', 'admin', 'merchant'] : [normalizedTarget]
   const projectRoot = process.cwd()
 
   // 校验目标有效性
   for (const t of targets) {
     if (!VALID_TARGETS.includes(t)) {
       logger.error(`不支持的部署目标: ${t}`)
-      logger.info('可用目标: front, admin, telegram-bot, all')
+      logger.info('可用目标: front, admin, merchant, telegram-bot, all')
       process.exitCode = 1
       return
     }
@@ -306,6 +292,7 @@ export async function deployToVercel(target, options = {}) {
       logger.info('  VERCEL_ORG_ID=team_xxx')
       logger.info('  VERCEL_PROJECT_ID_FRONT=prj_xxx')
       logger.info('  VERCEL_PROJECT_ID_ADMIN=prj_xxx')
+      logger.info('  VERCEL_PROJECT_ID_MERCHANT=prj_xxx')
       logger.info('  VERCEL_PROJECT_ID_TELEGRAM_BOT=prj_xxx')
       logger.info('')
       logger.info('获取方式:')

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ranger1/dx",
-  "version": "0.1.75",
+  "version": "0.1.77",
   "type": "module",
   "license": "MIT",
   "repository": {