From 1f37a9b4381cf8490ca2259241488ae5af9ba420 Mon Sep 17 00:00:00 2001 From: weichen Date: Thu, 22 Oct 2026 14:17:17 +0000 Subject: [PATCH 1/3] Update Gitea endpoints after server migration Why: the Gitea server moved to https://gitea.naitangbaobao.cn with SSH on port 52222; endpoint references must follow or superproject CI checkout refuses the old URLs. Evidence: host-verified API reach and SSH auth (Dev task card fix/gitea-endpoint-migration) Impact: configuration only; no runtime behavior change. Refs: Dev PR #706 --- .gitea/workflows/ci.yml | 2 +- .gitea/workflows/governance.yml | 2 +- .gitmodules | 8 ++++---- AGENTS.md | 6 +++--- PROJECT.md | 4 ++-- README.md | 2 +- docs/records/2026-09-29-agent-intent-design.md | 2 +- 7 files changed, 13 insertions(+), 13 deletions(-) diff --git a/.gitea/workflows/ci.yml b/.gitea/workflows/ci.yml index 8e79f04..a25e596 100644 --- a/.gitea/workflows/ci.yml +++ b/.gitea/workflows/ci.yml @@ -24,7 +24,7 @@ jobs: echo "SUBMODULE_TOKEN is not configured" >&2 exit 1 fi - git config --global url."https://weichen:${SUBMODULE_TOKEN}@git-home.u1680832.nyat.app:30319/".insteadOf "ssh://git@git-ssh.u1680832.nyat.app:31411/" + git config --global url."https://weichen:${SUBMODULE_TOKEN}@gitea.naitangbaobao.cn/".insteadOf "ssh://git@gitea.naitangbaobao.cn:52222/" git -c fetch.recurseSubmodules=false submodule update --init --recursive - name: Install Go 1.27.1 run: | diff --git a/.gitea/workflows/governance.yml b/.gitea/workflows/governance.yml index e96821b..2dadb0d 100644 --- a/.gitea/workflows/governance.yml +++ b/.gitea/workflows/governance.yml @@ -31,7 +31,7 @@ jobs: parsed_server = urlsplit(SERVER) if parsed_server.scheme not in {"http", "https"} or not parsed_server.netloc: sys.exit("Checkout server must be the platform-injected http(s) URL") - SSH = "ssh://git@git-ssh.u1680832.nyat.app:31411/weichen/" + SSH = "ssh://git@gitea.naitangbaobao.cn:52222/weichen/" # 审查过的白名单，独立于候选 .gitmodules：仅列出两个治理 gitlink。 REPOSITORIES = { "deps/development-guidelines": "Development-Guidelines", diff --git a/.gitmodules b/.gitmodules index 617fe9e..40b9f15 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,12 +1,12 @@ [submodule "deps/development-guidelines"] path = deps/development-guidelines - url = ssh://git@git-ssh.u1680832.nyat.app:31411/weichen/Development-Guidelines.git + url = ssh://git@gitea.naitangbaobao.cn:52222/weichen/Development-Guidelines.git [submodule "deps/error-code-system"] path = deps/error-code-system - url = ssh://git@git-ssh.u1680832.nyat.app:31411/weichen/Error-Code-System.git + url = ssh://git@gitea.naitangbaobao.cn:52222/weichen/Error-Code-System.git [submodule "deps/logging-system"] path = deps/logging-system - url = ssh://git@git-ssh.u1680832.nyat.app:31411/weichen/Logging-System.git + url = ssh://git@gitea.naitangbaobao.cn:52222/weichen/Logging-System.git [submodule "deps/development-manager"] path = deps/development-manager - url = ssh://git@git-ssh.u1680832.nyat.app:31411/weichen/Development-Manager.git + url = ssh://git@gitea.naitangbaobao.cn:52222/weichen/Development-Manager.git diff --git a/AGENTS.md b/AGENTS.md index 2684f21..9c22177 100644 --- a/AGENTS.md +++ b/AGENTS.md @@ -23,9 +23,9 @@ 历史文档与旧链接里的 `git-panel.u1680832.nyat.app:30319` 已失效（TLS 握手失败）， 见到一律按过期处理，不要再试。当前权威通道： -- **Web / API（HTTPS）**：`https://git-home.u1680832.nyat.app:30319`（Gitea 1.27.3， +- **Web / API（HTTPS）**：`https://gitea.naitangbaobao.cn`（Gitea 1.27.3， API 前缀 `/api/v1`；偶发 broken pipe / 超时，重试即可）。 -- **Git over SSH**：`ssh://git@git-ssh.u1680832.nyat.app:31411/weichen/.git` +- **Git over SSH**：`ssh://git@gitea.naitangbaobao.cn:52222/weichen/.git` （各仓 origin 与 gitlink 均为此格式）。 - **API token**：`~/.secrets/gitea`，两行键值 `URL_PREFIX=…` 与 `ACCESS_TOKEN=<40 位 hex>`；取值 `grep ACCESS_TOKEN ~/.secrets/gitea | cut -d= -f2-`， @@ -33,7 +33,7 @@ （baseline 硬边界 2：只记录来源、字段与可用状态）。 - **SSH key**：`~/.ssh/home_gitea`（ED25519，公钥指纹 `SHA256:GYXaOXIMeloQ1fKSfdJ/ndgPQzs/Ix7Hk62ekfkfQ20`，Gitea 侧密钥名 GMKtec）； - `~/.ssh/config` 已有 `git-ssh.u1680832.nyat.app` 主机条目，克隆/推送直接可用。 + `~/.ssh/config` 已有 `gitea.naitangbaobao.cn（端口 52222）` 主机条目，克隆/推送直接可用。 ## Agent 执行与新项目准入（强制） diff --git a/PROJECT.md b/PROJECT.md index a624750..7f3d9b0 100644 --- a/PROJECT.md +++ b/PROJECT.md @@ -6,7 +6,7 @@ - 目标/产品边界：通用意图识别基础库。提供意图定义（spec）、注册表与配置合并（registry/loader）、四级漏斗识别器（guard → expectation → rules → adjudicate）、槽位抽取与诊断（conformance/catalogcheck/intentctl）。不做动作执行、不内置 LLM 客户端、不含任何业务意图内容，不依赖 Agent-Native / Agent-Squad / Agent-System。 - 源码、资产、文档、机器契约位置：Go 源码在仓库根包目录；模块路径 `agent-intent`；人类文档在根 `README.md`、`docs/`、`policy/`；过程记录：任务卡与交付证据在 `.task/`，其他过程记录在 `docs/records/`；机器契约以 `intent` 包公开类型为准。 -- 权威远端、集成基线、受保护分支：`ssh://git@git-ssh.u1680832.nyat.app:31411/weichen/Agent-Intent.git`，集成基线 `main`。 +- 权威远端、集成基线、受保护分支：`ssh://git@gitea.naitangbaobao.cn:52222/weichen/Agent-Intent.git`，集成基线 `main`。 - 并行共同基线记录位置、合入通知/主动检查方式：任务主记录在 Gitea Issue/PR；合入前在本仓 `main` 上 `git fetch` 并确认 HEAD。 - 发布线与批准版本/实际制品查询入口：当前无独立制品仓库。可构建性以本仓 `main` 的 `go test` 为准；依赖子模块版本以 gitlink 为准，不把工作区未提交文件当发布组合。 - 提交/审核/合并/发布身份与权限：仓库所有者 weichen。本机提交不代替远端合并。 @@ -28,7 +28,7 @@ 克隆： ```bash -git clone --recurse-submodules ssh://git@git-ssh.u1680832.nyat.app:31411/weichen/Agent-Intent.git +git clone --recurse-submodules ssh://git@gitea.naitangbaobao.cn:52222/weichen/Agent-Intent.git # 已克隆时：git submodule update --init --recursive ``` diff --git a/README.md b/README.md index 72e51ba..b0d9d96 100644 --- a/README.md +++ b/README.md @@ -133,7 +133,7 @@ go run ./cmd/intentctl catalog -root configs/intents # 能力目录（注入 消费方把本库固定为 submodule，推荐路径 `deps/agent-intent`；版本以消费方 gitlink 为准，不执行 `submodule update --remote`： ```bash -git submodule add ssh://git@git-ssh.u1680832.nyat.app:31411/weichen/Agent-Intent.git deps/agent-intent +git submodule add ssh://git@gitea.naitangbaobao.cn:52222/weichen/Agent-Intent.git deps/agent-intent ``` ```text diff --git a/docs/records/2026-09-29-agent-intent-design.md b/docs/records/2026-09-29-agent-intent-design.md index a28aceb..0564096 100644 --- a/docs/records/2026-09-29-agent-intent-design.md +++ b/docs/records/2026-09-29-agent-intent-design.md @@ -201,7 +201,7 @@ agent-intent/ - `.gitmodules`：`deps/development-guidelines`（dev-only，不进 go.mod）、`deps/error-code-system`、`deps/logging-system`（build-required）。 - **pin 与生态当前组合一致**：guidelines `26b562d2`、error-code-system `95a03b75`、logging-system `2c5716f`（实现时以 `git submodule status` 实测为准）。理由：消费方的 `submodule-consistency.sh` 校验嵌套副本 gitlink 与本仓一致，Agent-Intent 作为中间层必须与上下游同组合，否则 Squad/Native 接入时一致性校验失败。 - go.mod：`require error-code-system v0.0.0` / `require logging-system v0.0.0` + 两条 `replace => ./deps/...`；无 go.sum、测试带 `GOWORK=off`（同 Squad/Native）。 -- 远端：`ssh://git@git-ssh.u1680832.nyat.app:31411/weichen/Agent-Intent.git`；初始化流程按 adoption 工作流第 2 节（远端需先建仓，Gitea API token 在 `~/.secrets/gitea`，实现阶段处理）。 +- 远端：`ssh://git@gitea.naitangbaobao.cn:52222/weichen/Agent-Intent.git`；初始化流程按 adoption 工作流第 2 节（远端需先建仓，Gitea API token 在 `~/.secrets/gitea`，实现阶段处理）。 ### Error-Code-System 上游变更 -- 2.54.0 From ebbd81621a8bbfb473607dd1dbc98deddbdfc23f Mon Sep 17 00:00:00 2001 From: weichen Date: Thu, 22 Oct 2026 14:26:08 +0000 Subject: [PATCH 2/3] Bump the development-manager pin for the endpoint migration Why: governance checks validate candidate .gitmodules URLs against the pinned development-manager scaffold, which now carries the new Gitea endpoint base after its own migration. Evidence: host-verified; see Dev PR #706 Impact: pin update only, part of the coordinated endpoint migration. Refs: Agent-System-Dev PR #706 --- deps/development-manager | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deps/development-manager b/deps/development-manager index bd3a7de..24e8a5c 160000 --- a/deps/development-manager +++ b/deps/development-manager @@ -1 +1 @@ -Subproject commit bd3a7de57a3a9e1a4495b94c5fa5c08d71e7be8c +Subproject commit 24e8a5c8ba9833437672e8c72841de8c54db321d -- 2.54.0 From 61ad3caac4be55d5db7d95897a28641831b29de8 Mon Sep 17 00:00:00 2001 From: weichen Date: Thu, 22 Oct 2026 14:36:11 +0000 Subject: [PATCH 3/3] Bump migrated dependency pins for the endpoint migration Why: recursive submodule checkout reads pinned dep commits; their .gitmodules now carries the new Gitea endpoint base only in the migrated mains. Evidence: host-verified; see Dev PR #706 Impact: pin updates only, part of the coordinated endpoint migration. Refs: Agent-System-Dev PR #706 --- deps/development-guidelines | 2 +- deps/error-code-system | 2 +- deps/logging-system | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/deps/development-guidelines b/deps/development-guidelines index 2688fd2..3ed9821 160000 --- a/deps/development-guidelines +++ b/deps/development-guidelines @@ -1 +1 @@ -Subproject commit 2688fd2be6a52c0bf110e7e6366b6f291ab5e4eb +Subproject commit 3ed982138c1ec065dc19b9871715af0c29836c21 diff --git a/deps/error-code-system b/deps/error-code-system index a3ee67b..00c0303 160000 --- a/deps/error-code-system +++ b/deps/error-code-system @@ -1 +1 @@ -Subproject commit a3ee67bba269e1276c14e22c026171ecf2cf6190 +Subproject commit 00c03035b5c3343911a07461d857d8a67afd4fdb diff --git a/deps/logging-system b/deps/logging-system index 49b5d8b..7005493 160000 --- a/deps/logging-system +++ b/deps/logging-system @@ -1 +1 @@ -Subproject commit 49b5d8be604d05e4246dffa0d10fa1c2b7ad45d7 +Subproject commit 7005493077f25603b4ba1452f8454da844565ecd -- 2.54.0