fix(patch): cherry-pick 030a5ac to release/v0.18.3-pr-13565 [CONFLICTS]#13869
Conversation
Summary of ChangesHello @gemini-cli-robot, 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 backports crucial bug fixes and enhancements related to the application's authentication process and terminal interaction. It centralizes terminal control logic, improves error reporting, and refines the user experience during authentication, especially in non-browser environments. The PR currently requires manual intervention to resolve merge conflicts before it can be merged. Highlights
Using Gemini Code AssistThe 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
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 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
|
![gemini-code-assist[bot]](https://avatars.githubusercontent.com/in/956858?s=60&v=4){kind=small}
There was a problem hiding this comment.
Code Review
This pull request contains several unresolved merge conflicts from the cherry-pick process. These are critical issues that block the PR from being merged. Please resolve all conflict markers. The underlying code changes appear to be a significant and beneficial refactoring of terminal I/O and authentication flows, centralizing logic into the core package and improving user experience.
| <<<<<<< HEAD | ||
| ======= | ||
| createInkStdio, | ||
| patchStdio, | ||
| writeToStdout, | ||
| writeToStderr, | ||
| disableMouseEvents, | ||
| enableMouseEvents, | ||
| enterAlternateScreen, | ||
| disableLineWrapping, | ||
| shouldEnterAlternateScreen, | ||
| >>>>>>> 030a5ace9 (Fix multiple bugs with auth flow including using the implemented but unused restart support. (#13565)) |
There was a problem hiding this comment.
This file contains an unresolved merge conflict that must be fixed before this pull request can be merged.
| <<<<<<< HEAD | ||
| ======= | ||
| writeToStdout: vi.fn((...args) => | ||
| process.stdout.write( | ||
| ...(args as Parameters<typeof process.stdout.write>), | ||
| ), | ||
| ), | ||
| writeToStderr: vi.fn((...args) => | ||
| process.stderr.write( | ||
| ...(args as Parameters<typeof process.stderr.write>), | ||
| ), | ||
| ), | ||
| patchStdio: vi.fn(() => () => {}), | ||
| createInkStdio: vi.fn(() => ({ | ||
| stdout: process.stdout, | ||
| stderr: process.stderr, | ||
| })), | ||
| enableMouseEvents: vi.fn(), | ||
| disableMouseEvents: vi.fn(), | ||
| >>>>>>> 030a5ace9 (Fix multiple bugs with auth flow including using the implemented but unused restart support. (#13565)) |
There was a problem hiding this comment.
This file contains an unresolved merge conflict that must be fixed before this pull request can be merged.
| <<<<<<< HEAD | ||
| import { ShellExecutionService } from '@google/gemini-cli-core'; | ||
| import { type ExtensionManager } from '../config/extension-manager.js'; | ||
| import { enableMouseEvents, disableMouseEvents } from './utils/mouse.js'; | ||
| import { writeToStdout } from '../utils/stdio.js'; | ||
| ======= | ||
| import { | ||
| ShellExecutionService, | ||
| writeToStdout, | ||
| enableMouseEvents, | ||
| disableMouseEvents, | ||
| } from '@google/gemini-cli-core'; | ||
| import { type ExtensionManager } from '../config/extension-manager.js'; | ||
| >>>>>>> 030a5ace9 (Fix multiple bugs with auth flow including using the implemented but unused restart support. (#13565)) |
There was a problem hiding this comment.
This file contains an unresolved merge conflict that must be fixed before this pull request can be merged.
| <<<<<<< HEAD | ||
| import { writeToStdout } from '../utils/stdio.js'; | ||
| ======= | ||
| >>>>>>> 030a5ace9 (Fix multiple bugs with auth flow including using the implemented but unused restart support. (#13565)) |
There was a problem hiding this comment.
This file contains an unresolved merge conflict that must be fixed before this pull request can be merged.
| <<<<<<< HEAD | ||
| import { writeToStdout } from '../../utils/stdio.js'; | ||
| ======= | ||
| import { enableMouseEvents, disableMouseEvents } from '@google/gemini-cli-core'; | ||
| >>>>>>> 030a5ace9 (Fix multiple bugs with auth flow including using the implemented but unused restart support. (#13565)) |
There was a problem hiding this comment.
This file contains an unresolved merge conflict that must be fixed before this pull request can be merged.
| <<<<<<< HEAD | ||
| ======= | ||
|
|
||
| // Export stdio utils | ||
| export * from './utils/stdio.js'; | ||
| export * from './utils/terminal.js'; | ||
| >>>>>>> 030a5ace9 (Fix multiple bugs with auth flow including using the implemented but unused restart support. (#13565)) |
There was a problem hiding this comment.
This file contains an unresolved merge conflict that must be fixed before this pull request can be merged.
…unused restart support. (#13565)
SandyTao520
force-pushed
the
hotfix/v0.18.3/0.18.4/stable/cherry-pick-030a5ac/pr-13565
branch
from
0bb9418 to
3101ef0
Compare
|
Size Change: +3.69 kB (+0.02%) Total Size: 21.3 MB
ℹ️ View Unchanged
|
SandyTao520
deleted the
hotfix/v0.18.3/0.18.4/stable/cherry-pick-030a5ac/pr-13565
branch
3 participants
This PR automatically cherry-picks commit 030a5ac to patch version v0.18.3 in the stable release to create version 0.18.4.
This cherry-pick resulted in merge conflicts that need manual resolution.
🔧 Next Steps:
📋 Files with conflicts:
The commit has been created with conflict markers for easier manual resolution.
🚨 Important: