[RobertScholey98]

Problem

satellite-v2 was based on upstream at d8e9fd2. Upstream main has moved 853 commits beyond that. The 2026-10-21 rescope asks to bring in the latest T3 Code before the 2.0.0 review.

Change

There is one real merge commit, 27c93f7, of upstream main at d27c6067a9162150f654e38f455a7a936ef79178 (the tip on 2026-10-21). Upstream stays an ancestor. The previous base was d8e9fd2; the original pin was e58a485.

• The orchestration protocol is unchanged (still 2).
• Upstream adds migrations 64 to 67 and moves to pnpm 12.14.0.
• The merge commit message lists all 94 conflicts and how each was resolved.
• The footprint (upstream files modified or deleted relative to the upstream tip) went from 359 to 345.

Two follow-up commits:

• fc065ab fixes the mobile client's release reads, which CI caught.
• d324cb8 applies the comment review.

Resolution rules:

• Upstream files take upstream's side, with Satellite's registration, identity and rebrand lines re-applied.
• Files on the rebrand list were re-merged with the rebrand applied to both base and upstream, and scripts/rebrand.ts was rerun. The list moves to the new upstream base and adds the upstream files that newly name the product.
• Workflows Satellite deleted stay deleted.
• Upstream deleted many low-value tests. A pruned test file keeps only the cases Satellite added; cases Satellite had only rebranded stay pruned.

PR-08's pull request fixes

• Bare repository containers. Upstream now resolves these itself (f7bef38). Satellite's duplicate code is dropped and both of PR-08's bare-container tests are kept. Their root-path expectation follows upstream: the git directory rather than the container.
• Named-remote identity lookup. Rebuilt on upstream's RepositoryIdentityCacheKey as a RepositoryIdentityLookup data class. Tests kept.
• Fork and includeUpstream listing, stats keys and detail lookups. PullRequestService hunks re-applied on upstream's Effect.fn rewrite. Tests kept.
• Web side. Upstream moved the pull requests page into components/pullRequest/PullRequestsPage.tsx and PullRequestsColumn.tsx. includeUpstream (search, scope key, list inputs, Filters toggle) and the Issues work tab strip moved with it. The route keeps only the includeUpstream search key. The Filters test was recreated with PR-08's case only.

Upstream files the merge forced Satellite to touch beyond its earlier lines

• Server and persistence.
  • server.ts keeps upstream's CloudLink layer plus SatelliteServer.layer.
  • RepositoryIdentityResolver.ts and PullRequestService.ts (above).
  • The dev-build fixture imports migrations 55 to 58 directly, since upstream no longer exports migrationEntries.
• Web.
  • PullRequestsPage.tsx and PullRequestsColumn.tsx (above).
  • TimelineToolActivityIcon.tsx uses SatelliteMark.
• Client-runtime and shared.
  • outdatedHostUpdate.ts, errorPresentation.ts: upstream's code with the product name the client supplies.
  • cliRelease.ts: Satellite's callers use a new releaseIndexPageUrl(repository, page). CLI_RELEASES_PAGE_URL and cliReleaseIndexPageUrl(page) stay on upstream's repository because only the unmodified apps/mobile reads them.
  • cli/update.ts passes RELEASE_REPOSITORY.
• Identity seams.
  • build-desktop-artifact.ts takes upstream's camera and microphone usage strings from productIdentity.
  • scripts/dev-runner.ts seeds new worktrees from ~/.satellite-t3 instead of ~/.t3.
  • environmentHttp.ts points the T3 Connect troubleshooting link at the fork's docs.
• Workflows and docs.
  • release-desktop.yml is upstream's, plus Satellite's wsl_runtime input.
  • ci.yml drops a desktop test upstream deleted.
  • AGENTS.md takes upstream's setup markers and dev seeding notes.
• Lint. Upstream's new prefer-effect-fn lint rule meant converting Satellite's Issues, Azure boards host and legacy drain to Effect.fn.
• Restored and deleted helpers. .github/scripts/ci-changes.cjs comes back because upstream's new vp run check:changed imports it. scripts/resolve-nightly-release.ts (upstream's release only) and vercel-deployment-output.test.cjs are deleted.

Ledger

• SatelliteLedgerUpgrade.integration.test.ts now pins the upstream ledger tip at 67 and adds a case for a database repaired when upstream's ledger ended at 63. That case asserts the seed ends at 63 and then moves forward cleanly. The dev-build fixture (fork-numbered 63 to 66 under different names) repairs and then runs upstream's 64 to 67.
• runSatelliteMigrations now rejects Revdoc's retired id 100, with a test. The next Satellite migration takes 102.

Verification

• Unit tests. On the merge, persistence, satellite and issues passed (195 tests), plus every conflict-touched module's owning tests:
  • server: 859, of which 3 fail on macOS at upstream's tip too;
  • desktop, scripts, shared, client-runtime, contracts: 2029, of which 10 fail on macOS at upstream's tip too;
  • web: 743;
  • provider packages: 687.
    The baseline was a clean upstream-tip worktree.
• Static checks. tsc-rs --noEmit passed in 14 packages including mobile. vp lint found no errors in Satellite's files. vp run knip:check and node scripts/rebrand.ts --check / --verify both pass.
• Live, at 27c93f7, on a fresh snapshot in scratch homes with an invalid GH_TOKEN:
  • Lane 1: trunk's ledger runs 1..63 and head's runs 1..67, with every trunk row kept.
  • Forward from trunk: a database trunk repaired runs 64..67 only.
  • Lane 2: thread counts match per project.
  • Lane 3: a migrated Claude thread replied, using context from earlier in the thread.
  • Lane 9: the dev-build fixture repairs to upstream's names, archives 2 threads, and is unchanged on its second start.
  • Lane 10: a second start leaves the ledger and schema unchanged.
  • Branding: Satellite name, mark, manifest and favicon, with no running animations.
  • Pull Requests: the Include upstream toggle sets includeUpstream=true.
  • Issues on a fake GitHub Enterprise host: connect, drag, and Start, which moved fix(ci): make packaging archive fixtures portable on Windows #11 to In progress.
• Perf. Cold start median: trunk 3092.9 ms, head 3067.7 ms (ratio 0.992, under 15 s).
• Release dry run. Run 39672241553 at fc065ab succeeded. It produced SatelliteT3-2.0.0 exe, dmg and zip for x64 and arm64, plus latest.yml and SHA256SUMS. No tag or release was created; releases/latest is still v1.2.1.

Model and harness: Claude Opus 5.5 in Claude Code.

🤖 Generated with Claude Code