Skip to content

chore(upstream): sync marcode through e60821f0e0d8 - #9

Draft
github-actions[bot] wants to merge 3 commits into
mainfrom
chore/upstream-e60821f0e0d8
Draft

chore(upstream): sync marcode through e60821f0e0d8#9
github-actions[bot] wants to merge 3 commits into
mainfrom
chore/upstream-e60821f0e0d8

Conversation

@github-actions

@github-actions github-actions Bot commented Aug 2, 2026

Copy link
Copy Markdown

Automatic upstream detection produced a clean merge of pingdotgg/t3code@e60821f0e0d8.

field value
target main dc6a1ad283556386e9df1dbd19d0cdf06397d4cb
source main e60821f0e0d82a5d671ca3b94719c49d333921c8
merge base 5192f777fe54c2a2a359f6c25ecf5fbde46d49b0
merge commit e7c4cae99f00de6ca4c94f6748f147afe3b6873c
changed paths 19

Upstream commits

Hotspot matches by owner

  • mobile (4)
    • apps/mobile/src/features/threads/NewTaskDraftScreen.tsx
    • apps/mobile/src/features/threads/ThreadComposer.tsx
    • apps/mobile/src/lib/modelOptions.test.ts
    • apps/mobile/src/lib/modelOptions.ts
  • server-runtime (2)
    • apps/server/src/cloud/bootService.test.ts
    • apps/server/src/cloud/bootService.ts
  • provider-runtime (4)
    • apps/server/src/provider/Layers/ClaudeCapabilitiesProbe.test.ts
    • apps/server/src/provider/Layers/ClaudeProvider.ts
    • apps/server/src/provider/Layers/CodexProvider.test.ts
    • apps/server/src/provider/Layers/CodexProvider.ts

Coupled vendored-repo findings

  • ok effect-version-subtree — source changed: false, companion changed: false
  • ok alchemy-version-subtree — source changed: false, companion changed: false

Required checks on this pull request

  • Check
  • Test
  • Mobile Native Static Analysis
  • Release Smoke

Safety statement

No conflicts were auto-resolved. The bot never uses --force, reset, checkout --ours/--theirs,
or auto-merge. This is a normal two-parent merge commit whose tree was verified against a
non-mutating merge probe before it was pushed.

Manual verification checklist

  • Hotspot paths reviewed: upstream intent and Marcode intent are both preserved.
  • Coupled vendored subtrees reviewed when flagged.
  • Web/mobile/desktop UI surfaces checked at 390px and 820px when UI hotspots changed.
  • Provider-focused tests run when apps/server/src/provider/** changed.
  • Branding asset checks run when asset paths changed.
  • All required checks green before this leaves draft.

@github-actions github-actions Bot added the upstream-sync Upstream T3 Code sync label Aug 2, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

upstream-sync Upstream T3 Code sync

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant