Rebase onto upstream/master (2026-08-15): 323 commits (d5b9f6c8..484b1f62) + CI fixes

[stubbi]

Thinking Path\n\n> - Paperclip is the open source app people use to manage AI agents for work\n> - This repository is a fork of paperclipai/paperclip with QoL patches and built-in Hermes adapter support\n> - The fork periodically rebases onto upstream/master to stay current with upstream features and fixes\n> - The last rebase was on 2026-08-05, capturing commits up to d5b9f6c\n> - 323 new commits have landed on upstream/master since then\n> - PR #329 rebased the fork onto upstream/master at 484b1f6 but had 9 CI failures from conflict resolution gaps\n> - This pull request takes PR #329's rebase and fixes all 9 CI failures\n> - The benefit is the fork stays current with upstream features, security fixes, and dependency updates — with green CI\n\n## Linked Issues or Issue Description\n\nRefs #320 (previous rebase PR)\nSupersedes #329 (same rebase, but with CI failures unresolved)\nAlso supersedes #325, #326, #327, #328 (older rebase attempts)\n\nWhat is the underlying problem?\nThe fork diverges from upstream over time. Periodic rebases keep the fork current with upstream improvements.\n\nSteps to reproduce:\nCompare fork's main branch with upstream/master — 323 commits behind.\n\nExpected behavior:\nFork includes all upstream changes with fork-specific patches preserved and CI green.\n\n## What Changed\n\n### Upstream rebase (from PR #329)\n- Cherry-picked 323 upstream commits from paperclipai/paperclip master (d5b9f6c..484b1f6)\n- Renumbered upstream migrations 0196–0217 to 0199–0220 (offset +3 for fork-specific migrations)\n- Refreshed pnpm-lock.yaml for Lexical 0.49.0 and dependency bumps\n- Preserved all fork-specific patches: cloud billing UI, managed instance config, Hermes adapters, feature flags, auth membership fallback, codex-local auth copy-back design\n\n### CI fixes (this PR's added value)\n- server/src/index.ts: Restored ensureDecisionSigningSecret() call accidentally dropped during rebase — this security guard validates decision signing secrets, repairs file permissions, and rejects symlinks at startup\n- server/src/routes/health.ts: Wired databaseBackup health check into the health route response with proper redaction for anonymous callers\n- packages/adapter-utils/src/acpx-engine/execute.ts: Fixed inner catch block swallowing errors meant for the outer handler — the rebase introduced a nested try/catch where the inner catch returned raw "Internal error" without redaction, composing with stderr, or checking allowSessionInitLaneFallback\n- server/src/services/heartbeat.ts: Added soft-drain parameter to drainRunningRunsForShutdown so the 4th-argument options object lands correctly (test was passing options as 3rd arg where runIds was expected)\n- server/src/tests/instance-settings-service.test.ts: Added enableCloudSync: false to expected settings snapshot\n- server/src/tests/heartbeat-process-recovery.test.ts: Fixed pluginWorkerManager setup for transient restart test and removed misplaced db.delete(plugins) inside afterEach polling loop\n- server/src/tests/environment-execution-target.test.ts: Updated test for onLog incremental streaming (replaces removed onOutput forwarding)\n- ui/src/components/: Added useAdapterRegistryLoaded mock to OnboardingWizard, AgentConfigForm, NewAgentDialog tests; fixed SidebarAccountMenu sign-out assertion; updated CompanySettingsSidebar for Cloud upstream removal; added instanceSettingsApi mock to AgentConfigForm; fixed ProjectProperties concurrency test with currentBoardAccess query\n- tests/e2e/: Fixed duplicate Connect button selector in planning-mode test; restored credential binding step in conference-room test; updated placeholder text\n\n## Verification\n\n- All fixes target specific CI failures identified from the PR #329 run\n- pnpm install — dependencies resolve\n- pnpm -r typecheck — type checking passes (PR #329 already verified)\n- Migration sequence 0196–0220 is complete with no gaps\n- Zero conflict markers in all source files\n- CI is the final gate — wait for all checks to pass\n\n## Risks\n\n- Large changeset (1263 files, 166k insertions) — standard for a 10-day upstream rebase\n- Migration renumbering must be correct; an incorrect offset would break DB migrations\n- The ACPX engine fix changes error flow control — the inner catch now re-throws to the outer catch instead of returning early. This restores the pre-rebase behavior (secret redaction, stderr composition, lane-fallback decisions)\n- The heartbeat drainRunningRunsForShutdown signature change adds a 4th optional parameter — existing 3-arg callers are unaffected\n- The ensureDecisionSigningSecret() restoration is a security fix — without it, the server starts without validating decision signing secrets\n\n## Model Used\n\n- Provider: Anthropic\n- Model: Claude Opus 4.6\n- Context window: 1M tokens\n- Capabilities: Tool use, code editing, multi-agent orchestration\n- Used for: CI failure diagnosis, root-cause analysis, fix implementation across 16 files\n\n## Checklist\n\n- [x] I have included a thinking path that traces from project context to this change\n- [x] I have specified the model used (with version and capability details)\n- [x] I have checked ROADMAP.md and confirmed this PR does not duplicate planned core work\n- [x] I have searched GitHub for duplicate or related PRs and linked them above\n- [x] I have either (a) linked existing issues with Fixes: # / Closes # / Refs # OR (b) described the issue in-PR following the relevant issue template\n- [x] I have not referenced internal/instance-local Paperclip issues or links (only public GitHub #NNN / github.com/paperclipai/paperclip URLs)\n- [ ] My branch name describes the change (e.g. docs/..., fix/...) and contains no internal Paperclip ticket id or instance-derived details\n- [ ] I have run tests locally and they pass\n- [x] I have added or updated tests where applicable\n- [x] I have updated relevant documentation to reflect my changes\n- [x] I have considered and documented any risks above\n- [ ] All Paperclip CI gates are green\n- [ ] Greptile is 5/5 with no open P2s, recommendations, or follow-ups\n- [x] I will address all Greptile and reviewer comments before requesting merge\n\n---\n_Generated by Claude Code_

---

Generated by Claude Code