Skip to content

chore(vendor): re-sync interchange vendor trees to 0.4.0, re-carry patches - #1424

Merged
TheGreatAxios merged 3 commits into
mainfrom
cl-10651-intx-re-sync-vendor-snapshot-to-040-re-carry-local-patches
Oct 15, 2026
Merged

TheGreatAxios merged 3 commits into
mainfrom
cl-10651-intx-re-sync-vendor-snapshot-to-040-re-carry-local-patches

Conversation

@TheGreatAxios

@TheGreatAxios TheGreatAxios commented Oct 14, 2026 •

Copy link
Copy Markdown
Collaborator

Summary

  • Re-syncs all 11 vendor/intx-* trees to upstream interchange 0.4.0 (5453d0b0). Commit 865f63c6 is not a pristine byte-identical snapshot of that pin (local lines remain, including ephemeralTurns / Locally patched in vendor/intx-inference/src/reactor.ts). The auditable artifact is the branch tip: upstream 5453d0b0 plus the carried local patches. Replaying the second commit onto a later pristine pin is not patch-only.
  • All local patch families survive (none subsumed upstream at 0.4.0): ephemeralTurns/ExtendedInferenceOptions (reactor.ts; used by director/nudge-director/cache-breakpoint), doom-loop poll exemption, stream-terminal detector pair, and ClassifiedAbortRaw — with a companion settle test in the vendored errors.test.ts.
  • PATCHES.md ledgers updated + the commissioned adjudication recorded: 38 ledger entries verified KEEP; the four carried-forward DELETE notes are contradicted at this pin and kept (context-transforms pair, agent flush chain, commitment boundary, frozen-turns pair); three unclear ledger labels adjudicated no-match with closest candidates named; expectedFrom removal is post-0.4.0 and reconciles with zero first-party references (the correlator-as-capability model change this enables is tracked in CL-10678's security work).
  • One recovery: bin/vendor-patch-diff surfaced a never-ledgered pre-existing divergence in vendor/intx-tools-posix (paged read_file description + registry-contract test) — now ledgered with markers, tools-posix moved verbatim to patched in the VENDORING tables, and step 3 of the resync procedure lists it as patched so a later sync does not drop registry-ts-read-file-paging-description.
  • Modest API adoption: upstream's new ./testing subpath (waitUntil and friends) live in vendored @intx/types/@intx/agent; ApprovalItem and waitForReactorDone arrive verbatim; PerCallInferenceOptions is post-0.4.0 (HEAD, CL-10656 scope) so ephemeralTurns stays for the nudge use-case with reasons recorded.
  • @intx/mailbox, @intx/agent, @intx/authz, @intx/log, @intx/harness, and @intx/tools-posix are published at npm 0.4.0. Patched packages stay vendored for their local patches. Verbatim packages are not described as unpublished.
  • Zero src/ changes; all tests green.

Verification

  • bun run check exit 0: full one-process suite 8938 pass / 0 fail across 580 files; bun test scripts/vendor-patch-ledger.test.ts 2 pass (marker-ledger correspondence, incl. the recovered tools-posix entry); e2e/vendored-carry.test.ts green (both carried-patch integration tests).
  • git diff 4dd0ee01..HEAD --stat -- src/ is empty. There is no exhaustive cmp claiming 865f63c6 matches upstream.
  • Vendored intx-types/package.json keeps the documented src-mode/0.2.2 local convention (not a re-sync miss; the +4 delta is the ./testing subpath adoption) — VENDORING.md documents this convention.
  • Known pre-existing, out-of-gate: the vendored substrate-mailbox-store.test.ts failure (cannot resolve @intx/hub-sessions from the vendored subtree) is documented in VENDORING and unchanged by this branch.

Fixes CL-10651

Re-sync per the docs/VENDORING.md procedure; adjudication lands with the patch commit.
Adjudicated the local patch ledger against upstream 0.4.0 (5453d0b0): all 38 ledger entries verified KEEP; the four carried-forward DROP notes are contradicted by evidence at this pin and are kept, with reasons recorded in docs/VENDORING.md; three unclear labels adjudicated no-match with the closest candidates noted; one previously never-ledgered tools-posix divergence (paged read_file description + registry-contract test) recovered and ledgered now.

PATCHES.md ledgers, docs/VENDORING.md, and the vendored package.json src-mode export convention arrive here, not in the pristine commit.
@linear-code

linear-code Bot commented Oct 14, 2026

Copy link
Copy Markdown

CL-10651

@corbits-triage

corbits-triage Bot commented Oct 14, 2026 •

Copy link
Copy Markdown
Contributor

Triage: Fail

@TheGreatAxios, please address the following:

  • pull request is over the files limit: 31 files (max 25)
  • pull request touches a forbidden path: vendor/intx-agent/PATCHES.md, vendor/intx-agent/src/agent.test.ts, vendor/intx-agent/src/audit-integration.test.ts, vendor/intx-agent/src/compactor-wiring.test.ts, vendor/intx-agent/src/flush-errors.test.ts, vendor/intx-agent/src/testing/index.ts, vendor/intx-agent/src/testing/reactor-waiters.test.ts, vendor/intx-agent/src/testing/reactor-waiters.ts, vendor/intx-authz/src/tool-namespace-invariants.test.ts, vendor/intx-harness/src/harness.test.ts, vendor/intx-harness/src/reply-drain.test.ts, vendor/intx-inference/PATCHES.md, vendor/intx-inference/src/default-director.test.ts, vendor/intx-inference/src/errors.test.ts, vendor/intx-inference/src/reactor.test.ts, vendor/intx-log/src/default-sink-probe.ts, vendor/intx-log/src/default-sink.test.ts, vendor/intx-storage-isogit/PATCHES.md, vendor/intx-tools-posix/PATCHES.md, vendor/intx-tools-posix/src/registry.ts, vendor/intx-tools-posix/src/tools-posix.test.ts, vendor/intx-types/PATCHES.md, vendor/intx-types/package.json, vendor/intx-types/src/base64.ts, vendor/intx-types/src/grants.ts, vendor/intx-types/src/sidecar.test.ts, vendor/intx-types/src/sidecar.ts, vendor/intx-types/src/testing/index.ts, vendor/intx-types/src/testing/wait-until.test.ts, vendor/intx-types/src/testing/wait-until.ts

The first sync commit still contains local lines, so it is not an
unmodified upstream tree, and the second commit is not a patch-only
replay onto a later pin. The auditable tree is the branch tip.
@intx/tools-posix stays in the patched set, and packages published at
npm 0.4.0 are no longer described as unpublished or ahead of npm.
@TheGreatAxios
TheGreatAxios merged commit 03fb5fd into main Oct 15, 2026
13 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant