Repository navigation
chore: sync upstream v0.1.12-nightly.20261122.5085 - #62
Merged
Merged
Conversation
pingdotgg#40545) Co-authored-by: Julius Marminge <julius0216@outlook.com>
…tgg#40538) Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: Grok 4.7 <noreply@x.ai> Co-authored-by: Julius Marminge <julius0216@outlook.com>
…gdotgg#40556) Co-authored-by: Julius Marminge <julius0216@outlook.com>
…gg#40475) Co-authored-by: Julius Marminge <julius0216@outlook.com>
pingdotgg#40553) Co-authored-by: Julius Marminge <julius0216@outlook.com>
…e number, date, header and footer (pingdotgg#40568) Co-authored-by: Julius Marminge <julius0216@outlook.com>
…board guide (pingdotgg#37758) Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…ingdotgg#40567) Co-authored-by: Julius Marminge <julius0216@outlook.com>
…thread's PR branch (pingdotgg#40564)
…tgg#40576) Co-authored-by: Julius Marminge <julius0216@outlook.com>
pingdotgg#40585) Co-authored-by: Julius Marminge <julius0216@outlook.com>
…ks (pingdotgg#40592) Co-authored-by: Julius Marminge <julius0216@outlook.com>
…gg#40587) Co-authored-by: Julius Marminge <julius0216@outlook.com>
…gdotgg#40595) Co-authored-by: Julius Marminge <julius0216@outlook.com>
…otgg#40594) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…pingdotgg#40604) Co-authored-by: Julius Marminge <julius0216@outlook.com>
… is gone (pingdotgg#40627) Co-authored-by: Kevin Flores <101906409+kevincommits@users.noreply.github.com>
… drag (pingdotgg#33221) Co-authored-by: shivam <91240327+shivamhwp@users.noreply.github.com>
…itle limit (pingdotgg#29830) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com> Co-authored-by: shivam <91240327+shivamhwp@users.noreply.github.com>
…ests (pingdotgg#40634) Co-authored-by: Mostafa El Ayoubi <20224923+MostafaElAyoubi@users.noreply.github.com>
pingdotgg#40633) Co-authored-by: Julius Marminge <julius0216@outlook.com>
pingdotgg#40622) Co-authored-by: Julius Marminge <julius0216@outlook.com>
…heckout (pingdotgg#38271) Co-authored-by: Julius Marminge <julius0216@outlook.com>
…gg#38542) Co-authored-by: Geezy <igor.licko@gloryck.com> Co-authored-by: Julius Marminge <julius0216@outlook.com>
…e per turn (pingdotgg#40671) Co-authored-by: Julius Marminge <julius0216@outlook.com>
… drops its prompt (pingdotgg#40670) Co-authored-by: Julius Marminge <julius0216@outlook.com>
…ared tooltip; remark leaves the web app (pingdotgg#27866) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com> Co-authored-by: Yash Singh <saiansh2525@gmail.com> Co-authored-by: Cursor <cursoragent@cursor.com> Co-authored-by: Gemini 4 Neon <noreply@google.com> Co-authored-by: Noah Sigel <noah.sigel@gmail.com>
Co-authored-by: Cursor <cursoragent@cursor.com> Co-authored-by: Julius Marminge <julius0216@outlook.com> Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…-foreground-muted (pingdotgg#40676) Co-authored-by: Julius Marminge <julius0216@outlook.com>
…gdotgg#40701) Co-authored-by: MarcoDotIO <20867620+MarcoDotIO@users.noreply.github.com> Co-authored-by: Julius Marminge <julius0216@outlook.com>
…not generate text (pingdotgg#40699) Co-authored-by: Julius Marminge <julius0216@outlook.com>
…ingdotgg#40682) Co-authored-by: Julius Marminge <julius0216@outlook.com>
…s the draft (pingdotgg#40708) Co-authored-by: Julius Marminge <julius0216@outlook.com>
…0261122.5085 # Conflicts: # apps/server/src/mcp/OrchestratorMcpService.test.ts # apps/server/src/orchestration-v2/RunExecutionService.ts
Author
|
Review of record: 3c2368a mergeable Reviewed merge commit Summary of checks
P1 findingsNone. P3 findings (follow-up issues, non-blocking)
|
Author
|
Review of record: 3c2368a mergeable Lead check: cross-family review (Gemini 4 Neon, high) found no P1; the two P3s become follow-up issues. No fix round needed, head unchanged. |
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.
Syncs upstream nightly
v0.1.12-nightly.20261122.5085(47 upstream commits since merge base1a9a858d45) into the fork as a merge commit (3c2368aada). Do not squash: the tag must stay an ancestor of main.Conflicted files (2) and resolutions
Both conflicts kept both behaviours:
apps/server/src/orchestration-v2/RunExecutionService.ts: the failed terminal event keeps the fork'sretryable: runtimeLost ? true : nulland wraps it in upstream's object so it also carriespromptDroppedwhen the turn dropped its prompt (fix(server,cursor): preserve inline handoff when a failed Cursor turn drops its prompt pingdotgg/t3code#40670).apps/server/src/mcp/OrchestratorMcpService.test.ts: the child projection fixture has both the fork'slineage: { relationshipToParent: "subagent" }and upstream'sforkedFrom: { type: "node", nodeId: taskId }(fix(mcp): t3_thread_wait no longer has parents poll a task's first run pingdotgg/t3code#40633 first-run wait).No conflict in the i18n catalogs (git merged the 10 web catalogs;
vp run i18n:checkpasses, soi18n:generatehad nothing to change) nor inagentContextBudget.json: upstream did not change its prompts' size, andAgentContextBudget.test.tspasses against the committed numbers (6295 / 7689 / 61425 bytes), so noagent-context-increaselabel.Semantic fixes after the merge
None needed. Checked against the fork's code:
t3_thread_wait(fix(mcp): t3_thread_wait no longer has parents poll a task's first run pingdotgg/t3code#40633, fix(mcp): a child's async question no longer keeps its parent polling pingdotgg/t3code#40604): the mergedwaitForThreadkeeps the fork'swaitingMessages/isParentWakeRequestKindfiltering and takes upstream's first-run task lookup throughforkedFromand thelive-only pending-request rule.titleRenamedon naming launches (fix(server): a thread named before its first message keeps its name pingdotgg/t3code#40567): the fork's cross-projectdelegate_tasklaunch does not pass it. Its child has noforkedFromand a chosen title, sohasTitleSetBeforeFirstMessagealready keeps the title. See D3.T3CODE_FEATURE_FLAGS(feat: read feature flags from one T3CODE_FEATURE_FLAGS service pingdotgg/t3code#40594), shared-checkout guard (fix(server): refuse ref switches while a thread works in the shared checkout pingdotgg/t3code#38271), settlement on another thread's PR (fix(server): a merge no longer settles an unlinked thread on another thread's PR branch pingdotgg/t3code#40564): upstream-only paths. The fork'sThreadSettlementServicechange merged cleanly, and typecheck passes with the newFeatureFlagslayer.IssueTrackerBindings.tsand a test of 103). Regenerating the manifest from the tag leftupstreamMigrations.jsonunchanged, so there is no manifest commit.Files both sides changed that merged without conflict (41 files)
apps/mobile/app.config.tsapps/mobile/src/state/use-thread-composer-state.tsapps/server/src/mcp/OrchestratorMcpService.tsapps/server/src/mcp/toolkits/project/handlers.test.tsapps/server/src/mcp/toolkits/project/handlers.tsapps/server/src/orchestration-v2/Adapters/AcpAdapterV2.test.tsapps/server/src/orchestration-v2/Orchestrator.tsapps/server/src/orchestration-v2/ProjectionStore.tsapps/server/src/orchestration-v2/RestartBackgroundNote.tsapps/server/src/orchestration-v2/RunExecutionService.test.tsapps/server/src/orchestration-v2/SteeringCompletion.integration.test.tsapps/server/src/orchestration-v2/ThreadLaunchService.tsapps/server/src/orchestration-v2/ThreadSettlementService.test.tsapps/server/src/orchestration-v2/ThreadSettlementService.tsapps/server/src/server.tsapps/server/src/vcs/GitVcsDriver.tsapps/server/src/ws.test.tsapps/server/src/ws.tsapps/web/src/components/BackgroundThreadAnnouncer.tsxapps/web/src/components/ChatView.tsxapps/web/src/components/settings/ScheduledTasksSettings.browser.test.tsxapps/web/src/components/settings/ScheduledTasksSettings.tsxapps/web/src/components/settings/settingsSearch.tsapps/web/src/i18n/translations/de.jsonapps/web/src/i18n/translations/en.jsonapps/web/src/i18n/translations/es.jsonapps/web/src/i18n/translations/fr.jsonapps/web/src/i18n/translations/ja.jsonapps/web/src/i18n/translations/ko.jsonapps/web/src/i18n/translations/pt-BR.jsonapps/web/src/i18n/translations/ru.jsonapps/web/src/i18n/translations/sv.jsonapps/web/src/i18n/translations/zh.jsondocs/user/source-control.mddocs/user/thread-sidebar.mdpackages/client-runtime/package.jsonpackages/contracts/src/orchestrationV2.tspackages/provider-acp/src/server/adapter.tspackages/provider-core/src/server/ProviderAdapter.tspackages/provider-cursor/src/server/adapter.test.tspackages/provider-cursor/src/server/adapter.tsDecisions
forkremote, and itsoriginis mediavee/t3code. So the branch was pushed with an explicit URL,git push https://github.com/mediavee/t3code.git, never to pingdotgg.titleRenamedis left off the fork's cross-projectdelegate_tasklaunch. It changes nothing today (see above), and adding it would be a behaviour change outside a sync. It is a possible follow-up for parity with upstream's same-project launch.Checks on
3c2368aada(cleanenv -i, Node 26.13.1,TMPDIRunder/home/agent,T3_UPSTREAM_REF=v0.1.12-nightly.20261122.5085)vp run typecheck0 (43/43);vp check0 (0 errors, 19 warnings);vp run i18n:check0;upstreamMigrations.test.ts3/3 (manifest regenerated from the tag, unchanged);AgentContextBudget.test.ts2/2.AntigravityInstallation(1),GrokProvider(5); 6/66 failed when rerun on a checkout of the tag.browser-secret-native(nolibsecret-1pkg-config on dev2); same failure on the tag.sqlite3 -readonly .backupcopy of dev2's database (9.5 GB, non-tmpfs) migrated with this head: 102 → 105. The ledger is exactly upstream's 105 numbered migrations (diffagainst the tag'sMigrations/NNN_*.tslist is empty). Both fork indexes exist (orchestration_v2_projection_subagents_remote_parent_done_idx,orchestration_v2_projection_turn_items_transient_failure_idx), as doscheduled_tasks.last_run_thread_id,gate_json,gate_last_hashandgate_result_json.quick_checkis ok.Merged by Claude Opus 5.5 (Claude Code in T3 Code).