@qijenchen/design-system 0.1.0-beta.57 → 0.1.0-beta.58

package/ds-canonical/hooks/inject_deploy_url_after_push.sh

@@ -51,7 +51,14 @@ fi
 
 CWD=$(pwd)
 URLS_FOUND=""
-BRANCH=$(echo "$CMD" | grep -oE 'origin\s+\S+' | awk '{print $2}' | head -1)
+# 2026-06-07 ROOT fix:只從「git push ... origin <ref>」這一段擷取 branch,不是整條 compound command 的
+# 第一個 `origin X`。否則 `git fetch origin --quiet && git push origin main` 會誤抓 fetch 段的 `--quiet`
+# 當 branch → 推導 `--quiet--site` 404(此前 5 道 guard 都沒擋到,因 `--quiet` 全是合法 git ref 字元)。
+# 隔出 push 段(到下個 command 分隔 ; & | 為止)後,取 origin 後第一個 token。
+PUSH_SEG=$(echo "$CMD" | grep -oE '(^|[;&|(])[[:space:]]*git[[:space:]]+push[[:space:]][^;&|]*' | head -1)
+BRANCH=$(echo "$PUSH_SEG" | grep -oE 'origin[[:space:]]+[^[:space:]]+' | head -1 | awk '{print $2}')
+# origin 後第一個 token 是 flag(`git push origin --force` = 無顯式 branch)→ 清空走 current-branch fallback
+case "$BRANCH" in -*) BRANCH="" ;; esac
 # 2026-06-06 fix:refspec `src:dst` → 取 dst(`HEAD:main` → `main`),否則推導出 `HEAD:main--site` 404 URL
 case "$BRANCH" in *:*) BRANCH="${BRANCH##*:}" ;; esac
 # 2026-06-06 fix:`git push origin HEAD`(或 `@`)= symbolic ref 指向當前 branch → 解析成真 branch 名,

package/ds-canonical/hooks/tests/test_inject_deploy_url_after_push.sh

@@ -41,6 +41,12 @@ head_leaked()   { echo "$STDOUT" | grep -qE 'HEAD(--|:|\))'; }
 fn7() { echo "$STDOUT" | grep -q "feature-test" && ! head_leaked; }
 fn8() { ! head_leaked; }
 fn9() { echo "$STDOUT" | grep -q "feature-test"; }
+has_feature() { echo "$STDOUT" | grep -q "feature-test"; }
+no_quiet()    { ! echo "$STDOUT" | grep -q -- "--quiet"; }
+fn10() { has_feature && no_quiet; }   # compound:fetch 段的 --quiet 不可被誤抓為 branch
+fn11() { has_feature; }                # compound:pull 段的 main 不可被誤抓(否則 grep feature-test 失敗)
+fn12() { has_feature; }                # bare push origin → fallback current branch
+fn13() { has_feature; }                # flag-after-origin → 清空 → fallback current branch
 
 check() {  # <name> <expect: skip|fire> [extra-assert-fn]
   local name="$1" expect="$2" extra="${3:-}"
@@ -98,6 +104,23 @@ check "8 refspec HEAD:main → no HEAD leak" fire 'fn8'
 run_hook "git add -A && git push origin feature-test"
 check "9 real branch push (positive control) → fire" fire 'fn9'
 
+# 10. ROOT regression:compound 命令前段 `git fetch origin --quiet` 的 flag 不可被誤抓為 branch
+#     (2026-06-07 anchor:merge 時 `git fetch origin --quiet && ... && git push origin main` 吐 `--quiet--site` 404)
+run_hook "git fetch origin --quiet && git push origin feature-test"
+check "10 compound w/ fetch flag → branch from push seg only (no --quiet leak)" fire 'fn10'
+
+# 11. compound 前段 `git pull origin main` 的 main 不可被誤抓(branch 必來自 push 段)
+run_hook "git pull origin main && git push origin feature-test"
+check "11 compound w/ pull → branch from push seg (not pull's main)" fire 'fn11'
+
+# 12. bare `git push origin`(無顯式 branch)→ fallback 當前 branch
+run_hook "git push origin"
+check "12 bare push origin → fallback current branch" fire 'fn12'
+
+# 13. flag-after-origin `git push origin --force`(無顯式 branch)→ fallback 當前 branch
+run_hook "git push origin --force"
+check "13 flag-after-origin → fallback current branch (no flag-as-branch)" fire 'fn13'
+
 teardown
 
 echo ""

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@qijenchen/design-system",
-  "version": "0.1.0-beta.57",
+  "version": "0.1.0-beta.58",
   "private": false,
   "description": "World-class design system — components, patterns, tokens, hooks (single source of truth for team distribution).",
   "type": "module",