nodejs
diff --git a/Collapse file
‎lib/internal/repl/history.js‎
Copy file name to clipboardExpand all lines: lib/internal/repl/history.js
+16-1Lines changed: 16 additions & 1 deletion b/Collapse file
‎lib/internal/repl/history.js‎
Copy file name to clipboardExpand all lines: lib/internal/repl/history.js
+16-1Lines changed: 16 additions & 1 deletion
diff --git a/Collapse file
‎lib/repl.js‎
Copy file name to clipboardExpand all lines: lib/repl.js
+8-2Lines changed: 8 additions & 2 deletions b/Collapse file
‎lib/repl.js‎
Copy file name to clipboardExpand all lines: lib/repl.js
+8-2Lines changed: 8 additions & 2 deletions
@@ -58,6 +58,7 @@ const kResolveHistoryPath = Symbol('_kResolveHistoryPath');
 const kReplHistoryMessage = Symbol('_kReplHistoryMessage');
 const kFlushHistory = Symbol('_kFlushHistory');
 const kGetHistoryPath = Symbol('_kGetHistoryPath');
+const kCloseHandle = Symbol('_kCloseHandle');
 
 class ReplHistory {
   constructor(context, options) {
@@ -393,15 +394,29 @@ class ReplHistory {
     }
     this[kContext].off('line', this[kOnLine].bind(this));
 
+    await this[kCloseHandle]();
+  }
+
+  async [kCloseHandle]() {
     if (this[kHistoryHandle] !== null) {
+      const handle = this[kHistoryHandle];
+      this[kHistoryHandle] = null;
       try {
-        await this[kHistoryHandle].close();
+        await handle.close();
       } catch (err) {
         debug('Error closing history file:', err);
       }
     }
   }
 
+  /**
+   * Closes the history file handle.
+   * @returns {Promise<void>}
+   */
+  closeHandle() {
+    return this[kCloseHandle]();
+  }
+
   [kReplHistoryMessage]() {
     if (this[kHistory].length === 0) {
       ReplHistory[kWriteToOutput](
 
@@ -1039,12 +1039,18 @@ class REPLServer extends Interface {
     this[kBufferedCommandSymbol] = '';
   }
   close() {
-    if (this.terminal && this.historyManager.isFlushing && !this._closingOnFlush) {
+    if (this.terminal && this.historyManager?.isFlushing && !this._closingOnFlush) {
       this._closingOnFlush = true;
-      this.once('flushHistory', () => super.close());
+      this.once('flushHistory', () => this.close());
 
       return;
     }
+    // Ensure the history file handle is closed before completing
+    if (this.terminal && this.historyManager?.closeHandle && !this._historyHandleClosed) {
+      this._historyHandleClosed = true;
+      this.historyManager.closeHandle().then(() => super.close());
+      return;
+    }
     process.nextTick(() => super.close());
   }
   createContext() {