Skip to content

fix(kiro): always attempt token refresh on 401 before checking retry …#124

Merged
luispater merged 1 commit intorouter-for-me:mainfrom
gogoing1024:main
Jan 25, 2026
Merged

fix(kiro): always attempt token refresh on 401 before checking retry …#124
luispater merged 1 commit intorouter-for-me:mainfrom
gogoing1024:main

Conversation

@gogoing1024
Copy link

…count

Refactor 401 error handling in both executeWithRetry and executeStreamWithRetry to always attempt token refresh regardless of remaining retry attempts. Previously, token refresh was only attempted when retries remained, which could leave valid refreshed tokens unused.

Also add auth directory resolution in RefreshManager.Initialize to properly resolve the base directory path before creating the token repository.

…count

Refactor 401 error handling in both executeWithRetry and
executeStreamWithRetry to always attempt token refresh regardless of
remaining retry attempts. Previously, token refresh was only attempted
when retries remained, which could leave valid refreshed tokens unused.

Also add auth directory resolution in RefreshManager.Initialize to
properly resolve the base directory path before creating the token
repository.
@gemini-code-assist
Copy link

Summary of Changes

Hello @gogoing1024, I'm Gemini Code Assist1! I'm currently reviewing this pull request and will post my feedback shortly. In the meantime, here's a summary to help you and other reviewers quickly get up to speed!

This pull request enhances the robustness of the Kiro executor's authentication mechanism by modifying its 401 error handling. Previously, token refresh attempts were tied to the remaining retry count, potentially leading to valid refreshed tokens being discarded. The updated logic now guarantees a token refresh attempt on every 401 error, improving resilience. Furthermore, the RefreshManager initialization has been improved to correctly resolve the authentication directory path, ensuring proper token repository setup.

Highlights

  • Refactored 401 Error Handling: The logic for handling 401 Unauthorized errors in both executeWithRetry and executeStreamWithRetry functions has been updated to always attempt a token refresh, regardless of the remaining retry attempts. Previously, token refresh was conditional on having retries left, which could lead to valid refreshed tokens not being used.
  • Improved Auth Directory Resolution: The RefreshManager.Initialize method now includes a step to properly resolve the base directory path using util.ResolveAuthDir before creating the token repository, ensuring correct file path handling for authentication.

🧠 New Feature in Public Preview: You can now enable Memory to help Gemini Code Assist learn from your team's feedback. This makes future code reviews more consistent and personalized to your project's style. Click here to enable Memory in your admin console.

Using Gemini Code Assist

The full guide for Gemini Code Assist can be found on our documentation page, here are some quick tips.

Invoking Gemini

You can request assistance from Gemini at any point by creating a comment using either /gemini <command> or @gemini-code-assist <command>. Below is a summary of the supported commands on the current page.

Feature Command Description
Code Review /gemini review Performs a code review for the current pull request in its current state.
Pull Request Summary /gemini summary Provides a summary of the current pull request in its current state.
Comment @gemini-code-assist Responds in comments when explicitly tagged, both in pull request comments and review comments.
Help /gemini help Displays a list of available commands.

Customization

To customize Gemini Code Assist for GitHub experience, repository maintainers can create a configuration file and/or provide a custom code review style guide (such as PEP-8 for Python) by creating and adding files to a .gemini/ folder in the base of the repository. Detailed instructions can be found here.

Limitations & Feedback

Gemini Code Assist may make mistakes. Please leave feedback on any instances where its feedback is incorrect or counter productive. You can react with 👍 and 👎 on @gemini-code-assist comments. If you're interested in giving your feedback about your experience with Gemini Code Assist for Github and other Google products, sign up here.

You can also get AI-powered code generation, chat, as well as code reviews directly in the IDE at no cost with the Gemini Code Assist IDE Extension.

Footnotes

  1. Review the Privacy Notices, Generative AI Prohibited Use Policy, Terms of Service, and learn how to configure Gemini Code Assist in GitHub here. Gemini can make mistakes, so double check it and use code with caution.

Copy link

@gemini-code-assist gemini-code-assist bot left a comment

Choose a reason for hiding this comment

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

Code Review

This pull request correctly refactors the 401 error handling to always attempt a token refresh, even on the last retry attempt. This ensures that a valid refreshed token is persisted for subsequent requests, which is a good improvement. The addition of auth directory resolution in the RefreshManager is also a welcome enhancement for path handling. My main feedback is regarding code duplication in kiro_executor.go, where the 401 handling logic is repeated in two functions. Refactoring this into a shared helper method would improve the code's maintainability.

@luispater luispater merged commit 275839e into router-for-me:main Jan 25, 2026
2 checks passed
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.

2 participants