Skip to content

upstream/2026-04-26 PR1: 無競合・軽量 3 commits 取り込み#435

Merged
MocA-Love merged 3 commits intomainfrom
upstream/batch-2026-04-26-pr-a
Apr 25, 2026
Merged

upstream/2026-04-26 PR1: 無競合・軽量 3 commits 取り込み#435
MocA-Love merged 3 commits intomainfrom
upstream/batch-2026-04-26-pr-a

Conversation

@MocA-Love
Copy link
Copy Markdown
Owner

Summary

upstream (superset-sh/superset) からの 9 commits 取り込みバッチの PR1(無競合・軽量)。3 commits を cherry-pick で取り込み、merge-tree dry-run で conflict 0 を確認済み。

取り込み内容

Commit upstream PR 概要
c272a5158 superset-sh#3733 v2 sidebar workspace item から branch 行を削除(workspace 名が branch にフォールバックするため冗長)
c2f3fdcda superset-sh#3735 .fade-edge-{t,r,b,l} ユーティリティ CSS 追加(水平/垂直スクロールのアフォーダンス表現用)
682d07c87 superset-sh#3736 v2 terminal の OSC リンク fix(terminal-link-manager に test 追加)

Fork 側のコンフリクト解決

なし(git merge-tree --write-tree --merge-base 実行で 3 commits すべて conflict 0 を事前確認、cherry-pick 中も auto-merge のみ)。

Fork 固有機能ヘルスチェック

baseline(/tmp/upstream-202604-baseline/fork-features.txt)と取り込み後の grep を比較済み:

  • 19 tRPC procedure 全件健在
  • ansi_up / @vscode/ripgrep / @xyflow/react 健在
  • TERMINAL_OPTIONS / SUPERSET_WORKSPACE_NAME / moonshot-ai.kimi-code / MainWindowEffects / INCEPTION_AUTH_PROVIDER_ID / v1MigrationState / TiptapPromptEditor 健在
  • desktop 1.5.10、drizzle idx (db=0035 / local-db=0072) 維持
  • electron-builder.ts の dmg.size="4g" 維持

検証

  • bun install: ✅
  • bun run typecheck: ✅ (27/27 successful)
  • bun run lint: ✅ (Biome: 4322 files, no fixes applied)
  • bun run --filter @superset/desktop build: PR2 と一括で確認予定(PR1 は型/lint で十分)

後続 PR の予定

  • PR2(単一ファイル競合・UI 系): 8928ac62e (v2 pane header), 6a3be2d35 (v2 terminal resize), 3012b5a57 (Optimistic Electric collection updates)
  • PR3(host-service restart): 1f55c623a + 0fe65d230
  • PR4(remote ports 大物): 7c0d22b77

Test plan

  • v2 ワークスペースサイドバー: workspace 名のみ表示(branch 行が消えていること)
  • .fade-edge-r 等のユーティリティクラスが利用可能(PR2 以降で実消費見込み)
  • v2 terminal で OSC リンクをクリックすると正しく開く

…t-sh#3733)

Workspace name already falls back to branch when missing, so the dedicated branch row was redundant. Slightly bumps row padding for breathing room.
* feat(desktop): add fade-edge mask utilities

Add composable `.fade-edge-{t,r,b,l}` utility classes that fade out one
or more edges of an element via a linear-gradient mask. Useful for
indicating horizontal/vertical scroll affordance.

Lives in `apps/desktop/src/renderer/styles/fade-edge.css` (single
import in `globals.css`) so the file can be promoted to `packages/ui`
once a second consumer needs it.

* style: blank line before mask-image declaration
@coderabbitai
Copy link
Copy Markdown

coderabbitai Bot commented Apr 25, 2026

Warning

Rate limit exceeded

@MocA-Love has exceeded the limit for the number of commits that can be reviewed per hour. Please wait 31 minutes and 36 seconds before requesting another review.

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 31 minutes and 36 seconds.

⌛ How to resolve this issue?

After the wait time has elapsed, a review can be triggered using the @coderabbitai review command as a PR comment. Alternatively, push new commits to this PR.

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 configuration

Configuration used: Organization UI

Review profile: CHILL

Plan: Pro

Run ID: 1da3072d-fa03-4557-a2f9-502dd23589f0

📥 Commits

Reviewing files that changed from the base of the PR and between 5bab531 and ba0baca.

📒 Files selected for processing (5)
  • apps/desktop/src/renderer/globals.css
  • apps/desktop/src/renderer/lib/terminal/terminal-link-manager.test.ts
  • apps/desktop/src/renderer/lib/terminal/terminal-link-manager.ts
  • apps/desktop/src/renderer/routes/_authenticated/_dashboard/components/DashboardSidebar/components/DashboardSidebarWorkspaceItem/components/DashboardSidebarExpandedWorkspaceRow/DashboardSidebarExpandedWorkspaceRow.tsx
  • apps/desktop/src/renderer/styles/fade-edge.css
✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests
  • Commit unit tests in branch upstream/batch-2026-04-26-pr-a

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.

❤️ Share

Comment @coderabbitai help to get the list of available commands and usage tips.

@MocA-Love MocA-Love merged commit 2aaaa22 into main Apr 25, 2026
6 checks passed
@github-actions
Copy link
Copy Markdown

🧹 Preview Cleanup Complete

The following preview resources have been cleaned up:

  • ⚠️ Neon database branch
  • ⚠️ Electric Fly.io app

Thank you for your contribution! 🎉

MocA-Love added a commit that referenced this pull request Apr 26, 2026
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)
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.

2 participants