Developed and integrated Windsurf terminal support within the aws/amazon-q-developer-cli-autocomplete repository, focusing on enhancing CLI interoperability for developers using Rust. The work involved updating the VSCodeVariant enum and refining terminal handling logic to recognize Windsurf as a distinct environment, thereby improving compatibility and laying groundwork for future terminal-specific features. This feature-driven effort prioritized seamless integration and a smoother developer experience in VSCode-based workflows. No major bugs were addressed during this period, as the primary focus remained on CLI development and integration. The contribution demonstrates depth in Rust programming and thoughtful design for cross-terminal support within developer tooling.