singularity/singularity-forge
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Merge pull request #2059 from TheReaperJay/feature/login-cancel-no-crash-pr

Browse source 
fix(pi-coding-agent): prevent crash when login is cancelled
This commit is contained in:
TÂCHES 2026-03-25 22:15:51 -06:00 • committed by GitHub
commit cb2185fe70
1 changed files with 7 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
packages/pi-coding-agent/src/modes/interactive/interactive-mode.ts
View file

@ -3428,14 +3428,6 @@ export class InteractiveMode {
this.ui.setFocus(dialog);
this.ui.requestRender();
// Promise for manual code input (racing with callback server)
let manualCodeResolve: ((code: string) => void) | undefined;
let manualCodeReject: ((err: Error) => void) | undefined;
const manualCodePromise = new Promise<string>((resolve, reject) => {
manualCodeResolve = resolve;
manualCodeReject = reject;
});
// Restore editor helper — also disposes the dialog to reject any
// dangling promises and prevent the UI from getting stuck.
const restoreEditor = () => {
@ -3451,23 +3443,7 @@ export class InteractiveMode {
onAuth: (info: { url: string; instructions?: string }) => {
dialog.showAuth(info.url, info.instructions);
if (usesCallbackServer) {
// Show input for manual paste, racing with callback
dialog
.showManualInput("Paste redirect URL below, or complete login in browser:")
.then((value) => {
if (value && manualCodeResolve) {
manualCodeResolve(value);
manualCodeResolve = undefined;
}
})
.catch(() => {
if (manualCodeReject) {
manualCodeReject(new Error("Login cancelled"));
manualCodeReject = undefined;
}
});
} else if (providerId === "github-copilot") {
if (!usesCallbackServer && providerId === "github-copilot") {
// GitHub Copilot polls after onAuth
dialog.showWaiting("Waiting for browser authentication...");
}
@ -3482,7 +3458,12 @@ export class InteractiveMode {
dialog.showProgress(message);
},
onManualCodeInput: () => manualCodePromise,
// Callback-server providers race browser callback with pasted redirect URL.
// Keep manual-input promise ownership inside provider flow to avoid
// orphaned rejections when the callback is not consumed.
onManualCodeInput: usesCallbackServer
? () => dialog.showManualInput("Paste redirect URL below, or complete login in browser:")
: undefined,
signal: dialog.signal,
});
@ -3514,12 +3495,6 @@ export class InteractiveMode {
this.showStatus(`Logged in to ${providerName}. Credentials saved to ${getAuthPath()}`);
} catch (error: unknown) {
restoreEditor();
// Also reject the manual code promise if it's still pending
if (manualCodeReject) {
manualCodeReject(new Error("Login cancelled"));
manualCodeReject = undefined;
manualCodeResolve = undefined;
}
const errorMsg = error instanceof Error ? error.message : String(error);
if (errorMsg !== "Login cancelled" && !errorMsg.includes("Superseded") && !errorMsg.includes("disposed")) {
this.showError(`Failed to login to ${providerName}: ${errorMsg}`);