@ranger1/dx 0.1.12 → 0.1.14

package/lib/cli/commands/ai.js

@@ -1,5 +1,5 @@
 import { existsSync, readFileSync } from 'node:fs'
-import { resolve } from 'node:path'
+import { resolve, join, isAbsolute } from 'node:path'
 import { homedir } from 'node:os'
 import { spawn, spawnSync } from 'node:child_process'
 import { logger } from '../../logger.js'
@@ -41,6 +41,36 @@ function expandHomePath(input) {
   return raw
 }
 
+function isBareFilename(input) {
+  const raw = String(input ?? '')
+  if (!raw) return false
+  if (raw.startsWith('.')) return false
+  return !raw.includes('/') && !raw.includes('\\')
+}
+
+function resolvePromptPath(promptFile) {
+  const projectRoot = process.env.DX_PROJECT_ROOT || process.cwd()
+  const expanded = expandHomePath(promptFile)
+
+  if (isAbsolute(expanded)) return [expanded]
+
+  const dxDir = join(projectRoot, 'dx')
+  const candidates = []
+
+  // 仅文件名：优先在 dx/prompts 下找（不破坏历史：仍保留 project root fallback）
+  if (isBareFilename(expanded)) {
+    candidates.push(join(dxDir, 'prompts', expanded))
+    candidates.push(resolve(projectRoot, expanded))
+    candidates.push(resolve(dxDir, expanded))
+    return candidates
+  }
+
+  // 相对路径：优先保持与历史一致（相对 project root），找不到再 fallback 到 dx/ 下
+  candidates.push(resolve(projectRoot, expanded))
+  candidates.push(resolve(dxDir, expanded))
+  return candidates
+}
+
 export async function handleAi(cli, args = []) {
   const name = args[0]
   if (!name) {
@@ -80,10 +110,16 @@ export async function handleAi(cli, args = []) {
     return
   }
 
-  const promptPath = resolve(process.cwd(), expandHomePath(promptFile))
-  if (!existsSync(promptPath)) {
+  const promptCandidates = resolvePromptPath(promptFile)
+  const promptPath = promptCandidates.find(p => existsSync(p)) || promptCandidates[0]
+  if (!promptPath || !existsSync(promptPath)) {
     logger.error(`未找到提示词文件: ${promptFile}`)
-    logger.info(`解析后的路径: ${promptPath}`)
+    if (promptCandidates.length <= 1) {
+      logger.info(`解析后的路径: ${promptPath}`)
+    } else {
+      logger.info('解析后的候选路径:')
+      for (const p of promptCandidates) logger.info(`- ${p}`)
+    }
     process.exitCode = 1
     return
   }

package/package.json

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