update

zichun
1 parent b3977095
Showing 4 changed files with 76 additions and 12 deletions
skills/coding/mr-create/scripts/create-mr.sh
skills/plan/downstream-gen/scripts/derive-gitlab.sh
skills/plan/skeleton-gen/templates/env-local-template
skills/plan/skeleton-gen/templates/scripts-test-template.sh
@@ -76,14 +76,35 @@ awk -v report=&quot;$REPORT&quot; &#39;
 mv .tmp/mr-desc.final "$DESC_FILE"
 # 7. 幂等守门：查已有 opened MR
-HTTP_CODE=$(curl -sS -o .tmp/existing.json -w '%{http_code}' \
+CURL_META=$(curl -sS -o .tmp/existing.json -w '%{http_code}|%{url_effective}' \
   --header "PRIVATE-TOKEN: ${GITLAB_TOKEN}" \
   "${GITLAB_API_URL}/projects/${GITLAB_PROJECT_ID}/merge_requests?source_branch=${CURRENT_BRANCH}&state=opened")
+HTTP_CODE=${CURL_META%%|*}
+EFFECTIVE_URL=${CURL_META#*|}
+
 if [ "$HTTP_CODE" != "200" ]; then
   echo "[create-mr] ⚠️ 查询已有 MR 失败 (HTTP $HTTP_CODE)" >&2
-  jq -r '.message // .error // .' .tmp/existing.json | head -c 200 >&2
-  echo >&2
+  echo "  effective URL: $EFFECTIVE_URL" >&2
+  FIRST=$(head -c 1 .tmp/existing.json 2>/dev/null || echo "")
+  case "$FIRST" in
+    '{'|'[')
+      echo "  响应（JSON）：" >&2
+      jq -r '.message // .error // .' .tmp/existing.json 2>/dev/null | head -c 200 >&2
+      echo >&2
+      ;;
+    '<')
+      echo "  响应是 HTML（很可能反代/路由失配，把 API 请求送进了 web 处理链）：" >&2
+      head -c 200 .tmp/existing.json >&2
+      echo >&2
+      echo "  常见原因：GITLAB_API_URL 错 / GITLAB_PROJECT_ID 不是数字 ID / 反代规范化路径" >&2
+      ;;
+    *)
+      echo "  响应非 JSON 非 HTML（前 200 bytes）：" >&2
+      head -c 200 .tmp/existing.json >&2
+      echo >&2
+      ;;
+  esac
   rm -f .tmp/existing.json "$DESC_FILE"
   exit 1
 fi
@@ -4,8 +4,9 @@
 # 用法: bash derive-gitlab.sh [.env.local 路径，默认 .env.local]
 #
 # 派生字段:
-#   GITLAB_PROJECT_ID = origin 的 namespace/path（/ 编码成 %2F）
 #   GITLAB_API_URL    = <scheme>://<host>/api/v3
+#   GITLAB_PROJECT_ID = 通过 GitLab API（GET /projects?search=...）解析得到的项目数字 ID
+#                       要求 GITLAB_TOKEN 已填且有效；token 缺失 / 验证失败 / 未匹配时留 TBD
 #
 # 仅当字段值为 TBD(A5 自动补) 或空时回填；用户手填值不动。
 # 仅支持 http(s) origin URL；其他协议（ssh / git@）跳过。
@@ -39,8 +40,8 @@ REST=${URL#${SCHEME}://}
 HOST=${REST%%/*}
 PATH_RAW=${REST#*/}
 PATH_RAW=${PATH_RAW%.git}
+REPO_NAME=$(basename "$PATH_RAW")
-PROJECT_ID=${PATH_RAW//\//%2F}
 API_URL="${SCHEME}://${HOST}/api/v3"
 update_field() {
@@ -99,6 +100,36 @@ report_token() {
 }
 echo "derive-gitlab.sh: 从 origin ($URL) 派生 GitLab 凭据："
-update_field GITLAB_PROJECT_ID "$PROJECT_ID"
 update_field GITLAB_API_URL "$API_URL"
+
+# GITLAB_PROJECT_ID：通过 GitLab API 解析数字 ID（要求 token 已填且有效）
+TOKEN_LINE=$(grep -E '^GITLAB_TOKEN=' "$ENV_FILE" | head -1)
+TOKEN_VAL=${TOKEN_LINE#GITLAB_TOKEN=}
+case "$TOKEN_VAL" in
+  \'*\') TOKEN_VAL=${TOKEN_VAL#\'}; TOKEN_VAL=${TOKEN_VAL%\'} ;;
+  \"*\") TOKEN_VAL=${TOKEN_VAL#\"}; TOKEN_VAL=${TOKEN_VAL%\"} ;;
+esac
+
+case "$TOKEN_VAL" in
+  ""|"【人工填写："*|"TBD"*)
+    echo "  GITLAB_PROJECT_ID = TBD  [token 未填，跳过 API 解析；填完 token 后重跑此脚本]"
+    ;;
+  *)
+    USER_HTTP=$(curl -sS -o /dev/null -w '%{http_code}' --header "PRIVATE-TOKEN: $TOKEN_VAL" "$API_URL/user" 2>/dev/null || echo "000")
+    if [ "$USER_HTTP" != "200" ]; then
+      echo "  GITLAB_PROJECT_ID = TBD  [token 验证失败 HTTP $USER_HTTP，留 TBD 待人工确认]"
+    else
+      SEARCH_RESP=$(curl -sS --header "PRIVATE-TOKEN: $TOKEN_VAL" \
+        "$API_URL/projects?search=$REPO_NAME&simple=true&per_page=50" 2>/dev/null || echo "[]")
+      NUMERIC_ID=$(echo "$SEARCH_RESP" | jq -r --arg p "$PATH_RAW" \
+        '.[] | select(.path_with_namespace == $p) | .id' 2>/dev/null | head -1)
+      if [ -n "$NUMERIC_ID" ]; then
+        update_field GITLAB_PROJECT_ID "$NUMERIC_ID"
+      else
+        echo "  GITLAB_PROJECT_ID = TBD  [API 未匹配 path_with_namespace=$PATH_RAW，请到 GitLab 项目设置页查数字 ID 后填入]"
+      fi
+    fi
+    ;;
+esac
+
 report_token
@@ -29,8 +29,9 @@ TEST_DB_ALLOWED_HOSTS=
 #   自动派生为 `<scheme>://<host>/api/v3`；如派生的 scheme 错（例如远程是 ssh 但实际 web 走 https），手动改掉即可
 # - GITLAB_TOKEN：GitLab v3 的 **Private Token**（用户 Profile → Account → Private token 生成；HTTP 调用仍用
 #   `PRIVATE-TOKEN` 头。v3 token 是全权限、无细粒度 scope）。**无法派生，必须人工填**
-# - GITLAB_PROJECT_ID：A5 从 origin 远程路径自动派生为 URL-encoded 形式（如 `zhuzc/test` → `zhuzc%2Ftest`）；
-#   也可手动改成项目数字 ID（GitLab 项目设置页可见）
+# - GITLAB_PROJECT_ID：项目数字 ID（GitLab 项目设置 → General → 顶部 Project ID 字段，纯整数）。
+#   A5 `downstream-gen` 在 GITLAB_TOKEN 已填的前提下会调 API 自动解析数字 ID 写入；
+#   token 未填 / API 解析失败时留 TBD，请人工到设置页查到后填入
 GITLAB_API_URL='TBD(A5 自动补)'
 GITLAB_TOKEN=【人工填写：GitLab Private Token（Profile → Account → Private token）】
 GITLAB_PROJECT_ID='TBD(A5 自动补)'
 #!/usr/bin/env bash
 # scripts/test.sh —— 合并到默认分支（main / master）前的测试闸门。
-# 顺序：setup-db → build → lint → unit+integration → e2e → reset-db
+# 顺序：detect → setup-db → build → lint → unit+integration → e2e → reset-db
 # 由 .githooks/pre-push 和 test-gate skill（通过子会话）调用。
 set -euo pipefail
@@ -8,17 +8,28 @@ set -euo pipefail
 PROJECT_ROOT="$(cd "$(dirname "$0")/.." && pwd)"
 cd "$PROJECT_ROOT"
+# Stack detection (runtime, mode-agnostic)
+HAS_BACKEND=0; [ -d backend ] && HAS_BACKEND=1
+HAS_FRONTEND=0; [ -d frontend ] && HAS_FRONTEND=1
+if [ $HAS_BACKEND -eq 0 ] && [ $HAS_FRONTEND -eq 0 ]; then
+  echo "[test.sh] FATAL: neither backend/ nor frontend/ exists" >&2
+  exit 1
+fi
+
 echo "[test.sh] 1/6 setup test db"
 ./scripts/setup-test-db.sh
 echo "[test.sh] 2/6 build"
-{{build_cmd}}
+if [ $HAS_BACKEND -eq 1 ]; then (cd backend && {{backend_build}}); else echo "[test.sh] skip backend build"; fi
+if [ $HAS_FRONTEND -eq 1 ]; then (cd frontend && {{frontend_build}}); else echo "[test.sh] skip frontend build"; fi
 echo "[test.sh] 3/6 lint"
-{{lint_cmd}}
+if [ $HAS_BACKEND -eq 1 ]; then (cd backend && {{backend_lint}}); else echo "[test.sh] skip backend lint"; fi
+if [ $HAS_FRONTEND -eq 1 ]; then (cd frontend && {{frontend_lint}}); else echo "[test.sh] skip frontend lint"; fi
 echo "[test.sh] 4/6 unit + integration"
-{{test_cmd}}
+if [ $HAS_BACKEND -eq 1 ]; then (cd backend && {{backend_test}}); else echo "[test.sh] skip backend test"; fi
+if [ $HAS_FRONTEND -eq 1 ]; then (cd frontend && {{frontend_test}}); else echo "[test.sh] skip frontend test"; fi
 echo "[test.sh] 5/6 E2E"
 {{e2e_cmd}}