@ranger1/dx 0.1.45 → 0.1.48

package/@opencode/agents/codex-reviewer.md

@@ -1,7 +1,7 @@
 ---
 description: review (Codex)
 mode: subagent
-model: openai/gpt-5.2-codex
+model: openai/gpt-5.3-codex
 temperature: 0.1
 tools:
   write: true

package/@opencode/agents/pr-context.md

@@ -1,7 +1,7 @@
 ---
 description: build PR context file
 mode: subagent
-model: openai/gpt-5.1-codex-mini
+model: github-copilot/claude-sonnet-4.5
 temperature: 0.1
 tools:
   bash: true

package/@opencode/agents/pr-fix.md

@@ -1,7 +1,7 @@
 ---
 description: PR fix review
 mode: subagent
-model: openai/gpt-5.2-codex
+model: openai/gpt-5.3-codex
 temperature: 0.1
 tools:
   write: true

package/@opencode/agents/pr-precheck.md

@@ -1,7 +1,7 @@
 ---
 description: PR precheck (checkout + lint + build)
 mode: subagent
-model: openai/gpt-5.2-codex
+model: openai/gpt-5.3-codex
 temperature: 0.1
 tools:
   bash: true

package/@opencode/commands/git-commit-and-pr.md

@@ -1,7 +1,7 @@
 ---
 allowed-tools: [Bash, Read, Glob, TodoWrite, Edit, Grep]
 description: 'Git 工作流：Issue/Commit/PR 自动化'
-agent: middle
+agent: documenter
 ---
 
 ## 用法

package/@opencode/commands/git-release.md

@@ -1,7 +1,7 @@
 ---
 allowed-tools: [Bash, Read, Glob, TodoWrite, Edit, Grep, AskUserQuestion]
 description: 'Create release versions with intelligent changelog generation from release branch'
-agent: quick
+agent: documenter
 ---
 
 ## Usage

package/@opencode/commands/oh_attach.json

@@ -15,10 +15,10 @@
       "variant": "high"
     },
     "librarian": {
-      "model": "openai/gpt-5.1-codex-mini"
+      "model": "github-copilot/claude-sonnet-4.5"
     },
     "explore": {
-      "model": "openai/gpt-5.1-codex-mini"
+      "model": "github-copilot/claude-sonnet-4.5"
     },
     "multimodal-looker": {
       "model": "github-copilot/gemini-3-flash-preview"

package/@opencode/commands/opencode_attach.json

@@ -14,6 +14,9 @@
     },
     "middle": {
       "model": "github-copilot/claude-sonnet-4.5"
+    },
+    "documenter": {
+      "model": "github-copilot/claude-sonnet-4.5"
     }
   },
   "permission": {

package/lib/cli/args.js

@@ -1,9 +1,7 @@
 export function getCleanArgs(args = []) {
   const result = []
-  let afterDoubleDash = false
   for (const arg of args) {
     if (arg === '--') {
-      afterDoubleDash = true
       break
     }
     if (arg.startsWith('-')) continue
@@ -12,6 +10,27 @@ export function getCleanArgs(args = []) {
   return result
 }
 
+// Like getCleanArgs(), but also strips values consumed by flags that expect a value.
+// consumedFlagValueIndexes: Set<number> of indexes in the original argv that should be skipped.
+export function getCleanArgsWithConsumedValues(args = [], consumedFlagValueIndexes = new Set()) {
+  const result = []
+  const consumed = consumedFlagValueIndexes instanceof Set
+    ? consumedFlagValueIndexes
+    : new Set(consumedFlagValueIndexes || [])
+
+  for (let i = 0; i < args.length; i++) {
+    const arg = args[i]
+    if (arg === '--') {
+      break
+    }
+    if (consumed.has(i)) continue
+    if (arg.startsWith('-')) continue
+    result.push(arg)
+  }
+
+  return result
+}
+
 export function getPassthroughArgs(args = []) {
   const doubleDashIndex = args.indexOf('--')
   if (doubleDashIndex === -1) return []

package/lib/cli/commands/deploy.js

@@ -2,6 +2,28 @@ import { logger } from '../../logger.js'
 import { envManager } from '../../env.js'
 import { validateEnvironment } from '../../validate-env.js'
 
+export function parseTelegramWebhookFlags(argv = []) {
+  const args = Array.isArray(argv) ? argv : []
+
+  const idx = args.indexOf('--webhook-path')
+  const webhookPath = idx !== -1 && idx + 1 < args.length ? args[idx + 1] : undefined
+
+  const dryRun = args.includes('--webhook-dry-run') ? true : undefined
+
+  // 默认值由下游根据 environment 决定，这里只负责覆盖
+  const strict = args.includes('--strict-webhook')
+    ? true
+    : args.includes('--no-strict-webhook')
+      ? false
+      : undefined
+
+  return {
+    webhookPath,
+    dryRun,
+    strict,
+  }
+}
+
 export async function handleDeploy(cli, args) {
   const target = args[0]
   if (!target) {
@@ -59,7 +81,9 @@ export async function handleDeploy(cli, args) {
   // 加载环境变量层，但不校验后端必需变量
   const layeredEnv = envManager.collectEnvFromLayers(null, environment)
   if (envManager.latestEnvWarnings && envManager.latestEnvWarnings.length > 0) {
-    envManager.latestEnvWarnings.forEach(message => logger.warn(message))
+    envManager.latestEnvWarnings.forEach(message => {
+      logger.warn(message)
+    })
   }
 
   // 仅在目标变量不存在或是占位符时才使用 .env 文件的值
@@ -72,5 +96,10 @@ export async function handleDeploy(cli, args) {
   envManager.syncEnvironments(environment)
 
   const { deployToVercel } = await import('../../vercel-deploy.js')
-  await deployToVercel(normalizedTarget, { environment })
+
+  const telegramWebhook = normalizedTarget === 'telegram-bot'
+    ? parseTelegramWebhookFlags(cli.args)
+    : null
+
+  await deployToVercel(normalizedTarget, { environment, telegramWebhook })
 }

package/lib/cli/dx-cli.js

@@ -11,7 +11,7 @@ import {
   resolveTargetRequiredVars,
 } from '../env-policy.js'
 import { FLAG_DEFINITIONS, parseFlags } from './flags.js'
-import { getCleanArgs } from './args.js'
+import { getCleanArgs, getCleanArgsWithConsumedValues } from './args.js'
 import { showHelp, showCommandHelp } from './help.js'
 import { getPackageVersion } from '../version.js'
 import {
@@ -175,7 +175,9 @@ class DxCli {
         const envKey = this.normalizeEnvKey(environment)
         const execFlags = { ...this.flags }
         ;['dev', 'development', 'prod', 'production', 'test', 'e2e', 'staging', 'stage'].forEach(
-          key => delete execFlags[key]
+          key => {
+            delete execFlags[key]
+          },
         )
         if (envKey === 'prod') execFlags.prod = true
         else if (envKey === 'dev') execFlags.dev = true
@@ -329,8 +331,12 @@ class DxCli {
 
   // 命令路由
   async routeCommand() {
-    const cleanArgs = getCleanArgs(this.args)
-    const [command, ...subArgs] = cleanArgs
+    const command = getCleanArgs(this.args)[0]
+
+    const allowedFlags = this.getAllowedFlags(command)
+    const consumedFlagValueIndexes = this.validateFlags(command, allowedFlags)
+    const cleanArgs = getCleanArgsWithConsumedValues(this.args, consumedFlagValueIndexes)
+    const [, ...subArgs] = cleanArgs
 
     if (!command) {
       showHelp()
@@ -747,13 +753,17 @@ class DxCli {
     const portSet = new Set()
 
     if (startConfig && Array.isArray(startConfig.ports)) {
-      startConfig.ports.forEach(port => this.addPortToSet(portSet, port))
+      startConfig.ports.forEach(port => {
+        this.addPortToSet(portSet, port)
+      })
     }
 
     if (envKey === 'dev') {
       const legacyConfig = this.commands.dev?.[service]
       if (legacyConfig && Array.isArray(legacyConfig.ports)) {
-        legacyConfig.ports.forEach(port => this.addPortToSet(portSet, port))
+        legacyConfig.ports.forEach(port => {
+          this.addPortToSet(portSet, port)
+        })
       }
     }
 

package/lib/cli/flags.js

@@ -37,6 +37,12 @@ export const FLAG_DEFINITIONS = {
   lint: [
     { flag: '--fix' },
   ],
+  deploy: [
+    { flag: '--webhook-path', expectsValue: true },
+    { flag: '--webhook-dry-run' },
+    { flag: '--strict-webhook' },
+    { flag: '--no-strict-webhook' },
+  ],
 }
 
 export function parseFlags(args = []) {

package/lib/cli/help.js

@@ -184,17 +184,26 @@ script 子命令:
 
     case 'deploy':
       console.log(`
-deploy 命令用法:
-  dx deploy <target> [环境标志]
+  deploy 命令用法:
+  dx deploy <target> [环境标志] [选项]
 
-参数说明:
+  参数说明:
   target: front, admin, telegram-bot, all
   环境标志: --dev、--staging、--prod（默认 --staging）
 
-常见示例:
+  Telegram Webhook（仅 target=telegram-bot 生效）:
+    --webhook-path <path>       对外 webhook 路径（默认 /api/webhook）
+    --webhook-dry-run           只打印将设置的 URL，不调用 Telegram API
+    --strict-webhook            强制严格校验（Webhook 不生效则 deploy 失败）
+    --no-strict-webhook         关闭严格校验（仅告警）
+
+  常见示例:
   dx deploy front --staging           # 部署用户前端（staging）
   dx deploy admin --prod              # 部署管理后台（生产）
   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 --prod --no-strict-webhook           # 生产环境也仅告警（不推荐）
   dx deploy all --staging             # 串行部署 front + admin
 `)
       return

package/lib/telegram-webhook.js

@@ -2,12 +2,89 @@ import { execSync } from 'node:child_process'
 import { logger } from './logger.js'
 import { envManager } from './env.js'
 
+function normalizeWebhookPath(raw) {
+  const s = String(raw || '').trim()
+  if (!s) return '/api/webhook'
+  if (s.startsWith('/')) return s
+  return `/${s}`
+}
+
+function normalizeDeployUrl(raw) {
+  const s = String(raw || '')
+  const m = s.match(/(https?:\/\/)?([a-z0-9-]+\.vercel\.app)\b/i)
+  if (!m) return null
+  return `https://${m[2]}`
+}
+
+export function parseDeployUrlFromDeployOutput(output) {
+  const s = String(output || '')
+  const matches = [...s.matchAll(/(https?:\/\/)?([a-z0-9-]+\.vercel\.app)\b/gi)]
+  if (matches.length === 0) return null
+  const last = matches[matches.length - 1]
+  return `https://${last[2]}`
+}
+
+export function parseDeployUrlFromVercelListOutput(output, projectNameHint) {
+  const lines = String(output || '')
+    .split(/\r?\n/)
+    .map(l => l.trim())
+    .filter(Boolean)
+
+  const isReady = line => /\b(Ready|READY)\b/.test(line)
+  const hasUrl = line => /\b[a-z0-9-]+\.vercel\.app\b/i.test(line)
+  const pickUrl = line => {
+    const m = line.match(/(https?:\/\/)?([a-z0-9-]+\.vercel\.app)\b/i)
+    return m ? `https://${m[2]}` : null
+  }
+
+  const hint = projectNameHint ? String(projectNameHint) : ''
+  if (hint) {
+    for (const line of lines) {
+      if (!line.includes(hint)) continue
+      if (!isReady(line)) continue
+      if (!hasUrl(line)) continue
+      const url = pickUrl(line)
+      if (url) return url
+    }
+  }
+
+  for (const line of lines) {
+    if (!isReady(line)) continue
+    if (!hasUrl(line)) continue
+    const url = pickUrl(line)
+    if (url) return url
+  }
+
+  return null
+}
+
 /**
  * 处理 Telegram Bot 部署后的 Webhook 配置
  */
-export async function handleTelegramBotDeploy(environment, projectId, orgId, token) {
+export async function handleTelegramBotDeploy(environment, projectId, orgId, token, options = {}) {
   logger.step('配置 Telegram Webhook...')
 
+  const {
+    deployOutput,
+    projectNameHint,
+    webhookPath: webhookPathOverride,
+    dryRun: dryRunOverride,
+    strict: strictOverride,
+  } = options || {}
+
+  const strictDefault = environment !== 'development'
+
+  const strictEnv = process.env.DX_TELEGRAM_WEBHOOK_STRICT != null
+    ? !['0', 'false', 'no'].includes(String(process.env.DX_TELEGRAM_WEBHOOK_STRICT).toLowerCase())
+    : undefined
+
+  const strict = strictOverride ?? strictEnv ?? strictDefault
+
+  const dryRunEnv = ['1', 'true', 'yes'].includes(String(process.env.DX_TELEGRAM_WEBHOOK_DRY_RUN || '').toLowerCase())
+  const dryRun = dryRunOverride ?? (dryRunEnv ? true : false)
+
+  const webhookPath = normalizeWebhookPath(webhookPathOverride ?? process.env.DX_TELEGRAM_WEBHOOK_PATH ?? '/api/webhook')
+
   // 1. 验证必需环境变量
   const botToken = process.env.TELEGRAM_BOT_TOKEN
   const webhookSecret = process.env.TELEGRAM_BOT_WEBHOOK_SECRET
@@ -25,21 +102,42 @@ export async function handleTelegramBotDeploy(environment, projectId, orgId, tok
     missingVars.forEach(v => {
       logger.error(`  - ${v}`)
     })
+
+    if (strict) {
+      throw new Error('Telegram Webhook 配置失败：缺少必需环境变量')
+    }
+
     logger.warn('跳过 Webhook 配置，请手动设置')
     return
   }
 
   try {
     // 2. 获取 Vercel 部署 URL
-    const deploymentUrl = await getLatestDeploymentUrl(projectId, orgId, token, environment)
+    const deploymentUrl = await getLatestDeploymentUrl({
+      projectId,
+      orgId,
+      token,
+      environment,
+      deployOutput,
+      projectNameHint,
+    })
     if (!deploymentUrl) {
+      if (strict) {
+        throw new Error('无法获取 Vercel 部署 URL')
+      }
+
       logger.error('无法获取 Vercel 部署 URL，跳过 Webhook 配置')
       return
     }
 
-    const webhookUrl = `${deploymentUrl}/api/webhook`
+    const webhookUrl = `${deploymentUrl}${webhookPath}`
     logger.info(`Webhook URL: ${webhookUrl}`)
 
+    if (dryRun) {
+      logger.warn('DX_TELEGRAM_WEBHOOK_DRY_RUN=1，已跳过 setWebhook/getWebhookInfo 调用')
+      return
+    }
+
     // 3. 调用 Telegram API 设置 Webhook
     const telegramApiUrl = `https://api.telegram.org/bot${botToken}/setWebhook`
     const payload = JSON.stringify({
@@ -65,10 +163,15 @@ export async function handleTelegramBotDeploy(environment, projectId, orgId, tok
       logger.info(`Webhook URL: ${webhookUrl}`)
 
       // 4. 验证 Webhook 状态
-      await verifyWebhook(botToken)
+      await verifyWebhook(botToken, webhookUrl, { strict })
     }
     else {
-      logger.error(`Telegram Webhook 设置失败: ${result.description}`)
+      const desc = result.description || '未知错误'
+      if (strict) {
+        throw new Error(`Telegram Webhook 设置失败: ${desc}`)
+      }
+
+      logger.error(`Telegram Webhook 设置失败: ${desc}`)
       logger.info('请手动执行以下命令（不要把明文 token/secret 写进日志）:')
       const manualPayload = JSON.stringify({
         url: webhookUrl,
@@ -81,7 +184,11 @@ export async function handleTelegramBotDeploy(environment, projectId, orgId, tok
     }
   }
   catch (error) {
-    logger.error(`Webhook 配置失败: ${error.message}`)
+    const message = error?.message || String(error)
+    logger.error(`Webhook 配置失败: ${message}`)
+
+    if (strict) throw error
+
     logger.warn('请手动设置 Webhook（参考 apps/telegram-bot/README.md）')
   }
 }
@@ -89,9 +196,86 @@ export async function handleTelegramBotDeploy(environment, projectId, orgId, tok
 /**
  * 获取最新部署的 URL
  */
-async function getLatestDeploymentUrl(projectId, orgId, token, environment) {
+async function getLatestDeploymentUrl({
+  projectId,
+  orgId,
+  token,
+  environment,
+  deployOutput,
+  projectNameHint,
+}) {
+  const fromDeploy = parseDeployUrlFromDeployOutput(deployOutput)
+  if (fromDeploy) return fromDeploy
+
+  const fromApi = await getDeploymentUrlFromVercelApi({ projectId, orgId, token, environment })
+  if (fromApi) return fromApi
+
+  const fromList = await getDeploymentUrlFromVercelList({ orgId, token, projectNameHint })
+  if (fromList) return fromList
+
+  return null
+}
+
+export function pickDeploymentUrlFromVercelApiResponse(json) {
+  const deployments = json?.deployments
+  if (!Array.isArray(deployments)) return null
+
+  for (const d of deployments) {
+    const url = d?.url
+    if (!url) continue
+    const state = d?.state || d?.readyState
+    if (state && String(state).toUpperCase() !== 'READY') continue
+    const normalized = normalizeDeployUrl(url)
+    if (normalized) return normalized
+  }
+
+  return null
+}
+
+async function getDeploymentUrlFromVercelApi({ projectId, orgId, token, environment }) {
+  try {
+    const qs = new URLSearchParams({
+      projectId: String(projectId),
+      state: 'READY',
+      limit: '10',
+    })
+
+    // dx 的 deploy 实现里：staging/production 都会传 --prod，因此对应 Vercel 的 production target。
+    // development 环境若需要兜底查询，则不强制 target（避免与 Vercel CLI/REST 字段差异耦合）。
+    if (environment !== 'development') {
+      qs.set('target', 'production')
+    }
+
+    if (orgId) {
+      const scope = String(orgId)
+      if (scope.startsWith('team_')) qs.set('teamId', scope)
+      else qs.set('slug', scope)
+    }
+
+    const url = `https://api.vercel.com/v6/deployments?${qs.toString()}`
+    const res = await fetch(url, {
+      method: 'GET',
+      headers: {
+        Authorization: `Bearer ${token}`,
+      },
+    })
+
+    if (!res.ok) {
+      logger.warn(`Vercel API 获取部署列表失败: HTTP ${res.status}`)
+      return null
+    }
+
+    const json = await res.json()
+    return pickDeploymentUrlFromVercelApiResponse(json)
+  } catch (error) {
+    logger.warn(`Vercel API 获取部署列表失败: ${error?.message || String(error)}`)
+    return null
+  }
+}
+
+async function getDeploymentUrlFromVercelList({ orgId, token, projectNameHint }) {
   try {
-    const cmd = ['vercel', 'ls', orgId ? `--scope=${orgId}` : '', '--json']
+    const cmd = ['vercel', 'list', orgId ? `--scope=${orgId}` : '']
       .filter(Boolean)
       .join(' ')
 
@@ -99,24 +283,13 @@ async function getLatestDeploymentUrl(projectId, orgId, token, environment) {
       encoding: 'utf8',
       env: {
         ...process.env,
-        // 不通过 CLI args 传递 token，避免出现在错误信息/日志中
         VERCEL_TOKEN: token,
       },
     })
-    const deployments = JSON.parse(output)
-
-    // 根据环境筛选部署
-    const targetEnv = environment === 'production' ? 'production' : 'preview'
-    const latest = deployments.find(d =>
-      d.projectId === projectId
-      && d.target === targetEnv
-      && d.state === 'READY',
-    )
 
-    return latest ? `https://${latest.url}` : null
-  }
-  catch (error) {
-    logger.warn(`获取部署 URL 失败: ${error.message}`)
+    return parseDeployUrlFromVercelListOutput(output, projectNameHint)
+  } catch (error) {
+    logger.warn(`vercel list 获取部署 URL 失败: ${error?.message || String(error)}`)
     return null
   }
 }
@@ -124,7 +297,8 @@ async function getLatestDeploymentUrl(projectId, orgId, token, environment) {
 /**
  * 验证 Webhook 配置
  */
-async function verifyWebhook(botToken) {
+async function verifyWebhook(botToken, expectedWebhookUrl, options = {}) {
+  const { strict = false } = options || {}
   try {
     const cmd = `curl -s "https://api.telegram.org/bot${botToken}/getWebhookInfo"`
     const response = execSync(cmd, { encoding: 'utf8' })
@@ -138,9 +312,22 @@ async function verifyWebhook(botToken) {
       if (info.last_error_message) {
         logger.warn(`  最后错误: ${info.last_error_message}`)
       }
+
+      if (expectedWebhookUrl && info.url !== expectedWebhookUrl) {
+        const message = `Webhook 未生效：期望 ${expectedWebhookUrl}，实际 ${info.url || '(empty)'}`
+        if (strict) throw new Error(message)
+        logger.warn(message)
+      }
+    }
+    else {
+      const desc = result?.description || '未知错误'
+      const message = `getWebhookInfo 失败: ${desc}`
+      if (strict) throw new Error(message)
+      logger.warn(message)
     }
   }
   catch (error) {
+    if (strict) throw error
     logger.warn('无法验证 Webhook 状态')
   }
 }

package/lib/vercel-deploy.js

@@ -87,21 +87,21 @@ export async function deployPrebuiltWithFallback(options) {
   } = options || {}
 
   try {
-    await run(baseArgs, { env, cwd })
-    return { usedArchive: false }
+    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')
-    await run(archiveArgs, { env, cwd })
-    return { usedArchive: true }
+    const result = await run(archiveArgs, { env, cwd })
+    return { usedArchive: true, result }
   }
 }
 
 export async function deployToVercel(target, options = {}) {
-  const { environment = 'staging' } = options
+  const { environment = 'staging', telegramWebhook = null } = options
 
   // 校验环境参数
   if (!ALLOWED_ENVIRONMENTS.includes(environment)) {
@@ -264,17 +264,27 @@ export async function deployToVercel(target, options = {}) {
         baseDeployArgs.push('--scope', orgId)
       }
 
-      await deployPrebuiltWithFallback({
+      const deployResult = await deployPrebuiltWithFallback({
         baseArgs: baseDeployArgs,
         env: envVars,
         cwd: process.cwd(),
       })
-      logger.success(`${t} 部署成功`)
 
-      // Telegram Bot 部署成功后自动设置 Webhook
+      const deployOutput = [deployResult?.result?.stdout, deployResult?.result?.stderr]
+        .filter(Boolean)
+        .join('\n')
+
+      // Telegram Bot 部署成功后自动设置 Webhook（并做严格校验）
       if (t === 'telegram-bot') {
         const { handleTelegramBotDeploy } = await import('./telegram-webhook.js')
-        await handleTelegramBotDeploy(environment, projectId, orgId, token)
+        await handleTelegramBotDeploy(environment, projectId, orgId, token, {
+          deployOutput,
+          projectNameHint: 'telegram-bot',
+          ...(telegramWebhook || {}),
+        })
+        logger.success(`${t} 部署成功（Webhook 已校验）`)
+      } else {
+        logger.success(`${t} 部署成功`)
       }
     } catch (error) {
       const message = error?.message || String(error)

package/package.json

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