Skip to content

upstream merge 2026-04-27 PR-D2: terminal connection diagnostics#449

Merged
MocA-Love merged 1 commit intomainfrom
upstream/batch-2026-04-27-pr-d2
Apr 28, 2026
Merged

upstream merge 2026-04-27 PR-D2: terminal connection diagnostics#449
MocA-Love merged 1 commit intomainfrom
upstream/batch-2026-04-27-pr-d2

Conversation

@MocA-Love
Copy link
Copy Markdown
Owner

Summary

upstream 2026-04-27 後半バッチ第2弾。PR-D2: terminal connection diagnostics (1 commit)。

依存: #448 (PR-D1) の上に乗っている。PR-D1 を先にマージしてください

取り込み

SHA upstream 概要
ce402ca6f superset-sh#3801 terminal WebSocket close / error の詳細診断メッセージを追加 (formatWsEndpoint, formatCloseDetails)

Fork 側コンフリクト解決

apps/desktop/src/renderer/lib/terminal/terminal-ws-transport.ts: fork の Sentry debug capture (terminalRendererDebug.error("ws-error", ...) with captureMessage: true, fingerprint: ["terminal.renderer", "ws-error"]) を維持しつつ、upstream の詳細 terminal.writeln("WebSocket error while connecting to ${formatWsEndpoint(transport.currentUrl)}. Check host-service or relay connectivity.") を併用。FORK NOTE コメントで意図を残す。

Test plan

  • bun install 整合性 OK
  • bun run typecheck 全 28 task green
  • bun run lint biome green
  • (手動) terminal 接続失敗時のエラー表示確認 (詳細メッセージ + Sentry capture 両方)

@coderabbitai
Copy link
Copy Markdown

coderabbitai Bot commented Apr 28, 2026

Important

Review skipped

Auto reviews are disabled on base/target branches other than the default branch.

Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

⚙️ Run configuration

Configuration used: Organization UI

Review profile: CHILL

Plan: Pro

Run ID: 37384b9a-a133-4cea-ad4a-316adee5d847

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Use the checkbox below for a quick retry:

  • 🔍 Trigger review
✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests
  • Commit unit tests in branch upstream/batch-2026-04-27-pr-d2

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.

@github-actions
Copy link
Copy Markdown

github-actions Bot commented Apr 28, 2026

🧹 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 MocA-Love changed the base branch from upstream/batch-2026-04-27-pr-d1 to main April 28, 2026 00:35
@MocA-Love MocA-Love merged commit c6d98ee into main Apr 28, 2026
12 of 13 checks passed
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