Compare commits
5 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 67dae3b814 | |||
| 43c328d26f | |||
| bcb736ed19 | |||
| 6772ca67d3 | |||
| 1b5551274a |
@@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"name": "isep",
|
"name": "isep",
|
||||||
"description": "InkStone Environment Plugin —— leo 的 Claude Code 環境唯一真相源:43 支機械閘(53 條註冊,白話盤點見 docs/hooks-inventory.md)、7 支 slash command、2 支 skill、27 支腳本,外加治理規範與標籤真相源。本機與雲端裝同一份,沒有子集。",
|
"description": "InkStone Environment Plugin —— leo 的 Claude Code 環境唯一真相源:43 支機械閘(53 條註冊,白話盤點見 docs/hooks-inventory.md)、7 支 slash command、2 支 skill、27 支腳本,外加治理規範與標籤真相源。本機與雲端裝同一份,沒有子集。",
|
||||||
"version": "0.3.2",
|
"version": "0.3.4",
|
||||||
"keywords": [
|
"keywords": [
|
||||||
"inkstone",
|
"inkstone",
|
||||||
"guardrails",
|
"guardrails",
|
||||||
|
|||||||
@@ -677,3 +677,28 @@ Gitea 的 milestone 只管得到同一個 repo,所以六個群在 `inkstone/IS
|
|||||||
結構(正交) hub ← tracking issue 標記
|
結構(正交) hub ← tracking issue 標記
|
||||||
封存不刪 duplicate ← 由 close/duplicate 取代,保留在歷史票上
|
封存不刪 duplicate ← 由 close/duplicate 取代,保留在歷史票上
|
||||||
```
|
```
|
||||||
|
|
||||||
|
### M4.8 每個里程碑都要有真的期限(leo 2026-08-21 立)
|
||||||
|
|
||||||
|
> 「**以後所有的 milestone 限制時間**」/「**你根本沒有時間概念,浪費一整天**」
|
||||||
|
|
||||||
|
🔴 **`9999-01-01` 不算期限。** 立這條的當下實查七個 open milestone,
|
||||||
|
**六個的期限是 `9999-01-01`**——那是「沒有期限」穿了一件期限的衣服,
|
||||||
|
比空白更糟:盤點時每一格看起來都有值,於是沒有人發現這裡從來沒有時間壓力。
|
||||||
|
|
||||||
|
**怎麼定**:里程碑的 deliverable 是**一個可測的版本**(M4.0)。
|
||||||
|
問一句「**這個版本幾號要能給 leo 打開?**」,那天就是期限。
|
||||||
|
|
||||||
|
| 剩幾張未結 | 期限 |
|
||||||
|
|---|---|
|
||||||
|
| 本週要收 | 三天 |
|
||||||
|
| 1–3 張 | 一週 |
|
||||||
|
| 4 張以上 | 兩週 |
|
||||||
|
|
||||||
|
**過期了怎麼辦**:不自動關、不自動打 tag(M4.3 已否決那條)。
|
||||||
|
過期只做兩件事——**對帳**(哪幾張沒動)與**通知**。
|
||||||
|
期限的用途是製造節奏,不是製造假完成。
|
||||||
|
|
||||||
|
**機械閘**=`hooks/milestone-due-guard.sh`(PreToolUse `Bash`):
|
||||||
|
建 milestone 沒有 `due_on`、或 `due_on` 帶 `9999` → 擋。
|
||||||
|
四向實測:無 due_on 擋/9999 擋/真期限放行/只是讀 milestone 放行。
|
||||||
|
|||||||
@@ -40,6 +40,10 @@
|
|||||||
{
|
{
|
||||||
"type": "command",
|
"type": "command",
|
||||||
"command": "${CLAUDE_PLUGIN_ROOT}/hooks/ticket-api-bypass-guard.sh"
|
"command": "${CLAUDE_PLUGIN_ROOT}/hooks/ticket-api-bypass-guard.sh"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"type": "command",
|
||||||
|
"command": "${CLAUDE_PLUGIN_ROOT}/hooks/milestone-due-guard.sh"
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -125,7 +125,33 @@ if printf '%s' "$CMD" | grep -qE '(^|[;&|(`]|&&|\|\|)[[:space:]]*git([[:space:]]
|
|||||||
# 2026-08-20: match the target branch on a word boundary, not a bare substring --
|
# 2026-08-20: match the target branch on a word boundary, not a bare substring --
|
||||||
# a glob like *main* also matches "domain" (d-o-**m-a-i-n**), e.g. a push to
|
# a glob like *main* also matches "domain" (d-o-**m-a-i-n**), e.g. a push to
|
||||||
# `fix/custom-domain-setup` would have false-positived.
|
# `fix/custom-domain-setup` would have false-positived.
|
||||||
if printf '%s' "$CMD" | grep -qE '(^|[^A-Za-z])(main|master)([^A-Za-z]|$)'; then
|
# 2026-08-21: 只看 **push 的目標**,不再掃整條指令。
|
||||||
|
# 舊版掃整條 ⇒ 一個晚上誤攔四次,全都是推 feature branch 或 tag:
|
||||||
|
# git checkout -b fix/x main && git push origin fix/x ← 「main」在 checkout 上
|
||||||
|
# gh pr create --base main ← 根本不是 git push
|
||||||
|
# git checkout origin/main --detach; git push origin refs/tags/v0.3.3
|
||||||
|
# ⇒ **紅線寫得越細,命中關鍵字的機率越高**(leo 2026-08-17 的觀察,
|
||||||
|
# 文字層封路必敗)。這裡改成判動作的目標,不是判字面。
|
||||||
|
_push_seg=$(printf '%s' "$CMD" | sed -E 's/.*git[[:space:]]+(-[^[:space:]]+[[:space:]]+)*push//' | sed -E 's/[;&|].*//')
|
||||||
|
_dest=""
|
||||||
|
_seen_remote=0
|
||||||
|
_saw_refspec=0
|
||||||
|
for _tok in $_push_seg; do
|
||||||
|
case "$_tok" in
|
||||||
|
-*) continue ;; # 旗標
|
||||||
|
refs/tags/*|*:refs/tags/*) _saw_refspec=1; continue ;; # 推 tag 不是推分支
|
||||||
|
esac
|
||||||
|
if [ "$_seen_remote" = "0" ]; then _seen_remote=1; continue; fi # 第一個非旗標=remote
|
||||||
|
_saw_refspec=1
|
||||||
|
_dest="$_dest ${_tok##*:}" # a:b 的目標是 b;沒有冒號就是它自己
|
||||||
|
done
|
||||||
|
# 🔴 只有「一個 refspec 都沒給」才退回猜當前分支。
|
||||||
|
# 看到 refspec(哪怕是 tag)就照它判——否則推 tag 會被當成推當前分支,
|
||||||
|
# 而當前分支若剛好叫 main 就誤擋(2026-08-21 實測抓到)。
|
||||||
|
if [ "${_saw_refspec:-0}" = "0" ]; then
|
||||||
|
_dest=$(git rev-parse --abbrev-ref HEAD 2>/dev/null || echo "")
|
||||||
|
fi
|
||||||
|
if printf '%s' "$_dest" | tr ' ' '\n' | grep -qE '^(main|master)$'; then
|
||||||
stamp_ok && exit 0
|
stamp_ok && exit 0
|
||||||
|
|
||||||
# ── 擋下的同時,把「誰想推什麼」留成一份請求(leo 2026-08-12)───────────
|
# ── 擋下的同時,把「誰想推什麼」留成一份請求(leo 2026-08-12)───────────
|
||||||
|
|||||||
Executable
+42
@@ -0,0 +1,42 @@
|
|||||||
|
#!/usr/bin/env bash
|
||||||
|
# milestone-due-guard.sh — 建 milestone 一定要有真的期限(leo 2026-08-21 立)
|
||||||
|
#
|
||||||
|
# leo 原話:「**以後所有的 milestone 限制時間**」
|
||||||
|
# 「**你根本沒有時間概念,浪費一整天**」
|
||||||
|
#
|
||||||
|
# 🔴 為什麼連 9999 也要擋:立這條的當下實查七個 open milestone,
|
||||||
|
# 六個的期限是 `9999-01-01`——那是「沒有期限」穿了一件期限的衣服,
|
||||||
|
# 比空白更糟,因為它讓盤點時看起來每一格都有值。
|
||||||
|
set -uo pipefail
|
||||||
|
INPUT=$(cat)
|
||||||
|
CMD=$(printf '%s' "$INPUT" | python3 -c "import json,sys;print(json.load(sys.stdin).get('tool_input',{}).get('command',''))" 2>/dev/null || echo "")
|
||||||
|
[ -z "$CMD" ] && exit 0
|
||||||
|
|
||||||
|
# 只管「建 milestone」這個動作
|
||||||
|
printf '%s' "$CMD" | grep -qE 'milestones' || exit 0
|
||||||
|
printf '%s' "$CMD" | grep -qE '\-X *POST|--request *POST' || exit 0
|
||||||
|
|
||||||
|
DUE=$(printf '%s' "$CMD" | grep -oE '"due_on"[^,}]*' | head -1)
|
||||||
|
BAD=""
|
||||||
|
[ -z "$DUE" ] && BAD="沒有 due_on"
|
||||||
|
printf '%s' "$DUE" | grep -q '9999' && BAD="due_on 是 9999(等於沒有期限)"
|
||||||
|
|
||||||
|
[ -z "$BAD" ] && exit 0
|
||||||
|
|
||||||
|
cat >&2 <<MSG
|
||||||
|
⏱️ 里程碑期限閘:$BAD
|
||||||
|
|
||||||
|
【leo 2026-08-21】「**以後所有的 milestone 限制時間**」
|
||||||
|
「**你根本沒有時間概念,浪費一整天**」
|
||||||
|
|
||||||
|
🔴 9999-01-01 也算違規。立這條的當下實查七個 open milestone,
|
||||||
|
六個是 9999——那是「沒有期限」穿了一件期限的衣服,
|
||||||
|
比空白更糟,因為盤點時每一格看起來都有值。
|
||||||
|
|
||||||
|
怎麼定:這個里程碑的 deliverable 是**一個可測的版本**。
|
||||||
|
問「這個版本幾號要能給 leo 打開?」,那天就是期限。
|
||||||
|
剩 1–3 張票 → 一週;4 張以上 → 兩週;本週要收 → 三天。
|
||||||
|
|
||||||
|
加上去再送一次: "due_on": "YYYY-MM-DDT23:59:59Z"
|
||||||
|
MSG
|
||||||
|
exit 2
|
||||||
@@ -119,8 +119,21 @@ if not ok_hits and not ng_hits:
|
|||||||
|
|
||||||
sid = (d.get("session_id") or "nosid")[:8]
|
sid = (d.get("session_id") or "nosid")[:8]
|
||||||
aid = (d.get("agent_id") or d.get("subagent_id") or "")[:10]
|
aid = (d.get("agent_id") or d.get("subagent_id") or "")[:10]
|
||||||
stamp = hashlib.sha1((tp + sid + aid).encode()).hexdigest()[:8]
|
# 🔴 2026-08-21:stamp 原本雜湊「交件路徑」⇒ 同樣的宣稱每回合生一個新檔名,
|
||||||
path = os.path.join(os.environ["DIR"], "claims-%s-%s.md" % (sid, stamp))
|
# 而且不知道總管已經驗過了。實際發作:同兩條 sdd-guard 宣稱連生四張單
|
||||||
|
# (1c97d461/fcb285dc/256de849/394b97ae),驗掉一張下一回合又冒一張。
|
||||||
|
# ⇒ 改成雜湊**宣稱內容本身**:同樣的宣稱=同一個檔名 ⇒ 驗過就不再冒出來。
|
||||||
|
_claims = sorted(set(str(x) for x in (ok_hits + ng_hits)))
|
||||||
|
# 🔴 空清單就退回舊行為 —— 但那等於這支閘沒抓到任何宣稱,本來就會 SKIP,
|
||||||
|
# 所以這個 fallback 實際上不會被用到;留著只是不讓 stamp 變成空字串的雜湊。
|
||||||
|
_basis = "\n".join(_claims) if _claims else (tp + sid + aid)
|
||||||
|
stamp = hashlib.sha1(_basis.encode()).hexdigest()[:8]
|
||||||
|
_name = "claims-%s-%s.md" % (sid, stamp)
|
||||||
|
path = os.path.join(os.environ["DIR"], _name)
|
||||||
|
|
||||||
|
# 已經驗過並移進 verified/ 的,不要再生一次。
|
||||||
|
if os.path.exists(os.path.join(os.environ["DIR"], "verified", _name)):
|
||||||
|
print("SKIP:already-verified"); raise SystemExit
|
||||||
|
|
||||||
def block(title, items, howto, cap):
|
def block(title, items, howto, cap):
|
||||||
if not items:
|
if not items:
|
||||||
|
|||||||
Regular → Executable
+24
-37
@@ -1,42 +1,29 @@
|
|||||||
#!/usr/bin/env bash
|
#!/usr/bin/env bash
|
||||||
# main-and-prod-push-guard.sh 的迴歸測試——重點在「geek6688 豁免的範圍夠不夠窄」。
|
# 八向實測 main-and-prod-push-guard.sh
|
||||||
# 🔴 寫成檔案跑:測試指令必然含 `wrangler deploy`,直接在 Bash 打會被 prod-write-guard 擋。
|
# 放在檔案裡跑,因為測試字串本身會觸發「舊版」那支閘(第五次誤攔)。
|
||||||
#
|
G="$1" # 要測的 hook 路徑
|
||||||
# 用一個**沒有 .github-armed** 的臨時 CLAUDE_PROJECT_DIR,
|
pass=0; fail=0
|
||||||
# 否則本機真的有那個檔 ⇒「該擋的」會假性通過,測了等於沒測。
|
|
||||||
HOOK="$1"
|
|
||||||
TMPPROJ=$(mktemp -d)
|
|
||||||
trap 'rm -rf "$TMPPROJ"' EXIT
|
|
||||||
|
|
||||||
mk(){ python3 -c "import json,sys;print(json.dumps({'tool_name':'Bash','tool_input':{'command':sys.argv[1]}}))" "$1"; }
|
t() { # t <說明> <指令> <期望 exit>
|
||||||
PASS=0; FAIL=0
|
printf '{"tool_name":"Bash","tool_input":{"command":"%s"}}' "$2" \
|
||||||
t(){ mk "$3" | env CLAUDE_PROJECT_DIR="$TMPPROJ" "$HOOK" >/dev/null 2>&1; rc=$?
|
| CLAUDE_CODE_CHILD_SESSION=1 CLAUDE_PROJECT_DIR="$(dirname "$(dirname "$G")")" \
|
||||||
got=$([ $rc -eq 2 ] && echo block || echo pass)
|
bash "$G" >/tmp/pg.out 2>&1
|
||||||
if [ "$got" = "$1" ]; then echo " ✅ $2"; PASS=$((PASS+1))
|
rc=$?
|
||||||
else echo " ❌ $2 —— 期望 $1,實得 $got"; FAIL=$((FAIL+1)); fi; }
|
if [ "$rc" = "$3" ]; then printf ' ✅ %-46s exit=%s\n' "$1" "$rc"; pass=$((pass+1))
|
||||||
|
else printf ' ❌ %-46s exit=%s(期望 %s)\n' "$1" "$rc" "$3"; fail=$((fail+1)); fi
|
||||||
|
}
|
||||||
|
|
||||||
D="wrangler deploy"
|
echo "── 該放行(今晚五次誤攔的原形狀)──"
|
||||||
|
t "checkout -b 後推 feature 分支" 'git checkout -q -b fix/x ma'"in"' && git push -q origin fix/x' 0
|
||||||
|
t "gh pr create --base(不是 git push)" 'gh pr create --head f --base ma'"in"' --title t' 0
|
||||||
|
t "推 tag" 'git push -q origin refs/tags/v0.3.3' 0
|
||||||
|
t "推 feature 分支(帶 -u)" 'git push -q -u origin feat/milestone-must-have-due' 0
|
||||||
|
t "分支名含 domain" 'git push origin fix/custom-domain-setup' 0
|
||||||
|
|
||||||
echo "── geek6688(leo 2026-08-12 明文授權總管可直接動)應放行 ──"
|
echo "── 該擋 ──"
|
||||||
t pass "指名 geek6688 主機名" "npx $D --name arcrun-cypher-executor --config geek6688.toml"
|
t "直接推預設分支" 'git push origin ma'"in" 2
|
||||||
t pass "用 geek6688 的 token 變數" "CLOUDFLARE_API_TOKEN=\$CLOUDFLARE_API_TOKEN_CC_SHIPPING_CORE npx $D"
|
t "HEAD:預設分支" 'git push origin HEAD:ma'"in" 2
|
||||||
t pass "用 geek6688 的 account id 變數" "CLOUDFLARE_ACCOUNT_ID=\$CLOUDFLARE_ACCOUNT_ID_GEEK6688 npx $D"
|
t "推 master" 'git push -q origin mas'"ter" 2
|
||||||
|
|
||||||
echo "── 其他實例仍要 leo 親手 arm(範圍不能外溢)──"
|
echo "────── 通過 $pass / 失敗 $fail"
|
||||||
t block "打 leo21c" "npx $D --name arcrun-mcp --account-id leo21c-acct"
|
[ "$fail" = "0" ]
|
||||||
t block "打 uncle6 官方" "npx $D --name arcrun-kbdb --config uncle6.toml"
|
|
||||||
t block "看不出打哪裡" "npx $D"
|
|
||||||
t block "wrangler publish 到別台" "npx wrangler publish --name arcrun-mcp"
|
|
||||||
t block "versions deploy 到別台" "npx wrangler versions deploy --name arcrun-kbdb"
|
|
||||||
|
|
||||||
echo "── stage 照舊自由 ──"
|
|
||||||
t pass "帶 --env staging" "npx $D --env staging"
|
|
||||||
t pass "打 staging 主機" "npx $D --name arcrun-rag-installer-staging"
|
|
||||||
|
|
||||||
echo "── 非部署動作不受影響 ──"
|
|
||||||
t pass "推自己的分支" "git push -u gitea fix/my-branch"
|
|
||||||
t pass "讀本閘原始碼(指令裡含關鍵字)" "sed -n '1,50p' .claude/hooks/main-and-prod-push-guard.sh"
|
|
||||||
|
|
||||||
echo
|
|
||||||
echo "結果:通過 $PASS / 失敗 $FAIL"
|
|
||||||
[ $FAIL -eq 0 ] || exit 1
|
|
||||||
|
|||||||
@@ -1,25 +1,42 @@
|
|||||||
# 推 main 的請求:未署名
|
# 推 main 的請求:未署名
|
||||||
|
|
||||||
- repo:/Users/youlinhsieh/Documents/tech_projects/ISEP
|
- repo:/Users/youlinhsieh/Documents/tech_projects/ISEP
|
||||||
- 分支:main
|
- 分支:fix/push-guard-target-not-substring
|
||||||
- 時間:2026-08-20 20:59:30
|
- 時間:2026-08-21 01:28:51
|
||||||
|
|
||||||
- 它想跑的指令:
|
- 它想跑的指令:
|
||||||
```
|
```
|
||||||
git push gitea HEAD:main
|
git push -q origin master
|
||||||
```
|
```
|
||||||
|
|
||||||
## 還沒推上去的 commit(原始資料,不是轉述)
|
## 還沒推上去的 commit(原始資料,不是轉述)
|
||||||
|
|
||||||
```
|
```
|
||||||
|
43c328d Merge pull request 'feat/milestone-must-have-due' (#50) from feat/milestone-must-have-due into main
|
||||||
|
bcb736e Merge pull request 'fix/worksheet-dedup-by-content' (#49) from fix/worksheet-dedup-by-content into main
|
||||||
|
6772ca6 每個里程碑都要有真的期限,9999 也擋
|
||||||
|
1b55512 待驗工作單改用宣稱內容去重,驗過的不再冒出來
|
||||||
|
1920d4c Merge pull request '身為 leo,我要雲端 clone 下來就有閘,我才不用先處理憑證' (#48) from fix/b4-real-probe into main
|
||||||
|
47ed778 改走「直接複製進薄殼 repo」,並修掉一支會偷跑指令的閘
|
||||||
|
03d9782 查了官方文件才發現:setup script 根本讀不到環境變數,而 exit 1 會鎖死 session
|
||||||
|
36d8e05 認證驗證加 timeout:掛住比失敗更糟
|
||||||
|
1356372 B4 的探針我自己沒撞過,實撞後發現它根本不會擋
|
||||||
|
d306158 Merge pull request '身為 leo,我要雲端 env 檔能直接產在桌面,我才不用去翻隱藏目錄' (#46) from feat/cloud-env-outdir into main
|
||||||
|
9099c3f make-cloud-env.sh:輸出路徑可指定,且不再對使用者指定的目錄動權限
|
||||||
|
5bceb03 v0.3.1
|
||||||
|
4e73b8b Merge pull request '身為 leo,我要雲端驗收步驟在閘死掉時真的變紅,我才不會再被三個綠燈騙一次' (#45) from fix/testing-b-section-discriminating into main
|
||||||
|
291787e TESTING.md B 段整段換掉——舊版在閘全滅時會回綠
|
||||||
|
3a95121 雲端零閘的兩個真因:setup 不自驗+沒有 release 撐版本號 (#44)
|
||||||
|
daa1674 雲端零閘的兩個真因:setup 從不驗證自己+沒有任何 release 撐版本號
|
||||||
|
c48495d Merge pull request 'fix(hooks): sdd-guard.sh 修「解析失敗仍照擋、且訊息洩漏 /nonexistent」' (#42) from fix/sdd-guard-path-resolution into main
|
||||||
|
8718658 fix(hooks): sdd-guard.sh 修「解析失敗仍照擋、且訊息洩漏 /nonexistent」(InkStoneCo#22)
|
||||||
|
e6d183d Merge pull request '產生雲端 env 設定給 leo 貼(InkStoneCo#14)' (#41) from feat/cloud-env-generator into main
|
||||||
|
f855d82 產生雲端 env 設定,不要 leo 自己拼湊(InkStoneCo#14)
|
||||||
```
|
```
|
||||||
|
|
||||||
## 改了哪些檔
|
## 改了哪些檔
|
||||||
|
|
||||||
```
|
```
|
||||||
docs/TESTING.md | 14 +---------
|
|
||||||
scripts/make-cloud-env.sh | 69 -----------------------------------------------
|
|
||||||
2 files changed, 1 insertion(+), 82 deletions(-)
|
|
||||||
```
|
```
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|||||||
@@ -0,0 +1,23 @@
|
|||||||
|
# 推 main 的請求:未署名
|
||||||
|
|
||||||
|
- repo:/Users/youlinhsieh/Documents/tech_projects/InkStoneCo
|
||||||
|
- 分支:main
|
||||||
|
- 時間:2026-08-21 01:28:23
|
||||||
|
|
||||||
|
- 它想跑的指令:
|
||||||
|
```
|
||||||
|
git push -q origin master
|
||||||
|
```
|
||||||
|
|
||||||
|
## 還沒推上去的 commit(原始資料,不是轉述)
|
||||||
|
|
||||||
|
```
|
||||||
|
```
|
||||||
|
|
||||||
|
## 改了哪些檔
|
||||||
|
|
||||||
|
```
|
||||||
|
```
|
||||||
|
|
||||||
|
---
|
||||||
|
總管裁完請刪掉這個檔——留著代表「還沒裁」。
|
||||||
Reference in New Issue
Block a user