xwang 0.0.7 → 0.0.9

package/assets/skills/xwang/scripts/xwang-guard.sh

@@ -13,6 +13,35 @@ red() { echo -e "\033[31m$1\033[0m" >&2; }
 green() { echo -e "\033[32m$1\033[0m" >&2; }
 warn() { echo -e "\033[33m$1\033[0m" >&2; }
 
+# --- Project root resolution ---
+
+find_project_root() {
+  if [ -n "${XWANG_PROJECT_ROOT:-}" ]; then
+    printf '%s' "$XWANG_PROJECT_ROOT"
+    return 0
+  fi
+
+  local git_root
+  git_root=$(git rev-parse --show-toplevel 2>/dev/null || true)
+  if [ -n "$git_root" ]; then
+    printf '%s' "$git_root"
+    return 0
+  fi
+
+  local dir="$PWD"
+  while [ "$dir" != "/" ]; do
+    if [ -d "$dir/openspec/changes" ]; then
+      printf '%s' "$dir"
+      return 0
+    fi
+    dir=$(dirname "$dir")
+  done
+
+  printf '%s' "$PWD"
+}
+
+PROJECT_ROOT=$(find_project_root)
+
 # --- Input validation ---
 
 validate_change_name() {
@@ -21,15 +50,19 @@ validate_change_name() {
     red "ERROR: Change name cannot be empty" >&2
     exit 1
   fi
-  if [[ ! "$name" =~ ^[a-zA-Z0-9_-]+$ ]]; then
-    red "ERROR: Invalid change name: '$name'" >&2
-    red "Valid characters: a-z, A-Z, 0-9, -, _" >&2
-    exit 1
-  fi
   if [[ "$name" =~ \.\. ]]; then
     red "ERROR: Change name cannot contain '..' (path traversal not allowed)" >&2
     exit 1
   fi
+  # Reject path separators, whitespace, control chars, and shell metacharacters.
+  # CJK characters and other Unicode letters are allowed.
+  if printf '%s' "$name" | perl -ne 'exit 1 if m{[/\\\s\0-\x1F\x7F;|&$`()<>{}[\]*'"'"'"!#@%^=+~]}; exit 0'; then
+    : # valid
+  else
+    red "ERROR: Invalid change name: '$name'" >&2
+    red "Avoid: / \\ spaces control chars and shell metacharacters" >&2
+    exit 1
+  fi
 }
 
 if [ "${XWANG_GUARD_SOURCE_ONLY:-0}" = "1" ]; then
@@ -48,9 +81,16 @@ else
   if [[ "${3:-}" == "--apply" ]]; then
     APPLY=1
   fi
-  CHANGE_DIR="openspec/changes/$CHANGE"
-  if [ "$PHASE" = "archive" ] && [ ! -d "$CHANGE_DIR" ] && [ -d "openspec/changes/archive/$CHANGE" ]; then
-    CHANGE_DIR="openspec/changes/archive/$CHANGE"
+  CHANGE_DIR="$PROJECT_ROOT/openspec/changes/$CHANGE"
+  if [ "$PHASE" = "archive" ] && [ ! -d "$CHANGE_DIR" ]; then
+    if [ -d "$PROJECT_ROOT/openspec/changes/archive/$CHANGE" ]; then
+      CHANGE_DIR="$PROJECT_ROOT/openspec/changes/archive/$CHANGE"
+    elif [ -d "$PROJECT_ROOT/openspec/changes/archive" ]; then
+      archived=$(find "$PROJECT_ROOT/openspec/changes/archive" -maxdepth 1 -type d -name "*-$CHANGE" -print -quit 2>/dev/null || true)
+      if [ -n "$archived" ]; then
+        CHANGE_DIR="$archived"
+      fi
+    fi
   fi
 fi
 
@@ -306,7 +346,7 @@ branch_status_handled() {
 design_doc_recorded() {
   local design_doc
   design_doc=$(yaml_field_value "design_doc" 2>/dev/null || true)
-  if [ -n "$design_doc" ] && [ "$design_doc" != "null" ] && [ -f "$design_doc" ]; then
+  if [ -n "$design_doc" ] && [ "$design_doc" != "null" ] && { [ -f "$PROJECT_ROOT/$design_doc" ] || [ -f "$design_doc" ]; }; then
     return 0
   fi
   echo "design_doc must point to an existing PRD for full workflow before leaving design." >&2
@@ -410,6 +450,7 @@ guard_design() {
   check "design.md exists and non-empty" file_nonempty "$CHANGE_DIR/design.md"
   check "tasks.md exists and non-empty" file_nonempty "$CHANGE_DIR/tasks.md"
   check "tasks.md has at least one task" tasks_has_any
+  check "OpenSpec artifacts language consistency" openspec_artifacts_language_consistent
 
   if [ "$workflow" = "full" ]; then
     check "design_doc is recorded for full workflow" design_doc_recorded
@@ -418,7 +459,10 @@ guard_design() {
   local design_doc
   design_doc=$(yaml_field_value "design_doc" 2>/dev/null || true)
   if [ -n "$design_doc" ] && [ "$design_doc" != "null" ]; then
-    check "PRD file ($design_doc) exists" file_nonempty "$design_doc"
+    local doc_path="$design_doc"
+    [ -f "$PROJECT_ROOT/$design_doc" ] && doc_path="$PROJECT_ROOT/$design_doc"
+    check "PRD file ($design_doc) exists" file_nonempty "$doc_path"
+    check "PRD language consistency" design_doc_language_consistent
   elif [ "$workflow" != "full" ]; then
     warn "  [WARN] No design_doc recorded in .xwang.yaml (optional for quick/tweak)"
   fi
@@ -454,6 +498,13 @@ guard_archive() {
   check "proposal.md exists" file_nonempty "$CHANGE_DIR/proposal.md"
   check "design.md exists" file_nonempty "$CHANGE_DIR/design.md"
   check "tasks.md all tasks checked" tasks_all_done
+  check "OpenSpec artifacts language consistency" openspec_artifacts_language_consistent
+
+  local design_doc
+  design_doc=$(yaml_field_value "design_doc" 2>/dev/null || true)
+  if [ -n "$design_doc" ] && [ "$design_doc" != "null" ]; then
+    check "PRD language consistency" design_doc_language_consistent
+  fi
 }
 
 locate_state_script() {
@@ -470,6 +521,66 @@ locate_state_script() {
   return 1
 }
 
+locate_doc_lang_check() {
+  local check_sh="$SCRIPT_DIR/xwang-doc-lang-check.sh"
+  if [ -f "$check_sh" ]; then
+    echo "$check_sh"
+    return 0
+  fi
+  check_sh="$(find "$SCRIPT_DIR" "$SCRIPT_DIR/.." "$HOME" -path '*/xwang/scripts/xwang-doc-lang-check.sh' -type f -print -quit 2>/dev/null || true)"
+  if [ -n "$check_sh" ] && [ -f "$check_sh" ]; then
+    echo "$check_sh"
+    return 0
+  fi
+  return 1
+}
+
+design_doc_language_consistent() {
+  local design_doc
+  design_doc=$(yaml_field_value "design_doc" 2>/dev/null || true)
+  if [ -z "$design_doc" ] || [ "$design_doc" = "null" ]; then
+    return 0
+  fi
+
+  local target=""
+  if [ -f "$PROJECT_ROOT/$design_doc" ]; then
+    target="$PROJECT_ROOT/$design_doc"
+  elif [ -f "$design_doc" ]; then
+    target="$design_doc"
+  elif [ -f "$CHANGE_DIR/design.md" ]; then
+    # design_doc may be stale after archiving; fall back to design.md in the change dir
+    target="$CHANGE_DIR/design.md"
+  fi
+
+  if [ -z "$target" ]; then
+    echo "design_doc file not found: $design_doc" >&2
+    return 1
+  fi
+
+  local check_sh
+  if ! check_sh=$(locate_doc_lang_check); then
+    echo "xwang-doc-lang-check.sh not found; skipping language check" >&2
+    return 0
+  fi
+  "$XWANG_BASH" "$check_sh" "$target" >/dev/null 2>&1
+}
+
+openspec_artifacts_language_consistent() {
+  local check_sh
+  if ! check_sh=$(locate_doc_lang_check); then
+    echo "xwang-doc-lang-check.sh not found; skipping language check" >&2
+    return 0
+  fi
+  local files=()
+  for f in "$CHANGE_DIR/proposal.md" "$CHANGE_DIR/design.md" "$CHANGE_DIR/tasks.md"; do
+    [ -f "$f" ] && files+=("$f")
+  done
+  if [ ${#files[@]} -eq 0 ]; then
+    return 0
+  fi
+  "$XWANG_BASH" "$check_sh" "${files[@]}" >/dev/null 2>&1
+}
+
 apply_state_update() {
   local state_sh
   if ! state_sh=$(locate_state_script); then

package/assets/skills/xwang/scripts/xwang-state.sh

@@ -62,15 +62,19 @@ validate_change_name() {
     red "ERROR: Change name cannot be empty" >&2
     exit 1
   fi
-  if [[ ! "$name" =~ ^[a-zA-Z0-9_-]+$ ]]; then
-    red "ERROR: Invalid change name: '$name'" >&2
-    red "Valid characters: a-z, A-Z, 0-9, -, _" >&2
-    exit 1
-  fi
   if [[ "$name" =~ \.\. ]]; then
     red "ERROR: Change name cannot contain '..' (path traversal not allowed)" >&2
     exit 1
   fi
+  # Reject path separators, whitespace, control chars, and shell metacharacters.
+  # CJK characters and other Unicode letters are allowed.
+  if printf '%s' "$name" | perl -ne 'exit 1 if m{[/\\\s\0-\x1F\x7F;|&$`()<>{}[\]*'"'"'"!#@%^=+~]}; exit 0'; then
+    : # valid
+  else
+    red "ERROR: Invalid change name: '$name'" >&2
+    red "Avoid: / \\ spaces control chars and shell metacharacters" >&2
+    exit 1
+  fi
 }
 
 validate_enum() {

package/assets/skills/xwang-archive/SKILL.md

@@ -77,6 +77,7 @@ fi
 - [ ] 调用 `/openspec-archive-change <name>`（或等价的 OpenSpec archive 命令）按 delta 语义合并主 spec 并移动 change 到归档目录。
 - [ ] 如归档命令返回非零退出码，报告错误并停止。
 - [ ] 归档成功后，确认 change 目录已移动到 `openspec/changes/archive/YYYY-MM-DD-<name>/`（或 OpenSpec 默认归档路径）。
+- [ ] **同步 `.xwang.yaml` 中的文件路径**：如果 `design_doc`、`plan`、`verification_report` 等字段指向的是 `openspec/changes/<name>/` 下的旧路径，更新为归档目录 `openspec/changes/archive/YYYY-MM-DD-<name>/` 下的相对路径，避免后续 guard 或读取时路径失效。
 - [ ] 向用户汇报归档完成、新目录路径与生命周期闭环状态。
 
 ## 退出条件

package/assets/skills/xwang-design/SKILL.md

@@ -11,10 +11,10 @@ description: 启动 xwang 项目阶段2：深度设计，明确需求并同步
 
 1. 调用 `/grill-with-docs` 围绕需求目标、范围、用户、约束、验收标准等逐层追问，同时对照现有领域模型和文档（CONTEXT.md、ADRs）挑战术语、澄清冲突，直到达成共识。
 2. **强制进行 PRD 拆分预检（阻塞点）**：`/grill-with-docs` 确认需求完成后，**必须**输出一份 `PRD 拆分预检报告`，基于已澄清信息评估是否需要拆分为多个 change。**无论是否需要拆分，都必须停下来向用户展示报告并等待明确选择**；未确认前不得生成 PRD 或创建 OpenSpec change。
-3. grilling 结束后，根据需求内容自己总结一个简洁的 kebab-case 需求名称 `<name>`，用于生成 `docs/mattpocock/<name>-prd.md`。
+3. grilling 结束后，根据需求内容自己总结一个简洁的中文需求名称 `<name>`，用于生成 `docs/mattpocock/<name>-prd.md`。
 4. 创建 `docs/mattpocock/` 目录（如不存在）。
 5. **需求澄清完成确认（阻塞点）**：向用户输出一份结构化的需求摘要（目标、范围、用户、核心行为、边界情况、非功能性需求、依赖与限制），等待用户明确确认或提出修改；未确认前不得生成 PRD 或创建 OpenSpec change。
-6. 用户确认后，调用 `/to-prd` 基于对话上下文合成**中文** PRD。
+6. 用户确认后，调用 `/to-prd` 基于对话上下文合成 PRD。
 7. 将生成的 PRD 内容写入 `docs/mattpocock/<name>-prd.md`。
 8. 直接调用 `/openspec-new-change`：以 `<name>` 作为 change 名称，将 PRD 的中文内容作为 change 文档/上下文创建 change，过程中无需用户确认；若 `/openspec-new-change` 流程中出现任何确认提示（如“是否继续创建 proposal.md？”），直接代为确认并继续，不得将确认问题抛给用户；**要求 `/openspec-new-change` 生成的所有文档/artifact 必须使用中文表述，包括但不限于 `proposal.md`、`design.md`、`tasks.md` 以及 `specs/*/spec.md`**。
 9. **初始化 xwang 状态**：调用 `"$XWANG_STATE" init <name> full`，在 `openspec/changes/<name>/.xwang.yaml` 创建状态文件（起始 phase 为 `design`）。
@@ -97,7 +97,7 @@ grilling 确认完成后、生成 PRD 前，**必须**执行 PRD 拆分预检并
 
 ### Step 1b：需求澄清完成确认（阻塞点）
 
-- [ ] grilling 结束后，根据需求核心内容自己生成一个简洁的 kebab-case 名称（如 `Auth Flow` → `auth-flow`）作为 `<name>`，直接使用无需确认。
+- [ ] grilling 结束后，根据需求核心内容自己生成一个简洁的中文名称（如 `会议周视图 UI 增强`）作为 `<name>`，直接使用无需确认。
 - [ ] 使用 `mkdir -p docs/mattpocock` 确保目录存在。
 - [ ] 向用户输出结构化的**需求确认摘要**（建议包含：目标、范围、目标用户、核心行为、边界情况、非功能性需求、依赖与限制）。
 - [ ] **必须使用当前平台可用的用户输入/确认机制暂停并等待用户确认需求澄清完成**。若用户提出修改，根据反馈调整摘要并再次确认，直到达成共识。

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "xwang",
-  "version": "0.0.7",
+  "version": "0.0.9",
   "description": "xwang CLI",
   "keywords": [
     "xwang",