TypeScript
fix(server): terminal history keeps output after an unterminated OSC (#29604)
Alex Southwell594532a73fc9
diff --git a/apps/server/src/terminal/Manager.test.ts b/apps/server/src/terminal/Manager.test.tsindex 05b8ea8c463..c210e4a519d 100644--- a/apps/server/src/terminal/Manager.test.ts+++ b/apps/server/src/terminal/Manager.test.ts@@ -1142,14 +1142,17 @@ it.layer(process.emitData("\u0090$q m\u009c\u00901$r0m\u009c");process.emitData("\u0090+q544e\u009c\u00901+r544e=1b\u009c");process.emitData('\u001b[!p\u001b["p\u001b[4 q\u001b[u');+ process.emitData("\u001b]0;x\u001b\u001b[?2026$p");process.emitData("done\n");yield* manager.close({ threadId: "thread-1" });const reopened = yield* manager.open(openInput());- expect(reopened.history.startsWith('prompt \u001b[!p\u001b["p\u001b[4 q\u001b[udone\n')).toBe(- true,- );+ expect(+ reopened.history.startsWith(+ 'prompt \u001b[!p\u001b["p\u001b[4 q\u001b[u\u001b]0;x\u001bdone\n',+ ),+ ).toBe(true);}),);@@ -1166,10 +1169,11 @@ it.layer({ name: "C1 CSI", sequence: "\u009b5" },])("keeps output after a cancelled $name sequence in history", ({ sequence }) =>Effect.gen(function* () {- const { manager, ptyAdapter } = yield* createManager();+ const { manager, ptyAdapter } = yield* createManager(10);yield* manager.open(openInput());const process = ptyAdapter.processes[0]!;- for (const cancel of ["\u0018", "\u001a"]) {+ // A new escape sequence also aborts one, as in xterm.js; keep it last so CAN cannot end it.+ for (const cancel of ["\u0018", "\u001a", "\u001b[0m"]) {process.emitData(sequence);process.emitData(cancel);process.emitData("next line\n");@@ -1178,7 +1182,7 @@ it.layer(yield* manager.close({ threadId: "thread-1" });const reopened = yield* manager.open(openInput());- expect(reopened.history.match(/next line/g)).toHaveLength(4);+ expect(reopened.history.match(/next line/g)).toHaveLength(6);}),);diff --git a/apps/server/src/terminal/Manager.ts b/apps/server/src/terminal/Manager.tsindex c881dbd7b19..09a881d15ea 100644--- a/apps/server/src/terminal/Manager.ts+++ b/apps/server/src/terminal/Manager.ts@@ -1142,8 +1142,10 @@ function findStringTerminatorIndex(input: string, start: number): number | nullif (codePoint === 0x07 || codePoint === 0x9c || isControlSequenceCancel(codePoint)) {return index + 1;}- if (codePoint === 0x1b && input.charCodeAt(index + 1) === 0x5c) {- return index + 2;+ // Like xterm.js, an ESC that does not start ST ends the string and begins the next sequence.+ if (codePoint === 0x1b) {+ if (index + 1 >= input.length) return null;+ return input.charCodeAt(index + 1) === 0x5c ? index + 2 : index;}}return null;@@ -1165,6 +1167,10 @@ function findEscapeSequenceEndIndex(input: string, start: number): number | nullif (cursor >= input.length) {return null;}+ // A second ESC restarts the sequence, so leave it for the next pass.+ if (input.charCodeAt(cursor) === 0x1b) {+ return cursor;+ }return isEscapeFinalByte(input.charCodeAt(cursor)) ? cursor + 1 : start + 1;}