github/openclaw
1
0
Fork 0
mirror of https://github.com/openclaw/openclaw.git synced 2026-05-08 13:31:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: Docker installation keeps hanging on MacOS (#12972)

Browse Source 
* Onboarding: avoid stdin resume after wizard finish

* Changelog: remove Docker hang entry from PR

* Terminal: make stdin resume behavior explicit at call sites

* CI: rerun format check

* Onboarding: restore terminal before cancel exit

* test(onboard): align restoreTerminalState expectation

* chore(format): align onboarding restore test with updated oxfmt config

* chore(format): enforce updated oxfmt on restore test

* chore(format): apply updated oxfmt spacing to restore test

* fix: avoid stdin resume after onboarding (#12972) (thanks @vincentkoc)

---------

Co-authored-by: Peter Steinberger <steipete@gmail.com>
This commit is contained in:
Vincent Koc
2026-02-14 10:46:07 -08:00
committed by GitHub
parent cab0abf52a
commit a042b32d2f
8 changed files with 129 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/terminal/restore.ts
View File

@@ -2,6 +2,16 @@ import { clearActiveProgressLine } from "./progress-line.js";
const RESET_SEQUENCE = "\x1b[0m\x1b[?25h\x1b[?1000l\x1b[?1002l\x1b[?1003l\x1b[?1006l\x1b[?2004l";
type RestoreTerminalStateOptions = {
/**
* Resumes paused stdin after restoring terminal mode.
* Keep this off when the process should exit immediately after cleanup.
*
* Default: false (safer for "cleanup then exit" call sites).
*/
resumeStdin?: boolean;
};
function reportRestoreFailure(scope: string, err: unknown, reason?: string): void {
const suffix = reason ? ` (${reason})` : "";
const message = `[terminal] restore ${scope} failed${suffix}: ${String(err)}`;
@@ -12,7 +22,11 @@ function reportRestoreFailure(scope: string, err: unknown, reason?: string): voi
}
}
export function restoreTerminalState(reason?: string): void {
export function restoreTerminalState(
reason?: string,
options: RestoreTerminalStateOptions = {},
): void {
const resumeStdin = options.resumeStdin ?? false;
try {
clearActiveProgressLine();
} catch (err) {
@@ -26,6 +40,13 @@ export function restoreTerminalState(reason?: string): void {
} catch (err) {
reportRestoreFailure("raw mode", err, reason);
}
if (resumeStdin && typeof stdin.isPaused === "function" && stdin.isPaused()) {
try {
stdin.resume();
} catch (err) {
reportRestoreFailure("stdin resume", err, reason);
}
}
}
if (process.stdout.isTTY) {