docs: preserve upstream integration verification and submission gaps

Co-Authored-By: Paperclip <noreply@paperclip.ing>

doc/plans/2026-10-10-boat-validation.md

@@ -2,12 +2,12 @@
 
 **Experimental and unmerged. Local journeys and partial staging qualification passed on the sources below; final-source staging acceptance remains incomplete.** A successful build, probe, or earlier-source journey does not establish the remaining product conditions.
 
-## Current source boundary (2026-10-11 11:54 UTC)
+## Current source boundary (2026-10-11 12:14 UTC)
 
 | Surface | Source and evidence |
 | --- | --- |
-| Combined implementation | Current head `4d2a2394bc` includes the reviewed closed module-fence diagnostic and committed live evidence; its CI is green: 54 passed, fresh review 5/5 and no unresolved threads at 11:16 UTC. Previous head `dc6ac92f7e` had 53 successful checks, fresh review 5/5 and no unresolved threads at 10:09 UTC. |
-| Core branch | Current head `8f62eef8f13e199f7a98d8a9ec27d617385e6fde` adds closed module-fence diagnostics; focused checks passed and full CI is green: 54 passed, four skips, fresh review 5/5 and no unresolved threads at 11:16 UTC. Previous head `8e8999d681` had 54 successful checks, four skips, fresh review 5/5 and no unresolved threads. Its serialized invite test passed one rerun with unchanged source and timeout. |
+| Combined implementation | The feature branch now includes core merge `0eac0a26` and marker correction `1f66cac0`; full checks for the new head remain pending. Earlier fully checked head `4d2a2394bc` includes the reviewed closed module-fence diagnostic and committed live evidence; its CI is green: 54 passed, fresh review 5/5 and no unresolved threads at 11:16 UTC. Previous head `dc6ac92f7e` had 53 successful checks, fresh review 5/5 and no unresolved threads at 10:09 UTC. |
+| Core branch | Current core `0eac0a26e90e1e8f3f935d345ec872903bd54c35` merges exact upstream `e733bddc45` with 240 focused tests and server typecheck passing; full CI is pending. Prior fully checked `8f62eef8f13e199f7a98d8a9ec27d617385e6fde` adds closed module-fence diagnostics; focused checks passed and full CI is green: 54 passed, four skips, fresh review 5/5 and no unresolved threads at 11:16 UTC. Previous head `8e8999d681` had 54 successful checks, four skips, fresh review 5/5 and no unresolved threads. Its serialized invite test passed one rerun with unchanged source and timeout. |
 | Verified staging source | Deployment28 verified `70fb0988c0aa760f9c84818aaf3fabbc339854b7` at 11:26:28.642 UTC; its cold and warm turns passed; after natural archive, its saved post-idle continuation failed before task work. Both owners retired and Boat archived automatically. Deployment27 verified `2605a03f00bc3d7decc8b8d5549ee06f8d77ae85` at 10:19:12.318 UTC. Saved Codex execution, agent computer use, generated preview, state-preserving warm HMR and natural process cleanup passed. Claude cold and warm passed; its saved post-idle continuation failed before provider task work. |
 | Local corrected-package qualification | Local51 also passed the full lifecycle with the same Node, sidecar and production-lock bytes as staging28, although the package closure differs. Its final archive completed at 11:38:23.197. Earlier compatible controller `049c57f64c9addb1ae45132626cf800d1ea41a95` and immutable pack `sha256:f6fbd13c71cdaf93060a7c240cbce1c8dfce2aefe5669db27d254b3b95dfb0a0` passed cold, warm, natural archive, first-attempt saved-session continuation and final natural archive. |
 | Carried source-specific evidence | Deployment26 passed simultaneous legacy admission from archive. Deployment25 passed embedded human mouse/keyboard control in Chrome and exact Codex child cancellation while its Claude sibling remained alive and completed. Earlier local checks cover file editing, detach/reconnect and company boundaries. Orderly restart has bounded observations, not a successful crash-recovery journey. These were not rerun for the later dependency-loader and viewer-warning changes. |
@@ -78,6 +78,12 @@ Core `1f66cac0f83484e01bdd4d4e9dc3375c3e7665c6` makes the closed import marker e
 
 The correction is included in staging candidate `05f3725af838b5a074707df1d6ed1e193bdfe49e`. This candidate has not yet been deployed or qualified. Staging28's underlying module rejection remains unresolved; no successful live result is inferred from the diagnostic correction.
 
+## Upstream integration and submission boundary (2026-10-11 12:14 UTC)
+
+Core merge `0eac0a26e90e1e8f3f935d345ec872903bd54c35` incorporates pinned upstream `e733bddc45e00efb1819fffa8677f7b0d07802c5` into the feature branch. The single import conflict retained both the Boat shutdown-deferral error and the new environment selector. Independent review found the extracted selector behavior equivalent and Boat ownership, cancellation and cleanup intact. 240 focused tests across eight files passed with zero skips; server typecheck and diff checks passed. No migration or live-state change occurred. [Verification](assets/2026-10-10-boat/evidence/core-e733-merge-verification.json).
+
+Staging deployment29 remains pinned to `05f3725af838b5a074707df1d6ed1e193bdfe49e` and is building, not verified serving. The draft PRs also exceed the preparation skill's per-PR file limit (core144; stacked UI/evidence258 before this evidence update). A coherent prerequisite/evidence split is being planned. Full new-head CI and submission constraints remain open; prior green-head receipts do not certify the updated branches.
+
 ## Local48 and deployment25 follow-up (2026-10-11 08:57 UTC)
 
 - **Local cold and warm Claude passed.** Cold run `2651f86d` succeeded at 08:40:21.872 after uploading and verifying the full 1166MiB pack. Warm run `1983527f` succeeded at 08:42:28.390 with the same native session, logical runner, Claude thread and physical owner/boot/launch identity. Both original proof hashes were unchanged. The owner remained warm beyond 130 seconds after the turn, retired after its configured 08:47:28 deadline, and Boat finished archive at 08:47:49.418. [Cold response](assets/2026-10-10-boat/local48-claude-cold.png), [warm response](assets/2026-10-10-boat/local48-claude-warm.png).

doc/plans/assets/2026-10-10-boat/evidence/core-e733-merge-verification.json

@@ -0,0 +1,30 @@
+{
+  "schema": "boat-upstream-integration-verification/v1",
+  "capturedAt": "2026-10-11T12:12:27.836159+00:00",
+  "mergeCommit": "0eac0a26e90e1e8f3f935d345ec872903bd54c35",
+  "upstreamCommit": "e733bddc45e00efb1819fffa8677f7b0d07802c5",
+  "featureParent": "1f66cac0f83484e01bdd4d4e9dc3375c3e7665c6",
+  "branch": "codex/boat-environment-core",
+  "conflictResolution": "Retain both ComputerStopPendingError and selectHeartbeatEnvironment imports.",
+  "newTests": "Agent-default and instance-default Boat selection with zero acquired run leases.",
+  "verification": {
+    "passed": 240,
+    "files": 8,
+    "skipped": 0,
+    "serverTypecheck": "passed",
+    "diffCheck": "passed",
+    "independentReview": "live_state_probe approved unchanged extraction and retained Boat fences",
+    "initialFailure": "New test fixture reused a globally unique environment name; made agent/instance fixture names distinct, affected 8-case suite then passed.",
+    "logs": [
+      "core-e733-merge-tests.log",
+      "core-e733-selection-final.log",
+      "core-e733-ownership-tests.log",
+      "core-e733-merge-tsc.log"
+    ]
+  },
+  "databasePolicy": "Uniquely named disposable databases on the existing task-owned PostgreSQL server; product database untouched.",
+  "migrationChanges": false,
+  "liveControllerChanged": false,
+  "stagingChanged": false,
+  "pushed": false
+}