Skip to content

chore: sync with upstream pingdotgg/t3code main - #60

Merged
yordis merged 15 commits into
mainfrom
yordis/chore-sync-upstream-20260924-2
Sep 24, 2026
Merged

yordis merged 15 commits into
mainfrom
yordis/chore-sync-upstream-20260924-2

Conversation

@yordis

@yordis yordis commented Sep 24, 2026 •

Copy link
Copy Markdown
Member
  • Upstream and the fork both grew observability env-forwarding helpers; kept the fork's superset function and dropped upstream's redundant one so there is a single source of truth for forwarded OTEL vars.
  • Upstream trims OTEL_RESOURCE_ATTRIBUTES more narrowly than the fork previously did; kept upstream's narrower trimming since it matches the OTEL spec and avoids silently accepting malformed attribute strings.
  • Restored an apiKeySource field upstream's own test omitted from a mock, since dropping it would have hidden a real type gap between the mock and the resolveCapabilities contract.
  • Renamed leftover CodexResetCredit references to ResetCreditCoordinator to match a rename that landed upstream, so provider registry tests exercise the same coordinator the runtime actually uses.
  • Removed a duplicate OtelEnvironment import left over from the merge so the module has one unambiguous binding.
  • Upstream added text-2xs and text-3xs design tokens, which made a few unrelated pre-existing arbitrary Tailwind values in chat components newly lintable against a named token; switched them to the new tokens and to the existing info color token to keep the lint rule's guarantee intact.

View with [code]smith Autofix with [code]smith
Need help on this PR? Tag @codesmith-bot with what you need. Autofix is disabled.

tris203 and others added 15 commits September 24, 2026 15:12
…2613)

Co-authored-by: shivam <91240327+shivamhwp@users.noreply.github.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>
…otgg#13397)

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

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

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: GPT-6 Sol <noreply@openai.com>
Co-authored-by: Julius Marminge <51714798+juliusmarminge@users.noreply.github.com>
Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…ops startup (pingdotgg#13469)

Signed-off-by: Yordis Prieto <yordis.prieto@gmail.com>
…gdotgg#13388)

Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Merge remote-tracking branch 'upstream/main' into yordis/chore-sync-upstream-20260924-2

Signed-off-by: Yordis Prieto <yordis.prieto@gmail.com>
The sync merge commit's pre-commit hook stashed and restored unstaged
content around lint-staged formatting, which silently dropped four
already-resolved fixes from the merge commit's tree even though the
working tree still had them.

Signed-off-by: Yordis Prieto <yordis.prieto@gmail.com>
@cursor

cursor Bot commented Sep 24, 2026 •

Copy link
Copy Markdown

PR Summary

Medium Risk
Claude OAuth reset redemption and shared account-level coordinator touch provider auth and external APIs; OTEL resource wiring and Git index mtime logic affect telemetry tagging and review diffs if wrong.

Overview
Syncs with upstream pingdotgg/t3code while landing several product and infra changes beyond merge cleanup.

Provider usage resets: Adds Claude banked reset credits (cedar_ember)—read from OAuth usage, redeem via organization API, surfaced on provider snapshots—and wires consumeResetCredit on the Claude driver. Codex and Claude now share a renamed ResetCreditCoordinator (idempotency + per-account locking); redemption only errors when a reset outcome cannot confirm refreshed limits, not for benign outcomes like alreadyRedeemed.

Observability: OTEL config uses flattened serviceVersion / resourceAttributes (replacing nested resource.*), and desktop/server telemetry layers provide shared layerResourceAttributes so exported signals share resource tags.

Antigravity: interruptTurn ends the session when the turn is idle but promoted commands are still running (so Stop actually kills background work), with a new adapter test.

Git review diffs: When building a temp index for working-tree previews, copies preserve the real index mtime (rounded down) so same-timestamp “racy clean” edits are not dropped.

Mobile / web branch UX: New-task and branch pickers use shared sanitizeNewRefName and filterNewTaskBranches (case-insensitive search, space→dash matching); mobile shows a remote branch badge.

Marketing / icons: Antigravity and OpenCode harness assets switch to SVG; web adds macOS privacy and computer-use icons and refreshes Antigravity icon data.

Web UI polish: Widespread migration to text-2xs / text-3xs, ease-drawer, workspace gutter CSS vars, command palette panelSize, and assorted ChatMarkdown / context-chip / diff-panel consistency tweaks. Macroscope check-run agents bump model to gpt-6-sol and effort: max.

Reviewed by Cursor Bugbot for commit e066160. Bugbot is set up for automated code reviews on this repo. Configure here.

@github-actions github-actions Bot added vouch:trusted PR author is trusted by repo permissions or the VOUCHED list. size:XXL labels Sep 24, 2026

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

Cursor Bugbot has reviewed your changes using default effort and found 1 potential issue.

Fix All in Cursor

❌ Bugbot Autofix is OFF. To automatically fix reported issues with cloud agents, have a team admin enable autofix in the Cursor dashboard.

Reviewed by Cursor Bugbot for commit e066160. Configure here.

const filteredBranches = useMemo(
() => filterNewTaskBranches(allBranchRefs, branchQuery),
[allBranchRefs, branchQuery],
);

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Remote worktree bases get doubled origin

Medium Severity

The new-task picker now lists remote refs whose name already includes the origin/ prefix. Worktree mode never rewrites that name, and startFromOrigin still prefixes origin/ again, so the label and worktree fetch look for a remote that does not exist.

Additional Locations (2)
Fix in Cursor Fix in Web

Reviewed by Cursor Bugbot for commit e066160. Configure here.

@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 13.5 KiB 13.5 KiB −7 B (−0.1%) 15.1 KiB ✅
Codex Thread snapshot wire 7.1 KiB 7.1 KiB −3 B (−0.0%) 7.3 KiB ✅
Codex Live turn WebSocket wire 6.5 KiB 6.4 KiB −4 B (−0.1%) 7.8 KiB ✅
Codex Live turn WebSocket decoded 56.2 KiB 56.2 KiB 0 B (0.0%) 66.4 KiB ✅
Codex Live turn messages 9 9 0 (0.0%) 21 ✅
Claude Total thread wire 13.5 KiB 13.5 KiB +30 B (+0.2%) 15.1 KiB ✅
Claude Thread snapshot wire 7.1 KiB 7.1 KiB −3 B (−0.0%) 7.3 KiB ✅
Claude Live turn WebSocket wire 6.4 KiB 6.4 KiB +33 B (+0.5%) 7.8 KiB ✅
Claude Live turn WebSocket decoded 57.0 KiB 57.0 KiB +44 B (+0.1%) 66.4 KiB ✅
Claude Live turn messages 8 9 +1 (+12.5%) 21 ✅

Baseline: 154cfb5 · PR result: e066160 · 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: 113.9 KiB
  • Claude decoded thread snapshot: 114.6 KiB

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

@yordis
yordis merged commit 897909f into main Sep 24, 2026
20 of 22 checks passed
@yordis
yordis deleted the yordis/chore-sync-upstream-20260924-2 branch September 24, 2026 20:56
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.

5 participants