Skip to content

chore: 同步上游 pingdotgg/t3code main 至 49e97d48f9 - #35

Merged
Hylouis233 merged 17 commits into
mainfrom
chore/upstream-sync-20261022c
Oct 22, 2026
Merged

Hylouis233 merged 17 commits into
mainfrom
chore/upstream-sync-20261022c

Conversation

@Hylouis233

Copy link
Copy Markdown
Owner

同步上游 pingdotgg/t3code 49e97d48f9 到 opent3code

取代 #34(#34 由 github-actions 自动创建,head 为 pingdotgg:main,fork CI 一直处于 action_required,不会运行)。

上游范围

  • fork main 基线:6451ae51a2(chore: 同步上游 pingdotgg/t3code main 至 b5a226e49c #33 合并)
  • 上一次合并基点:b5a226e49c
  • 本次合并的上游 sha:49e97d48f9(docs(import): correct conversation size and batch limits (#23226))
  • 上游新增提交:16 个(ed9b7ca9c5 起,含 8acbefefc5、49e97d48f9)
  • 合并提交:93bd432098(--no-ff)
  • 变更:66 个文件,+1606 / -931。主要涉及:
    • apps/mobile:iPhone Duo 布局/折叠/搜索/工具栏/sheet 一系列修复,react-native-screens 升级到 5.0.0-t3.36,新增 thread-feed-live-follow、useRestingTopOffset(及测试)
    • packages/source-control-gitcafe:PR 列表显示增删行数
    • 构建:根 package.json engines.node 从 ^24.13.1 改为 26.12.1;apps/server/vite.config.ts 中 SEA Node 版本改为读取 engines.node;release-desktop.yml 去掉 VP_NODE_VERSION
    • patches/:@legendapp/list、@react-navigation/native-stack 补丁更新,新增 react-native-reanimated@4.7.1 补丁;pnpm-lock.yaml 相应更新
    • 文档:docs/operations/*、docs/user/welcome-wizard.md

冲突

  • 无冲突(自动合并)。
  • fork 与上游自 b5a226e49c 起都改过的文件只有 .github/workflows/release-desktop.yml:自动合并后 fork 的 if: github.repository == 'pingdotgg/t3code' 守卫保留,上游的 Node 版本改动已合入。

删除检查

git diff --diff-filter=D origin/main HEAD 仅 2 个文件,均为上游删除,无 fork 独有文件被删:

  • apps/mobile/deps/react-native-screens-5.0.0-t3.30.tgz(由 t3.36 替代)
  • apps/mobile/src/native/NativeSheetContent.tsx

其他检查:

  • apps/server/src/provider/model-manifest.json 与 origin/main 一致:opencode/1=1、opencode/2=2、pi/2=2 不变
  • .github/workflows/cursor-hygiene-webhook.yml 仍不存在
  • opent3code-source-integrity.cjs --placeholder-only 6451ae51a2 HEAD 通过

上游 CI

本地测试(Node 24.22.0,CI=true vp install --frozen-lockfile 通过)

检查 结果
node --test .github/scripts/opent3code-*.test.cjs ✅ 105/105
apps/server providerCompatibility / ModelManifest / providerMaintenanceRunner ✅ 3 个文件,38/38
packages/source-control-gitcafe 单元测试 ✅ 5 个文件,52/52
apps/mobile unit + react(jsdom)测试 ✅ 195 个文件,2125/2125
apps/mobile 类型检查(tsc-rs --noEmit) ✅
source integrity(placeholder-only) ✅

未验证

  • 本地用的是 Node 24.22.0,上游已把 engines.node 固定为 26.12.1;未在 Node 26.12.1 下测试,CI 中 Setup Vite+ 会选用 26.12.1
  • 未跑 server 类型检查、server 全量测试、web/browser 测试、桌面构建
  • 未做 CLI single-executable / SEA 构建及 release-desktop.yml 发布流程验证
  • 移动端 iOS/Android 原生构建、iPhone Duo 真机行为、react-native-screens t3.36 / reanimated 补丁的原生效果未验证(Mobile Fingerprint / EAS 由 CI 判定)
  • 上游 49e97d48f9 的 CI 在推送时尚未完成

PixPMusic and others added 17 commits October 22, 2026 00:16
…tgg#22976)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…otgg#22979)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
)

Co-authored-by: Pixel Perfect <me@pixp.cc>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…uest (pingdotgg#23143)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ds with its sidebar (pingdotgg#23144)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…s list (pingdotgg#23145)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…tgg#23146)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ine in place (pingdotgg#23147)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…its tab bar (pingdotgg#23148)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…3226)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Copilot AI balanced review requested due to automatic review settings October 22, 2026 01:38
@Hylouis233
Hylouis233 enabled auto-merge October 22, 2026 01:38
@chatgpt-codex-connector

chatgpt-codex-connector Bot commented Oct 22, 2026 •

Copy link
Copy Markdown

Codex Review Summary

This comment shows the latest Codex review activity on this pull request.

Review Status Commit Review trigger
📝 Code Review ✅ Completed 2026-10-22T01:41:41.144734Z 93bd432 PR opened
ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

  • Open a pull request for review
  • Mark a draft as ready
  • Comment "@codex review" or "@codex security review".

Codex reacts with 👀 while any review is running, comments if it has suggestions, and reacts with 👍 once all reviews finish with no findings.

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. 📱 Native Change Native fingerprint changed; a new native build is required for compatible OTA updates. labels Oct 22, 2026
@Hylouis233
Hylouis233 merged commit a2fb757 into main Oct 22, 2026
18 checks passed
@github-actions

Copy link
Copy Markdown

Thread transfer impact

✅ Thread transfer remains within every enforced ceiling.

Provider Metric Main baseline This PR Impact PR ceiling
Codex Total thread wire 5.0 KiB 5.0 KiB 0 B (0.0%) 6.8 KiB ✅
Codex Thread snapshot wire 3.8 KiB 3.8 KiB 0 B (0.0%) 4.9 KiB ✅
Codex Live turn WebSocket wire 1.2 KiB 1.2 KiB 0 B (0.0%) 2.0 KiB ✅
Codex Live turn WebSocket decoded 20.9 KiB 20.9 KiB 0 B (0.0%) 29.3 KiB ✅
Codex Live turn messages 2 2 0 (0.0%) 8 ✅
Claude Total thread wire 5.0 KiB 5.0 KiB 0 B (0.0%) 6.8 KiB ✅
Claude Thread snapshot wire 3.8 KiB 3.8 KiB 0 B (0.0%) 4.9 KiB ✅
Claude Live turn WebSocket wire 1.2 KiB 1.2 KiB 0 B (0.0%) 2.0 KiB ✅
Claude Live turn WebSocket decoded 21.2 KiB 21.2 KiB 0 B (0.0%) 29.3 KiB ✅
Claude Live turn messages 2 2 0 (0.0%) 8 ✅

Baseline: 6451ae5 · PR result: 93bd432 · 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: 108.5 KiB
  • Claude decoded thread snapshot: 108.8 KiB

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

📱 Native Change Native fingerprint changed; a new native build is required for compatible OTA updates. 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.

6 participants