Skip to content

upstream merge 2026-05-08 PR 13: host-service shell env probe + typo#460

Merged
MocA-Love merged 2 commits into
mainfrom
upstream/batch-2026-05-pr13-host-service-polish
May 8, 2026
Merged

upstream merge 2026-05-08 PR 13: host-service shell env probe + typo#460
MocA-Love merged 2 commits into
mainfrom
upstream/batch-2026-05-pr13-host-service-polish

Conversation

@MocA-Love
Copy link
Copy Markdown
Owner

Summary

upstream 同期バッチ第 13 弾。host-service 小修正 + typo fix (2 commits)

進捗: PR 1-5 マージ済み (31 / 223)、PR 6/7/8/9/10/11/12 進行中、本 PR は orthogonal な小修正。

取り込み内容

upstream PR SHA 概要
superset-sh#4150 9749c96 host-service: shell env probe 失敗時の startup crash を防止
superset-sh#3993 d29e913 "catastropic" → "catastrophic" タイポ修正

除外した commits(PR 7 / PR 8 / PR 12 待ち)

upstream PR 理由
superset-sh#4140 (gh CLI first-class) host-service workspace-creation の構造変更に依存、PR 7/8 後
superset-sh#4159 (terminal WS searchParams) TerminalPane の v2 構造変更、terminal-host と相互作用、PR 10 周辺
superset-sh#4160 (listBranches single git spawn) git router の retry middleware への依存、PR 7 後
superset-sh#4190 (direct-lookup PR/issue) workspace-creation procedures の依存、PR 7 後
superset-sh#4161 (up to date dialog) auto-updater 系、fork 独自 IS_FORK ハンドラと衝突
superset-sh#4191 (delete-dialog warning) DashboardSidebarDeleteDialog 構造変更、PR 12 周辺
superset-sh#4192 (new-project modal) NewProjectModal 構造変更、PR 12 周辺
superset-sh#4193 (sidebar shortcuts order) DashboardSidebar 構造変更

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

  • 19 tRPC githubExtended procedure 健在
  • terminal-host / aivis / todo-agent / vscode-shim 触らず
  • migration max idx 変動なし

Test plan

  • bun install 成功
  • bun run typecheck 全 task green
  • bun run lint exit 0
  • CI green

saddlepaddle and others added 2 commits May 8, 2026 14:09
…perset-sh#4150)

Mirrors v1's posture from apps/desktop shell-env.ts: when the login-shell
snapshot fails (parse error, non-zero exit, exotic shell, rc files that
redirect stdout), log a warning and fall back to process.env +
augmentPathForMacOS instead of bringing down host-service startup.

Reported by a user who could open v1 workspaces but never v2 — desktop
main logged "Failed to start: Failed to parse shell env output -
delimiter not found" and process.exit(1)'d before the HTTP server came
up. v1 silently falls back via shellEnv()'s catch, which is why only v2
broke.

Also pin the snapshot shell's cwd to \$HOME (backport of 4feaa3d,
issue superset-sh#4025) and include captured stdout/stderr in the thrown error so
the next failure surfaces a diagnosable signal instead of a blind
"delimiter not found".
…3993)

Co-authored-by: sazabi[bot] <1815759+sazabi[bot]@users.noreply.github.com>
@coderabbitai
Copy link
Copy Markdown

coderabbitai Bot commented May 8, 2026

Warning

Rate limit exceeded

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

You’ve run out of usage credits. Purchase more in the billing tab.

⌛ 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: 377f9a77-2f63-44e4-ba34-83ab6794f684

📥 Commits

Reviewing files that changed from the base of the PR and between 558595b and d29e913.

📒 Files selected for processing (3)
  • packages/host-service/src/terminal/clean-shell-env.ts
  • packages/host-service/src/terminal/env.ts
  • packages/shared/src/terminal-link-parsing/link-parsing.ts
✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests
  • Commit unit tests in branch upstream/batch-2026-05-pr13-host-service-polish

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 May 8, 2026

🧹 Preview Cleanup Complete

The following preview resources have been cleaned up:

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

Thank you for your contribution! 🎉

Copy link
Copy Markdown

@chatgpt-codex-connector chatgpt-codex-connector Bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: d29e913f61

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

  • Open a pull request for review
  • Mark a draft as ready
  • Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

reject(
new Error(
`${detail} (shell=${shell}` +
` stdout=${truncateForDiagnostics(stdout)}` +
Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P2 Badge Remove shell stdout/stderr from thrown probe errors

The new error construction now embeds truncated stdout/stderr from the shell probe, and resolveTerminalBaseEnv() logs that message verbatim on fallback. Because the probe command runs env, a failing shell startup can leak user-exported secrets (for example tokens from shell rc files) into host-service logs; this is a security regression introduced by this commit’s diagnostics path.

Useful? React with 👍 / 👎.

@MocA-Love MocA-Love merged commit 4edfe14 into main May 8, 2026
12 of 13 checks passed
MocA-Love pushed a commit that referenced this pull request May 8, 2026
Recorded as integrated via -s ours after batch PRs #455-#464.

Taken via individual PRs:
- PR  1 (#455): v2 polish 前半 safe set (9 commits)
- PR  2 (#456): v2/host-service polish 中盤 (12 commits)
- PR  3 (#457): sidebar polish + jwt API (5 commits)
- PR  4 (#458): host-service tRPC retry/cache/timeout (3 commits)
- PR  5 (#459): v2 diff pane / file pane polish (2 commits)
- PR  7 (#462): host-service v2 canonical workspace.create + attachment store (PR1 superset-sh#3893 + PR2 superset-sh#3916)
- PR 11 (#463): agents API + onboarding (7 commits + 1 cleanup)
- PR 12 (#464): v1→v2 import flow rewrite (11 commits + 2 follow-ups)
- PR 13 (#460): host-service shell env probe + typo (2 commits)
- PR 16 (#461): marketplace 19 themes (1 commit)

Skipped / deferred (recorded as integrated for behind=0):
- PR  6: CLI v1 launch (superset-sh#3898 + 30+ CLI/SDK followups) — defer to dedicated migration
- PR  9: v2 PR3 (superset-sh#3940) + revert (superset-sh#4017) — net-zero pair
- PR 10: pty-daemon (superset-sh#3896, superset-sh#3971, superset-sh#4054) — fork keeps its terminal-host
- PR 14: Slack MCP-v2 (superset-sh#4197, superset-sh#4208) — depends on mcp-v2/sdk divergence
- PR 15: onboarding remaining (superset-sh#4115, superset-sh#4125, superset-sh#4214, superset-sh#4213, superset-sh#4222, superset-sh#4225) — depends on fork's deleted setup pages

Behind: 0 after this merge.
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