agentworkshop 0.7.5 → 0.7.7

package/cli/aw.mjs

@@ -19,6 +19,10 @@ import { parseArgs } from './core/args.mjs'
 import { renderHelp, renderCommandHelp } from './core/help.mjs'
 import { logger, color } from './core/logger.mjs'
 import { CliError, isUsageError } from './core/errors.mjs'
+import { installLocalIso } from '../shared/local-time.mjs'
+
+// 全 CLI 时间输出统一本地时区(先于任何命令逻辑)
+installLocalIso()
 
 export { CliError }
 
@@ -116,7 +120,10 @@ export async function main(argv = process.argv.slice(2), { cwd = process.cwd() }
     return EXIT.OK
   }
 
-  const ctx = await createContext({ cwd, explicitRoot: root ?? undefined, json, debug, registry })
+  // explicitRoot 只接受用户显式 --root:把自动探测的 root 冒充 explicitRoot 会在
+  // context 内强制 configRoot=<root>/.AgentWorkShop,旁路 resolveRunMode 的
+  // "检出内无 .AgentWorkShop → 回退 ~/.AgentWorkShop"规则(aw stop 因此停不掉 home 实例)
+  const ctx = await createContext({ cwd, explicitRoot, json, debug, registry })
 
   // 无指令 → 帮助（用法错误码）
   if (!commandName) {

package/cli/commands/stop.mjs

@@ -1,108 +1,111 @@
-// ============================================================
-// 指令:stop —— 终止当前配置根下运行中的 aw 实例(读单实例锁 → 终止进程树)。
-// 用法:aw stop [--home]   (--home 强制以 home 配置根为目标;默认随 cwd 解析)
-// ============================================================
-import { existsSync, readFileSync, rmSync } from 'node:fs'
-import { join } from 'node:path'
-import { spawnSync } from 'node:child_process'
-import { color } from '../core/logger.mjs'
-
-export const meta = {
-  name: 'stop',
-  aliases: [],
-  group: '服务',
-  summary: '终止运行中的 aw 服务实例(读单实例锁)',
-  usage: 'aw stop [--home]',
-  needsProject: false,
-}
-
-function pidAlive(pid) {
-  try {
-    process.kill(pid, 0)
-    return true
-  }
-  catch (err) {
-    return err?.code === 'EPERM'
-  }
-}
-
-/** 终止进程树:Windows taskkill /T /F;POSIX 先 SIGTERM 宽限 5s 再 SIGKILL */
-function killTree(pid) {
-  if (process.platform === 'win32') {
-    const r = spawnSync('taskkill', ['/PID', String(pid), '/T', '/F'], { encoding: 'utf8' })
-    if (r.status !== 0) throw new Error((r.stderr || r.stdout || 'taskkill 失败').trim().split(/\r?\n/)[0])
-    return
-  }
-  try {
-    process.kill(pid, 'SIGTERM')
-  }
-  catch { /* 已死 */ }
-  const deadline = Date.now() + 5000
-  while (Date.now() < deadline && pidAlive(pid)) {
-    Atomics.wait(new Int32Array(new SharedArrayBuffer(4)), 0, 0, 200)
-  }
-  if (pidAlive(pid)) {
-    try {
-      process.kill(pid, 'SIGKILL')
-    }
-    catch { /* 已死 */ }
-  }
-}
-
-export async function run(argv, ctx) {
-  // argv 为 parseArgs 结果({ flags, positionals, unknown });兼容裸数组调用
-  const flags = argv?.flags ?? {}
-  const positionals = Array.isArray(argv?.positionals) ? argv.positionals : (Array.isArray(argv) ? argv : [])
-  const forceHome = flags.home === true || positionals.includes('--home')
-
-  const configRoot = forceHome
-    ? ctx.home
-    : (ctx.mode === 'repo' ? join(ctx.root, '.AgentWorkShop') : ctx.home)
-  const lockPath = join(configRoot, '.runtime', 'aw.lock')
-
-  if (!existsSync(lockPath)) {
-    console.log(`${color.blue('ℹ')} 未发现运行中的实例(无锁文件:${lockPath})`)
-    return 0
-  }
-  let holder
-  try {
-    holder = JSON.parse(readFileSync(lockPath, 'utf8'))
-  }
-  catch {
-    rmSync(lockPath, { force: true })
-    console.log(`${color.blue('ℹ')} 锁文件损坏,已清除:${lockPath}`)
-    return 0
-  }
-
-  const pid = Number(holder?.pid)
-  if (!Number.isInteger(pid) || pid <= 0) {
-    rmSync(lockPath, { force: true })
-    console.log(`${color.blue('ℹ')} 锁内 PID 无效,已清除锁文件`)
-    return 0
-  }
-  if (!pidAlive(pid)) {
-    rmSync(lockPath, { force: true })
-    console.log(`${color.blue('ℹ')} 持锁进程已不存在(pid=${pid},残留锁),已清除锁文件`)
-    return 0
-  }
-
-  console.log(`› 终止实例 pid=${pid}(mode=${holder.mode ?? '?'}${holder.port ? `,端口=${holder.port}` : ''},启动于 ${holder.startedAt ?? '?'})`)
-  try {
-    killTree(pid)
-  }
-  catch (err) {
-    console.error(`${color.red('✖')} 终止失败:${err.message}`)
-    console.error(`  可手动执行:taskkill /PID ${pid} /T /F(Windows)`)
-    return 1
-  }
-  // 锁文件由退出钩子自清;残留则手动兜底
-  for (let i = 0; i < 20 && existsSync(lockPath); i++) {
-    Atomics.wait(new Int32Array(new SharedArrayBuffer(4)), 0, 0, 200)
-  }
-  try {
-    if (existsSync(lockPath)) rmSync(lockPath, { force: true })
-  }
-  catch { /* ignore */ }
-  console.log(`${color.green('✔')} 实例已停止(pid=${pid})`)
-  return 0
-}
+// ============================================================
+// 指令:stop —— 终止当前配置根下运行中的 aw 实例(读单实例锁 → 终止进程树)。
+// 用法:aw stop [--home]   (--home 强制以 home 配置根为目标;默认随 cwd 解析)
+// ============================================================
+import { existsSync, readFileSync, rmSync } from 'node:fs'
+import { join } from 'node:path'
+import { spawnSync } from 'node:child_process'
+import { color } from '../core/logger.mjs'
+import { isTruthy } from '../core/args.mjs'
+
+export const meta = {
+  name: 'stop',
+  aliases: [],
+  group: '服务',
+  summary: '终止运行中的 aw 服务实例(读单实例锁)',
+  usage: 'aw stop [--home]',
+  needsProject: false,
+}
+
+function pidAlive(pid) {
+  try {
+    process.kill(pid, 0)
+    return true
+  }
+  catch (err) {
+    return err?.code === 'EPERM'
+  }
+}
+
+/** 终止进程树:Windows taskkill /T /F;POSIX 先 SIGTERM 宽限 5s 再 SIGKILL */
+function killTree(pid) {
+  if (process.platform === 'win32') {
+    const r = spawnSync('taskkill', ['/PID', String(pid), '/T', '/F'], { encoding: 'utf8' })
+    if (r.status !== 0) throw new Error((r.stderr || r.stdout || 'taskkill 失败').trim().split(/\r?\n/)[0])
+    return
+  }
+  try {
+    process.kill(pid, 'SIGTERM')
+  }
+  catch { /* 已死 */ }
+  const deadline = Date.now() + 5000
+  while (Date.now() < deadline && pidAlive(pid)) {
+    Atomics.wait(new Int32Array(new SharedArrayBuffer(4)), 0, 0, 200)
+  }
+  if (pidAlive(pid)) {
+    try {
+      process.kill(pid, 'SIGKILL')
+    }
+    catch { /* 已死 */ }
+  }
+}
+
+export async function run(argv, ctx) {
+  // argv 为 parseArgs 结果({ flags, positionals, unknown });兼容裸数组调用
+  const flags = argv?.flags ?? {}
+  const positionals = Array.isArray(argv?.positionals) ? argv.positionals : (Array.isArray(argv) ? argv : [])
+  // --home 接受布尔与字符串赋值两种形态(--home=true 走 parseArgs 是字符串)
+  const forceHome = isTruthy(flags.home) || positionals.includes('--home')
+
+  // 配置根必须与启动侧(start.mjs / dev-guard)同源:ctx.configRoot 已按
+  // resolveRunMode 解析(检出内无 .AgentWorkShop 时回退 home),硬编码
+  // <repo>/.AgentWorkShop 会对 home 模式运行实例失明。
+  const configRoot = forceHome ? ctx.home : (ctx.configRoot ?? ctx.home)
+  const lockPath = join(configRoot, '.runtime', 'aw.lock')
+
+  if (!existsSync(lockPath)) {
+    console.log(`${color.blue('ℹ')} 未发现运行中的实例(无锁文件:${lockPath})`)
+    return 0
+  }
+  let holder
+  try {
+    holder = JSON.parse(readFileSync(lockPath, 'utf8'))
+  }
+  catch {
+    rmSync(lockPath, { force: true })
+    console.log(`${color.blue('ℹ')} 锁文件损坏,已清除:${lockPath}`)
+    return 0
+  }
+
+  const pid = Number(holder?.pid)
+  if (!Number.isInteger(pid) || pid <= 0) {
+    rmSync(lockPath, { force: true })
+    console.log(`${color.blue('ℹ')} 锁内 PID 无效,已清除锁文件`)
+    return 0
+  }
+  if (!pidAlive(pid)) {
+    rmSync(lockPath, { force: true })
+    console.log(`${color.blue('ℹ')} 持锁进程已不存在(pid=${pid},残留锁),已清除锁文件`)
+    return 0
+  }
+
+  console.log(`› 终止实例 pid=${pid}(mode=${holder.mode ?? '?'}${holder.port ? `,端口=${holder.port}` : ''},启动于 ${holder.startedAt ?? '?'})`)
+  try {
+    killTree(pid)
+  }
+  catch (err) {
+    console.error(`${color.red('✖')} 终止失败:${err.message}`)
+    console.error(`  可手动执行:taskkill /PID ${pid} /T /F(Windows)`)
+    return 1
+  }
+  // 锁文件由退出钩子自清;残留则手动兜底
+  for (let i = 0; i < 20 && existsSync(lockPath); i++) {
+    Atomics.wait(new Int32Array(new SharedArrayBuffer(4)), 0, 0, 200)
+  }
+  try {
+    if (existsSync(lockPath)) rmSync(lockPath, { force: true })
+  }
+  catch { /* ignore */ }
+  console.log(`${color.green('✔')} 实例已停止(pid=${pid})`)
+  return 0
+}

package/cli/commands/tui.mjs

@@ -14,6 +14,15 @@ export const meta = {
 
 export async function run(argv) {
   const { main } = await import('../../tui/aw-tui.mjs')
-  await main(argv)
+  // 分发器传入 parseArgs 结果({ flags, positionals });aw-tui.main 自带
+  // 数组形态的参数解析 —— 这里还原为等价数组,直接传对象会因无 .length 被静默丢弃。
+  const flags = argv?.flags ?? {}
+  const positionals = Array.isArray(argv?.positionals) ? argv.positionals : (Array.isArray(argv) ? argv : [])
+  const legacy = [...positionals]
+  for (const [key, value] of Object.entries(flags)) {
+    if (value === true) legacy.push(`--${key}`)
+    else if (value !== undefined && value !== false) legacy.push(`--${key}`, String(value))
+  }
+  await main(legacy)
   return 0
 }

package/cli/core/registry.mjs

@@ -99,12 +99,14 @@ export class CommandRegistry {
   }
 }
 
-/** 拼接指令扫描目录清单（内建 → 用户级 → 项目级;配合同名后者覆盖,项目级优先级最高） */
+/** 拼接指令扫描目录清单（内建 → 用户级 → 项目级;配合同名后者覆盖,项目级优先级最高）
+ *  目录名与 shared/config/home.mjs 的 HOME_DIRNAME 保持一致(.AgentWorkShop):
+ *  Windows 大小写不敏感无感,Linux/macOS 下小写目录会导致注册的指令永远扫描不到。 */
 export function commandDirs({ packageRoot, projectRoot, homeDir }) {
   const dirs = []
   if (packageRoot) dirs.push(join(packageRoot, 'cli', 'commands'))
-  if (homeDir) dirs.push(join(homeDir, '.agentworkshop', 'commands'))
-  if (projectRoot) dirs.push(join(projectRoot, '.agentworkshop', 'commands'))
+  if (homeDir) dirs.push(join(homeDir, '.AgentWorkShop', 'commands'))
+  if (projectRoot) dirs.push(join(projectRoot, '.AgentWorkShop', 'commands'))
   return dirs
 }
 

package/cli/infra.mjs

@@ -1,109 +1,108 @@
-// ============================================================
-// AgentWorkShop CLI — 数采基础设施前置检查(Docker 编排)
-// ------------------------------------------------------------
-// aw start 启动服务前的引导层:
-//   1. 探测 MQTT / TimescaleDB 端口连通(按有效配置的 host/port)
-//   2. 已连通 → 依赖就绪,直接通过
-//   3. 未连通且本机 Docker 可用且策略允许 → docker compose up -d 拉起并等待端口
-//   4. 无 Docker → 打印回退引导:安装 Docker,或在 config.yml 按需配置外部依赖地址
-// 真正的容器编排与降级重连在服务进程内(server/plugins/daq.ts → ensureDaqInfrastructure);
-// 本模块只做启动前置探测与引导,失败不阻断服务启动(平台降级可用)。
-// ============================================================
-import { spawnSync } from 'node:child_process'
-import { existsSync } from 'node:fs'
-import { connect } from 'node:net'
-import { join } from 'node:path'
-import { color } from './core/logger.mjs'
-
-/** 本机 Docker 可用性(docker -v) */
-export function detectDocker() {
-  const r = spawnSync('docker', ['-v'], { encoding: 'utf8', shell: process.platform === 'win32' })
-  if (r.status === 0) return { ok: true, version: (r.stdout ?? '').trim().replace(/^Docker version\s*/i, '') }
-  return { ok: false, version: null }
-}
-
-/** TCP 端口连通探测(毫秒级超时;resolve('online'|'offline')) */
-export function probeTcp(port, host = '127.0.0.1', timeoutMs = 1200) {
-  return new Promise((resolveState) => {
-    const sock = connect({ port: Number(port), host })
-    const done = (state) => {
-      sock.destroy()
-      resolveState(state)
-    }
-    sock.setTimeout(timeoutMs)
-    sock.on('connect', () => done('online'))
-    sock.on('timeout', () => done('offline'))
-    sock.on('error', () => done('offline'))
-  })
-}
-
-/** 在 compose 目录执行 docker compose up -d(阻塞至命令结束) */
-export function composeUp(composeDir) {
-  const r = spawnSync('docker', ['compose', 'up', '-d'], {
-    cwd: composeDir,
-    stdio: 'inherit',
-    shell: process.platform === 'win32',
-  })
-  return r.status === 0
-}
-
-/**
- * 数采基础设施前置检查。
- * @param {{ daq: any, configRoot: string }} opts ctx.config 片段与配置根(daQ compose 种子所在)
- * @returns {{ ok: boolean, mqtt: object, timescale: object, docker: object }}
- */
-export async function daqPreflight({ daq, configRoot }) {
-  const mqtt = {
-    host: String(daq?.['daq.mqtt.host'] ?? '127.0.0.1'),
-    port: Number(daq?.['daq.mqtt.port'] ?? 1883),
-    online: null,
-  }
-  const timescale = {
-    host: String(daq?.['daq.timescale.host'] ?? '127.0.0.1'),
-    port: Number(daq?.['daq.timescale.port'] ?? 5432),
-    online: null,
-  }
-  const policy = String(daq?.['daq.startInfrastructure'] ?? 'auto')
-
-  const docker = detectDocker()
-  mqtt.online = (await probeTcp(mqtt.port, mqtt.host)) === 'online'
-  timescale.online = (await probeTcp(timescale.port, timescale.host)) === 'online'
-  const allOnline = mqtt.online && timescale.online
-  const composeDir = existsSync(join(configRoot, 'docker-compose.yml')) ? configRoot : null
-
-  const result = { ok: allOnline, mqtt, timescale, docker, policy, composeDir }
-
-  if (allOnline) return result
-
-  // 未全连通:
-  //  · Docker 可用 + 策略允许(auto/always)+ 本地有 compose 定义 → 拉起并等待端口上线
-  if (docker.ok && policy !== 'never' && composeDir) {
-    console.log(`${color.cyan('›')} 数采依赖未就绪(MQTT ${mqtt.online ? '✓' : '✗'} / Timescale ${timescale.online ? '✓' : '✗'})——docker compose up -d 拉起 ...`)
-    const up = composeUp(composeDir)
-    // 等待端口上线(最长 30s;Timescale 首启初始化较慢)
-    for (let i = 0; i < 15; i++) {
-      await new Promise(r => setTimeout(r, 2000))
-      mqtt.online = (await probeTcp(mqtt.port, mqtt.host)) === 'online'
-      timescale.online = (await probeTcp(timescale.port, timescale.host)) === 'online'
-      if (mqtt.online && timescale.online) break
-    }
-    result.ok = mqtt.online && timescale.online
-    result.pulled = up
-    return result
-  }
-
-  return result
-}
-
-/** 打印回退引导(无 Docker 且依赖不可达时) */
-export function printInfraGuidance({ mqtt, timescale, docker }) {
-  console.log('')
-  console.log(color.yellow('⚠ 数采基础设施不可达(MQTT/TimescaleDB)——服务将继续启动,数采功能降级并每 30s 自动重连。'))
-  console.log(color.dim('  解决方式(二选一):'))
-  console.log(`  ${color.cyan('1.')} 安装 Docker Desktop 后重启本命令,依赖容器将自动拉起`)
-  console.log(`  ${color.cyan('2.')} 在 config.yml 的 daq 段按需配置外部依赖:`)
-  console.log(color.dim(`       daq.mqtt.host/port       (当前 ${mqtt.host}:${mqtt.port} ✗)`))
-  console.log(color.dim(`       daq.timescale.host/port  (当前 ${timescale.host}:${timescale.port} ✗)`))
-  if (!docker.ok) console.log(color.dim('       (本机未检测到 Docker)'))
-  console.log('')
-}
+// ============================================================
+// AgentWorkShop CLI — 数采基础设施前置检查(Docker 编排)
+// ------------------------------------------------------------
+// aw start 启动服务前的引导层:
+//   1. 探测 MQTT / TimescaleDB 端口连通(按有效配置的 host/port)
+//   2. 已连通 → 依赖就绪,直接通过
+//   3. 未连通且本机 Docker 可用且策略允许 → docker compose up -d 拉起并等待端口
+//   4. 无 Docker → 打印回退引导:安装 Docker,或在 config.yml 按需配置外部依赖地址
+// 真正的容器编排与降级重连在服务进程内(server/plugins/daq.ts → ensureDaqInfrastructure);
+// 本模块只做启动前置探测与引导,失败不阻断服务启动(平台降级可用)。
+// ============================================================
+import { spawnSync } from 'node:child_process'
+import { existsSync } from 'node:fs'
+import { connect } from 'node:net'
+import { join } from 'node:path'
+import { color } from './core/logger.mjs'
+
+/** 本机 Docker 可用性(docker -v) */
+export function detectDocker() {
+  const r = spawnSync('docker', ['-v'], { encoding: 'utf8' })
+  if (r.status === 0) return { ok: true, version: (r.stdout ?? '').trim().replace(/^Docker version\s*/i, '') }
+  return { ok: false, version: null }
+}
+
+/** TCP 端口连通探测(毫秒级超时;resolve('online'|'offline')) */
+export function probeTcp(port, host = '127.0.0.1', timeoutMs = 1200) {
+  return new Promise((resolveState) => {
+    const sock = connect({ port: Number(port), host })
+    const done = (state) => {
+      sock.destroy()
+      resolveState(state)
+    }
+    sock.setTimeout(timeoutMs)
+    sock.on('connect', () => done('online'))
+    sock.on('timeout', () => done('offline'))
+    sock.on('error', () => done('offline'))
+  })
+}
+
+/** 在 compose 目录执行 docker compose up -d(阻塞至命令结束) */
+export function composeUp(composeDir) {
+  const r = spawnSync('docker', ['compose', 'up', '-d'], {
+    cwd: composeDir,
+    stdio: 'inherit',
+  })
+  return r.status === 0
+}
+
+/**
+ * 数采基础设施前置检查。
+ * @param {{ daq: any, configRoot: string }} opts ctx.config 片段与配置根(daQ compose 种子所在)
+ * @returns {{ ok: boolean, mqtt: object, timescale: object, docker: object }}
+ */
+export async function daqPreflight({ daq, configRoot }) {
+  const mqtt = {
+    host: String(daq?.['daq.mqtt.host'] ?? '127.0.0.1'),
+    port: Number(daq?.['daq.mqtt.port'] ?? 1883),
+    online: null,
+  }
+  const timescale = {
+    host: String(daq?.['daq.timescale.host'] ?? '127.0.0.1'),
+    port: Number(daq?.['daq.timescale.port'] ?? 5432),
+    online: null,
+  }
+  const policy = String(daq?.['daq.startInfrastructure'] ?? 'auto')
+
+  const docker = detectDocker()
+  mqtt.online = (await probeTcp(mqtt.port, mqtt.host)) === 'online'
+  timescale.online = (await probeTcp(timescale.port, timescale.host)) === 'online'
+  const allOnline = mqtt.online && timescale.online
+  const composeDir = existsSync(join(configRoot, 'docker-compose.yml')) ? configRoot : null
+
+  const result = { ok: allOnline, mqtt, timescale, docker, policy, composeDir }
+
+  if (allOnline) return result
+
+  // 未全连通:
+  //  · Docker 可用 + 策略允许(auto/always)+ 本地有 compose 定义 → 拉起并等待端口上线
+  if (docker.ok && policy !== 'never' && composeDir) {
+    console.log(`${color.cyan('›')} 数采依赖未就绪(MQTT ${mqtt.online ? '✓' : '✗'} / Timescale ${timescale.online ? '✓' : '✗'})——docker compose up -d 拉起 ...`)
+    const up = composeUp(composeDir)
+    // 等待端口上线(最长 30s;Timescale 首启初始化较慢)
+    for (let i = 0; i < 15; i++) {
+      await new Promise(r => setTimeout(r, 2000))
+      mqtt.online = (await probeTcp(mqtt.port, mqtt.host)) === 'online'
+      timescale.online = (await probeTcp(timescale.port, timescale.host)) === 'online'
+      if (mqtt.online && timescale.online) break
+    }
+    result.ok = mqtt.online && timescale.online
+    result.pulled = up
+    return result
+  }
+
+  return result
+}
+
+/** 打印回退引导(无 Docker 且依赖不可达时) */
+export function printInfraGuidance({ mqtt, timescale, docker }) {
+  console.log('')
+  console.log(color.yellow('⚠ 数采基础设施不可达(MQTT/TimescaleDB)——服务将继续启动,数采功能降级并每 30s 自动重连。'))
+  console.log(color.dim('  解决方式(二选一):'))
+  console.log(`  ${color.cyan('1.')} 安装 Docker Desktop 后重启本命令,依赖容器将自动拉起`)
+  console.log(`  ${color.cyan('2.')} 在 config.yml 的 daq 段按需配置外部依赖:`)
+  console.log(color.dim(`       daq.mqtt.host/port       (当前 ${mqtt.host}:${mqtt.port} ✗)`))
+  console.log(color.dim(`       daq.timescale.host/port  (当前 ${timescale.host}:${timescale.port} ✗)`))
+  if (!docker.ok) console.log(color.dim('       (本机未检测到 Docker)'))
+  console.log('')
+}