agentworkshop 0.5.2 → 0.5.3

package/server/services/workshop/agents/node-bindings.repo.ts

@@ -10,7 +10,7 @@
 import { createLogger } from '../logger'
 import { randomUUID } from 'node:crypto'
 import fs from 'node:fs'
-import { join } from 'node:path'
+import { dirname, join } from 'node:path'
 import { ensureDataDir } from '@/shared/config/home.mjs'
 import { AppError, ErrorCodes } from '../../../utils/errors'
 
@@ -148,7 +148,7 @@ export class AgentNodeBindingRepo {
 
   private flush(): void {
     try {
-      fs.mkdirSync(path.dirname(DB_PATH), { recursive: true })
+      fs.mkdirSync(dirname(DB_PATH), { recursive: true })
       fs.writeFileSync(DB_PATH, JSON.stringify(this.list, null, 2), 'utf-8')
     }
     catch (err) {

package/shared/config/home.mjs

@@ -38,16 +38,34 @@ export function findRepoRoot(startDir = process.cwd()) {
   }
 }
 
+/** 从 cwd 向上找项目级配置根(<dir>/.AgentWorkShop 目录真实存在);找不到返回 null。
+ *  向上不超过用户主目录——~/.AgentWorkShop 是回退根,不能被误判为某项目的运行时根 */
+export function findLocalConfigRoot(startDir = process.cwd()) {
+  const home = homedir()
+  let dir = resolve(startDir)
+  for (;;) {
+    const candidate = join(dir, HOME_DIRNAME)
+    if (dir !== home && existsSync(candidate) && statSync(candidate).isDirectory()) return candidate
+    const parent = dirname(dir)
+    if (parent === dir || dir === home) return null
+    dir = parent
+  }
+}
+
 /**
  * 解析当前运行模式与全部路径。
- * 优先级：env.AW_MODE === 'home' 显式强制 home 模式（启动器对全局安装的
- * 应用载荷注入;否则包目录自身含 config.yml+nuxt.config.ts 会被误判为检出）
- * > cwd 向上找检出 > home 模式。
+ * 配置根优先级（用户规约：项目 ./.AgentWorkShop > ~/.AgentWorkShop）：
+ *   ① env.AW_MODE === 'home' 显式强制 home 模式（启动器对全局安装的应用载荷注入;
+ *      否则包目录自身含 config.yml+nuxt.config.ts 会被误判为检出）
+ *   ② cwd 向上找到真实存在的 ./.AgentWorkShop 目录 → 项目运行时根(检出或纯工作区皆可)
+ *   ③ cwd 向上找到项目检出(config.yml+nuxt.config.ts)但无 ./.AgentWorkShop
+ *      → 按规约回退 ~/.AgentWorkShop 作为运行时根(工厂默认 config.yml 仍取检出根)
+ *   ④ 其余任意目录 → home 模式(~/.AgentWorkShop,AW_HOME 可重定向)
  * @returns {{
  *   mode: 'repo'|'home',
  *   root: string,            // repo=检出根; home=应用载荷根(本包)
  *   home: string,            // 用户级根 ~/.AgentWorkShop(AW_HOME 可重定向;用户级指令/全局配置)
- *   configRoot: string,      // 当前生效配置根(repo=<repo>/.AgentWorkShop; home=~/.AgentWorkShop)
+ *   configRoot: string,      // 当前生效配置根(项目运行时=<项目>/.AgentWorkShop; 否则 ~/.AgentWorkShop)
  *   configPath: string,      // 生效的 config.yml(工厂默认;repo 在检出根,home 在配置根)
  *   settingsPath: string,    // 生效的 runtime-settings.json(两种模式都在配置根)
  *   dataDir: string,         // 运行数据目录(两种模式都在配置根)
@@ -55,20 +73,44 @@ export function findRepoRoot(startDir = process.cwd()) {
  */
 export function resolveRunMode({ cwd, packageRoot, env = process.env } = {}) {
   const home = awHome(env)
+  const startDir = cwd ?? process.cwd()
   const forceHome = env.AW_MODE === 'home'
-  const repoRoot = forceHome ? null : findRepoRoot(cwd ?? process.cwd())
+
+  // ② 项目级 ./.AgentWorkShop 显式存在 → 它就是运行时根(最高优先)
+  if (!forceHome) {
+    const localConfigRoot = findLocalConfigRoot(startDir)
+    if (localConfigRoot) {
+      const projectRoot = dirname(localConfigRoot)
+      const repoRoot = isRepoRoot(projectRoot) ? projectRoot : null
+      return {
+        mode: 'repo',
+        root: repoRoot ?? projectRoot,
+        home,
+        configRoot: localConfigRoot,
+        configPath: repoRoot
+          ? join(repoRoot, 'config.yml')
+          : (existsSync(join(localConfigRoot, 'config.yml')) ? join(localConfigRoot, 'config.yml') : join(packageRoot ?? '', 'config.yml')),
+        settingsPath: join(localConfigRoot, 'runtime-settings.json'),
+        dataDir: join(localConfigRoot, 'data'),
+      }
+    }
+  }
+
+  // ③ 检出内运行但无 ./.AgentWorkShop → 回退 ~/.AgentWorkShop(工厂默认配置仍在检出根)
+  const repoRoot = forceHome ? null : findRepoRoot(startDir)
   if (repoRoot) {
-    const configRoot = join(repoRoot, HOME_DIRNAME)
     return {
       mode: 'repo',
       root: repoRoot,
       home,
-      configRoot,
+      configRoot: home,
       configPath: join(repoRoot, 'config.yml'),
-      settingsPath: join(configRoot, 'runtime-settings.json'),
-      dataDir: join(configRoot, 'data'),
+      settingsPath: join(home, 'runtime-settings.json'),
+      dataDir: join(home, 'data'),
     }
   }
+
+  // ④ home 模式
   return {
     mode: 'home',
     root: packageRoot ?? repoRoot,
@@ -82,16 +124,16 @@ export function resolveRunMode({ cwd, packageRoot, env = process.env } = {}) {
 
 /**
  * 运行数据目录（服务端/CLI 通用）：
- *   AW_DATA_DIR 环境变量 > home 模式(AW_MODE=home) 配置根/data
- *   > repo 模式(cwd 有 config.yml) cwd/.AgentWorkShop/data > cwd/data 兜底。
+ *   AW_DATA_DIR 环境变量 > resolveRunMode 的配置根/data
+ *   (项目 ./.AgentWorkShop 显式存在 > 检出内无 .AgentWorkShop 回退 ~/.AgentWorkShop
+ *   > home 模式 ~/.AgentWorkShop/data > cwd/data 兜底)。
  * 启动器(scripts/start.mjs / dev-guard.mjs)会经 resolveRunMode 注入 AW_DATA_DIR;
  * 本函数为其兜底(直接 node .output/server/index.mjs 等无启动器场景)。
  */
 export function dataDirFor(cwd = process.cwd(), env = process.env) {
   if (env.AW_DATA_DIR && String(env.AW_DATA_DIR).trim()) return resolve(String(env.AW_DATA_DIR).trim())
-  if (env.AW_MODE === 'home') return join(awHome(env), 'data')
-  if (existsSync(join(cwd, 'config.yml'))) return join(cwd, HOME_DIRNAME, 'data')
-  return join(cwd, 'data')
+  const rm = resolveRunMode({ cwd, env })
+  return rm.dataDir
 }
 
 /**
@@ -102,7 +144,9 @@ export function dataDirFor(cwd = process.cwd(), env = process.env) {
 export function ensureDataDir(cwd = process.cwd(), env = process.env) {
   const dir = dataDirFor(cwd, env)
   mkdirSync(dir, { recursive: true })
-  if (env.AW_MODE === 'home') return dir
+  // 旧位置迁移仅当配置根就在 cwd 内(本地 ./.AgentWorkShop);回退 ~/.AgentWorkShop
+  // 时不得把检出仓库的旧数据搬进用户全局根(跨项目污染)
+  if (env.AW_MODE === 'home' || !resolve(dir).startsWith(resolve(cwd))) return dir
   const legacyDirs = [join(cwd, 'data'), join(cwd, 'server', 'data')]
   for (const legacy of legacyDirs) {
     if (resolve(legacy) === resolve(dir) || !existsSync(legacy)) continue
@@ -140,6 +184,7 @@ export default {
   awHome,
   isRepoRoot,
   findRepoRoot,
+  findLocalConfigRoot,
   resolveRunMode,
   dataDirFor,
   ensureDataDir,

package/.output/public/_nuxt/builds/meta/eede1532-1366-486a-bdab-4d27fa03a1d8.json

@@ -1 +0,0 @@
-{"id":"eede1532-1366-486a-bdab-4d27fa03a1d8","timestamp":1788336798647,"prerendered":[]}