From e3d606c137b0562a9654ae39241159dc0183f52d Mon Sep 17 00:00:00 2001 From: Takeshi Date: Thu, 15 Oct 2026 20:04:50 +0900 Subject: [PATCH] docs: align superseded P13 root instructions with reviewed candidate --- .../INTEGRATION_CONTEXT_CONFLICT_RESOLUTION.json | 11 +++++++++++ .../execution/p13-03/P13_ORDER_FINAL_REPAIR_INPUT.md | 4 ++++ 2 files changed, 15 insertions(+) create mode 100644 docs/plans/original-completion-2026-10-02/execution/p13-03-resume-20261015/INTEGRATION_CONTEXT_CONFLICT_RESOLUTION.json diff --git a/docs/plans/original-completion-2026-10-02/execution/p13-03-resume-20261015/INTEGRATION_CONTEXT_CONFLICT_RESOLUTION.json b/docs/plans/original-completion-2026-10-02/execution/p13-03-resume-20261015/INTEGRATION_CONTEXT_CONFLICT_RESOLUTION.json new file mode 100644 index 0000000..da2c4cf --- /dev/null +++ b/docs/plans/original-completion-2026-10-02/execution/p13-03-resume-20261015/INTEGRATION_CONTEXT_CONFLICT_RESOLUTION.json @@ -0,0 +1,11 @@ +{ + "failed_main": "32ca5b34c5ebe8714bd398a33e60697798ad0328", + "submitted": "bd3a97ec741ddb2346d0c2b2e0472c978927ce82", + "failed_checkout": "/Users/korizatou114/Projects/TheTree-managed-worktrees/p13-03/P13-03-integration-3541c11e", + "conflict_only": "docs/plans/original-completion-2026-10-02/execution/p13-03/P13_ORDER_FINAL_REPAIR_INPUT.md", + "reason": "Both branches added the Root historical input document; reviewed candidate adds 4-line superseded instruction header. Main still has the identical original body.", + "resolution": "Retain entire historical body byte-for-byte; align main Root context with reviewed submitted document. No implementation or proof/acceptance changes. Retry ordinary prepare-integration against new main, same reviewed submission.", + "old_sha256": "f7fb2ee06a96b520a3265243cb34cf48156a6a4f0d128522eaf59d6baa5d133d", + "reviewed_sha256": "ad84f77bdff0d3caeb5315d11b2300eca50c08b196e62b758bcc7c4986426570", + "formal_credit": 0 +} diff --git a/docs/plans/original-completion-2026-10-02/execution/p13-03/P13_ORDER_FINAL_REPAIR_INPUT.md b/docs/plans/original-completion-2026-10-02/execution/p13-03/P13_ORDER_FINAL_REPAIR_INPUT.md index f49ea48..7cff24d 100644 --- a/docs/plans/original-completion-2026-10-02/execution/p13-03/P13_ORDER_FINAL_REPAIR_INPUT.md +++ b/docs/plans/original-completion-2026-10-02/execution/p13-03/P13_ORDER_FINAL_REPAIR_INPUT.md @@ -1,3 +1,7 @@ +# Superseded historical repair instructions + +The old repair-2 limit and 500000/450000-byte caps below are superseded by the current owner direction. Preserve required evidence without omissions or cap-driven compression. The prior failed invocation remains history, not current readiness. The immutable spec, scope and acceptance remain in force. + # P13-03 final bounded repair input (root context, not implementation) Original contract/spec/acceptance1 and repair cap2 remain unchanged. Repair1 used. Initial submitted7645c55149d3bebf3ed602cf3039b15b28fa376f records seven facilities,84slots,six non-facility categories. Root read-only diagnostic ran its --negative-checks: integrity pass,13 mutations rejected. This is not formal acceptance.