tasmota-esp-web-tools 12.0.0 → 12.1.1

package/dist/install-dialog.js

@@ -1159,9 +1159,6 @@ export class EwtInstallDialog extends LitElement {
           name="password"
           type="password"
         ></ew-filled-text-field>
-        <ew-text-button slot="actions" @click=${this._doProvision}
-          >Connect</ew-text-button
-        >
         <ew-text-button
           slot="actions"
           @click=${async () => {
@@ -1185,6 +1182,9 @@ export class EwtInstallDialog extends LitElement {
                 ? "Skip"
                 : "Back"}</ew-text-button
         >
+        <ew-text-button slot="actions" @click=${this._doProvision}
+          >Connect</ew-text-button
+        >
       `;
         }
         return [heading, content, hideActions];
@@ -1203,17 +1203,17 @@ export class EwtInstallDialog extends LitElement {
       <ew-text-button
         slot="actions"
         @click=${() => {
-            const checkbox = this.shadowRoot.querySelector("ew-checkbox");
-            this._startInstall(checkbox.checked);
+            this._state = "DASHBOARD";
         }}
-        >Next</ew-text-button
+        >Back</ew-text-button
       >
       <ew-text-button
         slot="actions"
         @click=${() => {
-            this._state = "DASHBOARD";
+            const checkbox = this.shadowRoot.querySelector("ew-checkbox");
+            this._startInstall(checkbox.checked);
         }}
-        >Back</ew-text-button
+        >Next</ew-text-button
       >
     `;
         return [heading, content];
@@ -1229,6 +1229,13 @@ export class EwtInstallDialog extends LitElement {
             content = html `
         Do you want to reset your device and erase all user data from your
         device?
+        <ew-text-button
+          slot="actions"
+          @click=${() => {
+                this._state = "DASHBOARD";
+            }}
+          >Back</ew-text-button
+        >
         <ew-text-button
           class="danger"
           slot="actions"
@@ -1250,9 +1257,6 @@ export class EwtInstallDialog extends LitElement {
         ${this._installErase
                 ? html `<br /><br />All data on the device will be erased.`
                 : ""}
-        <ew-text-button slot="actions" @click=${this._confirmInstall}
-          >Install</ew-text-button
-        >
         <ew-text-button
           slot="actions"
           @click=${() => {
@@ -1260,6 +1264,9 @@ export class EwtInstallDialog extends LitElement {
             }}
           >Back</ew-text-button
         >
+        <ew-text-button slot="actions" @click=${this._confirmInstall}
+          >Install</ew-text-button
+        >
       `;
         }
         else if (!this._installState ||

package/dist/util/console-color.d.ts

@@ -5,6 +5,10 @@ interface ConsoleState {
     strikethrough: boolean;
     foregroundColor: string | null;
     backgroundColor: string | null;
+    fgRgb: string | null;
+    bgRgb: string | null;
+    dim: boolean;
+    reverse: boolean;
     carriageReturn: boolean;
     lines: string[];
     secret: boolean;
@@ -31,5 +35,5 @@ export declare class ColoredConsole {
     processLines(): void;
     addLine(line: string): void;
 }
-export declare const coloredConsoleStyles = "\n  .log {\n    flex: 1;\n    background-color: #1c1c1c;\n    font-family: \"SFMono-Regular\", Consolas, \"Liberation Mono\", Menlo, Courier,\n      monospace;\n    font-size: 12px;\n    padding: 16px;\n    overflow: auto;\n    line-height: 1.45;\n    border-radius: 3px;\n    white-space: pre-wrap;\n    overflow-wrap: break-word;\n    color: #ddd;\n  }\n\n  .log-bold { font-weight: bold; }\n  .log-italic { font-style: italic; }\n  .log-underline { text-decoration: underline; }\n  .log-strikethrough { text-decoration: line-through; }\n  .log-underline.log-strikethrough { text-decoration: underline line-through; }\n  .log-blink { animation: blink 1s step-end infinite; }\n  .log-rapid-blink { animation: blink 0.4s step-end infinite; }\n  @keyframes blink { 50% { opacity: 0; } }\n  .log-secret {\n    -webkit-user-select: none;\n    -moz-user-select: none;\n    -ms-user-select: none;\n    user-select: none;\n  }\n  .log-secret-redacted { opacity: 0; width: 1px; font-size: 1px; }\n  .log-fg-black { color: rgb(128, 128, 128); }\n  .log-fg-red { color: rgb(255, 0, 0); }\n  .log-fg-green { color: rgb(0, 255, 0); }\n  .log-fg-yellow { color: rgb(255, 255, 0); }\n  .log-fg-blue { color: rgb(0, 0, 255); }\n  .log-fg-magenta { color: rgb(255, 0, 255); }\n  .log-fg-cyan { color: rgb(0, 255, 255); }\n  .log-fg-white { color: rgb(187, 187, 187); }\n  .log-bg-black { background-color: rgb(0, 0, 0); }\n  .log-bg-red { background-color: rgb(255, 0, 0); }\n  .log-bg-green { background-color: rgb(0, 255, 0); }\n  .log-bg-yellow { background-color: rgb(255, 255, 0); }\n  .log-bg-blue { background-color: rgb(0, 0, 255); }\n  .log-bg-magenta { background-color: rgb(255, 0, 255); }\n  .log-bg-cyan { background-color: rgb(0, 255, 255); }\n  .log-bg-white { background-color: rgb(255, 255, 255); }\n";
+export declare const coloredConsoleStyles = "\n  .log {\n    flex: 1;\n    background-color: #1c1c1c;\n    font-family: \"SFMono-Regular\", Consolas, \"Liberation Mono\", Menlo, Courier,\n      monospace;\n    font-size: 12px;\n    padding: 16px;\n    overflow: auto;\n    line-height: 1.45;\n    border-radius: 3px;\n    white-space: pre-wrap;\n    overflow-wrap: break-word;\n    color: #ddd;\n  }\n\n  .log-bold { font-weight: bold; }\n  .log-dim { opacity: 0.5; }\n  .log-italic { font-style: italic; }\n  .log-underline { text-decoration: underline; }\n  .log-strikethrough { text-decoration: line-through; }\n  .log-underline.log-strikethrough { text-decoration: underline line-through; }\n  .log-blink { animation: blink 1s step-end infinite; }\n  .log-rapid-blink { animation: blink 0.4s step-end infinite; }\n  @keyframes blink { 50% { opacity: 0; } }\n  .log-secret {\n    -webkit-user-select: none;\n    -moz-user-select: none;\n    -ms-user-select: none;\n    user-select: none;\n  }\n  .log-secret-redacted { opacity: 0; width: 1px; font-size: 1px; }\n  .log-reverse { background: #ddd; color: #1c1c1c; }\n  .log-fg-black { color: rgb(128, 128, 128); }\n  .log-fg-red { color: rgb(255, 0, 0); }\n  .log-fg-green { color: rgb(0, 255, 0); }\n  .log-fg-yellow { color: rgb(255, 255, 0); }\n  .log-fg-blue { color: rgb(0, 0, 255); }\n  .log-fg-magenta { color: rgb(255, 0, 255); }\n  .log-fg-cyan { color: rgb(0, 255, 255); }\n  .log-fg-white { color: rgb(187, 187, 187); }\n  .log-bg-black { background-color: rgb(0, 0, 0); }\n  .log-bg-red { background-color: rgb(255, 0, 0); }\n  .log-bg-green { background-color: rgb(0, 255, 0); }\n  .log-bg-yellow { background-color: rgb(255, 255, 0); }\n  .log-bg-blue { background-color: rgb(0, 0, 255); }\n  .log-bg-magenta { background-color: rgb(255, 0, 255); }\n  .log-bg-cyan { background-color: rgb(0, 255, 255); }\n  .log-bg-white { background-color: rgb(255, 255, 255); }\n";
 export {};

package/dist/util/console-color.js

@@ -1,3 +1,56 @@
+const ANSI_256 = (() => {
+    const t = [];
+    // Standard colors 0-7
+    t[0] = "rgb(0,0,0)";
+    t[1] = "rgb(128,0,0)";
+    t[2] = "rgb(0,128,0)";
+    t[3] = "rgb(128,128,0)";
+    t[4] = "rgb(0,0,128)";
+    t[5] = "rgb(128,0,128)";
+    t[6] = "rgb(0,128,128)";
+    t[7] = "rgb(192,192,192)";
+    // Bright colors 8-15
+    t[8] = "rgb(128,128,128)";
+    t[9] = "rgb(255,0,0)";
+    t[10] = "rgb(0,255,0)";
+    t[11] = "rgb(255,255,0)";
+    t[12] = "rgb(99,153,255)";
+    t[13] = "rgb(255,0,255)";
+    t[14] = "rgb(0,255,255)";
+    t[15] = "rgb(255,255,255)";
+    // 6x6x6 color cube 16-231
+    for (let i = 0; i < 216; i++) {
+        const r = Math.floor(i / 36);
+        const g = Math.floor((i % 36) / 6);
+        const b = i % 6;
+        t[16 + i] =
+            "rgb(" +
+                (r ? r * 40 + 55 : 0) +
+                "," +
+                (g ? g * 40 + 55 : 0) +
+                "," +
+                (b ? b * 40 + 55 : 0) +
+                ")";
+    }
+    // Grayscale ramp 232-255
+    for (let i = 0; i < 24; i++) {
+        const v = i * 10 + 8;
+        t[232 + i] = "rgb(" + v + "," + v + "," + v + ")";
+    }
+    return t;
+})();
+// Maps 256-color indices 0–7 to the named CSS class tokens so that
+// \x1b[38;5;1m renders the same red as \x1b[31m.
+const ANSI_NAMED = [
+    "black",
+    "red",
+    "green",
+    "yellow",
+    "blue",
+    "magenta",
+    "cyan",
+    "white",
+];
 const MAX_LINES = 2000;
 export class ColoredConsole {
     constructor(targetElement) {
@@ -9,6 +62,10 @@ export class ColoredConsole {
             strikethrough: false,
             foregroundColor: null,
             backgroundColor: null,
+            fgRgb: null,
+            bgRgb: null,
+            dim: false,
+            reverse: false,
             carriageReturn: false,
             lines: [],
             secret: false,
@@ -114,7 +171,7 @@ export class ColoredConsole {
         }
     }
     processLine(line) {
-        const re = /(?:\x1B|\\x1B)(?:\[(.*?)[@-~]|\].*?(?:\x07|\x1B\\))/g;
+        const re = /(?:\x1B|\\x1B)(?:\[(.*?)([@-~])|\].*?(?:\x07|\x1B\\))/g;
         let i = 0;
         const lineSpan = document.createElement("span");
         lineSpan.classList.add("line");
@@ -131,6 +188,8 @@ export class ColoredConsole {
             const span = document.createElement("span");
             if (this.state.bold)
                 span.classList.add("log-bold");
+            if (this.state.dim)
+                span.classList.add("log-dim");
             if (this.state.italic)
                 span.classList.add("log-italic");
             if (this.state.underline)
@@ -141,10 +200,39 @@ export class ColoredConsole {
                 span.classList.add("log-blink");
             if (this.state.rapidBlink)
                 span.classList.add("log-rapid-blink");
-            if (this.state.foregroundColor !== null)
-                span.classList.add(`log-fg-${this.state.foregroundColor}`);
-            if (this.state.backgroundColor !== null)
-                span.classList.add(`log-bg-${this.state.backgroundColor}`);
+            // Resolve colors with reverse-video support
+            let fgRgb = this.state.fgRgb;
+            let bgRgb = this.state.bgRgb;
+            let fg = this.state.foregroundColor;
+            let bg = this.state.backgroundColor;
+            if (this.state.reverse) {
+                fgRgb = this.state.bgRgb;
+                bgRgb = this.state.fgRgb;
+                fg = this.state.backgroundColor;
+                bg = this.state.foregroundColor;
+                if (!fgRgb && !fg && !bgRgb && !bg) {
+                    span.classList.add("log-reverse");
+                }
+                else {
+                    if (!fgRgb && !fg)
+                        fgRgb = "rgb(28,28,28)";
+                    if (!bgRgb && !bg)
+                        bgRgb = "rgb(221,221,221)";
+                }
+            }
+            // Inline rgb() style takes priority over CSS class
+            if (fgRgb) {
+                span.style.color = fgRgb;
+            }
+            else if (fg !== null) {
+                span.classList.add(`log-fg-${fg}`);
+            }
+            if (bgRgb) {
+                span.style.backgroundColor = bgRgb;
+            }
+            else if (bg !== null) {
+                span.classList.add(`log-bg-${bg}`);
+            }
             span.appendChild(document.createTextNode(content));
             lineSpan.appendChild(span);
         };
@@ -155,17 +243,39 @@ export class ColoredConsole {
             const j = match.index;
             addSpan(line.substring(i, j));
             i = j + match[0].length;
-            if (match[1] === undefined)
+            // Only process SGR sequences (final byte 'm'); skip cursor, erase, etc.
+            if (match[1] === undefined || match[2] !== "m")
                 continue;
-            for (const colorCode of match[1].split(";")) {
-                switch (parseInt(colorCode)) {
+            const rawCodes = match[1] === "" ? [""] : match[1].split(";");
+            const codes = [];
+            let invalidSgr = false;
+            for (const rawCode of rawCodes) {
+                if (rawCode === "") {
+                    codes.push(0);
+                    continue;
+                }
+                if (!/^\d+$/.test(rawCode)) {
+                    invalidSgr = true;
+                    break;
+                }
+                codes.push(Number(rawCode));
+            }
+            if (invalidSgr)
+                continue;
+            for (let ci = 0; ci < codes.length; ci++) {
+                const code = codes[ci];
+                switch (code) {
                     case 0:
                         this.state.bold = false;
+                        this.state.dim = false;
                         this.state.italic = false;
                         this.state.underline = false;
                         this.state.strikethrough = false;
                         this.state.foregroundColor = null;
                         this.state.backgroundColor = null;
+                        this.state.fgRgb = null;
+                        this.state.bgRgb = null;
+                        this.state.reverse = false;
                         this.state.secret = false;
                         this.state.blink = false;
                         this.state.rapidBlink = false;
@@ -173,6 +283,9 @@ export class ColoredConsole {
                     case 1:
                         this.state.bold = true;
                         break;
+                    case 2:
+                        this.state.dim = true;
+                        break;
                     case 3:
                         this.state.italic = true;
                         break;
@@ -181,9 +294,14 @@ export class ColoredConsole {
                         break;
                     case 5:
                         this.state.blink = true;
+                        this.state.rapidBlink = false;
                         break;
                     case 6:
                         this.state.rapidBlink = true;
+                        this.state.blink = false;
+                        break;
+                    case 7:
+                        this.state.reverse = true;
                         break;
                     case 8:
                         this.state.secret = true;
@@ -193,6 +311,7 @@ export class ColoredConsole {
                         break;
                     case 22:
                         this.state.bold = false;
+                        this.state.dim = false;
                         break;
                     case 23:
                         this.state.italic = false;
@@ -204,6 +323,9 @@ export class ColoredConsole {
                         this.state.blink = false;
                         this.state.rapidBlink = false;
                         break;
+                    case 27:
+                        this.state.reverse = false;
+                        break;
                     case 28:
                         this.state.secret = false;
                         break;
@@ -212,57 +334,211 @@ export class ColoredConsole {
                         break;
                     case 30:
                         this.state.foregroundColor = "black";
+                        this.state.fgRgb = null;
                         break;
                     case 31:
                         this.state.foregroundColor = "red";
+                        this.state.fgRgb = null;
                         break;
                     case 32:
                         this.state.foregroundColor = "green";
+                        this.state.fgRgb = null;
                         break;
                     case 33:
                         this.state.foregroundColor = "yellow";
+                        this.state.fgRgb = null;
                         break;
                     case 34:
                         this.state.foregroundColor = "blue";
+                        this.state.fgRgb = null;
                         break;
                     case 35:
                         this.state.foregroundColor = "magenta";
+                        this.state.fgRgb = null;
                         break;
                     case 36:
                         this.state.foregroundColor = "cyan";
+                        this.state.fgRgb = null;
                         break;
                     case 37:
                         this.state.foregroundColor = "white";
+                        this.state.fgRgb = null;
+                        break;
+                    case 38:
+                        // Extended foreground: 38;5;n (256-color) or 38;2;r;g;b (true-color)
+                        if (ci + 1 < codes.length) {
+                            if (codes[ci + 1] === 5) {
+                                if (ci + 2 < codes.length) {
+                                    const idx = codes[ci + 2];
+                                    if (idx >= 0 && idx <= 7 && ANSI_NAMED[idx]) {
+                                        this.state.foregroundColor = ANSI_NAMED[idx];
+                                        this.state.fgRgb = null;
+                                    }
+                                    else if (idx >= 0 && idx <= 255 && ANSI_256[idx]) {
+                                        this.state.foregroundColor = null;
+                                        this.state.fgRgb = ANSI_256[idx];
+                                    }
+                                    ci += 2;
+                                }
+                                else {
+                                    ci += 1;
+                                }
+                            }
+                            else if (codes[ci + 1] === 2) {
+                                if (ci + 4 < codes.length) {
+                                    this.state.foregroundColor = null;
+                                    const r = Math.max(0, Math.min(255, codes[ci + 2]));
+                                    const g = Math.max(0, Math.min(255, codes[ci + 3]));
+                                    const b = Math.max(0, Math.min(255, codes[ci + 4]));
+                                    this.state.fgRgb = "rgb(" + r + "," + g + "," + b + ")";
+                                    ci += 4;
+                                }
+                                else {
+                                    ci = codes.length - 1;
+                                }
+                            }
+                        }
                         break;
                     case 39:
                         this.state.foregroundColor = null;
+                        this.state.fgRgb = null;
                         break;
                     case 40:
                         this.state.backgroundColor = "black";
+                        this.state.bgRgb = null;
                         break;
                     case 41:
                         this.state.backgroundColor = "red";
+                        this.state.bgRgb = null;
                         break;
                     case 42:
                         this.state.backgroundColor = "green";
+                        this.state.bgRgb = null;
                         break;
                     case 43:
                         this.state.backgroundColor = "yellow";
+                        this.state.bgRgb = null;
                         break;
                     case 44:
                         this.state.backgroundColor = "blue";
+                        this.state.bgRgb = null;
                         break;
                     case 45:
                         this.state.backgroundColor = "magenta";
+                        this.state.bgRgb = null;
                         break;
                     case 46:
                         this.state.backgroundColor = "cyan";
+                        this.state.bgRgb = null;
                         break;
                     case 47:
                         this.state.backgroundColor = "white";
+                        this.state.bgRgb = null;
+                        break;
+                    case 48:
+                        // Extended background: 48;5;n (256-color) or 48;2;r;g;b (true-color)
+                        if (ci + 1 < codes.length) {
+                            if (codes[ci + 1] === 5) {
+                                if (ci + 2 < codes.length) {
+                                    const idx = codes[ci + 2];
+                                    if (idx >= 0 && idx <= 7 && ANSI_NAMED[idx]) {
+                                        this.state.backgroundColor = ANSI_NAMED[idx];
+                                        this.state.bgRgb = null;
+                                    }
+                                    else if (idx >= 0 && idx <= 255 && ANSI_256[idx]) {
+                                        this.state.backgroundColor = null;
+                                        this.state.bgRgb = ANSI_256[idx];
+                                    }
+                                    ci += 2;
+                                }
+                                else {
+                                    ci += 1;
+                                }
+                            }
+                            else if (codes[ci + 1] === 2) {
+                                if (ci + 4 < codes.length) {
+                                    this.state.backgroundColor = null;
+                                    const r = Math.max(0, Math.min(255, codes[ci + 2]));
+                                    const g = Math.max(0, Math.min(255, codes[ci + 3]));
+                                    const b = Math.max(0, Math.min(255, codes[ci + 4]));
+                                    this.state.bgRgb = "rgb(" + r + "," + g + "," + b + ")";
+                                    ci += 4;
+                                }
+                                else {
+                                    ci = codes.length - 1;
+                                }
+                            }
+                        }
                         break;
                     case 49:
                         this.state.backgroundColor = null;
+                        this.state.bgRgb = null;
+                        break;
+                    // Bright foreground colors
+                    case 90:
+                        this.state.foregroundColor = null;
+                        this.state.fgRgb = ANSI_256[8];
+                        break;
+                    case 91:
+                        this.state.foregroundColor = null;
+                        this.state.fgRgb = ANSI_256[9];
+                        break;
+                    case 92:
+                        this.state.foregroundColor = null;
+                        this.state.fgRgb = ANSI_256[10];
+                        break;
+                    case 93:
+                        this.state.foregroundColor = null;
+                        this.state.fgRgb = ANSI_256[11];
+                        break;
+                    case 94:
+                        this.state.foregroundColor = null;
+                        this.state.fgRgb = ANSI_256[12];
+                        break;
+                    case 95:
+                        this.state.foregroundColor = null;
+                        this.state.fgRgb = ANSI_256[13];
+                        break;
+                    case 96:
+                        this.state.foregroundColor = null;
+                        this.state.fgRgb = ANSI_256[14];
+                        break;
+                    case 97:
+                        this.state.foregroundColor = null;
+                        this.state.fgRgb = ANSI_256[15];
+                        break;
+                    // Bright background colors
+                    case 100:
+                        this.state.backgroundColor = null;
+                        this.state.bgRgb = ANSI_256[8];
+                        break;
+                    case 101:
+                        this.state.backgroundColor = null;
+                        this.state.bgRgb = ANSI_256[9];
+                        break;
+                    case 102:
+                        this.state.backgroundColor = null;
+                        this.state.bgRgb = ANSI_256[10];
+                        break;
+                    case 103:
+                        this.state.backgroundColor = null;
+                        this.state.bgRgb = ANSI_256[11];
+                        break;
+                    case 104:
+                        this.state.backgroundColor = null;
+                        this.state.bgRgb = ANSI_256[12];
+                        break;
+                    case 105:
+                        this.state.backgroundColor = null;
+                        this.state.bgRgb = ANSI_256[13];
+                        break;
+                    case 106:
+                        this.state.backgroundColor = null;
+                        this.state.bgRgb = ANSI_256[14];
+                        break;
+                    case 107:
+                        this.state.backgroundColor = null;
+                        this.state.bgRgb = ANSI_256[15];
                         break;
                 }
             }
@@ -360,6 +636,7 @@ export const coloredConsoleStyles = `
   }
 
   .log-bold { font-weight: bold; }
+  .log-dim { opacity: 0.5; }
   .log-italic { font-style: italic; }
   .log-underline { text-decoration: underline; }
   .log-strikethrough { text-decoration: line-through; }
@@ -374,6 +651,7 @@ export const coloredConsoleStyles = `
     user-select: none;
   }
   .log-secret-redacted { opacity: 0; width: 1px; font-size: 1px; }
+  .log-reverse { background: #ddd; color: #1c1c1c; }
   .log-fg-black { color: rgb(128, 128, 128); }
   .log-fg-red { color: rgb(255, 0, 0); }
   .log-fg-green { color: rgb(0, 255, 0); }

package/dist/util/timestamp-transformer.d.ts

@@ -1,3 +1,5 @@
 export declare class TimestampTransformer implements Transformer<string, string> {
+    private deviceHasTimestamps;
     transform(chunk: string, controller: TransformStreamDefaultController<string>): void;
+    reset(): void;
 }

package/dist/util/timestamp-transformer.js

@@ -1,25 +1,27 @@
-// Matches lines that already carry a wall-clock or tick timestamp so we don't
-// add a redundant one. Does NOT match bare log-level prefixes like ESPHome's
-// [I][tag:line]: — those have no time information.
-//
+// Matches lines that already carry a wall-clock timestamp so we don't add a
+// redundant one.  Only real wall-clock formats are matched — tick-based
+// formats like FreeRTOS "(12345)" or ESP-IDF "I (15) boot:" are NOT matched
+// because they don't carry time-of-day information
 // Covered formats:
-//   (123456)          FreeRTOS ms-tick  e.g. "(12345) "
 //   [HH:MM:SS]        wall-clock bracket
 //   [HH:MM:SS.mmm]    wall-clock bracket with millis
-//   I (1234) tag:     ESP-IDF log level + tick  e.g. "I (1234) wifi: ..."
 //   HH:MM:SS.mmm      plain wall-clock
-const DEVICE_TIMESTAMP_RE = /^\s*(?:\(\d+\)\s|\[\d{2}:\d{2}:\d{2}(?:\.\d+)?\]|[DIWEACV] \(\d+\) \w|(?:\d{2}:){2}\d{2}\.\d)/;
+const DEVICE_TIMESTAMP_RE = /^\s*(?:\[\d{2}:\d{2}:\d{2}(?:\.\d+)?\]|(?:\d{2}:){2}\d{2}\.\d)/;
 export class TimestampTransformer {
+    constructor() {
+        this.deviceHasTimestamps = false;
+    }
     transform(chunk, controller) {
-        // Pass through pure newline (blank-line sentinel) and empty chunks unchanged
-        // so that carriage-return overwrite logic in console-color.ts can still
-        // detect them via line !== "\n".
+        // Pass through pure newline / empty sentinel unchanged so that
+        // carriage-return overwrite logic in console-color.ts still works.
         if (chunk === "" || chunk === "\n" || chunk === "\r") {
             controller.enqueue(chunk);
             return;
         }
-        // Skip prefixing if the line already starts with a timestamp
-        if (DEVICE_TIMESTAMP_RE.test(chunk)) {
+        if (!this.deviceHasTimestamps && DEVICE_TIMESTAMP_RE.test(chunk)) {
+            this.deviceHasTimestamps = true;
+        }
+        if (this.deviceHasTimestamps) {
             controller.enqueue(chunk);
             return;
         }
@@ -27,6 +29,9 @@ export class TimestampTransformer {
         const h = date.getHours().toString().padStart(2, "0");
         const m = date.getMinutes().toString().padStart(2, "0");
         const s = date.getSeconds().toString().padStart(2, "0");
-        controller.enqueue(`[${h}:${m}:${s}]${chunk}`);
+        controller.enqueue(`[${h}:${m}:${s}] ${chunk}`);
+    }
+    reset() {
+        this.deviceHasTimestamps = false;
     }
 }