Rebase onto upstream/master (2026-08-27): 575 commits (d5b9f6c8..d785b192) - #335
Draft
stubbi wants to merge 22 commits into
Draft
Rebase onto upstream/master (2026-08-27): 575 commits (d5b9f6c8..d785b192)#335stubbi wants to merge 22 commits into
stubbi wants to merge 22 commits into
Conversation
Brings fork up to date with upstream paperclipai/paperclip through d785b19. Notable upstream additions: byte-ledger ceiling test fix, Daytona zstd compression, Sentry observability opt-in, TypeScript 7.0 upgrade, workspace-restore merge lock, referenced-project sync fixes, Codex execution adapter, service worker freshness, hideable company settings pages, dashboard banner for paused imported agents. Fork-specific patches partially re-applied; remaining fork customizations follow in subsequent fix commits. No pnpm-lock.yaml in the diff, per fork policy.
Re-apply fork customizations that failed to apply during the automated rebase of upstream d5b9f6c..d785b19: - SurfaceGuard wrapping for company settings routes (App.tsx) - Cloud billing detection in SidebarAccountMenu - Cloud company creation in CompanySwitcher - Missing imports in Layout.tsx (useFeatures, findCompanyByUrlSegment) - Brand directory support in server app - Fork-specific route and service changes - Adapter execution fork patches (credential rotation, managed instance) Work in progress — additional fork patches being applied by parallel agents.
- Remove database backup health monitoring from health route (fork removal) - Restore assertSurfaceExposed in secrets routes - Fix garbled import block in companies route - Fix agents route: remove dangling imports, relocate adapterType property - Relocate prebakedRuntime in environment-execution-target - Additional server/adapter fixes from parallel agents
Re-apply fork-specific onboarding wizard customizations that were dropped during the upstream rebase.
- Fix createPluginStreamBus import spliced into wrong import block - Fix streamBus option misplaced inside terminalizeLoginPtyRoute body - Additional adapter and test fixes from parallel agents
Partial fixes from parallel agents still running.
…icates - Remove database backup health tests from health.test.ts (fork exclusion) - Remove duplicate plugins import in heartbeat-process-recovery.test.ts - Additional adapter parse fix
- OnboardingWizard: combine fork credential binding with upstream gate - AgentConfigForm: restore useFeatures hook and currentEnv state - CompanySettingsSidebar: restore useBoardCapabilities and exposedSurfaces - CompanySettingsNav: combine fork surface filtering with upstream hiddenSettings - SummarySlotCard: restore useFeatures hook - IssueChatThread: combine upstream import pause with fork custom display - AgentConfigForm tests: fix buildCurrentBoardAccess pattern - CompanySettingsSidebar tests: restore fork test patterns - Additional adapter-utils and page fixes
Move prebakedRuntime field from inside postedIssueCommentLogMarker function body to AdapterSandboxExecutionTarget interface where it belongs.
- Change @types/node from ^24.6.0 to ^24.0.0 - Add engines.node >=24.11.0 Required by the monorepo node-version-policy check.
Add back the fork-specific enableCloudSync boolean to InstanceExperimentalSettings interface, its zod validator default, and its feature catalog entry. Fixes TS2339 compilation error.
The function was declared twice in heartbeat.ts due to a merge artifact. Removes the first copy, keeping the one with the full comment block.
…body The const declaration was incorrectly spliced into buildAcpLoginProbeUnavailableCheck's parameter list during the rebase. Move it to testClaudeAcpEnvironment where it is actually used.
Merge artifacts: asBoolean was imported twice, and hostOauthToken was declared twice in the same function scope in acp.ts.
Remove the re-export of firstMeaningfulStderrLine from adapter-utils (fork artifact) since upstream now defines a local version with Codex-specific benign-line filtering. Add the missing firstNonEmptyLine helper that the local function depends on.
Same merge artifact as claude-local: the const declaration was spliced into an object literal inside the remote-target info check. Move it after the block where it's used.
…mNotification Merge artifact: the terminalize block was duplicated inside publishStreamNotification (a sync function). The correct copy already exists in the async terminalizeLoginPtyRoute function above.
Fork-specific function imported in server/src/index.ts but missing from the services barrel export.
- Add loginCapability to ServerAdapterModule interface - Add streamBus to PluginWorkerManager interface - Import instrumentationReady and shutdownInstrumentation in server index - Export reconcileCloudUpstreamRunsOnStartup from services index
- Restore packages/db/src/schema/cloud_upstreams.ts (deleted by upstream) - Restore packages/shared/src/types/cloud-upstream.ts (deleted by upstream) - Export cloudUpstreamConnections/cloudUpstreamRuns from DB schema index - Export cloud-upstream types from shared index - Remove duplicate mockAdapterPluginStore in test file
… version The sync version from upstream was duplicated alongside the fork's async version that includes the paperclip_runner rollout flag check. The sync version shadowed the async one, disabling the flag validation.
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
2 participants
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.
Thinking Path
Linked Issues or Issue Description
Supersedes the upstream range from #320. Continues the periodic upstream rebase pattern established by #320, #277, #265, #262.
What problem exists: The fork was 575 commits behind upstream
paperclipai/paperclip. Hosted users miss upstream bug fixes, new features, and security patches until a rebase lands.Why it needs to be addressed: Falling further behind upstream makes each subsequent rebase harder and delays feature delivery to hosted users.
What Changed
d5b9f6c8..d785b192— 575 commitspnpm-lock.yamlin the diff, per fork policyVerification
Honest scope limit: Local
pnpm installwould rewrite the lockfile. CI gates are the authoritative verification for this rebase.Risks
Moderate, inherent to a 575-commit rebase.
Model Used
claude-opus-4-6[1m], 1M context), via the Claude Code CLI harness with tool use (shell, file edits, parallel subagents). Change authored agent-assisted.Checklist
Fixes: #/Closes #/Refs #OR (b) described the issue in-PR following the relevant issue template#NNN/github.com/paperclipai/paperclipURLs)docs/...,fix/...) and contains no internal Paperclip ticket id or instance-derived detailsGenerated by Claude Code