@rebon/cli-win32-x64 1.1.5 → 1.2.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rebon/cli-win32-x64",
-  "version": "1.1.5",
+  "version": "1.2.0",
   "description": "Agent cli for coding and more.",
   "license": "UNLICENSED",
   "engines": {

package/payload/plugin-host/src/json.mjs

@@ -89,8 +89,20 @@ class JsonParser {
         } else result += String.fromCharCode(first);
         continue;
       }
-      if (c.charCodeAt(0) < 0x20) this.#error('malformed_json', 'unescaped control character in JSON string');
-      if (c.charCodeAt(0) >= 0xd800 && c.charCodeAt(0) <= 0xdfff) this.#error('invalid_surrogate', 'lone surrogate in JSON string');
+      const unit = c.charCodeAt(0);
+      if (unit < 0x20) this.#error('malformed_json', 'unescaped control character in JSON string');
+      // The text is UTF-16, so a raw character outside the BMP (an emoji, as
+      // serde_json writes it unescaped) is two units here: a high surrogate
+      // followed by a low one. Only a half without its partner is invalid.
+      if (unit >= 0xd800 && unit <= 0xdbff) {
+        const next = this.text.charCodeAt(this.index);
+        if (next >= 0xdc00 && next <= 0xdfff) {
+          result += c + this.text[this.index++];
+          continue;
+        }
+        this.#error('invalid_surrogate', 'lone surrogate in JSON string');
+      }
+      if (unit >= 0xdc00 && unit <= 0xdfff) this.#error('invalid_surrogate', 'lone surrogate in JSON string');
       result += c;
     }
   }