Skip to content

fix wsh ai arg handling after "-" (for stdin) #2129

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Apr 28, 2025
Merged

fix wsh ai arg handling after "-" (for stdin) #2129

merged 2 commits into from
Apr 28, 2025

Conversation

sawka
Copy link
Member

@sawka sawka commented Apr 28, 2025

No description provided.

Copy link
Contributor

coderabbitai bot commented Apr 28, 2025

Walkthrough

The changes in this update include modifications across several areas of the codebase. In the VSCode editor settings, the diff editor configuration was changed to render diffs in a unified (inline) view instead of side-by-side. Within the cmd/wsh/cmd/wshcmd-ai.go file, the logic for handling message input from stdin was updated to append any additional command-line arguments that follow the "-" argument to the message, ensuring they are included in the final message sent to the AI block. In cmd/wsh/cmd/wshcmd-connserver.go, the utility function utilfn.DrainChannelSafe was replaced with an explicit for-range loop to drain a channel, and the import of the utilfn package was removed. Lastly, in pkg/util/utilfn/utilfn.go, the DrainChannelSafe function was modified to log an error and exit gracefully on a timeout instead of panicking, improving the function's error handling without altering its signature. No changes were made to the declarations of exported or public entities.


📜 Recent review details

Configuration used: CodeRabbit UI
Review profile: CHILL
Plan: Pro

📥 Commits

Reviewing files that changed from the base of the PR and between e7ecd9e and d6195b8.

📒 Files selected for processing (4)
  • .vscode/settings.json (1 hunks)
  • cmd/wsh/cmd/wshcmd-ai.go (1 hunks)
  • cmd/wsh/cmd/wshcmd-connserver.go (1 hunks)
  • pkg/util/utilfn/utilfn.go (1 hunks)
🧰 Additional context used
🧠 Learnings (1)
pkg/util/utilfn/utilfn.go (1)
Learnt from: esimkowitz
PR: wavetermdev/waveterm#1896
File: pkg/util/utilfn/utilfn.go:1050-1067
Timestamp: 2025-02-13T03:13:44.823Z
Learning: In the waveterm codebase, DrainChannelSafe intentionally panics after a timeout to catch channel leaks early during development. The panic is a deliberate fail-fast mechanism, not an error to be handled. Additionally, receiver channels should never be closed as that's the sender's responsibility.
⏰ Context from checks skipped due to timeout of 90000ms (3)
  • GitHub Check: Analyze (javascript-typescript)
  • GitHub Check: Build for TestDriver.ai
  • GitHub Check: Analyze (go)
🔇 Additional comments (3)
.vscode/settings.json (1)

8-8: Confirm inclusion of project-wide VSCode settings.

The addition of "diffEditor.renderSideBySide": false will enforce an inline diff view for anyone opening this repository in VSCode.

  • If you intend to standardize diffs across the team, please document this in your CONTRIBUTING guide or share with the team.
  • If this is a personal preference, consider moving it to your global user settings or excluding the .vscode folder from version control to avoid unintended overrides.
cmd/wsh/cmd/wshcmd-connserver.go (1)

165-167: Good replacement of utility function with explicit loop

Replacing utilfn.DrainChannelSafe with a simple for-range loop improves code clarity and removes an external dependency. This change aligns with the modifications made to the DrainChannelSafe function.

cmd/wsh/cmd/wshcmd-ai.go (1)

138-145: Enhanced argument handling for stdin input

This change correctly implements the feature to append additional command-line arguments when stdin is used with the - flag. The implementation properly handles spacing between the stdin content and appended arguments.

The code ensures that when a user provides input through stdin (with the - flag) and adds additional arguments, all content is properly included in the final message. This aligns with the PR objective to fix AI arg handling after - for stdin.

✨ Finishing Touches
  • 📝 Generate Docstrings

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
🪧 Tips

Chat

There are 3 ways to chat with CodeRabbit:

  • Review comments: Directly reply to a review comment made by CodeRabbit. Example:
    • I pushed a fix in commit <commit_id>, please review it.
    • Generate unit testing code for this file.
    • Open a follow-up GitHub issue for this discussion.
  • Files and specific lines of code (under the "Files changed" tab): Tag @coderabbitai in a new review comment at the desired location with your query. Examples:
    • @coderabbitai generate unit testing code for this file.
    • @coderabbitai modularize this function.
  • PR comments: Tag @coderabbitai in a new PR comment to ask questions about the PR branch. For the best results, please provide a very specific query, as very limited context is provided in this mode. Examples:
    • @coderabbitai gather interesting stats about this repository and render them as a table. Additionally, render a pie chart showing the language distribution in the codebase.
    • @coderabbitai read src/utils.ts and generate unit testing code.
    • @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.
    • @coderabbitai help me debug CodeRabbit configuration file.

Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments.

CodeRabbit Commands (Invoked using PR comments)

  • @coderabbitai pause to pause the reviews on a PR.
  • @coderabbitai resume to resume the paused reviews.
  • @coderabbitai review to trigger an incremental review. This is useful when automatic reviews are disabled for the repository.
  • @coderabbitai full review to do a full review from scratch and review all the files again.
  • @coderabbitai summary to regenerate the summary of the PR.
  • @coderabbitai generate docstrings to generate docstrings for this PR.
  • @coderabbitai generate sequence diagram to generate a sequence diagram of the changes in this PR.
  • @coderabbitai resolve resolve all the CodeRabbit review comments.
  • @coderabbitai configuration to show the current CodeRabbit configuration for the repository.
  • @coderabbitai help to get help.

Other keywords and placeholders

  • Add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.
  • Add @coderabbitai summary to generate the high-level summary at a specific location in the PR description.
  • Add @coderabbitai anywhere in the PR title to generate the title automatically.

CodeRabbit Configuration File (.coderabbit.yaml)

  • You can programmatically configure CodeRabbit by adding a .coderabbit.yaml file to the root of your repository.
  • Please see the configuration documentation for more information.
  • If your editor has YAML language server enabled, you can add the path at the top of this file to enable auto-completion and validation: # yaml-language-server: $schema=https://coderabbit.ai/integrations/schema.v2.json

Documentation and Community

  • Visit our Documentation for detailed information on how to use CodeRabbit.
  • Join our Discord Community to get help, request features, and share feedback.
  • Follow us on X/Twitter for updates and announcements.

@sawka sawka merged commit 5befc96 into main Apr 28, 2025
6 of 8 checks passed
@sawka sawka deleted the sawka/fix-wsh-ai branch April 28, 2025 18:01
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.

1 participant