Repository navigation
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Behavior and integration
Adds negotiated same-session conversation rewind without creating another Codex thread.
_session/rewindvalidates the user-message identity, fingerprint/occurrence and retained assistant boundary, then verifies the persisted same-ID prefix after native revert. Legacy rollback is used only for an explicitly legacy history mode. Ambiguous writes are not retried; successful load is required to reconcile an unknown history outcome. This does not restore files.Replaces #596 after withdrawing the earlier submission. Refreshed on upstream main
202e66e63343ec4f5a5e35ab590251d813d129ca(2.2.2), retaining custom instructions, AIR sessionIndex, title selection and app-server recovery. The contract and original implementation credit Nikita Ashikhmin's #508; the refreshed history consolidates the old integration.New regressions cover crash recovery before rewind, no replay after a lost native acknowledgement, index mutation admission, provider-update/close ordering, idle title invalidation and dispatched-title draining across load/resume/close. A retired title generator cannot restart work; unknown title acknowledgements remain fenced. The upstream bounded title wait during load is preserved.
The full companion #611 adds runtime/discovery/archive/attachments and previewed file reversal. It contains this core scope; review/merge core first and refresh the companion afterwards. The persistent queue proposal is independent.
Local validation
中文
撤回旧 #596 后,按最新主线
202e66e(2.2.2)重新提交同 ID 持久对话回退。保留新上游自定义指令、sessionIndex、标题选择和 app-server 恢复;先验证身份与保留边界,再执行并核对原生历史,未知结果不自动重试。协议及原始实现注明 #508 作者归属。补齐崩溃恢复、索引修改互斥、provider 更新与 close 的取消顺序,以及跨 load/resume/close 旧标题任务的失效/回执保护。回退不恢复文件;完整增强 companion 包含本核心,应先审核心;原生持久队列为独立提案。
本地 Linux 全量 1546 通过/36 跳过,类型检查和构建通过;Windows 定向回归通过;双平台隔离原生各 13/13,六个平台交叉编译通过。Windows 的五项上游基线失败如实保留,未声称全套全绿或真实账号/模型/ARM 实机验证。托管 CI 与维护者批准另行判断。
Extension-only review after the full companion is published: core → extensions.