Repository navigation
chore(sync): merge upstream t3code through 322f654 - #386
Merged
Merged
Conversation
…squash-merged (pingdotgg#29919) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ointed parent run (pingdotgg#25662) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ngdotgg#29721) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
pingdotgg#29580) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com> Co-authored-by: maria-rcks <maria@kuuro.net>
… the project folder (pingdotgg#29908) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com> Co-authored-by: Maria <maria-rcks@users.noreply.github.com>
…ngdotgg#29962) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…dotgg#29911) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…oading it (pingdotgg#29893) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ingdotgg#29902) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…oved or steered (pingdotgg#29904) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
… it inherited (pingdotgg#29794) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…r hosts' tokens (pingdotgg#29554) Signed-off-by: Yordis Prieto <yordis.prieto@gmail.com>
… release (pingdotgg#30319) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…9916) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…pen (pingdotgg#29263) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ed thread (pingdotgg#29643) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
… source (pingdotgg#29013) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ingdotgg#28494) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…#28135) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…h to Privacy Mode (pingdotgg#28097) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…son from hub rows (pingdotgg#28065) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ned-in hosts (pingdotgg#27840) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…9806) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…managed Codex (pingdotgg#30004) Co-authored-by: maria-rcks <254055478+maria-rcks@users.noreply.github.com> Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ingdotgg#29862) Co-authored-by: Matthew Feroz <136640686+MatthewFeroz@users.noreply.github.com> Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
PR discovery used the full shell snapshot, which derived activity and counted historical items across active threads. Read only PR metadata and its event sequence in one transaction, then decode after releasing the reader. Preserve settled backfill, targeted refreshes, legacy PR normalization, and guarded updates. Validation: check:changed passed with 80 tests after merging main; CI passed on 988187f. Native Electron measurements and a concurrent-write control confirmed metadata parity and coherent sequences. Synthetic measurements cover PR reads and service initialization, not full desktop startup. Model: GPT 6.1 Sol. Harness: Codex in T3 Code.
…aracter (pingdotgg#29906) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…race (pingdotgg#29889) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…g#30025) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
… the catalog (pingdotgg#30051) Co-authored-by: maria-rcks <maria@kuuro.net>
…point (pingdotgg#30033) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…go (pingdotgg#30071) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com> Co-authored-by: maria-rcks <maria@kuuro.net>
…he runtime starts (pingdotgg#30079) Co-authored-by: wenshen <wlum0002@student.monash.edu> Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…30080) Co-authored-by: Dominik <git@domko.sbs>
…otgg#30174) Co-authored-by: maria-rcks <maria@kuuro.net>
…ingdotgg#30142) Co-authored-by: SAPHID <saphid@users.noreply.github.com> Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ttle (pingdotgg#29847) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ngs (pingdotgg#29853) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…t hooks (pingdotgg#29907) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…backports (pingdotgg#30161) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ol (pingdotgg#30481) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ient list (pingdotgg#30498) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Merge pingdotgg/t3code v0.1.7-nightly.20261104.4151 (322f654), which brings Electron 44.10.1 with the October Chromium security backports (pingdotgg#30161), the Muse error banner redaction (pingdotgg#29910) and the source control token save fix (pingdotgg#29554). Conflicts resolved toward upstream's refactors, keeping S2Code branding, the fork's release workflows and the shuvbot signing hardening (.github is unchanged from main): - mobile app.config/App/appLinking: keep fork signing team, auth domains and s2code/shuv2code schemes; take upstream's route-only link filter and Android dictation (recordAudioAndroid). Drop upstream's app.t3.codes universal links, intent filter and .well-known files, which list upstream bundle IDs. - cli/up: take upstream's base-dir-aware pair hint with S2CODE_LAN. - cli/update, cloud/selfUpdate, cloud/pinnedRuntime: keep fork launcher handling, s2code naming and multi-name archive lookup; add upstream's policy update mirror and restart-pending wording. - orchestration-v2/Orchestrator: take upstream's busy-session queue hold. - peer/PeerLinks: keep fork capabilities, add upstream's label refresh. - persistence/Migrations: keep fork's fence-once 71, add upstream 79. - settingsSecrets, serviceLauncher.test: keep both imports. - docs: S2Code wording with upstream's behavior changes. - npm launcher files stay deleted (fork removed them in 36222d4). Fork adaptations beyond conflicts: - shared/threadLinks: with no hosted app (the fork default), copied thread links fall back to t3-thread v2 links and hosted-path matching is off, so plain /threads/a/b text never becomes a link and hostedThreadLink no longer throws on an empty origin. - provider-cursor textGeneration: use the fork's cursorUsageLimit. - Drop duplicate imports left by the merge (usageLimits, serverSettings.test). - Adapt upstream's new tests to fork homes, names and schemes. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Merges pingdotgg/t3code
v0.1.7-nightly.20261104.4151(322f6544, 155 commits since the last sync at115739c) into the fork with a normal merge commit.Priority content:
The fork's branding, versioning, release workflows and the shuvbot signing hardening from #378 and #383 are unchanged.
.github/is byte-identical tomain(upstream made no.githubchanges in this range).Conflict resolutions
19 files conflicted. Resolved toward upstream's refactors, keeping fork identity:
apps/mobile/app.config.tsAPPLE_TEAM_ID) andmobileAuthDomains. Took upstream's Android dictation (recordAudioAndroid: true, image-picker mic permission) with S2Code wording. Dropped upstream'sapp.t3.codesassociated domain and Android intent filter.apps/mobile/src/App.tsxs2code/shuv2codeschemes; dropped the emptyDEFAULT_HOSTED_APP_URLprefix (an empty prefix matches every URL).apps/mobile/src/lib/appLinking.tsapps/server/src/cli/up.ts--base-dir-aware pair hint (pingdotgg#29684) via the fork-awareresolveHostCliCommand; keptS2CODE_LAN.apps/server/src/cli/update.tsreadLauncherTargetand added upstream'sresolveMirrorVersion(pingdotgg#29911); took upstream's restart-pending wording (pingdotgg#29901) with the fork's resolved restart command.apps/server/src/cloud/pinnedRuntime.tspublishedArchiverefactor; it keeps the fork's multi-name archive lookup (s2code-,shuv2code-,t3-).apps/server/src/cloud/selfUpdate.tss2code@naming.apps/server/src/orchestration-v2/Orchestrator.tsapps/server/src/peer/PeerLinks.tscapabilitiesinresolveand added upstream's peer label refresh (pingdotgg#29779).apps/server/src/persistence/Migrations.tsapps/server/src/settingsSecrets.tsapps/server/src/serviceLauncher.test.tsnode:fs.apps/server/src/cli/update.test.ts,apps/server/src/cloud/selfUpdate.test.tspackages/shared/src/promptLinks.test.ts/threads/cases to a fork origin.docs/user/background-service.md,docs/user/composer.mdscripts/npm-launcher/t3.mjs,scripts/build-npm-launcher.test.tsFork adaptations beyond the conflicts
packages/shared/src/threadLinks.ts). Upstream's Copy thread links (feat(server,web,mobile,desktop): Copy thread copies a link that opens the thread pingdotgg/t3code#26290, feat(mobile,web): copied thread links open the mobile app pingdotgg/t3code#29815) assumeDEFAULT_HOSTED_APP_URLishttps://app.t3.codes. In the fork it is empty, sohostedThreadLinkthrew (new URL(path, "")) and the bare-link matcher read any/threads/a/bpath in a message as a thread link. Without a hosted app, copied links now fall back tot3-thread://v2links and hosted-link matching is off. A build withVITE_HOSTED_APP_URLstill copies its own hosted link.apps/web/public/.well-knownapp-site-association and assetlinks files and the Vercel rewrite for them, since they list upstream bundle IDs. Kept the fork'sapp.config.test.ts.packages/provider-cursor/src/server/textGeneration.ts: upstream's new call usesisCursorUsageLimitError, which the fork replaced withcursorUsageLimit.packages/shared/src/usageLimits.ts,apps/server/src/serverSettings.test.ts). Passed upstream's newclientargument in a fork test..product-identityand.install-product), archive names, schemes and resolved CLI invocations.docs/user/prompt-links.md: the new "Share a thread" section no longer promisesapp.t3.codeslinks that open the mobile app.Checks (local)
vp run typecheck: pass (41/41 packages)vp run lint: pass (0 errors; existing warnings only)vp run fmt:check: passvp run knip:check: passtestscript): 30 packages pass. The remaining failures also fail onmain(e2c5d2e) on the same machine, run as a baseline in a separate worktree:@t3tools/scripts: 2 failed (install,mobile-production-reconcile), a subset of the 7 known failurest3(server): 2 failed (GitVcsDriverpartial clone remote URLs,GitVcsDriverCoreworktree base fetch)@t3tools/desktop: 2 failed (DesktopLifecyclerelaunch,DesktopWindowoff-origin navigation)@t3tools/mobile: 5 failed (app.config.test.tsupstream bundle IDs ×4,composerChipPresentationaccent)@t3tools/provider-opencode: 1 failed (driver upgrade from 1.x)@t3tools/web: 9 failed (themePalettefork dark controls; 8 Chromium browser tests inChatViewandCommandPalette;mainfails the same plusGuestPage)agentContextBudget.jsonequalsmain(claudeSystemAppendBytes5153,codexAdditionalContextBytes6883,mcpToolListJsonBytes47883), andAgentContextBudget.test.tspasses, so the measured context matches.git diff main -- .github/Against
origin/main(e2c5d2e):Claude Opus 5.5 via T3 Code (Cursor harness).