Skip to content

chore: merge upstream pingdotgg/t3code through 76d3c96fd - #172

Merged
andrewcai8 merged 111 commits into
mainfrom
sync/upstream-1006
Oct 6, 2026
Merged

andrewcai8 merged 111 commits into
mainfrom
sync/upstream-1006

Conversation

@andrewcai8

Copy link
Copy Markdown
Owner

Brings the fork up to upstream 76d3c96 (108 commits). The automatic sync failed on 37 conflicts; this merge resolves them, keeping every fork feature (cloud chats and scheduled cloud runs, per-account usage limits, Claude driver changes) and taking upstream wherever the fork had no reason to differ. Upstream's Services/Layers move and the Effect 4.0.1 upgrade needed import updates in about 90 fork files. The merge commit's body lists how each conflicted file was resolved.

Notable upstream additions: agents can show inline HTML pages in a thread (charts, tables, diagrams, mockups; pingdotgg#15968, pingdotgg#16283), tool screenshots render as images (pingdotgg#16199), a Goal status for /goal, a private secret-request card, and PR watches in the thread details card.

Known risk: the repository origin shape changes (canonicalKey/displayName), so mismatched client and server builds may not decode each other's clone requests.

🤖 Generated with Claude Code

maria-rcks and others added 30 commits October 5, 2026 12:04
Co-authored-by: maria-rcks <254055478+maria-rcks@users.noreply.github.com>
…dotgg#15958)

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

Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
…of encoding a fallback (pingdotgg#16118)

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

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

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

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

Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Co-authored-by: Julius Marminge <51714798+juliusmarminge@users.noreply.github.com>
Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
…tgg#16200)

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

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

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>
…ng to the inbox (pingdotgg#16204)

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

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

Favicons in ProjectEnrichmentService now keep for 15 minutes. Repository identity keeps its 1-minute TTL, so remote changes still show within a minute.

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
… histories (pingdotgg#16358)

The Claude capabilities probe now asks for usage with skipBehaviors, so it no longer scans every local transcript and misses its 4 s deadline. Takes over pingdotgg#14456.

Co-authored-by: Ashkaan <a@ashkaan.me>
Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
…tgg#16285)

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

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

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

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

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

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

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

Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Merges 108 upstream commits from pingdotgg/t3code (1604ccc..76d3c96).

Conflicted files:
- apps/mobile/src/connection/platform.ts: upstream's namespaced layers, plus the fork's presenceLayer in the type and list.
- apps/mobile/src/features/settings/SettingsScheduledTasksRouteScreen.tsx: both imports (webhook age limit, cloud target labels).
- apps/mobile/src/features/settings/scheduledTaskDraft.ts: draft key keeps both target and webhook age limit.
- apps/mobile/src/features/threads/thread-list-v2-items.tsx: upstream's Goal label first, then the fork's cloud machine labels.
- apps/server/package.json: fork deps kept (connect, e2b, namespace sdk, undici 7 pin for e2b), @cursor/sdk bumped to upstream's 1.0.35.
- apps/server/src/orchestration-v2/Adapters/CodexAdapterV2.ts: upstream's moved provider paths, fork's resolveCodexProviderEnvironment.
- apps/server/src/orchestration-v2/ThreadLaunchService.test.ts: upstream's layerXyz harness, fork's cloud-only host layer threaded through; fork test also provides SecretRequests.
- apps/server/src/orchestration-v2/runtimeLayer.ts: upstream's namespace imports and SecretRequests; ScheduledCloudFire.layer added to the scheduled task layer.
- apps/server/src/project/RepositoryIdentityResolver.ts: upstream's RepositoryOrigin {canonicalKey, displayName}; fork's partial-clone remote regex kept; fork's repositoryOrigin.ts removed.
- apps/server/src/provider/ClaudeProvider.ts: upstream's skipBehaviors usage probe with the fork's longer usage probe timeout.
- apps/server/src/provider/CodexProvider.probeTimeout.test.ts: fork test moved out of Layers/ with upstream's refactor.
- apps/server/src/provider/Drivers/ClaudeDriver.ts: upstream's path, fork's claudeHostProbe import.
- apps/server/src/provider/Layers/ProviderRegistry.test.ts: deleted; the fork's 30 s Codex probe wait ported into upstream's provider/ProviderRegistry.test.ts.
- apps/server/src/provider/claudeColdProbe.ts, claudeColdProbe.test.ts: fork files moved out of Layers/, relative imports fixed.
- apps/server/src/provider/claudeSetupTokenUsage.ts, claudeSetupTokenUsage.test.ts: fork files moved out of Layers/, relative imports fixed.
- apps/server/src/provider/claudeUsageLimits.ts: upstream's path, fork's setup-token window import.
- apps/server/src/provider/cursorBillingCycle.ts, cursorBillingCycle.test.ts: fork files moved out of Layers/, relative imports fixed.
- apps/server/src/provider/cursorUsageLimits.ts: upstream's paths, fork's billing cycle import.
- apps/server/src/provider/makeManagedServerProvider.ts: upstream's ServerProvider path, fork's provider check permits.
- apps/server/src/scheduledTasks/ScheduledTaskService.ts: webhooks and cloud targets combined; runTask takes { resumedAt, webhook }, scheduled and manual runs go through startRun, webhook tasks refuse Run now.
- apps/server/src/server.ts: upstream's namespaced layers plus the fork's EnvironmentControl, usage and environment-control HTTP APIs, gateway route and body limits.
- apps/web/src/components/chat/ChatComposer.tsx: upstream's memoized skills, still passing provisioned skills.
- apps/web/src/components/settings/ScheduledTasksSettings.tsx: cloud target label plus upstream's Listening state.
- apps/web/src/components/settings/scheduledTasksSettings.logic.ts: both type imports.
- apps/web/src/connection/platform.ts: upstream's namespaced layers plus presenceLayer.
- apps/web/src/observability/clientTracing.ts: fork's body-reading exporter client over upstream's PrimaryEnvironmentHttpLayer.layer.
- docs/user/project-settings.md: fork's cloud Run on paragraph, then upstream's webhook section.
- packages/client-runtime/src/connection/layer.ts: upstream's layer names, fork's pairing redemption layer.
- packages/client-runtime/src/connection/registry.ts: fork's boxes.removeRoute with upstream's catchTags.
- packages/contracts/src/environment.ts: upstream's RepositoryOrigin; cloneRepository derives owner/name from origin.canonicalKey.
- packages/contracts/src/environmentHttp.ts: both the fork's cloud APIs and upstream's webhook group.
- packages/contracts/src/index.ts: both exports.
- packages/contracts/src/scheduledTask.ts: both the fork's target and upstream's webhook endpoint.
- pnpm-lock.yaml: upstream's lockfile regenerated with vp i for the fork's dependencies.

Also adapted to upstream's refactors outside the conflicts: fork files moved
to effect/* stable import paths (Effect 4.0.1), Layers/ and Services/ import
paths, renamed layer exports (SqlitePersistence.layerMemory/layerFromPath,
ProviderRegistryMock.layer, layerAppServerClientFactory, layerRemoteHttpClient),
catchTag to catchTags and a suppression reason for the new lint rules. Fork
tests now provide SecretRequests to ScheduledTaskService and expect upstream's
migrations 57 and 58 in the ledger. A cloud fire of a webhook task sends the
rendered prompt, and is not resumed after a restart.

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
@github-actions github-actions Bot added vouch:trusted PR author is trusted by repo permissions or the VOUCHED list. size:XXL labels Oct 6, 2026
@github-actions

github-actions Bot commented Oct 6, 2026 •

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 −17 B (−0.3%) 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 −17 B (−1.4%) 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 −17 B (−0.3%) 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 −17 B (−1.4%) 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: ee0b134 · PR result: f4c760d · 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.

andrewcai8 and others added 2 commits October 6, 2026 09:45
… resumedAt only when set, the auto-pull test config has localAgentRuns

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
…no Blacksmith

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
@andrewcai8
andrewcai8 merged commit ea7fbf2 into main Oct 6, 2026
25 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

size:XXL vouch:trusted PR author is trusted by repo permissions or the VOUCHED list.

Projects

None yet

Development

Successfully merging this pull request may close these issues.