Merge the approved IAM U3 account contract documents #115

Merged
weichen merged 10 commits from feature/iam-u3-account-contract into main 2026-10-19 02:17:29 +00:00
Owner

feature/iam-u3-account-contract 任务卡

任务主记录:本文件随 PR 描述维护。
状态:已完成(合入前闭合);owner:weichen。PR:待创建

基线与授权

  • 权威仓:ssh://git@git-ssh.u1680832.nyat.app:31411/weichen/Agent-System-Documents.git;root_target:main;immediate_target:main
  • branch_kind:standalone;accepting_requirements:false;跨仓总任务:Agent-System-Dev feature/iam-u3-account-directory-recovery(Dev PR #626 已合入 7716b28)
  • R0(initial_main_sha):1e036e9;工作区:/home/weichen/projects/Agent-System-Documents-wt-iam-u3-contract-merge;分支:feature/iam-u3-account-contract
  • 授权与交付终点:用户 2026-10-18 授权按计划完成并清理 IAM 各线 worktree,U3 采用 merge_then_accept。回收 Dev U3 worktree 时发现 U3 已批准合同(Documents c236d30 r1、fb3a821 A1–A4 修订、5783940 委托投影真实操作者修订)只存在于该 worktree 的子模块元数据中,从未推送,也未进入 Documents main;本任务先把原分支推送到远端保全,再经 PR 合入 main。
  • 实施执行:agent-per-unit(配置:AGENT-EXECUTION.md)。原分支缺 AGENT-EXECUTION.md,因此从 main 新建分支,由 worker 应用 git merge-tree 三方合并补丁并解决 INDEX.md 冲突;随后以 merge -s ours 并入原分支头 3481253(树不变),使已批准 SHA 可从 main 到达。

目标与非目标

  • 目标:三份已批准合同正文按原文进入 docs/proposals/,docs/proposals/INDEX.md 收录 U3 条目并写明当前事实状态。
  • 非目标:修改已批准正文;推进 Dev 的 Documents gitlink;部署或业务验收。

Agent 实施收据

单元 ID 预期范围 角色 候选顺序 attempt CLI/模型 终态 transport fallback 源码外收据路径
iam-u3-documents-contract-onto-main docs/proposals/INDEX.md 与三份 2026-10-14-iam-u3-*.md implementation cursor, antigravity, pi 1 cursor-agent / auto(session not-observable,新进程) success apply 快进 1e036e9..08b8618 否 /tmp/cleanup-20261018/render/u3-doc-contract-receipt.json
iam-u3-documents-contract-index-date-repair docs/proposals/INDEX.md repair cursor, antigravity, pi 1 cursor-agent / auto(session not-observable,新进程) success apply 快进 08b8618..43f2fd4 否 /tmp/cleanup-20261018/render/u3-doc-contract-repair-receipt.json

结果与验证(完成后填写)

  • 结果:三份合同正文与 INDEX 条目;修复单元把 Backend PR #198 的合入日期更正为 2026-10-14(Gitea API merged_at 核对)。
  • 验证(SELF,host):三份正文的 blob 与 origin/feature/iam-u3-account-contract 逐一相同;git diff --check 通过;merge -s ours 前后树相同;c236d30、fb3a821、5783940 均为分支头祖先;Backend v0.5.0 经 git ls-remote 核对指向 2716b9e。
  • Review:host 主模型对照原分支与 Gitea PR 元数据逐项核对 INDEX 事实,无阻塞项。
  • 影响与剩余项:仅文档。Dev 的 Documents gitlink 未推进(非目标)。
# feature/iam-u3-account-contract 任务卡 任务主记录:本文件随 PR 描述维护。 状态:已完成(合入前闭合);owner:weichen。PR:待创建 ## 基线与授权 - 权威仓:ssh://git@git-ssh.u1680832.nyat.app:31411/weichen/Agent-System-Documents.git;root_target:main;immediate_target:main - branch_kind:standalone;accepting_requirements:false;跨仓总任务:Agent-System-Dev `feature/iam-u3-account-directory-recovery`([Dev PR #626](https://git-home.u1680832.nyat.app:30319/weichen/Agent-System-Dev/pulls/626) 已合入 `7716b28`) - R0(initial_main_sha):1e036e9;工作区:/home/weichen/projects/Agent-System-Documents-wt-iam-u3-contract-merge;分支:feature/iam-u3-account-contract - 授权与交付终点:用户 2026-10-18 授权按计划完成并清理 IAM 各线 worktree,U3 采用 merge_then_accept。回收 Dev U3 worktree 时发现 U3 已批准合同(Documents `c236d30` r1、`fb3a821` A1–A4 修订、`5783940` 委托投影真实操作者修订)只存在于该 worktree 的子模块元数据中,从未推送,也未进入 Documents main;本任务先把原分支推送到远端保全,再经 PR 合入 main。 - 实施执行:agent-per-unit(配置:AGENT-EXECUTION.md)。原分支缺 `AGENT-EXECUTION.md`,因此从 main 新建分支,由 worker 应用 `git merge-tree` 三方合并补丁并解决 `INDEX.md` 冲突;随后以 `merge -s ours` 并入原分支头 `3481253`(树不变),使已批准 SHA 可从 main 到达。 ## 目标与非目标 - 目标:三份已批准合同正文按原文进入 `docs/proposals/`,`docs/proposals/INDEX.md` 收录 U3 条目并写明当前事实状态。 - 非目标:修改已批准正文;推进 Dev 的 Documents gitlink;部署或业务验收。 ## Agent 实施收据 | 单元 ID | 预期范围 | 角色 | 候选顺序 | attempt | CLI/模型 | 终态 | transport | fallback | 源码外收据路径 | |---|---|---|---|---|---|---|---|---|---| | iam-u3-documents-contract-onto-main | docs/proposals/INDEX.md 与三份 2026-10-14-iam-u3-*.md | implementation | cursor, antigravity, pi | 1 | cursor-agent / auto(session not-observable,新进程) | success | apply 快进 1e036e9..08b8618 | 否 | /tmp/cleanup-20261018/render/u3-doc-contract-receipt.json | | iam-u3-documents-contract-index-date-repair | docs/proposals/INDEX.md | repair | cursor, antigravity, pi | 1 | cursor-agent / auto(session not-observable,新进程) | success | apply 快进 08b8618..43f2fd4 | 否 | /tmp/cleanup-20261018/render/u3-doc-contract-repair-receipt.json | ## 结果与验证(完成后填写) - 结果:三份合同正文与 INDEX 条目;修复单元把 Backend PR #198 的合入日期更正为 2026-10-14(Gitea API `merged_at` 核对)。 - 验证(SELF,host):三份正文的 blob 与 `origin/feature/iam-u3-account-contract` 逐一相同;`git diff --check` 通过;`merge -s ours` 前后树相同;`c236d30`、`fb3a821`、`5783940` 均为分支头祖先;Backend `v0.5.0` 经 `git ls-remote` 核对指向 `2716b9e`。 - Review:host 主模型对照原分支与 Gitea PR 元数据逐项核对 INDEX 事实,无阻塞项。 - 影响与剩余项:仅文档。Dev 的 Documents gitlink 未推进(非目标)。
weichen added 9 commits 2026-10-19 02:16:33 +00:00
Why: refine the approved IAM scope into enforceable account, directory and recovery boundaries.

Evidence: SELF document checks and independent document reviews; business tests and CI are NOT_RUN.

Impact: proposed contract and implementation plan only; preserve the approved global plan and all runtime data.

Refs: Dev feature/iam-u3-account-directory-recovery; IAM r1 U3 and IAM-D/IAM-C
Why: prepare the U3 review amendment against the current documentation baseline.

Evidence: origin/main=2d35cd49c203820d24d7c38acead06d37793c1f1.

Impact: integrate upstream documentation without changing the approved U3 r1 text.

Refs: IAM U3 r1
Why: independent review found in-flight write, API-key admission, lock-order, and cross-instance cursor gaps in the U3 candidate.

Evidence: SELF source review of Backend 4053c4d against approved U3 r1; proposal records triggers, scope, and replay plan.

Impact: request stage-four and stage-five re-review before further affected implementation; no production action.

Refs: IAM U3 r1; Dev policy/delivery.md
Why: Delegated RDM renames currently lose the real operator before the Backend project write, leaving an account-disable race in the Backend database.

Evidence: Read-only source review identified both HTTP lifecycle and command rename paths; the proposed contract and validation plan are pending human stage 4-5 review.

Impact: Adds a narrow request-bound projection capability proposal and two-account final transaction plan. No product code, production state, or approval status changes.

Refs: Approved U3 r1 and A1-A4 amendment; Dev feature/iam-u3-account-directory-recovery task card.
Record the U3 contract merge task card
governance / governance (pull_request) Successful in 22s
c6c411a6db
Why: track preservation and merge of the approved U3 contract documents.

Evidence: SELF blob identity, diff check and ancestry checks recorded in the card.

Impact: task card only.

Refs: Dev PR #626; Documents c236d30, fb3a821, 5783940
Co-authored-by: Cursor <cursoragent@cursor.com>
weichen added 1 commit 2026-10-19 02:16:37 +00:00
Link the U3 contract task card to its PR
governance / governance (pull_request) Successful in 20s
4a2cb19fde
Why: the card and PR description are one record.

Evidence: PR #115 created via the Gitea API.

Impact: task card only.

Refs: Documents PR #115
Co-authored-by: Cursor <cursoragent@cursor.com>
weichen merged commit 933fe263da into main 2026-10-19 02:17:29 +00:00
Sign in to join this conversation.
No Reviewers
No labels
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: weichen/Agent-System-Documents#115