Worked on the ComposioHQ/composio repository to enhance the accuracy and reliability of organization-scoped CLI workflows. Focused on refining the 'composio whoami' command so that session information correctly reflects the active organization by forwarding the x-org-id header when an organization is selected. Used TypeScript and Effect-TS to implement the fix, ensuring backward compatibility when no organization is chosen. Developed targeted unit tests with Vitest to verify correct header behavior and performed end-to-end validation across multiple organizations. This work addressed user confusion during organization switching and aligned the command’s behavior with other org-scoped flows in the CLI tool.