Skip to content

chore(v2): merge main into the V2 branch - #14855

Merged
juliusmarminge merged 4 commits into
t3code/codex-turn-mappingfrom
v2/main-sync-1002b
Oct 2, 2026
Merged

juliusmarminge merged 4 commits into
t3code/codex-turn-mappingfrom
v2/main-sync-1002b

Conversation

@juliusmarminge

@juliusmarminge juliusmarminge commented Oct 2, 2026 •

Copy link
Copy Markdown
Member

Merges main (e0db2a5) into V2 (af7de21). The previous sync (#14851) landed as a merge commit, so only main's 3 new commits apply.

What comes in

V1 files kept deleted

  • fix(server): stop a second server from resending Claude turns #13295 changed orchestration/Layers/OrchestrationEngine(.test).ts, which V2 deleted. V1's engine republished every event since a stale snapshot after a failed command, so a second server sharing the state directory could start a duplicate Claude turn. V2 has no equivalent path to port: EventSink only ever publishes the events its own write appended (each publishLiveEvents call takes the storedEvents its transaction returned).

Verification

  • Merge commit b37fcea42f has V2 as first parent and main as second. Apart from V2's own changes, every file main touched matches main.
  • vp i clean; tsc --noEmit exits 0 for apps/server and packages/contracts.
  • No sk-or-/crsr_ in the diff.

Lands as a fast-forward push of this head to t3code/codex-turn-mapping, so main stays a parent.

Model: Claude Opus 5.5 (Claude Code)

🤖 Generated with Claude Code


Devin Review

bompus and others added 4 commits October 2, 2026 11:11
Merges origin/main (e0db2a5) into t3code/codex-turn-mapping (af7de21).
The previous sync (#14851) landed as a merge commit, so git's merge base is
6c8fed3 and only main's 3 new commits apply.

Brings in #14850 (Android release builds no longer crash when opening a
thread: react-native-keyboard-controller patch), the v0.0.45 release prep
(package versions), and #13295.

V1 files V2 deleted (kept deleted):
- orchestration/Layers/OrchestrationEngine(.test).ts (#13295): V1's engine
  republished every event since a stale snapshot after a failed command, so a
  second server sharing the state directory could start a duplicate Claude
  turn. V2's EventSink only ever publishes the events its own write appended
  (EventSink.ts: each publishLiveEvents call takes the storedEvents its
  transaction returned), so V2 has no equivalent path to port.

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
@github-actions github-actions Bot added the vouch:trusted PR author is trusted by repo permissions or the VOUCHED list. label Oct 2, 2026
@juliusmarminge juliusmarminge added the macroscope-review Opt PRs made by unvouched contributors in for Macroscope review. Vouched contributors auto-reviews label Oct 2, 2026
@github-actions github-actions Bot added the size:L 100-499 changed lines (additions + deletions). label Oct 2, 2026
@macroscopeapp

macroscopeapp Bot commented Oct 2, 2026

Copy link
Copy Markdown
Contributor

Approvability

Verdict: Approved at b37fcea

Macroscope's review found this PR approvable — The merge updates release metadata and dependency bookkeeping, plus a narrowly scoped mobile crash fix that preserves existing ref behavior while supporting Reanimated shareable refs. It introduces no new capability, schema, deployment, security-sensitive, or static-analysis configuration change.

You can add or adjust custom eligibility rules. Learn more.

@juliusmarminge
juliusmarminge merged commit b37fcea into t3code/codex-turn-mapping Oct 2, 2026
32 of 33 checks passed
@juliusmarminge
juliusmarminge deleted the v2/main-sync-1002b branch October 2, 2026 18:44
@github-actions

github-actions Bot commented Oct 2, 2026

Copy link
Copy Markdown
Contributor

Thread transfer impact

✅ Thread transfer remains within every enforced ceiling.

ℹ️ No successful main baseline artifact is available yet. This run establishes the initial measurement.

Provider Metric Main baseline This PR Impact PR ceiling
Codex Total thread wire — 4.9 KiB — 6.8 KiB ✅
Codex Thread snapshot wire — 3.7 KiB — 4.9 KiB ✅
Codex Live turn WebSocket wire — 1.2 KiB — 2.0 KiB ✅
Codex Live turn WebSocket decoded — 20.4 KiB — 29.3 KiB ✅
Codex Live turn messages — 2 — 8 ✅
Claude Total thread wire — 4.9 KiB — 6.8 KiB ✅
Claude Thread snapshot wire — 3.7 KiB — 4.9 KiB ✅
Claude Live turn WebSocket wire — 1.2 KiB — 2.0 KiB ✅
Claude Live turn WebSocket decoded — 20.7 KiB — 29.3 KiB ✅
Claude Live turn messages — 1 — 8 ✅

Baseline: unavailable · PR result: b37fcea · Source CI: success

Scenario and decoded snapshot size

10 historical turns, 5 command tools per turn, 878.9 KiB retained MCP result per historical turn, and a 1.05 MiB retained result in the measured turn.

  • Codex decoded thread snapshot: 106.1 KiB
  • Claude decoded thread snapshot: 106.4 KiB

Updated in place by a trusted workflow. PR artifacts are strictly validated and never executed.

This branch was successfully deployed

1 active deployment
production — b37fcea4 Deployed Oct 2, 2026 by juliusmarminge via Resolve T3 Connect public config #2598
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

macroscope-review Opt PRs made by unvouched contributors in for Macroscope review. Vouched contributors auto-reviews size:L 100-499 changed lines (additions + deletions). vouch:trusted PR author is trusted by repo permissions or the VOUCHED list.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants