Skip to content

chore: sync upstream pingdotgg/t3code#189

Merged
adamfgr merged 9 commits into
mainfrom
chore/upstream-sync-20260717
Jul 17, 2026
Merged

chore: sync upstream pingdotgg/t3code#189
adamfgr merged 9 commits into
mainfrom
chore/upstream-sync-20260717

Conversation

@wizzoapp

@wizzoapp wizzoapp Bot commented Jul 17, 2026

Copy link
Copy Markdown

Nightly upstream sync: cherry-picks the 9 new commits from pingdotgg/t3code since the last sync (ecb35f7fdca154).

Synced commits

upstream title
b982337 [codex] Fix onboarding connection status (pingdotgg#4001)
5e8b2c8 Isolate native diff highlight grammar state (pingdotgg#4029)
0418301 Fix macOS fullscreen titlebar spacing (pingdotgg#4019)
d114e27 Prevent duplicate project workspace roots (pingdotgg#3829)
54f167e Normalize over-indented markdown list items (pingdotgg#4020)
bde0a4c Resolve localhost preview URLs for remote environments (pingdotgg#4011)
2a33a18 fix(mobile): Send composer images in upload wire format (pingdotgg#4035)
5d68fca Fix iOS terminal Enter input encoding (pingdotgg#4043)
fdca154 Add native mobile share target support (pingdotgg#4021)

Conflict resolution

Five files needed manual resolution; everything else applied cleanly. This set is the only surface where the merge could introduce a defect.

  • apps/desktop/src/ipc/DesktopIpcHandlers.ts — import-list conflict. Union: kept fork-local isNotificationSupported alongside upstream's new getWindowFullscreenState. Both handler registrations auto-merged and were verified present.
  • apps/desktop/src/window/DesktopWindow.test.ts — window mock conflict. Union: kept the fork's loadURL (records currentUrl for the getURL mock) and adopted upstream's on (records windowListeners, required by the new fullscreen tests).
  • apps/server/src/orchestration/decider.ts — both sides added a different guard to project.meta.update. Kept both, nested under if (command.workspaceRoot !== undefined): the fork's removable-worktree guard runs first, then upstream's requireActiveProjectWorkspaceRootAbsent. Upstream's guard on project.create auto-merged.
  • apps/server/src/orchestration/decider.projectScripts.test.ts — git interleaved the fork's and upstream's tests (similar boilerplate). Rebuilt the region from the clean merge stages, keeping the fork's superset: fork's removable-worktree test + upstream's two duplicate-root tests. 9/9 pass.
  • apps/mobile/app.config.ts — both sides added declarations at the same point. Union: upstream's derived iosBundleIdentifier (personal-team aware) plus the fork's easProjectId / mobileAppVersion / widgets / readReleaseVersion. Upstream's variant.iosBundleIdentifieriosBundleIdentifier rewrites auto-merged at every use site and now resolve against that declaration.

Modify/delete: upstream modified apps/web/src/components/preview/PreviewAutomationHosts.tsx, which this fork deleted in #175 (refactor(mcp): remove preview tool surface, ADA-115). Kept the deletion — upstream's change was pure call-site adaptation to the new browserTargetResolver API, contained no logic the fork needs, and nothing in the tree references the file.

pnpm install was required: pingdotgg#4021 adds the expo-sharing dependency.

Verification

  • vp run typecheck — pass
  • vp check — pass (2301 formatted, 0 lint errors)
  • vp test run665 files / 5914 tests pass, 0 failures

Per the fork's upstream-sync policy, this PR is gated by CI; Codex findings in files outside the conflicted set above are upstream-origin and are not blocking.

@wizzoapp

wizzoapp Bot commented Jul 17, 2026

Copy link
Copy Markdown
Author

@codex review

@chatgpt-codex-connector chatgpt-codex-connector Bot 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.

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 6395bad630

ℹ️ About Codex in GitHub

Codex has been enabled to automatically 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".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

When you sign up for Codex through ChatGPT, Codex can also answer questions or update the PR, like "@codex address that feedback".

Comment thread apps/web/src/browser/browserTargetResolver.ts
Comment thread apps/mobile/src/features/threads/NewTaskRouteScreen.tsx
Comment thread apps/mobile/src/features/sharing/IncomingShareProvider.tsx
Comment thread apps/mobile/src/features/sharing/IncomingShareProvider.tsx

@adamfgr adamfgr 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.

Auto-approved by wizzo-approve: all policy conditions verified against HEAD 6395bad.

@adamfgr
adamfgr merged commit a710c9d into main Jul 17, 2026
19 checks passed
@adamfgr
adamfgr deleted the chore/upstream-sync-20260717 branch July 17, 2026 02:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants