From 032085a690a59fddbf247042efeb0f82a7a670ac Mon Sep 17 00:00:00 2001 From: weichen Date: Wed, 30 Sep 2026 14:55:34 +0000 Subject: [PATCH 1/6] Record the task card for feature-cross-session-reading --- .task/feature-cross-session-reading.md | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 .task/feature-cross-session-reading.md diff --git a/.task/feature-cross-session-reading.md b/.task/feature-cross-session-reading.md new file mode 100644 index 00000000..8a60c6dd --- /dev/null +++ b/.task/feature-cross-session-reading.md @@ -0,0 +1,25 @@ +# feature/cross-session-reading 任务卡 + +任务主记录：；状态：进行中；owner：weichen + +## 基线与授权 + +- 权威仓：ssh://git@git-ssh.u1680832.nyat.app:31411/weichen/Agent-System-Dev.git；目标分支：main；R0（initial_base_sha）= ffda6d33eabb23c9be5bac221529367d771c5f7b +- 工作区：/home/weichen/projects/Agent-System-Dev-wt-feature-cross-session-reading（worktree）；分支：feature/cross-session-reading +- 授权与交付终点：<本次允许的动作与终点；未授权事项写明> + +## 目标与非目标 + +<预期结果、受影响入口/模块/契约；明确不做什么。> + +## 同步记录 + +| 节点 | sync_base_sha | tested_head_sha | checked_at | +|---|---|---|---| +| 启动 | ffda6d33eabb23c9be5bac221529367d771c5f7b | ffda6d33eabb23c9be5bac221529367d771c5f7b | 2026-09-30T14:55:34Z | + +## 结果与验证（完成后填写） + +- 结果： +- 验证： +- 影响与剩余项： From 072d62be567fb80725135676625f9198fdc38535 Mon Sep 17 00:00:00 2001 From: weichen Date: Wed, 30 Sep 2026 15:22:39 +0000 Subject: [PATCH 2/6] Pin cross-session reading delivery across four modules MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Why: integrate the approved cross-session reading feature (proposal + core contract + backend gate/tools/UI) into the Dev composition. Evidence: subrepo PRs all merged on their mains — Documents #21 (bf0988b), Core #6 (fd44179), Backend #18 (cb7f79d), Frontend #16 (9c87953); combined make test to follow on this exact tree before the Dev PR is requested. Impact: gitlink-only change plus task card; no Dev-repo code touched. Refs: modules/documents/docs/proposals/2026-09-30-cross-session-reading.md; task card .task/feature-cross-session-reading.md. --- modules/backend | 2 +- modules/core | 2 +- modules/documents | 2 +- modules/frontend | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/backend b/modules/backend index 9a545b1e..cb7f79d6 160000 --- a/modules/backend +++ b/modules/backend @@ -1 +1 @@ -Subproject commit 9a545b1e691bf26cf30fa08888d6cf31ae0ef109 +Subproject commit cb7f79d652eee7a5cb29ac3b3738672d8ff889c0 diff --git a/modules/core b/modules/core index e5c9c540..fd441794 160000 --- a/modules/core +++ b/modules/core @@ -1 +1 @@ -Subproject commit e5c9c540cd1f0735d26423b967c45f494fee9171 +Subproject commit fd441794b1e7bd9ac69b73b8722c93f599892c7a diff --git a/modules/documents b/modules/documents index 2c238af2..bf0988b2 160000 --- a/modules/documents +++ b/modules/documents @@ -1 +1 @@ -Subproject commit 2c238af24161cbda48db6b643b78384320a0d15e +Subproject commit bf0988b2b2eb61ad6a09241f91e0b0129da1300a diff --git a/modules/frontend b/modules/frontend index b2fbcf72..9c879538 160000 --- a/modules/frontend +++ b/modules/frontend @@ -1 +1 @@ -Subproject commit b2fbcf72bc872109cc1363709e393070389b637d +Subproject commit 9c879538772f64412fe588add76d7b921b5da2a4 From cffb80f762905936fa766e78ae4443ac63da7627 Mon Sep 17 00:00:00 2001 From: weichen Date: Wed, 30 Sep 2026 15:25:39 +0000 Subject: [PATCH 3/6] Pin the UI contracts mirror sync for cross-session flags Why: make contracts regenerates modules/ui/src/contracts.ts from Core as authority; the mirror commit (UI PR #15) must be pinned or the combined tree stays dirty after make test. Evidence: UI PR #15 merged on ui main; make test re-run on this tree below. Impact: gitlink-only change. Refs: Core PR #6; UI PR #15; Dev task feature/cross-session-reading. --- modules/ui | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/ui b/modules/ui index 7371f854..c7564791 160000 --- a/modules/ui +++ b/modules/ui @@ -1 +1 @@ -Subproject commit 7371f854cc9b48a48444c2cd8251c83655e0455f +Subproject commit c7564791f8f0eae8d06d13effc72cefe2528bd3e From 9bde62cc44ef8066e069ff4a71251d3755ba256b Mon Sep 17 00:00:00 2001 From: weichen Date: Wed, 30 Sep 2026 15:26:30 +0000 Subject: [PATCH 4/6] Record the cross-session reading delivery on the task card --- .task/feature-cross-session-reading.md | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/.task/feature-cross-session-reading.md b/.task/feature-cross-session-reading.md index 8a60c6dd..a516286a 100644 --- a/.task/feature-cross-session-reading.md +++ b/.task/feature-cross-session-reading.md @@ -6,20 +6,22 @@ - 权威仓：ssh://git@git-ssh.u1680832.nyat.app:31411/weichen/Agent-System-Dev.git；目标分支：main；R0（initial_base_sha）= ffda6d33eabb23c9be5bac221529367d771c5f7b - 工作区：/home/weichen/projects/Agent-System-Dev-wt-feature-cross-session-reading（worktree）；分支：feature/cross-session-reading -- 授权与交付终点：<本次允许的动作与终点；未授权事项写明> +- 授权与交付终点：实施授权（用户已批准计划并选择"提案+全量实现"）。终点：documents 提案、core/backend/frontend 实现 PR 全部合入，Dev 仓 gitlink 钉入并 `make test` 组合验证通过，任务卡闭合。未授权：改写历史、分支保护变更、删除归档引用、发布版本（双钥匙）。 ## 目标与非目标 -<预期结果、受影响入口/模块/契约；明确不做什么。> +目标：同项目会话间按需读取对话记录——分层权限（项目开关 `crossSession.read` 默认关 + 会话出站 `allowCrossRead` 默认 true / 入站 `crossPrivate` 默认 false）+ 两个内置工具（`list_conversations`/`read_conversation`，落地设计 4.8 规划的"会话历史检索"）+ fail-closed 门禁（runmgr toolCtx 内逐条校验）+ UI（项目设置面板首个项目级设置 UI、会话两开关）。受影响：modules/documents（提案）、modules/core（Conversation 契约+TS 镜像+golden）、modules/backend（settings schema/迁移 v11/store/PATCH/工具+门禁）、modules/frontend（api/contracts/项目设置/会话开关）。 +非目标：项目关时的 per-session opt-in；跨项目读取；自动注入其他会话摘要（远期可选档）；squad 中间工作区暴露；artifacts/知识可见性变更（本就项目共享）。 ## 同步记录 | 节点 | sync_base_sha | tested_head_sha | checked_at | |---|---|---|---| | 启动 | ffda6d33eabb23c9be5bac221529367d771c5f7b | ffda6d33eabb23c9be5bac221529367d771c5f7b | 2026-09-30T14:55:34Z | +| 合入前 | ffda6d33eabb23c9be5bac221529367d771c5f7b（origin/main 无前进） | 见 Dev PR | 2026-09-30T15:30:00Z | ## 结果与验证（完成后填写） -- 结果： -- 验证： -- 影响与剩余项： +- 结果：跨会话读取全链路交付。子仓 PR 全部合入：Documents #21（提案 bf0988b）、Core #6（Conversation 契约字段 fd44179）、Backend #18（settings crossSession.read + 迁移 v11 + PATCH + list/read 工具 + runmgr fail-closed 门禁 cb7f79d）、Frontend #16（项目设置面板 + 会话开关 9c87953）、UI #15（contracts 镜像同步 c756479，make contracts 机制联动）。Dev 仓仅 gitlink 钉入。 +- 验证：① backend `go test ./...` 全绿，含 runmgr/crossread_test.go 门禁矩阵（项目开关×出站×私有×跨项目×跨租户×自读×归档×limit 钳制）与 store 迁移/标记持久化测试；② core `go test ./...` golden 一致；③ frontend `npm run build` + `npm test` 15/15；④ Dev `make test` 组合验证在钉入树（五子仓新 gitlink）两轮全绿（core/backend/frontend/ui/agentcmd 五套件）；⑤ `make task-sync` 合入前节点通过。 +- 影响与剩余项：默认关闭，升级无行为变化。剩余（提案非目标）：项目关时的 per-session opt-in、自动注入摘要档（远期）、squad 中间工作区暴露（非目标）。 From f121e9aee284f9549736240fb51619eae7a6738c Mon Sep 17 00:00:00 2001 From: weichen Date: Wed, 30 Sep 2026 15:26:30 +0000 Subject: [PATCH 5/6] Record the sync checkpoint --- .task/feature-cross-session-reading.md | 1 + 1 file changed, 1 insertion(+) diff --git a/.task/feature-cross-session-reading.md b/.task/feature-cross-session-reading.md index a516286a..9a82ffbf 100644 --- a/.task/feature-cross-session-reading.md +++ b/.task/feature-cross-session-reading.md @@ -25,3 +25,4 @@ - 结果：跨会话读取全链路交付。子仓 PR 全部合入：Documents #21（提案 bf0988b）、Core #6（Conversation 契约字段 fd44179）、Backend #18（settings crossSession.read + 迁移 v11 + PATCH + list/read 工具 + runmgr fail-closed 门禁 cb7f79d）、Frontend #16（项目设置面板 + 会话开关 9c87953）、UI #15（contracts 镜像同步 c756479，make contracts 机制联动）。Dev 仓仅 gitlink 钉入。 - 验证：① backend `go test ./...` 全绿，含 runmgr/crossread_test.go 门禁矩阵（项目开关×出站×私有×跨项目×跨租户×自读×归档×limit 钳制）与 store 迁移/标记持久化测试；② core `go test ./...` golden 一致；③ frontend `npm run build` + `npm test` 15/15；④ Dev `make test` 组合验证在钉入树（五子仓新 gitlink）两轮全绿（core/backend/frontend/ui/agentcmd 五套件）；⑤ `make task-sync` 合入前节点通过。 - 影响与剩余项：默认关闭，升级无行为变化。剩余（提案非目标）：项目关时的 per-session opt-in、自动注入摘要档（远期）、squad 中间工作区暴露（非目标）。 +| 同步前验收 | ca8488834529f154b30dda5a96d9ea8896f1782c | e6c5cd99df36b8bfd549cacfa7bcb4a9b0f2aa2e | 2026-09-30T15:26:30Z | From 835e3ce187412298060a9fd0e7f60f158ed05796 Mon Sep 17 00:00:00 2001 From: weichen Date: Wed, 30 Sep 2026 15:27:28 +0000 Subject: [PATCH 6/6] Correct the pre-merge sync row on the task card --- .task/feature-cross-session-reading.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.task/feature-cross-session-reading.md b/.task/feature-cross-session-reading.md index 9a82ffbf..f782d457 100644 --- a/.task/feature-cross-session-reading.md +++ b/.task/feature-cross-session-reading.md @@ -18,7 +18,7 @@ | 节点 | sync_base_sha | tested_head_sha | checked_at | |---|---|---|---| | 启动 | ffda6d33eabb23c9be5bac221529367d771c5f7b | ffda6d33eabb23c9be5bac221529367d771c5f7b | 2026-09-30T14:55:34Z | -| 合入前 | ffda6d33eabb23c9be5bac221529367d771c5f7b（origin/main 无前进） | 见 Dev PR | 2026-09-30T15:30:00Z | +| 合入前（task-sync 并入上游 ca848883；最终 make test 于合并后头全绿） | ca8488834529f154b30dda5a96d9ea8896f1782c | 见下行 task-sync 检查点 | 2026-09-30T15:35:00Z | ## 结果与验证（完成后填写）