95c5418c0f
- 三个文档冲突按两边都保留解决:decision-log.md、pitfalls.md、实施计划技术方案;两边追加的是不同主题(资源画布/预览/聊天区 vs 写锁),语义无冲突 - Rust 侧 direct_runtime.rs、direct_tool_bridge.rs、project_gates.rs、project.rs 自动合并成功,无手工介入 - 冲突处仅移除 Git 标记行,未删改任何一方内容(每个文件恰好减少 3 行)
37 lines
858 B
Rust
37 lines
858 B
Rust
use super::*;
|
|
use sha2::{Digest, Sha256};
|
|
use similar::TextDiff;
|
|
use std::io::{Seek, SeekFrom};
|
|
|
|
mod agent_db;
|
|
mod asset_export;
|
|
mod asset_rename;
|
|
mod checkpoint;
|
|
mod conversation;
|
|
mod export;
|
|
mod external_editor_bindings;
|
|
mod filesystem;
|
|
mod manifest;
|
|
mod memory;
|
|
mod resource_dependency_graph;
|
|
mod resource_editor;
|
|
mod resource_layout;
|
|
mod verification;
|
|
mod write_lock;
|
|
|
|
pub(crate) use agent_db::*;
|
|
pub(crate) use asset_export::*;
|
|
pub(crate) use asset_rename::*;
|
|
pub(crate) use checkpoint::*;
|
|
pub(crate) use conversation::*;
|
|
pub(crate) use export::*;
|
|
pub(crate) use external_editor_bindings::*;
|
|
pub(crate) use filesystem::*;
|
|
pub(crate) use manifest::*;
|
|
pub(crate) use memory::*;
|
|
pub(crate) use resource_dependency_graph::*;
|
|
pub(crate) use resource_editor::*;
|
|
pub(crate) use resource_layout::*;
|
|
pub(crate) use verification::*;
|
|
pub(crate) use write_lock::*;
|