修复素材导入与资源提交的项目锁争用 #581

2026-10-02T02:39:17+08:00

lhk229 commented

2026-10-02 02:39:17 +08:00

修复 #551：本地素材导入、账户素材提交和资源编辑提交在 conversation.write 短暂持有项目锁时会立即失败。现在复用既有约 10 秒有界等待，并将同步取锁与提交放入阻塞线程池，等待期间异步 runtime 继续响应。

项目锁先于账号身份租约，等待后重新验证账号身份、导入权限及原 WritePermit；保留跨进程互斥、权限分类和持锁方诊断。
资源资产/版本提交和已完成结果清理保留 operation/project guard，取消异步等待不会提前释放仍在执行的提交互斥。超时保留原 operation、幂等键与 staging，恢复不重复远端生成。
Runtime 素材导入与 UI workflow 切图登记也接入阻塞池，避免共享导入函数新增等待后阻塞这些调用方。同步更新 AGC 行为规范及共享记忆。

验证：163 项 Rust 定向测试通过，覆盖导入与资源编辑、Direct bridge、Runtime 导入、UI workflow、项目锁恢复和失败分类。包含同进程争用、单线程 runtime 心跳、并行 manifest/revision、账号切换、许可取消、完整超时后原 operation 恢复及取消后的 guard 生命周期。

cargo test --locked --manifest-path apps/ai-game-creator-shell/src-tauri/Cargo.toml --bin genarrative-ai-game-creator-shell -- resource_editor:: commands::agent_asset_import_tests agent::direct_tool_bridge::tests tests::project_lock_recovery project::write_lock agent::runtime_tools::context::asset_import_input_tests ui_editor::agent_tools --test-threads=1
npm run check:rustfmt
npm run check:encoding
npm run check:doc-index
git diff --check

全部上述检查通过。Linux 本地未执行 Windows 专属删除挂起行为测试；未调用真实付费 Provider，远端链路使用既有 mock 测试和已下载账本恢复测试验证。没有 API/DTO/schema 变更或数据迁移。

Closes #551

修复 #551：本地素材导入、账户素材提交和资源编辑提交在 conversation.write 短暂持有项目锁时会立即失败。现在复用既有约 10 秒有界等待，并将同步取锁与提交放入阻塞线程池，等待期间异步 runtime 继续响应。 - 项目锁先于账号身份租约，等待后重新验证账号身份、导入权限及原 WritePermit；保留跨进程互斥、权限分类和持锁方诊断。 - 资源资产/版本提交和已完成结果清理保留 operation/project guard，取消异步等待不会提前释放仍在执行的提交互斥。超时保留原 operation、幂等键与 staging，恢复不重复远端生成。 - Runtime 素材导入与 UI workflow 切图登记也接入阻塞池，避免共享导入函数新增等待后阻塞这些调用方。同步更新 AGC 行为规范及共享记忆。验证：163 项 Rust 定向测试通过，覆盖导入与资源编辑、Direct bridge、Runtime 导入、UI workflow、项目锁恢复和失败分类。包含同进程争用、单线程 runtime 心跳、并行 manifest/revision、账号切换、许可取消、完整超时后原 operation 恢复及取消后的 guard 生命周期。 ```sh cargo test --locked --manifest-path apps/ai-game-creator-shell/src-tauri/Cargo.toml --bin genarrative-ai-game-creator-shell -- resource_editor:: commands::agent_asset_import_tests agent::direct_tool_bridge::tests tests::project_lock_recovery project::write_lock agent::runtime_tools::context::asset_import_input_tests ui_editor::agent_tools --test-threads=1 npm run check:rustfmt npm run check:encoding npm run check:doc-index git diff --check ``` 全部上述检查通过。Linux 本地未执行 Windows 专属删除挂起行为测试；未调用真实付费 Provider，远端链路使用既有 mock 测试和已下载账本恢复测试验证。没有 API/DTO/schema 变更或数据迁移。 Closes #551

lhk229 added 1 commit 2026-10-02 02:39:18 +08:00

修复素材导入与资源提交的项目锁争用

Project CI / AI game creator shell Rust crates (pull_request) Successful in 1m45s

Details

Project CI / AI game creator shell Rust smoke (pull_request) Successful in 2m18s

Details

Project CI / Backend tests (pull_request) Successful in 3m52s

Details

Project CI / Frontend tests (pull_request) Successful in 1m52s

Details

Project CI / Native shell tests (pull_request) Successful in 6m0s

Details

Project CI / AI game creator shell Rust lane 2/2 (pull_request) Successful in 9m49s

Details

Project CI / Repository checks (pull_request) Successful in 2m22s

Details

Project CI / AI game creator shell web tests (pull_request) Successful in 1m44s

Details

Project CI / AI game creator shell Rust lane 1/2 (pull_request) Successful in 10m17s

Details

f4464ac289

素材导入与资源提交复用有界等待并在阻塞线程池执行
等待后复核账号身份和写入许可，保留取消后的提交互斥
补齐并行导入、超时恢复、幂等与运行时响应回归测试
同步 AGC 行为规范与项目共享记忆

lhk229 merged commit 89d40c0836 into master

2026-10-02 10:55:29 +08:00

lhk229 deleted branch fix/551-asset-commit-lock-wait

2026-10-02 10:55:29 +08:00

Sign in to join this conversation.

1 Participants

Notifications

Due Date

No due date set.

Dependencies

No dependencies set.

Reference: GenarrativeAI/Genarrative#581