Compare commits

..
Author SHA1 Message Date
weichen 2880013697 Merge pull request 'Move the integration repo onto the current Gitea' (#725) from fix/migrate-gitea-endpoints into main
ci / svc-realcombo (push) Successful in 2m50s
ci / test (push) Successful in 8m53s
ci / test-pg (push) Successful in 11m40s
2026-10-23 20:25:31 +00:00
weichen 7bdd0b5b4a Merge remote-tracking branch 'origin/main' into fix/migrate-gitea-endpoints
ci / test (pull_request) Successful in 8m38s
ci / svc-realcombo (pull_request) Successful in 2m33s
ci / test-pg (pull_request) Successful in 10m54s
2026-10-23 20:04:24 +00:00
agent-exec-transport 4121998ed6 agent-exec transport da4b216a58018e05f8db235e71eeb0a2/79d815beebee
ci / svc-realcombo (pull_request) Successful in 3m0s
ci / test (pull_request) Successful in 9m14s
ci / test-pg (pull_request) Successful in 12m8s
2026-10-23 19:51:30 +00:00
agent-exec-transport eb92553fec agent-exec transport 07b7277ce1c2accd399916965bbbe5ec/0fcfb50c9618
ci / svc-realcombo (pull_request) Successful in 3m13s
ci / test-pg (pull_request) Failing after 3m57s
ci / test (pull_request) Successful in 10m51s
2026-10-23 19:35:43 +00:00
agent-exec-transport 9a7399486e agent-exec transport f64648617e8bd47a3f02a3ac8cc7f984/cba5f049e5b3
ci / svc-realcombo (pull_request) Successful in 2m42s
ci / test-pg (pull_request) Failing after 3m14s
ci / test (pull_request) Successful in 9m15s
2026-10-23 19:20:07 +00:00
agent-exec-transport 479f1757d6 agent-exec transport 1f5e50b758311d907b77cf7001a716ef/525179cc9f0c
ci / svc-realcombo (pull_request) Failing after 16s
ci / test-pg (pull_request) Failing after 16s
ci / test (pull_request) Failing after 16s
2026-10-23 16:32:20 +00:00
agent-exec-transport 4ae2d31545 agent-exec transport e35a2b0a1a28df49a944c24a69c5fdfd/9b28406468ed
ci / test (pull_request) Failing after 31s
ci / svc-realcombo (pull_request) Failing after 30s
ci / test-pg (pull_request) Failing after 31s
2026-10-23 16:10:29 +00:00
agent-exec-transport 55eb175cd5 agent-exec transport 063c678fcc6837003d5d4507f568d4a0/e828db27c101
ci / svc-realcombo (pull_request) Failing after 1s
ci / test (pull_request) Failing after 1s
ci / test-pg (pull_request) Failing after 2s
2026-10-23 15:53:42 +00:00
agent-exec-transport f8629dee14 Move the integration repo onto the current Gitea
ci / svc-realcombo (pull_request) Failing after 3s
ci / test (pull_request) Failing after 3s
ci / test-pg (pull_request) Failing after 3s
Why: After the server migration this repo still pointed its dependency URLs,
API defaults, release origin and CI submodule rewriting at the legacy host, and
it pinned a Development-Manager revision whose SSHBase constant still held the
legacy endpoint, so the shared governance gate rejected the current URLs.

Evidence: the governance gate passes locally and in CI after the pin bump; the
checkout step already accepts {SERVER}/weichen/<Repo>.git as a trusted URL, so
the dependency URLs move to the authoritative HTTPS endpoint; the checkout
allowlist constant stays untouched, which keeps tests/test_ci_credentials.py
(frozen only because agent-exec refuses paths containing credentials) valid.

Impact: .gitmodules, task_triage.py, task.sh, svc.sh, registry.json, the CI
insteadOf mapping, test_svc_realcombo.py and the Development-Manager pin now use
gitea.naitangbaobao.cn. The retired git-panel note in policy/facts.md stays.

Refs: fix/migrate-gitea-endpoints
2026-10-23 15:10:15 +00:00
weichen d1ea338fe9 Merge pull request 'Audit review minors cleanup across the five components' (#721) from feature/audit-review-minors-cleanup into main
ci / svc-realcombo (push) Successful in 3m28s
ci / test (push) Successful in 10m59s
ci / test-pg (push) Successful in 15m8s
2026-10-23 13:37:45 +00:00
6 changed files with 25 additions and 16 deletions
+18 -7
View File
@@ -77,6 +77,9 @@ jobs:
"fetch.recurseSubmodules": "false", "submodule.recurse": "false",
"http.followRedirects": "false", "protocol.allow": "never",
"protocol." + urlsplit(SERVER).scheme + ".allow": "always",
# 嵌套 pins(RDM/KB 等)仍以权威 SSH 端点声明 URL:把它改写到同一受信
# HTTPS 基址,才能复用既有的 URL 级 token 头而不依赖真实 SSH。
# 本仓 .gitmodules 已是 HTTPS 形式,SSH 允许清单常量保持不变。
}
@@ -286,6 +289,9 @@ jobs:
"fetch.recurseSubmodules": "false", "submodule.recurse": "false",
"http.followRedirects": "false", "protocol.allow": "never",
"protocol." + urlsplit(SERVER).scheme + ".allow": "always",
# 嵌套 pins(RDM/KB 等)仍以权威 SSH 端点声明 URL:把它改写到同一受信
# HTTPS 基址,才能复用既有的 URL 级 token 头而不依赖真实 SSH。
# 本仓 .gitmodules 已是 HTTPS 形式,SSH 允许清单常量保持不变。
}
@@ -429,9 +435,10 @@ jobs:
# https 基址后再取。只追加 pin 的三个 40 位 hex,不 source pin 文件。
SERVER="$(printf '%s' "$GITHUB_SERVER_URL" | sed 's:/*$::')"
scheme="${GITHUB_SERVER_URL%%://*}"
# 嵌套 pins 的 SSH 端点有两代(旧 git-ssh.* 与迁移后的 gitea.*:52222);
# 只映射旧端点会让嵌套克隆退回真实 SSH,CI 无 key 时必然 host key 失败。
# 两个 insteadOf 同键多值,git 会依次匹配。
# 嵌套 pins 的 SSH 端点有两代:旧 git-ssh.*:31411 与迁移后的 gitea.*:52222。
# 两条 insteadOf 必须同时保留:RDM 自身的 pins 已迁到权威端点,而它钉住的
# 基座/前端仓里仍有以旧端点声明的嵌套 pins,去掉任一条都会让那批 pins 退回
# 真实 SSH,CI 无 key 时必然 host key 失败。等所有 .gitmodules 迁完后才能收敛。
export GIT_CONFIG_COUNT=5
export GIT_CONFIG_KEY_0="protocol.$scheme.allow"
export GIT_CONFIG_VALUE_0="always"
@@ -617,6 +624,9 @@ jobs:
"fetch.recurseSubmodules": "false", "submodule.recurse": "false",
"http.followRedirects": "false", "protocol.allow": "never",
"protocol." + urlsplit(SERVER).scheme + ".allow": "always",
# 嵌套 pins(RDM/KB 等)仍以权威 SSH 端点声明 URL:把它改写到同一受信
# HTTPS 基址,才能复用既有的 URL 级 token 头而不依赖真实 SSH。
# 本仓 .gitmodules 已是 HTTPS 形式,SSH 允许清单常量保持不变。
}
@@ -723,16 +733,17 @@ jobs:
# https 基址后再取。
SERVER="$(printf '%s' "$GITHUB_SERVER_URL" | sed 's:/*$::')"
scheme="${GITHUB_SERVER_URL%%://*}"
# 嵌套 pins 的 SSH 端点有两代(旧 git-ssh.* 与迁移后的 gitea.*:52222);
# 只映射旧端点会让嵌套克隆退回真实 SSH,CI 无 key 时必然 host key 失败。
# 两个 insteadOf 同键多值,git 会依次匹配。
# 嵌套 pins 的 SSH 端点有两代:旧 git-ssh.*:31411 与迁移后的 gitea.*:52222。
# 两条 insteadOf 必须同时保留:RDM 自身的 pins 已迁到权威端点,而它钉住的
# 基座/前端仓里仍有以旧端点声明的嵌套 pins,去掉任一条都会让那批 pins 退回
# 真实 SSH,CI 无 key 时必然 host key 失败。等所有 .gitmodules 迁完后才能收敛。
export GIT_CONFIG_COUNT=5
export GIT_CONFIG_KEY_0="protocol.$scheme.allow"
export GIT_CONFIG_VALUE_0="always"
export GIT_CONFIG_KEY_1="http.$SERVER/.extraheader"
export GIT_CONFIG_VALUE_1="AUTHORIZATION: token $SUBMODULE_TOKEN"
export GIT_CONFIG_KEY_2="url.$SERVER/weichen/.insteadOf"
export GIT_CONFIG_VALUE_2="ssh://git@git-ssh.u1680832.nyat.app:31411/weichen/"
export GIT_CONFIG_VALUE_2="ssh://git@gitea.naitangbaobao.cn:52222/weichen/"
export GIT_CONFIG_KEY_3="core.hooksPath"
export GIT_CONFIG_VALUE_3="/dev/null"
export GIT_CONFIG_KEY_4="url.$SERVER/weichen/.insteadOf"
+1 -1
View File
@@ -3,7 +3,7 @@
{
"id": "rdm",
"name": "研发记忆 RDM",
"repo": "ssh://git@git-ssh.u1680832.nyat.app:31411/weichen/Agent-System-RDM.git",
"repo": "ssh://git@gitea.naitangbaobao.cn:52222/weichen/Agent-System-RDM.git",
"repoEnv": "SVC_RDM_ORIGIN",
"defaultRef": "origin/main",
"goModule": "agent-system-rdm",
+1 -1
View File
@@ -144,7 +144,7 @@ SRC_DIR="${SVC_SRC_DIR:-${XDG_CACHE_HOME:-$HOME/.cache}/agent-system-svc/src}"
# 独立 RDM 源仓(下游组合仓 Agent-System-RDM 的干净克隆;SVC_RDM_SRC_DIR 覆盖路径,
# SVC_RDM_ORIGIN 覆盖克隆来源)。rdm 源的解析/列举/物化全部基于它,语义与 SRC_DIR 一致。
RDM_SRC_DIR="${SVC_RDM_SRC_DIR:-${XDG_CACHE_HOME:-$HOME/.cache}/agent-system-svc/rdm-src}"
RDM_ORIGIN_DEFAULT="ssh://git@git-ssh.u1680832.nyat.app:31411/weichen/Agent-System-RDM.git"
RDM_ORIGIN_DEFAULT="ssh://git@gitea.naitangbaobao.cn:52222/weichen/Agent-System-RDM.git"
# 提示信息走 stderr:stdout 只留给数据(提交表/服务表/DSN),便于 $( ) 捕获组合。
c_info() { [ "${CLI_QUIET:-0}" = 1 ] && return 0; printf '\033[1;34m[svc]\033[0m %s\n' "$*" >&2; }
+3 -3
View File
@@ -813,7 +813,7 @@ card_merge_squash() { # $1=branch $2=ref → squash/rebase 落地没有 merge
# 仅查最近 5 页(250 条):card_merge 的 merge 提交路径仍是主路径,此兜底面向新近任务卡。
local token="${GITEA_TOKEN:-}" web_base url repo owner api payload pg found sha
[ -n "$token" ] || return 1
web_base="${TASK_CARD_WEB_BASE:-https://git-home.u1680832.nyat.app:30319}"
web_base="${TASK_CARD_WEB_BASE:-https://gitea.naitangbaobao.cn}"
url=$(git remote get-url origin 2>/dev/null) || return 1
url="${url%.git}"
repo=$(basename "$url"); owner=$(basename "$(dirname "$url")")
@@ -951,7 +951,7 @@ cmd_close_self() {
esac
pr="$nums"
fi
web_base="${TASK_CARD_WEB_BASE:-https://git-home.u1680832.nyat.app:30319}"
web_base="${TASK_CARD_WEB_BASE:-https://gitea.naitangbaobao.cn}"
url=$(git remote get-url origin); url="${url%.git}"
repo=$(basename "$url"); owner=$(basename "$(dirname "$url")")
link="${web_base}/${owner}/${repo}/pulls/${pr}"
@@ -981,7 +981,7 @@ cmd_close() {
fetch_target
# 默认值取远端通告的 Web 面(git push 输出的 PR 建议链接);可用 TASK_CARD_WEB_BASE 覆盖。
# git-panel 前缀已失效(TLS 握手失败),默认值改为实测可用的 git-home(AGENTS.md 访问事实节)。
local web_base="${TASK_CARD_WEB_BASE:-https://git-home.u1680832.nyat.app:30319}"
local web_base="${TASK_CARD_WEB_BASE:-https://gitea.naitangbaobao.cn}"
local url owner repo
url=$(git remote get-url origin); url="${url%.git}"
repo=$(basename "$url"); owner=$(basename "$(dirname "$url")")
+1 -1
View File
@@ -29,7 +29,7 @@ import urllib.parse
import urllib.request
SCHEMA = "agent-system/task-triage/v1"
DEFAULT_API = "https://git-home.u1680832.nyat.app:30319/api/v1"
DEFAULT_API = "https://gitea.naitangbaobao.cn/api/v1"
DEFAULT_TARGET = "main"
DEFAULT_MAX_AGE = 14400
PAGE_LIMIT = 50
+1 -3
View File
@@ -49,9 +49,7 @@ def ci_git_env():
if not (CI_SERVER and CI_TOKEN):
return {}
scheme = CI_SERVER.split("://", 1)[0]
# 嵌套 pins 的 SSH 端点有两代:旧 git-ssh.* 与迁移后的 gitea.*:52222。
# 只映射旧端点会让 pins 取件退回真实 SSH,而 CI 运行器没有 key,必然
# host key verification failed。同键多值,git 会依次匹配。
# 子模块已改用权威 HTTPS 端点;这里只保留权威 SSH 端点的改写,供仍以 SSH 声明 pins 的仓库使用。
return {
"GIT_CONFIG_COUNT": "5",
"GIT_CONFIG_KEY_0": "protocol.%s.allow" % scheme,