Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions .factory/breaker.sh
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,12 @@ LIB="$(dirname "$0")/factory_lib.py"
python3 "${LIB}" breaker "${LOCKSDIR}/floor.json" "${LOCKSDIR}/ledger.jsonl" && exit 0
rc=$?
if [ "${rc}" -eq 3 ]; then
echo "成本熔断(R4):ledger 累计超 floor 上限,停止派发;人工复核 locks/floor.json 与 ledger.jsonl 后方可恢复" >&2
# 熔断原因已由 factory_lib breaker_check 打到 stderr("熔断:连续失败 N 次
# (上限 M),需人工介入" 或 "熔断:今日已跑 N 次(上限 M)")。此处不再包装:
# 曾固定输出"成本熔断 ledger 累计超 floor 上限",与连续失败类熔断事实不符,
# 误导排查方向(2026-09-05 实证)。
:
else
echo "成本熔断(R4):breaker 自身故障(floor.json/ledger.jsonl 缺失或损坏,见上方堆栈),fail-closed 停止派发;人工复核 locks/floor.json 与 ledger.jsonl" >&2
echo "breaker 门自身故障(floor.json/ledger.jsonl 缺失或损坏,见上方堆栈):fail-closed 停止派发;人工复核 floor.json 与 ledger.jsonl" >&2
fi
exit "${rc}"
4 changes: 2 additions & 2 deletions .factory/dispatch.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
# dispatch.sh — S2 派发器入口 shim(零 LLM,设计 A3/§7)。
#
# 进程编排(后台链并发槽/收割、mkdir+PID 硬锁、watch 循环、TERM/HUP 放锁)
# 已下沉 factory_lib.py dispatch 子命令(decisions.md ADR-005:bash 进程
# 原语缺陷类在 Python 形态下结构性不可表达)。本文件只保留入口:
# 已下沉 factory_lib.py dispatch 子命令(docs/adr/ADR-005-dispatch-orchestration-python.md:
# bash 进程原语缺陷类在 Python 形态下结构性不可表达)。本文件只保留入口:
# CLI/env 契约不变——--dry-run(DRY=1 同义)/--watch/--interval N
# (INTERVAL 同义,默认 300s)/MAX_PARALLEL/FACTORY_MERGE_METHOD/
# FACTORY_AUTO_MERGE/GH_REPO/NODE_TIMEOUT,退出码语义不变(2=环境缺失、
Expand Down
14 changes: 11 additions & 3 deletions .factory/downstream-check.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@
# downstream-check.sh — 中心仓对下游仓清单的集中巡检/追平。
#
# 定位:替代「逐仓手工追平」。中心仓是工具链主权方(三态分发);
# 本脚本读 .factory/downstream.json(skip 态清单,仓特定数据),对每个
# 本脚本读下游仓清单(ADR-012:真实清单住 downstream.local.json,gitignored;
# tracked downstream.json 仅空模板),对每个
# 下游仓调**中心版** sync-from-upstream.sh——下游副本滞后/缺失也照常
# 工作(鸡生蛋免疫);巡检一律以中心仓 main 为锚(发布线,非工作分支)。
#
Expand All @@ -16,12 +17,17 @@
# 进程已死自动清锁重试一次(照抄 cron-dispatch 语义)。
#
# 首次移植的新仓不入本清单——先走 README「移植到其他仓库」四步,
# 再由人工登记进 downstream.json。
# 再由人工登记进 downstream.local.json(gitignored,ADR-012——勿写
# tracked 模板,那正是 ADR-012 要杜绝的污染路径)。
set -euo pipefail

SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
CENTER="$(cd "$SCRIPT_DIR/.." && pwd)"
MANIFEST="$SCRIPT_DIR/downstream.json"
# ADR-012:真实清单住 downstream.local.json(gitignored 仓特定数据);
# tracked 模板仅文档占位,local 存在则优先
LOCAL_MANIFEST="$SCRIPT_DIR/downstream.local.json"
[ -f "$LOCAL_MANIFEST" ] && MANIFEST="$LOCAL_MANIFEST"
SYNC="$SCRIPT_DIR/sync-from-upstream.sh"
LOCK="$SCRIPT_DIR/locks/downstream-check.lock"
OUT_FILE="$(mktemp "${TMPDIR:-/tmp}/.factory-downstream-check.XXXXXX")"
Expand Down Expand Up @@ -54,7 +60,9 @@ for r in rows:
if not isinstance(r, dict) or not isinstance(r.get("path"), str) or not r["path"].strip():
sys.exit(1)
print(r["path"])' "$MANIFEST" 2>/dev/null)" \
|| { echo "下游清单损坏(需非空 repos[].path): $MANIFEST" >&2; exit 2; }
|| { _hint="——真实清单写 .factory/downstream.local.json(gitignored,ADR-012)"
case "$MANIFEST" in *downstream.local.json) _hint="——修复或删除该 local 清单(它已在 ADR-012 载体位)";; esac
echo "下游清单损坏(需非空 repos[].path): $MANIFEST $_hint" >&2; exit 2; }

mkdir -p "$SCRIPT_DIR/locks" # 净克隆首跑:gitignored 目录缺失时 shlock ENOENT 被误读为锁被持
if ! /usr/bin/shlock -f "$LOCK" -p $$; then
Expand Down
32 changes: 28 additions & 4 deletions .factory/factory-lease.sh
Original file line number Diff line number Diff line change
Expand Up @@ -118,12 +118,37 @@ _lease_sw_fresh() { # _lease_sw_fresh <mtime> → 0=未过期 1=已过期;租
[ $(( $1 + ${_SW_SECS:-${FACTORY_LEASE_SECS:-900}} )) -gt "$now" ]
}

_lease_sw_restore() { # <src 墓碑/残本> <dst 锁位> → 不可覆盖放回:ln 原子判位后统一 rm 源
# 检查-移动([ -e ] || mv)在检查与 mv 之间可被并发 claimer 占位,mv 会覆盖
# 新主锁(双赢家);ln 硬链原子(dst 已存在即失败)——成功=dst 得内容删源链;
# 失败=位上有更新主,弃残本(其主 hb/fence 自毙,单写者仍成立)。
ln "$1" "$2" 2>/dev/null || true
rm -f "$1"
}

_lease_sw_claim() { # <key> <secs> <mid> → 成功打印 epoch,失败 return 1
local key="$1" secs="$2" mid="$3"
local lock ctr mt held last new_ep stale
_lease_sw_notice
lock="$(_lease_sw_path "$key" .lock)"; ctr="$(_lease_sw_path "$key" .epoch)"
mkdir -p "${lock%/*}" || return 1
# 墓碑调和(PR #116 CodeRabbit):release 在 mv 后/放回前被 SIGKILL → .rel.*
# 会截留仍有效(新鲜)的持有者锁。建主锁前先处理:新鲜墓碑 = 活锁被截留
# → 不可覆盖放回(_lease_sw_restore 的 ln 判位;随后正常流程读新鲜即拒,
# ≤ 租期后自解);过期/坏内容 = 死锁残渣 → 清理。
for tomb in "${lock}".rel.*; do
[ -e "$tomb" ] || continue
_SW_MID=; _SW_EPOCH=; _SW_SECS=""
if _lease_sw_read "$tomb"; then
mt="$(_lease_mtime "$tomb")"
case "$mt" in ''|*[!0-9]*) rm -f "$tomb"; continue ;; esac
if _lease_sw_fresh "$mt"; then
_lease_sw_restore "$tomb" "$lock"
continue
fi
fi
rm -f "$tomb"
done
held=0; _SW_MID=; _SW_EPOCH=; _SW_SECS="$secs" # 读失败时新鲜度按本 claim 租期判(原语义)
if [ -f "$lock" ]; then
_lease_sw_read "$lock" || true # 坏内容 → held=0(判代退回计数器)
Expand All @@ -142,8 +167,7 @@ _lease_sw_claim() { # <key> <secs> <mid> → 成功打印 epoch,失败 return
# 并拒(放回位已有新锁则弃残本——输者 hb/fence 自毙,单写者仍成立)。
mt="$(_lease_mtime "$stale")"
if _lease_sw_fresh "$mt"; then
[ -e "$lock" ] || mv "$stale" "$lock" 2>/dev/null
rm -f "$stale"
_lease_sw_restore "$stale" "$lock"
return 1
fi
rm -f "$stale"
Expand Down Expand Up @@ -219,8 +243,8 @@ _lease_sw_release() { # <key> <epoch> <mid> → 尽力释放(幂等):持
if [ "$_SW_MID" = "$mid" ] && [ "$_SW_EPOCH" = "$epoch" ]; then
rm -f "$tomb"
else
[ -e "$lock" ] || mv "$tomb" "$lock" 2>/dev/null
rm -f "$tomb"
# 放回语义见 _lease_sw_restore:ln 原子判位,绝不 mv 覆盖并发新主
_lease_sw_restore "$tomb" "$lock"
fi
return 0
}
Expand Down
34 changes: 28 additions & 6 deletions .factory/factory-lib.sh
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,11 @@ source "${REPO}/.factory/factory-lease.sh"
omp_node() { # omp_node <cwd> <log> <timeout> [omp-opts...] -- <prompt...>
# omp CLI 唯一执行点(ADR-009 引擎收口,设计 §4 runNode 的 bash 形态):
# 链/批次/PR 门/反哺全部节点经此 spawn——换引擎(SDK 直连等)只改本函数。
# 契约:--no-session 恒加(物理级 fresh context,A1);--max-time 必填;
# 契约:--no-session 恒加(物理级 fresh context,A1);--no-extensions 恒加
# (扩展发现把无头 -p 节点 hook 进 feishu 网关 attach:恒定 ~19s 附加税,且
# attach 劣化即整预算静默死锁——#165 r2/r3 review 连挂实证,空 diff 也烧满
# 17m 零输出;--no-extensions 后平凡探针 7.9s。显式 -e 不受影响,launchd
# 网关 daemon 独立托管亦不受影响);--max-time 必填;
# opts 透传(--no-tools / --config …);prompt 为 "--" 之后的剩余参数整体。
# 返回 omp 进程退出码(调用方自持 metric/失败语义)。
local _cwd="$1" _log="$2" _tmo="$3"
Expand All @@ -32,7 +36,7 @@ omp_node() { # omp_node <cwd> <log> <timeout> [omp-opts...] -- <prompt...>
_opts+=("$1"); shift
done
shift
(cd "${_cwd}" && omp -p "$*" --no-session ${_opts[@]+"${_opts[@]}"} \
(cd "${_cwd}" && omp -p "$*" --no-session --no-extensions ${_opts[@]+"${_opts[@]}"} \
--max-time "${_tmo}" < /dev/null) > "${_log}" 2>&1
}

Expand All @@ -50,10 +54,14 @@ issue_label_swap() { # issue_label_swap <"删,删"|空> <"加,加"> —— 单
local -a args=("issue" "set-labels" "${ISSUE}")
[ -n "${1:-}" ] && args+=(--remove "${1}")
[ -n "${2:-}" ] && args+=(--add "${2}")
if python3 "${REPO}/.factory/hosting.py" "${args[@]}" >/dev/null 2>&1; then
local err
if err="$(python3 "${REPO}/.factory/hosting.py" "${args[@]}" 2>&1 >/dev/null)"; then
echo " [label] -${1:-} +${2}"
else
# stderr 落档(#207 实证:>/dev/null 2>&1 把 HostingError 里的 gh
# 失败原因吞掉,[error] 行无从排查)——hosting 侧原因回显在错误行下。
echo "[error] 标签转移失败:-${1:-} +${2}(issue #${ISSUE})" >&2
[ -n "${err}" ] && printf ' [hosting] %s\n' "${err}" >&2
return 1
fi
}
Expand Down Expand Up @@ -90,16 +98,30 @@ issue_reject() { # issue_reject <remove-csv|空> <triage.json> —— 拒绝的
# <remove-csv> 落标同时原子移除的标签。链入口传 "factory:triaging,
# factory:in-progress";批次入口(零标签 issue)传 ""
# <triage.json> 判据源;回执渲染于同目录 reject-receipt.md
# 失败语义分两级:落标失败 return 1——裁决未落定,调用方终止/跳过;
# 失败语义分两级:落标调用失败先复核远端标签态(#207 实证:gh 非零
# 但标签已落远端——退出码 ≠ 落定事实),factory:rejected 确在列即按
# 已落定继续回执,确证缺失才 return 1(裁决未落定,调用方终止/跳过);
# 回执生成/评论失败仅告警——裁决已由标签落定,回执是透明度而非门,
# 正文留档可手动补发。评论经 issue_comment 唯一出口,标记中和不因入口
# 不同而绕过;回执刻意不含裸标记——标记评论通道保留给人类手动覆盖。
# 回执带幂等键:同轮次重放(诈尸残窗/人工重跑)查重跳过;链侧带轮次
# ROUND、批次侧固定 batch——同 issue 两入口的回执键天然互不冲突。
# ROUND、批次侧固定 rbatch(r 前缀恒在,ROUND 缺省展开 batch)——同
# issue 两入口的回执键天然互不冲突。
local marker="factory:receipt:issue-${ISSUE}:r${ROUND:-batch}"
local dir
dir="$(dirname "$2")"
issue_label_swap "${1:-}" "factory:rejected" || return 1
if ! issue_label_swap "${1:-}" "factory:rejected"; then
# 假阴性复核(#207:mutation landed + client reported failure——
# 2026-09-20 11:01:01Z 标签已落 GitHub 而 gh 报非零):落标调用失败
# ≠ 裁决未落定。factory:rejected 在远端 = 裁决已生效,回执必须跟上
# (steering 审查报告规范:只落标不发判据 = 不可审计的静默拒绝);
# 确证缺失才按未落定终止。
if ! python3 "${REPO}/.factory/hosting.py" issue get-labels "${ISSUE}" 2>/dev/null \
| grep -q '"factory:rejected"'; then
return 1
fi
echo " [warn] 落标调用失败但 factory:rejected 已在远端(issue #${ISSUE})——按已落定继续回执" >&2
fi
if python3 "${REPO}/.factory/factory_lib.py" receipt "$2" \
> "${dir}/reject-receipt.md" 2>/dev/null; then
if issue_comment "${dir}/reject-receipt.md" "${marker}" >/dev/null 2>&1; then
Expand Down
Loading
Loading