Skip to content

chore: sync upstream main - #4

Closed
Hylouis233 wants to merge 567 commits into
Hylouis233:mainfrom
pingdotgg:main
Closed

Hylouis233 wants to merge 567 commits into
Hylouis233:mainfrom
pingdotgg:main

Conversation

@Hylouis233

@Hylouis233 Hylouis233 commented Sep 16, 2026 •

Copy link
Copy Markdown
Owner

Upstream synchronization

Track pingdotgg/t3code:main, including pull requests already merged into that branch, not arbitrary open pull requests. This remains the single upstream synchronization PR. Upstream moves continuously; each checkpoint below is evidence for one immutable snapshot only and never substitutes for fresh refs, merge parents, conflicts and exact-candidate CI immediately before a merge.

Current checkpoint — 2026-09-24

  • Fork main: a204dfcd57b2a873c42283adbe8b6b5355ee1857.
  • Current immutable upstream snapshot: d4cd7d5c33122473da22ae118c93477ef7e38310 (fix(providers): restore compatibility ranges for every harness, fix(providers): restore compatibility ranges for every harness pingdotgg/t3code#13328).
  • Fresh read-only diagnostics: OpenT3Code upstream sync run 35833857956, attempt 2. The existing workflow/job was rerun rather than creating another synchronization path. prepare and Inspect upstream conflicts (not validation) succeeded; validate and merge were skipped because the current upstream PR is not mergeable.
  • Diagnostic artifact SHA-256: 9bc3eabe6d9d3caa8b20d9ebbd9b5bcbb95517e6713c0e8b094140ea4fd23912.
  • Complete Git-object inventory: 5,614 upstream changed paths, 58 fork changed paths, ten fork/upstream overlaps, and three textual conflicts. Rename detection is intentionally disabled, so these counts are not GitHub UI file counts.
  • Current conflicts: .github/workflows/mobile-fingerprint-check.yml, .github/workflows/release.yml, and README.md.
  • State: no clean merge candidate exists for this snapshot; no exact-candidate validation pass exists; not authorized for merge.

The ten current overlap paths are:

  • .github/workflows/deploy-relay.yml
  • .github/workflows/mobile-eas-preview.yml
  • .github/workflows/mobile-eas-production.yml
  • .github/workflows/mobile-fingerprint-check.yml
  • .github/workflows/release.yml
  • README.md
  • apps/server/src/provider/acp/AcpSessionRuntime.ts
  • knip.jsonc
  • packages/contracts/src/model.ts
  • packages/contracts/src/settings.ts

This supersedes the 2026-09-23 conflict snapshot. .github/workflows/ci.yml is no longer a textual conflict: later upstream commits removed the short-lived restyle-ceiling script/command. In exchange, .github/workflows/release.yml is now conflicted and .github/workflows/mobile-eas-preview.yml is now an overlap. Treat that as a change in review surface, not progress toward merge authorization.

Since immutable upstream snapshot 96c4bfa0a27f776f7cd17df7c7115c3de79ee399, upstream advanced by 31 commits. Important merged changes in that range include:

A separate open upstream candidate, pingdotgg#13137 (fix(acp): prevent assistant message fragmentation on background tool updates & filter leaked harness telemetry), remains relevant because it directly changes apps/server/src/provider/acp/AcpSessionRuntime.ts. Its exact head 7f7483713e82289be8d30798a8fa8421e326ee4d currently has CI, Mobile Fingerprint, Web Preview and Mobile EAS Preview all completed as action_required. It is therefore an observation candidate only, not authorized for cherry-pick or merge. If it later lands on upstream main, re-review its session-segmentation, message-ID and telemetry-filter state against supervised MCode/DSH ACP behavior.

A newer open candidate, pingdotgg#13333 (fix(server): subagent effort label shows the level it actually runs at), is a small Claude-adapter correctness fix. Exact head e066bb06ba9a5e5163c6568256f149871e02cf33 changes only ClaudeAdapter.ts and its focused test (110 additions, 2 deletions), records the SDK-reported subagent effort from read-only hooks, and does not alter permission decisions. Macroscope marked the reviewed revision approvable, but the current CI, Mobile Fingerprint, Web Preview and Mobile EAS Preview runs are all action_required. It is lower priority than the ACP-runtime overlap and remains an observation candidate only; do not cherry-pick it without separate authorization and successful checks.

The latest scheduled inherited Release run on fork main, 35940305508, completed as skipped; no production deployment was approved in this maintenance pass.

Completed fork maintenance

PR #3 merged supervised MCode/DSH source-preview integrations as 745f7c4f8fe381424eeb2273ea8f616e62065491. Its exact-main CI 35047674488 passed. The immutable 0.1.0-alpha.1 source prerelease remains pinned to that SHA with its source artifacts; it is not a signed desktop release or live-account end-to-end certification.

PR #5 previously resolved the mobile production workflow conflict and merged as e03b7dee5dd3a45a5aed8d35bf63cc6480599901 only after exact candidate 61d8fc64961c2835d1d9336a0d913c939f66b59e passed CI 35048005139 and PR Gate.

PR #6 subsequently landed verified synchronization diagnostics and CI-maintenance work. It merged as current fork main a204dfcd57b2a873c42283adbe8b6b5355ee1857 only after exact candidate 3880b966887c2690ace76cbe8e80f1f4468a2dd3 passed CI 35574114297, including OpenT3Code Maintenance, formatting/lint/typecheck, desktop build/preload, Test, all three server shards, Rust, Release Smoke, mobile native static analysis and PR Gate. Those maintenance changes do not resolve or authorize this upstream integration.

Required conflict and overlap review

README.md must preserve OpenT3Code branding, source-first distribution language, supervised MCode/DSH preview guidance, independent maintenance policy and upstream attribution. It must not be replaced wholesale by the upstream README.

For .github/workflows/mobile-fingerprint-check.yml, retain the fork's security boundary: untrusted PR code runs only in the read-only fingerprint job, while label mutation stays in the separate trusted API-only publisher with stale-head revalidation. Upstream improvements may be integrated only without combining write permissions with execution of PR-controlled code.

For .github/workflows/deploy-relay.yml, retain the whole-job github.repository == 'pingdotgg/t3code' guard so this fork never deploys upstream infrastructure. Upstream relay changes may be integrated only inside that retained guard.

.github/workflows/mobile-eas-preview.yml, .github/workflows/mobile-eas-production.yml and .github/workflows/release.yml require semantic review. Keep preview execution scoped to its intended credentials and retain all upstream-only production/publishing restrictions. No inherited production deployment may be approved as part of this sync.

The ACP runtime, Knip and contracts overlaps require source-level compatibility review against the fork's independent provider integrations. Merge shared ACP/runtime and contract behavior only after proving it preserves MCode/DSH discovery, permissions, session creation/resume/cancellation and explicit unsupported-capability handling. Textual conflict count is not evidence of semantic compatibility.

Merge gate

Do not merge this PR until a fresh integration candidate has no unresolved conflicts, preserves every fork-specific boundary above, and passes every applicable check on the exact immutable candidate SHA. Required checks that are missing, queued, action_required, cancelled, skipped because no candidate exists, or attached to a different regenerated candidate are not successful evidence. Recheck the current fork and upstream refs, immutable candidate parents, protected-file diff, reviews and branch protection immediately before a normal merge.

Never force-push main, reset the fork to upstream, weaken branch protection, manufacture status results, approve inherited production deployments, repeatedly close/reopen this PR to refresh checks, or push directly to upstream.

Copilot AI lite review requested due to automatic review settings September 16, 2026 00:56
@chatgpt-codex-connector

Copy link
Copy Markdown

You have reached your Codex usage limits for code reviews. You can see your limits in the Codex usage dashboard.
To continue using code reviews, add credits to your account and enable them for code reviews in your settings.

Copilot AI left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copilot was unable to review this pull request because the user who requested the review has reached their quota limit.

@github-actions github-actions Bot added vouch:trusted Author has write access or is explicitly trusted by OpenT3Code. size:XXL 1,000+ effective changed lines. labels Sep 16, 2026

Copy link
Copy Markdown
Owner Author

Manual fork-maintenance review (2026-09-16): this upstream snapshot touches the protected path .github/workflows/mobile-eas-production.yml, so it is not eligible for unattended merge under docs/operations/opent3code.md.

The protected workflow delta comes from upstream merged PR pingdotgg#11966. It adds an opt-in v2-preview store-build profile, rejects preview OTA updates, and verifies orchestration protocol v2 before the preview build. The earlier upstream review concern about dispatching a preview from the wrong source was addressed before merge. Production remains the default profile. This is nevertheless release/distribution configuration and requires explicit fork review.

Current identities for this review:

  • fork base: 712baceb199943385e3e059e825c32188ecad9ba
  • upstream head: 935c55b3778fdeae0e25b250ce2a9fa7e79c0327
  • GitHub candidate merge: b0bb8be224e7a51532edfb316f6092e0fec25e9d

Do not merge on ordinary head checks alone. The exact candidate still must pass the fork's OpenT3Code upstream sync validation (candidate ancestry, maintenance tests, knip/check/typecheck, workspace tests, desktop build/preload, and Rust tests), with the base and upstream head unchanged. Pending or missing checks are not approval. Fork branding/maintenance files are not replaced by this upstream delta; independent feature PR #3 remains separate and may need reconciliation after any upstream merge.

Hylouis233 added a commit that referenced this pull request Sep 16, 2026
Merge the one-line guard relocation after full CI 35048005139 and GitHub Actions PR Gate succeeded. The maintenance checkout log confirms exact candidate 61d8fc64961c2835d1d9336a0d913c939f66b59e, head c11a7c6, and independently rechecked base 745f7c4. All 50 maintenance tests passed; formatting, lint, typechecks, application and server tests, Rust, release smoke, desktop build and preload checks succeeded. Mobile native analysis was correctly not applicable.

Move the unchanged upstream-only production guard away from the upstream job-name edit. No deployment permissions, application behavior, protection rules, branding, MCode/DSH integration or published source release are changed. Keep existing upstream PR #4 for separate exact-candidate validation and deliberate protected-file review; this is not an upstream-sync merge.

Copy link
Copy Markdown
Owner Author

Maintenance checkpoint — refresh validation after the base changed

PR #3 was merged as 745f7c4f8fe381424eeb2273ea8f616e62065491; its exact-main CI 35047674488 passed and the source-only opent3code-v0.1.0-alpha.1 prerelease was published with all four assets. PR #5 was then merged as e03b7dee5dd3a45a5aed8d35bf63cc6480599901 after CI 35048005139 and PR Gate passed for exact candidate 61d8fc64961c2835d1d9336a0d913c939f66b59e.

The upstream conflict is now resolved without removing the production guard. The current candidate is fab66a5f292f461364f69614175458a1fa552e6d; its immutable parents were independently verified as fork base e03b7dee5dd3a45a5aed8d35bf63cc6480599901 and upstream head 0ec2b08a9a1db6fa35fab8d505b5bdc2d3709a8a. The candidate still has the job-level upstream-only mobile production condition, and the new v2-preview configuration remains disabled in this fork.

Upstream advanced while this PR was conflicting. There is no PR CI run for the current head yet; the earlier action_required runs on 8c18b5bb21a5349fbadba8c77456ea34c41b7339 are not evidence for this candidate. I am closing and immediately reopening this same PR solely to request a fresh normal pull_request CI event for the regenerated candidate. No new sync PR or Git ref will be created or changed; no approval policy, required check, repository protection, or deployment condition is being relaxed. Any approval requirement returned by GitHub remains a blocker.

This is not a merge approval. Before merging, recheck the exact candidate, all applicable checks, protected-file review, fork-specific functionality and current refs. Missing or queued checks and earlier green runs do not qualify.

@Hylouis233 Hylouis233 closed this Sep 16, 2026
@Hylouis233 Hylouis233 reopened this Sep 16, 2026

Hylouis233 commented Sep 17, 2026 •

Copy link
Copy Markdown
Owner Author

Maintenance checkpoint — 2026-09-20

  • Repository identity remains stable: repository ID 1341460159 resolves to Hylouis233/opent3code; owner is Hylouis233; fork main remains e03b7dee5dd3a45a5aed8d35bf63cc6480599901.
  • Upstream pingdotgg/t3code:main is now d6f291303ddc0c9a14f570266a4d9eff6d431593 (fix(server): surface ACP stderr when cursor-agent exits at session start (#12625)). This is 27 commits ahead of the previous checkpoint head 8c3b5bef17a637bf53f297189350359790ef7afb.
  • PR chore: sync upstream main #4 is still the single upstream synchronization PR. It tracks the current upstream head but remains non-mergeable (mergeable=false) and GitHub exposes no candidate merge SHA. Against fork main, it now spans 205 commits and 4,970 changed files.
  • The current-head PR Size run 35472637011 failed closed. All 19 trusted policy tests passed, then classification stopped with: PR #4: incomplete file list (3000/4970); refusing to guess size. This remains a real maintenance blocker rather than a cosmetic label failure.
  • The latest completed OpenT3Code upstream sync run is 35429249607. Its prepare job reported PR #4 needs conflict resolution or a fresh base snapshot; validate and merge were skipped. The workflow-level success therefore does not validate any merge candidate.
  • The 27-commit upstream increment touches protected/release-sensitive surfaces including .github/workflows/release.yml and .github/workflows/mobile-fingerprint-check.yml, in addition to Desktop, provider/ACP, server, mobile and web code. These surfaces require deliberate fork review once a bounded merge candidate exists.
  • There is still no exact candidate SHA for the current upstream head, so there is nothing eligible for exact-candidate validation or merge. Missing, skipped, queued or action_required checks are not approval, and stale green runs from older candidates must not be reused.
  • Preserve OpenT3Code branding/documentation, maintenance policy, release/deployment guards, and the MCode/DSH supervised source-preview integrations during any reconciliation.
  • The newest inherited scheduled Release run 35473429530 is pending on fork main at e03b7dee5dd3a45a5aed8d35bf63cc6480599901. It was not approved, rerun or otherwise touched.

No merge or main-branch write was performed in this checkpoint.

Next safe merge gate: resolve the actual conflict or establish a fresh bounded base snapshot without overwriting fork-specific changes; obtain a fresh immutable candidate merge SHA; verify its exact base/head parents; explicitly review protected/fork-specific surfaces; then require the exact candidate's full validation and all applicable observed head checks to finish successfully. Do not force-push main, bypass protection, reuse stale green runs, count missing/queued checks as passing, or close/reopen PR #4 merely to manufacture events.

Hylouis233 added a commit that referenced this pull request Sep 21, 2026
Merge the verified CI repair after full PR CI 35574114297 and PR Gate succeeded. The maintenance job checked out exact candidate 3880b966887c2690ace76cbe8e80f1f4468a2dd3 with parents e03b7de and 987761d; main was independently rechecked before merging. All 71 maintenance tests, Check (formatting, lint, typecheck, desktop build and preload validation), Test, all three server shards, Rust, Release Smoke and mobile native static analysis succeeded.

Handle the PR file-list limit without guessing exact totals, stabilize cold Shiki initialization tests, and preserve all existing CI gates. Upstream diagnostics remain read-only and do not authorize or merge upstream PR #4. No branch-protection or release policy is weakened.

Verification and merge: GPT-6 Astra Pro via ChatGPT and the GitHub connector.
juliusmarminge and others added 16 commits September 22, 2026 19:00
Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
… variants (#13188)

Co-authored-by: julusy <julius@t3.codes>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…3200)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
…#13192)

Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
…3193)

Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
…and Command (#13206)

Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
t3dotgg and others added 10 commits October 1, 2026 02:10
…14573)

Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
#12046)

Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
…tale (#12047)

Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
…12048)

Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
…URL (#12049)

Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
…UIScreen.main (#12050)

Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
…bers (#12051)

Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
…12052)

Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
…ard (#13487)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Kamkmgamer and others added 18 commits October 1, 2026 12:08
Co-authored-by: t3-code[bot] <269035359+t3-code[bot]@users.noreply.github.com>
Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
…ched GraphQL (#14673)

Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
#13926)

Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Co-authored-by: t3-code[bot] <269035359+t3-code[bot]@users.noreply.github.com>
Co-authored-by: maria <254055478+maria-rcks@users.noreply.github.com>
…ode browser (#14601)

Co-authored-by: PR Batch Tester <agent@local.test>
Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
)

Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
@Hylouis233 Hylouis233 closed this in #8 Oct 2, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

size:XXL 1,000+ effective changed lines. vouch:trusted Author has write access or is explicitly trusted by OpenT3Code.

Projects

None yet

Development

Successfully merging this pull request may close these issues.