GenarrativeAI/Genarrative
11
0
Fork 0
Code Issues 21 Pull Requests 6 Actions 7 Packages Projects 3 Releases Wiki Activity

收敛项目客户端占用锁语义 #344

Merged
kdletters merged 3 commits from codex/project-client-lock-single into master 2026-09-14 13:56:23 +08:00
Conversation 0 Commits 3 Files Changed 5
+77 -11
kdletters commented 2026-09-14 12:01:00 +08:00
Member
Copy Link
Copy Source

本 PR 收敛项目锁的同进程重入语义，避免客户端内部调用等待自身持有的 .agent/project.lock。

变更：

  • 同进程嵌套项目锁返回 advisory guard，不删除真实持有者锁。
  • 跨进程占用、残留回收和权限分类保持不变。
  • 增加回归测试与锁收敛里程碑/实施计划文档。

验证：

  • 定向 Rust 锁测试通过。
  • Runner owner 定向测试通过。
  • cargo fmt --check 通过。
  • npm run check:encoding 通过。
  • git diff --check 通过。

后续里程碑：Runner 的 .agent/runtime/execution-owner.lock 迁移到统一项目占用锁仍需单独完成跨进程生命周期验证。

本 PR 收敛项目锁的同进程重入语义，避免客户端内部调用等待自身持有的 `.agent/project.lock`。 变更： - 同进程嵌套项目锁返回 advisory guard，不删除真实持有者锁。 - 跨进程占用、残留回收和权限分类保持不变。 - 增加回归测试与锁收敛里程碑/实施计划文档。 验证： - 定向 Rust 锁测试通过。 - Runner owner 定向测试通过。 - cargo fmt --check 通过。 - npm run check:encoding 通过。 - git diff --check 通过。 后续里程碑：Runner 的 `.agent/runtime/execution-owner.lock` 迁移到统一项目占用锁仍需单独完成跨进程生命周期验证。
kdletters added 1 commit 2026-09-14 12:01:00 +08:00
收敛项目客户端占用锁语义
Project CI / Repository checks (pull_request) Failing after 2m40s
Details
Project CI / Frontend tests (pull_request) Successful in 3m20s
Details
Project CI / Backend tests (pull_request) Successful in 8m14s
Details
Project CI / Native shell tests (pull_request) Failing after 15m5s
Details
fbd493029d 
统一同进程项目锁重入行为，避免客户端自身等待项目锁

补充锁收敛里程碑、实施计划与回归测试
kdletters added 1 commit 2026-09-14 12:31:02 +08:00
Merge branch 'master' into codex/project-client-lock-single
Project CI / Repository checks (pull_request) Failing after 2m46s
Details
Project CI / Frontend tests (pull_request) Successful in 3m25s
Details
Project CI / Backend tests (pull_request) Successful in 6m7s
Details
Project CI / Native shell tests (pull_request) Failing after 15m13s
Details
563dac9238
kdletters added 1 commit 2026-09-14 13:20:13 +08:00
Merge branch 'master' into codex/project-client-lock-single
Project CI / Repository checks (pull_request) Failing after 2m50s
Details
Project CI / Frontend tests (pull_request) Successful in 3m38s
Details
Project CI / Backend tests (pull_request) Successful in 6m20s
Details
Project CI / Native shell tests (pull_request) Failing after 15m33s
Details
4a014944bc
kdletters merged commit 818cfdba50 into master 2026-09-14 13:56:23 +08:00
kdletters deleted branch codex/project-client-lock-single 2026-09-14 13:56:23 +08:00
Sign in to join this conversation.
Reviewers
No Reviewers
Labels
Clear labels
Compat/Breaking
Breaking change that won't be backward compatible
 Kind/Bug
Something is not working
 Kind/Documentation
Documentation changes
 Kind/Enhancement
Improve existing functionality
 Kind/Feature
New functionality
 Kind/Security
This is security issue
 Kind/Testing
Issue or pull request related to testing
Priority
Critical
1
The priority is critical
Priority
High
2
The priority is high
Priority
Low
4
The priority is low
Priority
Medium
3
The priority is medium
Reviewed
Confirmed
1
Issue has been confirmed
Reviewed
Duplicate
2
This issue or pull request already exists
Reviewed
Invalid
3
Invalid issue
Reviewed
Won't Fix
3
This issue won't be fixed
Status
Abandoned
3
Somebody has started to work on this but abandoned work
Status
Blocked
1
Something is blocking this issue or pull request
Status
Need More Info
2
Feedback is required to reproduce issue or to continue work
No Label
Milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
HuangJiaJia JenkenB k88936 (王德宇) kdletters (段舒康) laura2008 (王乐) lhk229 (孔令弘) Loer (农洛儿) loong suzmii (董羽秦) taobaisu (叶东旭) wuxiangwanzi (王子民) YixuanLiu ziyu
No Assignees
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: GenarrativeAI/Genarrative#344
Delete Branch "codex/project-client-lock-single"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?