Skip to content

[None][fix] Correctly select zsh in devcontainer - #21384

Merged
Funatiq merged 4 commits into
NVIDIA:mainfrom
Funatiq:dev/fix/devcontainer_zsh
Nov 2, 2026
Merged

Funatiq merged 4 commits into
NVIDIA:mainfrom
Funatiq:dev/fix/devcontainer_zsh

Conversation

@Funatiq

@Funatiq Funatiq commented Nov 1, 2026 •

Copy link
Copy Markdown
Collaborator

Description

The PR contains three commits affecting devcontainer.json:

  • Sets SHELL=/bin/zsh.
  • Adds a startup hook that restores HISTFILE through Oh My Zsh, keeping history in the host-mounted .cache/._bash_history despite VS Code’s override.
  • Updates the documentation links and normalizes indentation.

Dev Engineer Review

The devcontainer sets SHELL to /bin/zsh and enables zsh as the default shell. Its postStartCommand creates .cache and writes an Oh My Zsh startup hook that sets HISTFILE to .cache/._zsh_history. The configured container environment still sets HISTFILE to .cache/._bash_history; zsh uses the custom startup hook to override that path.

QA Engineer Review

No test changes.

Per-File QA Perspective

  • .devcontainer/devcontainer.json: Verify that a new devcontainer session starts with zsh and that zsh history persists at .cache/._zsh_history. The configuration also retains .cache/._bash_history as the container-level HISTFILE value.

Test Coverage

PR Checklist

Please review the following before submitting your PR:

  • PR description clearly explains what and why. If using CodeRabbit's summary, please make sure it makes sense.

  • PR Follows TRT-LLM CODING GUIDELINES to the best of your knowledge.

  • Test cases are provided for new code paths (see test instructions)

  • If PR introduces API changes, an appropriate PR label is added - either api-compatible or api-breaking. For api-breaking, include BREAKING in the PR title.

  • Any new dependencies have been scanned for license and vulnerabilities

  • CODEOWNERS updated if ownership changes

  • Documentation updated as needed

  • Update tava architecture diagram if there is a significant design change in PR.

  • The reviewers assigned automatically/manually are appropriate for the PR.

  • Please check this after reviewing the above items as appropriate for this PR.

GitHub Bot Help

To see a list of available CI bot commands, please comment /bot help.

- Set the SHELL environment variable to zsh in the devcontainer. This was already configured in the devcontainer features but did not work as expected since the container was still inherited the default shell.
- Format the devcontainer configuration.

Signed-off-by: Robin Kobus <19427718+Funatiq@users.noreply.github.com>
…idance

Signed-off-by: Robin Kobus <19427718+Funatiq@users.noreply.github.com>
…ntegration

Signed-off-by: Robin Kobus <19427718+Funatiq@users.noreply.github.com>
@Funatiq
Funatiq requested a review from a team as a code owner November 1, 2026 09:31
@Funatiq
Funatiq requested review from QiJune and schetlur-nv November 1, 2026 09:31
@Funatiq

Funatiq commented Nov 1, 2026

Copy link
Copy Markdown
Collaborator Author

/bot skip --comment "only change devcontainer config"

@coderabbitai

coderabbitai Bot commented Nov 1, 2026 •

Copy link
Copy Markdown
Contributor

Review in Change Stack →

No actionable comments were generated in the recent review.

Recent review info
Run configuration
Commits

Reviewing files that changed from the base of the PR and between ccc87a4 and 6c772b4.

Files selected for processing: 1
  • .devcontainer/devcontainer.json

Included review availability: This review used your included allowance. Your plan provides up to 12 included reviews per hour; 11 remain after this review.

Walkthrough

The devcontainer configuration sets SHELL to /bin/zsh. A new postStartCommand creates .cache and writes the configured HISTFILE path to an Oh My Zsh custom configuration file. Other settings remain unchanged.

Changes

Devcontainer Shell Setup

Layer / File(s) Summary
Shell and history startup configuration
.devcontainer/devcontainer.json
The container environment adds SHELL=/bin/zsh. A startup command creates .cache and writes the HISTFILE setting to an Oh My Zsh custom configuration file. The VS Code settings and container features remain unchanged.

Estimated code review effort: 2 (Simple) | ~10 minutes

Change: Bug fix

Suggested reviewers: bowenfu

Merge Risk: Minimal · up to 6c772

The devcontainer history setup is correctly configured and presents no actionable merge risk.

Pre-merge checks: Passed 4 · Inconclusive 1

Failed Failed checks: 1 inconclusive

Check name Status Explanation Resolution
Description check Inconclusive The description explains the three commits: setting SHELL to /bin/zsh, adding a startup hook to restore HISTFILE through Oh My Zsh, and updating documentation links and indentation. It leaves the temp… 1. Fill in the Test Coverage section. List the tests or manual checks that verify the devcontainer change, or state that no automated test applies and explain how the change was checked.
2. Correct the history file path. The description say…
Passed Passed checks: 4 passed
Check name Status Explanation
Title check Passed The title "[None][fix] Correctly select zsh in devcontainer" follows the required template with a ticket placeholder and a lowercase type. It matches the main change, which sets SHELL to /bin/zsh in d…
Docstring Coverage Passed No eligible functions found in the changed files. Skipping docstring coverage check. Docstring coverage is scoped to functions touched by this diff with cyclomatic complexity of at least 2. Documentat…
Linked Issues check Passed Check skipped because no linked issues were found for this pull request.
Out of Scope Changes check Passed Check skipped because no linked issues were found for this pull request.
Full details: Title check

Explanation

The title "[None][fix] Correctly select zsh in devcontainer" follows the required template with a ticket placeholder and a lowercase type. It matches the main change, which sets SHELL to /bin/zsh in devcontainer.json. It does not mention the HISTFILE restore hook or the doc link updates, which is acceptable for a title.

Full details: Docstring Coverage

Explanation

No eligible functions found in the changed files. Skipping docstring coverage check. Docstring coverage is scoped to functions touched by this diff with cyclomatic complexity of at least 2. Documentation-only edits and deletions within surviving functions are included; unchanged diff context and fully deleted functions are excluded. Analyzed 0 functions across 0 files. (1 skipped: 1 unsupported.)

Full details: Description check

Explanation

The description explains the three commits: setting SHELL to /bin/zsh, adding a startup hook to restore HISTFILE through Oh My Zsh, and updating documentation links and indentation. It leaves the template's Test Coverage section empty, with only the HTML comment prompt left in place. The Description section also keeps the template comment, and the description does not state the reason for the change in full. The PR checklist is marked complete. The description states the history file as .cache/._bash_history, but the commit messages and objectives describe .cache/._zsh_history for zsh, so the description conflicts with them. The author should fix that conflict and fill in the Test Coverage section.

Resolution

  1. Fill in the Test Coverage section. List the tests or manual checks that verify the devcontainer change, or state that no automated test applies and explain how the change was checked.
  2. Correct the history file path. The description says .cache/._bash_history, but the commit messages say .cache/._zsh_history for zsh. Confirm the correct path and make the description match it.
  3. Expand the Description section with the reason for the change. Explain why VS Code overrides HISTFILE and why the restore hook is needed.
Finishing Touches
Generate unit tests (beta)
  • Create a new PR
  • Autofix · Keep fixing CodeRabbit findings and required CI, and resolving merge conflicts

@tensorrt-cicd

Copy link
Copy Markdown
Collaborator

PR_Github #81836 [ skip ] triggered by Bot. Commit: ccc87a4 Link to invocation

@tensorrt-cicd

Copy link
Copy Markdown
Collaborator

PR_Github #81836 [ skip ] completed with state SUCCESS. Commit: ccc87a4
Skipping testing for commit ccc87a4

Link to invocation

@brnguyen2 brnguyen2 left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Approving — the comments below are optional touch-ups, not blockers.

The re-indent plus the two functional lines make the diff look much bigger than it is. Reviewers can use git diff -w. In future, putting the formatting change in its own commit makes this easier.

There's no test coverage, so please add the manual check to the PR's Test Coverage section: rebuild the container, open a new VS Code terminal, run echo $SHELL $HISTFILE, and confirm that history survives a container restart.

Comment thread .devcontainer/devcontainer.json Resolved
@github-actions

github-actions Bot commented Nov 2, 2026

Copy link
Copy Markdown

Automatically added "ci: full pre-merge approved" because this PR has satisfied the required GitHub review approvals. Unresolved review conversations and other required checks remain independent merge requirements.

Configure the Oh My Zsh startup override to use .cache/._zsh_history while retaining .cache/._bash_history for bash. This keeps zsh extended history entries separate from bash history while preserving both files in the workspace mount.

Signed-off-by: Robin Kobus <19427718+Funatiq@users.noreply.github.com>
@Funatiq

Funatiq commented Nov 2, 2026

Copy link
Copy Markdown
Collaborator Author

/bot skip --comment "only change devcontainer config"

@tensorrt-cicd

Copy link
Copy Markdown
Collaborator

PR_Github #82031 [ skip ] triggered by Bot. Commit: 6c772b4 Link to invocation

@tensorrt-cicd

Copy link
Copy Markdown
Collaborator

PR_Github #82031 [ skip ] completed with state SUCCESS. Commit: 6c772b4
Skipping testing for commit 6c772b4

Link to invocation

@Funatiq
Funatiq merged commit 687dc98 into NVIDIA:main Nov 2, 2026
11 checks passed
@Funatiq
Funatiq deleted the dev/fix/devcontainer_zsh branch November 2, 2026 16:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants