[e-kotov]

Merge upstream main through 7f6f47b.

Upstream Changes (9e85538..7f6f47b)

• test(web): PDF preview tests wait on pdf.js loads and stop timing out (test(web): PDF preview tests wait on pdf.js loads and stop timing out pingdotgg/t3code#31104 / 7f6f47b27b)
• test(server): AgentSessionScanner blocked-repo test no longer races the git-read timeout (test(server): AgentSessionScanner blocked-repo test no longer races the git-read timeout pingdotgg/t3code#30554 / 62db6623cb)
• fix(client-runtime): a thread keeps syncing after a stream defect (fix(client-runtime): a thread keeps syncing after a stream defect pingdotgg/t3code#31071 / 8ab024f31a)
• refactor(client-runtime): share DPoP proof creation across web and mobile (refactor(client-runtime): share DPoP proof creation across web and mobile pingdotgg/t3code#30540 / a07be97ab0)
• refactor: hold relay signing keys in EnvironmentSigningKey and CloudMintSigner (refactor: hold relay signing keys in EnvironmentSigningKey and CloudMintSigner pingdotgg/t3code#30529 / 33ba7bf5ef)
• refactor(server): sign server tokens through PayloadSigner (refactor(server): sign server tokens through PayloadSigner pingdotgg/t3code#30523 / 16fc3cc45b)
• refactor: move HMAC, key, and random work to effect/crypto (refactor: move HMAC, key, and random work to effect/crypto pingdotgg/t3code#30501 / fb99a5e4b0)
• refactor: replace jose with effect/jose (refactor: replace jose with effect/jose pingdotgg/t3code#30474 / 14e8f393fa)
• build: typecheck with tsrs and Effect's rules through @effect/tsgo (build: typecheck with tsrs and Effect's rules through @effect/tsgo pingdotgg/t3code#31028 / 95e53a54db)
• fix(relay): use released drizzle rc.5 and fail installs on unmet peers (fix(relay): use released drizzle rc.5 and fail installs on unmet peers pingdotgg/t3code#31016 / dd5f98eeec)

Resolved Conflicts

• apps/mobile/app.config.ts: Preserved fork build flag (T3CODE_FORK_BUILD) alongside upstream EXPO_NO_TYPESCRIPT_SETUP = "1".
• apps/server/src/provider/CodexProvider.ts: Preserved fork non-ChatGPT rate limits skip check (accountResponse.account?.type !== "chatgpt") while adopting upstream's Effect.undefined return.
• pnpm-lock.yaml: Preserved fork's react-native-enriched-markdown@1.2.0-t3.16 patched dependency while incorporating upstream removal of @alchemy.run/drizzle patch and updated pnpmfile checksum.

[greptile-apps]

Confidence Score: 5/5

[High impact] The PR appears safe to merge; no actionable regression was found.

Summary

Merges upstream changes through 7f6f47b27b while preserving the fork-specific conflict resolutions.

• Web and mobile requests now share one builder for relay DPoP proofs.
• Server and relay tokens now use shared Effect signing and verification services.
• RPC subscriptions keep waiting after a stream defect.
• PDF previews restore the reader’s place after a reload.
• Workspace checks and dependency metadata now match the upstream toolchain.

No actionable issues were found. Tests and visual checks were not run; dependencies and a running client were unavailable.

Diagram

%%{init: {'theme': 'neutral'}}%%
flowchart LR
  Web["Web stored key"] --> Proof["Shared DpopProof"]
  Mobile["Mobile stored key"] --> Proof
  Proof --> Relay["Relay requests"]
  Secrets["ServerSecretStore"] --> Payload["PayloadSigner"]
  Payload --> Tokens["Session, asset, and guest tokens"]
  Environment["EnvironmentSigningKey"] --> EnvironmentProofs["Environment proofs"]
  Mint["CloudMintSigner"] --> RelayTokens["Relay tokens and delivery proofs"]

Loading

_{Reviews (1) · Last reviewed commit: "Merge upstream main 7f6f47b27b" · Reviewed by Greptile}

[e-kotov]

Superseded by upstream sync merge commit dd1513c into main