Developed a centralized shell quoting mechanism for CLI hints and file path outputs in the martinvonz/jj repository, focusing on robust handling of special characters in remote and bookmark names. Leveraged Rust and the shlex crate to implement a reusable shell_quote helper, ensuring consistent and safe argument escaping across the codebase. Refactored large file hint generation to utilize this new abstraction, reducing logic duplication and improving maintainability. The work addressed a critical escaping bug that previously prevented correct bookmarking via hints, ultimately enhancing developer productivity and laying a scalable foundation for future CLI development and shell scripting improvements within the project.