Skip to content

Guard target inspection and explicit clone conflicts before import #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
SamZebrado merged 3 commits into from
Oct 6, 2026
Merged

Guard target inspection and explicit clone conflicts before import #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a94d423
fix: fail closed on unknown session import targets
SamZebrado Oct 3, 2026
05c56fe
fix: guard clone destinations and skipped directory links
SamZebrado Oct 3, 2026
0ad8791
fix: reject occupied equal-ID session clones
SamZebrado Oct 3, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,9 +193,9 @@ bundle.zip/
- `--mode overwrite`：备份后覆盖已有会话

**推荐冲突策略（`--on-conflict`）**：
- `--on-conflict abort`（默认）：如果目标机器已有该会话，则报错退出
- `--on-conflict abort`（默认）：如果目标机器已有该会话，则报错退出（JSONL、SQLite、index 任一项存在都算冲突；读取失败或身份不明会阻止导入）
- `--on-conflict overwrite`：备份后覆盖已有会话
- `--on-conflict import-as-new`：即使目标机器已有该会话，导入为新会话
- `--on-conflict import-as-new`：即使目标机器已有该会话，导入为新会话。每次自动生成新 ID，重复执行会创建独立克隆；不按内容相似度去重

**导入时新建 session ID**：
- `--new-session-id auto`：自动生成新 session ID
Expand Down Expand Up @@ -359,3 +359,5 @@ python3 codex_workdir_migrate.py import-bundle \
- [import_safety.md](docs/import_safety.md) - 导入安全指南
- [known_limits.md](docs/known_limits.md) - 已知限制
- [migration_design.md](docs/migration_design.md) - 迁移设计文档

不确定导入结果时，保存 bundle、目标 ID、映射、冲突模式、备份和 `imported_files`，先检查目标再重试。需要重启后沿用同一克隆身份时，首次执行前指定 `--new-session-id <explicit-id>`；现有 ID 是冲突证据，不是成功或内容等价凭据。详见 [导入安全指南](docs/import_safety.md#目标检查失败与不确定重试)。
Loading
Loading