Skip to content

chore(sync): merge upstream nightly v0.1.11-nightly.20261117.4851, adopting upstream Issues - #469

Merged
tannerpolley merged 222 commits into
mainfrom
sync/upstream-2026-11-17
Nov 18, 2026
Merged

tannerpolley merged 222 commits into
mainfrom
sync/upstream-2026-11-17

Conversation

@tannerpolley

@tannerpolley tannerpolley commented Nov 18, 2026 •

Copy link
Copy Markdown
Owner

Closes #454. Step 3 of 7 for #451.

What this does

This is a real merge of upstream nightly v0.1.11-nightly.20261117.4851, the newest nightly when the work started. Upstream's Issues feature becomes the base, as the #451 plan and owner decisions require. main was then merged in twice, with no rebase. The second merge brought in the #449 fix (#466) and #464; a third brought in the latest web fixes.

  • Upstream owns: issue content, the issue right-panel tab, the thread-details issue rows, /issues, and its issue tools (list_issues, read_issue, create_issue, comment_on_issue, set_issue_state, link_issue, unlink_issue, list_thread_issues).
  • The fork roadmap moved to /roadmap. The command palette gains "Open roadmap", and "Start agent on issue…" with no thread goes there. The roadmap opens issues in upstream's detail panel. The per-repository issues side panel (the fork issues surface) still shows the roadmap, and its rows open upstream's issue tab beside the thread.
  • The fork work section joins upstream's IssueDetailPanel through one hook line (<IssueWorkSlot …/>). The slot is gated on the issueWork capability and GitHub issues. The fork's own issue detail panel and ThreadIssueSurface are deleted. The ⋯ menu keeps only Unlink (old table link), Refresh and Copy issue number.
  • The fork's link_issue/unlink_issue MCP tools are deleted (IssueMcpTools.ts), and upstream's toolkit is registered.
  • create_issue and set_issue_state are hidden from repository-managed threads and every thread below them (owner decision, 2026-11-17).
    • Which threads: the orchestrator root, an issue-claiming worker, and all their descendants, including read-only and Writer children.
    • How: IssueChangeService.isManagedCaller walks stored parent links in one depth-bounded recursive read on the read-only connection. Hiding uses McpSchema.EnabledWhen, which is enforced on both tools/list and tools/call, so propose_issue_change stays their gated path. Every other issue tool stays available.
    • Tests: McpHttpServer.test.ts lists the real IssuesToolkit for a managed thread, its child and an ordinary thread. IssueChangeService.test.ts checks the lineage query on a child, a grandchild, a claiming worker, the worker's child, and an unrelated thread and its child.
  • The roadmap refreshes on upstream's thread.issue-synced, which upstream's link_issue/unlink_issue emit. The test is in IssueRoadmap.test.ts.
  • linkedIssue is kept beside upstream's thread.issues[]. IssueLinks.enrich now also reads thread.issues[] GitHub links, which count as live work but cannot be unlinked from there. The new case is in IssueLinks.test.ts.
  • Right-panel storage goes to v18. Fork-shaped issue tabs, keyed by repository, close on load. The test is in rightPanelStore.fork.test.ts.

Conflict resolutions

Area Resolution
The 7 colliding issue paths (_chat.issues.tsx, ChatMarkdown issue links, RightPanelTabs issue cases, rightPanelStore issue surface, PullRequestSummaryTab meta rows, presentation issues atom, thread-details issue rows) Upstream's files. Fork behavior is re-added through issueTabs.ts (fork ref ↔ upstream IssueSurfaceTarget) and the /roadmap route.
ws.ts Upstream's issues.* and issueTrackers.* handlers added; both prefixes split out.
ServerEnvironment / contracts environment.ts Both: upstream issues capability plus the fork issue capabilities.
GitVcsDriverCore.createWorktree Upstream's sparse-checkout support ported into the fork's restructured worktree creation, keeping the fork semaphore and fast checkout (skipped when sparse).
serverSettings.ts Upstream's function-patch support combined with the fork's secret-reference echo and simlock filtering.
ServerBrowser.ts Upstream's awaitShown wait, then the fork's hide on an existing tab.
ThreadLaunchService.ts Fork version plus upstream's existing_worktree case.
orchestrationV2.ts contracts Fork pendingBackgroundTaskSchema plus upstream's runId.
ProjectionStore.ts, Orchestrator.control-reads.test.ts, Observability.ts, server.ts Conflicted; kept both sides. ProjectionStore.ts: the interface block keeps both sides' methods, and listActiveShellIndex is identical to upstream's (it matches migration 98). Orchestrator.control-reads.test.ts: the fork test, with upstream's failed-span tracer check ported into the fork's parent-PR delegate test. Observability.ts and server.ts: both sides' additions. Orchestrator.ts, EffectOutbox, EffectWorker and the migrations merged without conflicts. IssueWorkDispatch now uses upstream's findThread (an expected miss is not an error span), which removed two new control-reads failures. The #466 fixes are intact: run-scoped delegated reads, Layer.fresh(layerTest), and INDEXED BY on the usage-limit index.
packages/source-control-forgejo Upstream's package as-is.
DesktopApp.test.ts Upstream's refactored test, plus the fork's showConnectingSplash mock (the fork app still calls it).
agentContextBudget.json Remeasured; see below.

Behavior ledger (scripts/fork-sync/lost-fork-code.py 4a0f11ee58 v0.1.11-nightly.20261117.4851 e467a6504f)

The script flags 47 hunks in 152 files changed on both sides, plus 3 deleted fork files. None is a silent loss.

Flagged Judgment
GitVcsDriverCore.ts (3 hunks), serverSettings.ts Restyled. Fork behavior kept inside upstream's newer shape (see above).
ChatMarkdown.tsx (2), ChatView.tsx (2), RightPanelTabs.tsx (7), PullRequestSummaryTab.tsx (2), rightPanelStore.ts (6), presentation.ts Replaced by upstream per the #451 decision (upstream's issue surface and rows). Fork-only pieces re-added: the issues list surface, the issue-host link preview, issueSurface export, and v18 migration. NO_MODIFIER_CLICK is gone with upstream's onOpenFallback.
routes/_chat.issues.tsx, CommandPalette.tsx (2) Moved to /roadmap; upstream keeps /issues.
t3McpToolPresentation.ts Deleted deliberately. The fork link_issue/unlink_issue presentation entries went with the tools; upstream's entries stay.
IssueMcpTools.ts, issues/IssueDetailPanel.tsx, ThreadIssueSurface.tsx (deleted) Deleted and replaced. Upstream tools; upstream panel plus IssueWorkSlot; upstream issue surface.
docs/user/source-control.md (2) Rewritten for the Roadmap page and upstream's issue panel.
packages/source-control-forgejo (14) Dropped deliberately. Fork Forgejo caching and tests give way to upstream's package; Forgejo is a read-only archive for this fork.
DesktopApp.test.ts Kept. The fork's splash mock is restored in upstream's refactored test.
agentContextBudget.json Remeasured.

Reverse audit (upstream code the merge did not keep): only the deliberate items above. Upstream's savedViews.ts and graphql.config.ts came along unchanged.

Gates

  • Migrations: I checked these on a disposable copy of a worktree dev database, not ~/.t3/userdata. Upstream's 97_IssueTrackerBindings and 98_ActiveShellIndexIndexes applied. The fork ledger t3_fork_migrations stayed at 30/30, and issue_thread_links was preserved. PRAGMA integrity_check returned ok.
  • Workflows: none added (only composite actions under .github/actions), so there was nothing to gh workflow disable.
  • Agent context budget: mcpToolListJsonBytes went from 79439 to 80901 (+1462: upstream's 8 issue tools in, the fork's 2 link tools out). claudeSystemAppendBytes (6729) and codexAdditionalContextBytes (8122) are unchanged. Needs the agent-context-increase label. I did not cut any text, so no paid evals were run.
  • 11 server tests fail on main: FoundationPersistence (9) and Orchestrator.control-reads (2) #449 test files after merging main (with fix(server): restore the reads and test isolation the 20261116 sync merge dropped #466): Orchestrator.control-reads, FoundationPersistence and ProjectionStore.fork, plus AgentContextBudget, give 4/4 files and 119/119 tests passing.
  • vp run check:changed (with CHECK_CHANGED_TIMEOUT=3600, because the 405 selected test files ran past the default 900 s under agent-heavy):
  • Integrated pass: in the in-app browser against vp run dev --no-seed, with one synthetic project and no seeded data. Upstream /issues lists and opens issues; the work section (Start agent, Prepare draft, Ask agent, ⋯, live state) renders in upstream's detail panel. /roadmap renders the roadmap, and its URL target opens upstream's detail panel with the work section. The thread's per-repository Issues side panel shows the roadmap, and a row opens upstream's #451 tab beside the thread. The dev server was stopped.

Surfaces

  • Clients: web and desktop share these changes. Mobile gets upstream's Issues tab unchanged and no fork additions (out of scope).
  • Providers: the MCP tool hiding applies to every provider through the MCP server.

Model: Claude Opus 5.5 in Claude Code, running in T3 Code.

🤖 Generated with Claude Code

juliusmarminge and others added 30 commits November 16, 2026 12:15
…heir project (pingdotgg#37682)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…hread (pingdotgg#37725)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
… with web (pingdotgg#37743)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…er area (pingdotgg#37508)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…lds (pingdotgg#37755)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…s an error (pingdotgg#37747)

Co-authored-by: Martin Bergo <14320143+mInrOz@users.noreply.github.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…ingdotgg#37745)

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…ingdotgg#37764)

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>
Co-authored-by: Cursor <cursoragent@cursor.com>
…read span (pingdotgg#37763)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: Cursor <cursoragent@cursor.com>
…away (pingdotgg#35761)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…otgg#28635)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
juliusmarminge and others added 18 commits November 17, 2026 11:50
…n recovery (pingdotgg#38241)

Co-authored-by: Grok 4.7 <noreply@x.ai>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…g#38313)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
Upstream's Issues feature takes the issue tab, thread-details rows, issue
tools and /issues. The fork roadmap moves to /roadmap, the work section mounts
in upstream's issue detail panel, link_issue/unlink_issue are deleted, and
create_issue/set_issue_state are hidden from repository-managed threads.

Closes #454. Part of #451.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
…m code

The desktop app still shows the connecting splash, the issue-work lock reads
findThread, the delegated-task progress read uses getThreadShell, and pending
background tasks keep the fork's startedAt; the tests now provide or expect
each of these.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
It fails once any extra migration is registered, on main as on this sync, so
the interrupt point it pins moves with setup work; #468 tracks whether that is
a real permit race or test fragility.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
… below managed threads

Upstream's link_issue/unlink_issue emit thread.issue-synced, which the roadmap
refresh ignored, so the roadmap and thread-details Issues stayed stale. The
managed-thread mark now also covers every descendant of a managed thread
(owner decision, 2026-11-17) through one bounded parent walk, and its reads
use the read-only connection instead of the writer.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

#451 step 3: Sync with the newest upstream nightly, adopting upstream Issues