upstream/2026-04-26 PR3: host-service restart 関連 2 commits 取り込み#437
upstream/2026-04-26 PR3: host-service restart 関連 2 commits 取り込み#437
Conversation
…er tests (superset-sh#3734) The mock.module() calls in this test for node:child_process and shell-env are hoisted by Bun and persist process-wide, causing 17 unrelated tests (merge-pull-request, git, teardown, listExternalWorktrees) to fail or timeout when run in the same suite. Bun does not provide per-file mock isolation, and re-mocking back in afterAll fires too late to restore live ESM bindings already captured by other test files. Removes the test entirely to unblock CI. Coverage of the host-service restart-adoption fix should be restored via a refactor that injects spawn / getProcessEnvWithShellPath as constructor options instead of mocking modules.
|
Warning Rate limit exceeded
Your organization is not enrolled in usage-based pricing. Contact your admin to enable usage-based pricing to continue reviews beyond the rate limit, or try again in 47 minutes and 38 seconds. ⌛ How to resolve this issue?After the wait time has elapsed, a review can be triggered using the We recommend that you space out your commits to avoid hitting the rate limit. 🚦 How do rate limits work?CodeRabbit enforces hourly rate limits for each developer per organization. Our paid plans have higher rate limits than the trial, open-source and free plans. In all cases, we re-allow further reviews after a brief timeout. Please see our FAQ for further information. ℹ️ Review info⚙️ Run configurationConfiguration used: Organization UI Review profile: CHILL Plan: Pro Run ID: 📒 Files selected for processing (1)
✨ Finishing Touches🧪 Generate unit tests (beta)
Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out. Comment |
🧹 Preview Cleanup CompleteThe following preview resources have been cleaned up:
Thank you for your contribution! 🎉 |
PR1〜PR5 (#435 #436 #437 #438 #440) で 13 commits 全件 cherry-pick + 手動 conflict 解消で取り込み済み。 本コミットは git 履歴上 behind=0 とするための ours マージ記録。 取り込み済み 13 commits: - 1f55c62 Fix host service restart adoption (superset-sh#3732) - 0fe65d2 test(desktop): remove host-service-coordinator test (superset-sh#3734) - 3012b5a Add optimistic Electric collection updates (superset-sh#3722) - c272a51 fix(desktop): drop branch row from v2 sidebar workspace item (superset-sh#3733) - c2f3fdc feat(desktop): add fade-edge mask utilities (superset-sh#3735) - 682d07c fix v2 terminal osc links (superset-sh#3736) - 7c0d22b feat(ports): surface remote host-service ports in the sidebar (superset-sh#3676) - 6a3be2d [codex] Stabilize v2 terminal resize (superset-sh#3739) - 8928ac6 [codex] Improve v2 pane header responsiveness (superset-sh#3737) - 5fe3d22 refactor(desktop): tidy v2 terminal session dropdown (superset-sh#3743) - 66c23d6 Fix automation timezone scheduling (superset-sh#3738) - 16e270c [codex] Add terminal session titles (superset-sh#3740) - 583fa5d fix(desktop): refit v2 terminal after font settle (superset-sh#3742)
Summary
upstream (superset-sh/superset) からの 9 commits 取り込みバッチの PR3(host-service restart 関連 2 commits)。
host-service-coordinator.tsで fork が Linux 用に拡張したspawnPersistent(systemd-run --user --scope) ラッパーを保持しつつ、upstream の「全環境で detach + log file 経由」方針を統合。取り込み内容
1f55c623afetchHostVersionの response 形式にresult.json.versionフォールバック追加。spawn ロジックをisPackaged分岐ベースから「全環境detached: true+ log file 経由」へ統一。dev 環境のパイプ stdout/stderr console.log ハンドラを削除。0fe65d230host-service-coordinator.test.tsを削除(Bun のmock.module()がnode:child_process/shell-envをプロセス全体で hoist し、merge-pull-request / git / teardown / listExternalWorktrees 等の 17 件の無関係テスト を pollute するため)。Fork 側のコンフリクト解決
host-service-coordinator.ts(1f55c62)Block 1: spawn 部分
spawnPersistentラッパー(Linux で systemd-run --user --scope 化)は 保持。dev 環境では plain spawn にフォールバックする挙動も維持。detached: true全環境化を採用(dev でも detach、host-service が Electron restart を生き延びる)。windowsHide: true/ stdio (logFd-only) は upstream の流れに沿って統一。Block 2: post-spawn 部分
instance.scopeUnit = scopeUnitは 保持(systemd-run 単位の追跡用)。child.stdout.on("data", ...)/child.stderr.on("data", ...)console ロガーを削除。dev 中もログはhost-service.log(rotating) に書かれるので機能的に等価。fetchHostVersionのレスポンス形式フォールバックや、isPackaged分岐削除(条件 stdio / logFd 構築の片付け)等は auto-merge 成立。0fe65d230は1f55c623aで追加されたテストの削除なので競合なし。Fork 固有機能ヘルスチェック
getHostServiceCoordinator関数本体含む)spawnPersistent/killPersistentScopeの Linux systemd-run 統合は完全に維持検証
bun install: ✅ (5757 packages, 88s)bun run typecheck: ✅ (27/27 successful)bun run lint: ✅ (Biome: 4331 files, no fixes applied)bun run --filter @superset/desktop compile:app: ✅ (electron-vite build, 2m 24s, exit 0)後続 PR の予定
7c0d22b77(78 files / +4234 -1088、conflict 9 件、新規packages/port-scanner/パッケージ追加)Test plan
superset-host-service-<orgId>として実体化されるfetchHostVersionでresult.json.versionフォールバックが機能する)bun testで merge-pull-request / git / teardown / listExternalWorktrees 系テストが通る(host-service-coordinator.test.ts の汚染が解消されたこと)