diff --git a/Cargo.lock b/Cargo.lock
index a13d95b..52110c8 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -376,7 +376,7 @@ dependencies = [
 [[package]]
 name = "makepad-error-log"
 version = "1.0.0"
-source = "git+https://github.com/OctoSense-org/makepad.git?rev=a5a3cf5b0dbd1b56c25defe6d98479f25843e770#a5a3cf5b0dbd1b56c25defe6d98479f25843e770"
+source = "git+https://github.com/OctoSense-org/makepad.git?rev=1f3b1dedfbb81424eb8dbf69e5e2c634fa73dc54#1f3b1dedfbb81424eb8dbf69e5e2c634fa73dc54"
 dependencies = [
  "makepad-micro-serde",
 ]
@@ -384,7 +384,7 @@ dependencies = [
 [[package]]
 name = "makepad-html"
 version = "1.0.0"
-source = "git+https://github.com/OctoSense-org/makepad.git?rev=a5a3cf5b0dbd1b56c25defe6d98479f25843e770#a5a3cf5b0dbd1b56c25defe6d98479f25843e770"
+source = "git+https://github.com/OctoSense-org/makepad.git?rev=1f3b1dedfbb81424eb8dbf69e5e2c634fa73dc54#1f3b1dedfbb81424eb8dbf69e5e2c634fa73dc54"
 dependencies = [
  "makepad-live-id",
 ]
@@ -392,7 +392,7 @@ dependencies = [
 [[package]]
 name = "makepad-live-id"
 version = "1.0.0"
-source = "git+https://github.com/OctoSense-org/makepad.git?rev=a5a3cf5b0dbd1b56c25defe6d98479f25843e770#a5a3cf5b0dbd1b56c25defe6d98479f25843e770"
+source = "git+https://github.com/OctoSense-org/makepad.git?rev=1f3b1dedfbb81424eb8dbf69e5e2c634fa73dc54#1f3b1dedfbb81424eb8dbf69e5e2c634fa73dc54"
 dependencies = [
  "makepad-live-id-macros",
 ]
@@ -400,7 +400,7 @@ dependencies = [
 [[package]]
 name = "makepad-live-id-macros"
 version = "1.0.0"
-source = "git+https://github.com/OctoSense-org/makepad.git?rev=a5a3cf5b0dbd1b56c25defe6d98479f25843e770#a5a3cf5b0dbd1b56c25defe6d98479f25843e770"
+source = "git+https://github.com/OctoSense-org/makepad.git?rev=1f3b1dedfbb81424eb8dbf69e5e2c634fa73dc54#1f3b1dedfbb81424eb8dbf69e5e2c634fa73dc54"
 dependencies = [
  "makepad-micro-proc-macro",
 ]
@@ -408,7 +408,7 @@ dependencies = [
 [[package]]
 name = "makepad-math"
 version = "1.0.0"
-source = "git+https://github.com/OctoSense-org/makepad.git?rev=a5a3cf5b0dbd1b56c25defe6d98479f25843e770#a5a3cf5b0dbd1b56c25defe6d98479f25843e770"
+source = "git+https://github.com/OctoSense-org/makepad.git?rev=1f3b1dedfbb81424eb8dbf69e5e2c634fa73dc54#1f3b1dedfbb81424eb8dbf69e5e2c634fa73dc54"
 dependencies = [
  "makepad-micro-serde",
 ]
@@ -416,12 +416,12 @@ dependencies = [
 [[package]]
 name = "makepad-micro-proc-macro"
 version = "1.0.0"
-source = "git+https://github.com/OctoSense-org/makepad.git?rev=a5a3cf5b0dbd1b56c25defe6d98479f25843e770#a5a3cf5b0dbd1b56c25defe6d98479f25843e770"
+source = "git+https://github.com/OctoSense-org/makepad.git?rev=1f3b1dedfbb81424eb8dbf69e5e2c634fa73dc54#1f3b1dedfbb81424eb8dbf69e5e2c634fa73dc54"
 
 [[package]]
 name = "makepad-micro-serde"
 version = "1.0.0"
-source = "git+https://github.com/OctoSense-org/makepad.git?rev=a5a3cf5b0dbd1b56c25defe6d98479f25843e770#a5a3cf5b0dbd1b56c25defe6d98479f25843e770"
+source = "git+https://github.com/OctoSense-org/makepad.git?rev=1f3b1dedfbb81424eb8dbf69e5e2c634fa73dc54#1f3b1dedfbb81424eb8dbf69e5e2c634fa73dc54"
 dependencies = [
  "makepad-live-id",
  "makepad-micro-serde-derive",
@@ -430,7 +430,7 @@ dependencies = [
 [[package]]
 name = "makepad-micro-serde-derive"
 version = "1.0.0"
-source = "git+https://github.com/OctoSense-org/makepad.git?rev=a5a3cf5b0dbd1b56c25defe6d98479f25843e770#a5a3cf5b0dbd1b56c25defe6d98479f25843e770"
+source = "git+https://github.com/OctoSense-org/makepad.git?rev=1f3b1dedfbb81424eb8dbf69e5e2c634fa73dc54#1f3b1dedfbb81424eb8dbf69e5e2c634fa73dc54"
 dependencies = [
  "makepad-micro-proc-macro",
 ]
@@ -438,12 +438,12 @@ dependencies = [
 [[package]]
 name = "makepad-regex"
 version = "0.1.0"
-source = "git+https://github.com/OctoSense-org/makepad.git?rev=a5a3cf5b0dbd1b56c25defe6d98479f25843e770#a5a3cf5b0dbd1b56c25defe6d98479f25843e770"
+source = "git+https://github.com/OctoSense-org/makepad.git?rev=1f3b1dedfbb81424eb8dbf69e5e2c634fa73dc54#1f3b1dedfbb81424eb8dbf69e5e2c634fa73dc54"
 
 [[package]]
 name = "makepad-script"
 version = "1.0.0"
-source = "git+https://github.com/OctoSense-org/makepad.git?rev=a5a3cf5b0dbd1b56c25defe6d98479f25843e770#a5a3cf5b0dbd1b56c25defe6d98479f25843e770"
+source = "git+https://github.com/OctoSense-org/makepad.git?rev=1f3b1dedfbb81424eb8dbf69e5e2c634fa73dc54#1f3b1dedfbb81424eb8dbf69e5e2c634fa73dc54"
 dependencies = [
  "makepad-error-log",
  "makepad-html",
@@ -458,7 +458,7 @@ dependencies = [
 [[package]]
 name = "makepad-script-derive"
 version = "1.0.0"
-source = "git+https://github.com/OctoSense-org/makepad.git?rev=a5a3cf5b0dbd1b56c25defe6d98479f25843e770#a5a3cf5b0dbd1b56c25defe6d98479f25843e770"
+source = "git+https://github.com/OctoSense-org/makepad.git?rev=1f3b1dedfbb81424eb8dbf69e5e2c634fa73dc54#1f3b1dedfbb81424eb8dbf69e5e2c634fa73dc54"
 dependencies = [
  "makepad-micro-proc-macro",
 ]
@@ -466,7 +466,7 @@ dependencies = [
 [[package]]
 name = "makepad-stitch"
 version = "0.1.0"
-source = "git+https://github.com/OctoSense-org/makepad.git?rev=a5a3cf5b0dbd1b56c25defe6d98479f25843e770#a5a3cf5b0dbd1b56c25defe6d98479f25843e770"
+source = "git+https://github.com/OctoSense-org/makepad.git?rev=1f3b1dedfbb81424eb8dbf69e5e2c634fa73dc54#1f3b1dedfbb81424eb8dbf69e5e2c634fa73dc54"
 
 [[package]]
 name = "memchr"
@@ -869,7 +869,7 @@ checksum = "f8fadd59c855ef2080decdef8ff161eb6661b86933c9d82e5ba29dc602a55aba"
 [[package]]
 name = "smallvec"
 version = "1.15.1"
-source = "git+https://github.com/OctoSense-org/makepad.git?rev=a5a3cf5b0dbd1b56c25defe6d98479f25843e770#a5a3cf5b0dbd1b56c25defe6d98479f25843e770"
+source = "git+https://github.com/OctoSense-org/makepad.git?rev=1f3b1dedfbb81424eb8dbf69e5e2c634fa73dc54#1f3b1dedfbb81424eb8dbf69e5e2c634fa73dc54"
 
 [[package]]
 name = "smallvec"
diff --git a/UPSTREAM.md b/UPSTREAM.md
index 6b7808e..9fbd939 100644
--- a/UPSTREAM.md
+++ b/UPSTREAM.md
@@ -5,7 +5,7 @@ parser, derive crate, and their leaf dependencies come from the `octoscript`
 branch of the OctoSense fork of Makepad, consumed as a pinned git dependency:
 
 ```toml
-makepad-script = { git = "https://github.com/OctoSense-org/makepad.git", rev = "a5a3cf5b0dbd1b56c25defe6d98479f25843e770" }
+makepad-script = { git = "https://github.com/OctoSense-org/makepad.git", rev = "1f3b1dedfbb81424eb8dbf69e5e2c634fa73dc54" }
 ```
 
 The pin appears in exactly two manifests, `crates/octoscript-core/Cargo.toml`
diff --git a/crates/octoscript-capabilities/Cargo.toml b/crates/octoscript-capabilities/Cargo.toml
index 0f226cb..875df0a 100644
--- a/crates/octoscript-capabilities/Cargo.toml
+++ b/crates/octoscript-capabilities/Cargo.toml
@@ -13,7 +13,7 @@ workspace = true
 blake3 = { version = "1.8.5", features = ["pure"] }
 getrandom = { version = "0.3.4", features = ["wasm_js"] }
 keyring = { version = "3.6.3", default-features = false, features = ["apple-native", "windows-native"], optional = true }
-makepad-script = { git = "https://github.com/OctoSense-org/makepad.git", rev = "a5a3cf5b0dbd1b56c25defe6d98479f25843e770" }
+makepad-script = { git = "https://github.com/OctoSense-org/makepad.git", rev = "1f3b1dedfbb81424eb8dbf69e5e2c634fa73dc54" }
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0.150"
 octoscript-core = { path = "../octoscript-core" }
diff --git a/crates/octoscript-core/Cargo.toml b/crates/octoscript-core/Cargo.toml
index bfdebe3..027f9b9 100644
--- a/crates/octoscript-core/Cargo.toml
+++ b/crates/octoscript-core/Cargo.toml
@@ -11,5 +11,5 @@ workspace = true
 
 [dependencies]
 octoscript-ui-l0 = { path = "../octoscript-ui-l0" }
-makepad-script = { git = "https://github.com/OctoSense-org/makepad.git", rev = "a5a3cf5b0dbd1b56c25defe6d98479f25843e770" }
+makepad-script = { git = "https://github.com/OctoSense-org/makepad.git", rev = "1f3b1dedfbb81424eb8dbf69e5e2c634fa73dc54" }
 serde_json = "1.0.150"
diff --git a/fuzz/Cargo.lock b/fuzz/Cargo.lock
index 3e5a791..5e40eee 100644
--- a/fuzz/Cargo.lock
+++ b/fuzz/Cargo.lock
@@ -313,7 +313,7 @@ dependencies = [
 [[package]]
 name = "makepad-error-log"
 version = "1.0.0"
-source = "git+https://github.com/OctoSense-org/makepad.git?rev=a5a3cf5b0dbd1b56c25defe6d98479f25843e770#a5a3cf5b0dbd1b56c25defe6d98479f25843e770"
+source = "git+https://github.com/OctoSense-org/makepad.git?rev=1f3b1dedfbb81424eb8dbf69e5e2c634fa73dc54#1f3b1dedfbb81424eb8dbf69e5e2c634fa73dc54"
 dependencies = [
  "makepad-micro-serde",
 ]
@@ -321,7 +321,7 @@ dependencies = [
 [[package]]
 name = "makepad-html"
 version = "1.0.0"
-source = "git+https://github.com/OctoSense-org/makepad.git?rev=a5a3cf5b0dbd1b56c25defe6d98479f25843e770#a5a3cf5b0dbd1b56c25defe6d98479f25843e770"
+source = "git+https://github.com/OctoSense-org/makepad.git?rev=1f3b1dedfbb81424eb8dbf69e5e2c634fa73dc54#1f3b1dedfbb81424eb8dbf69e5e2c634fa73dc54"
 dependencies = [
  "makepad-live-id",
 ]
@@ -329,7 +329,7 @@ dependencies = [
 [[package]]
 name = "makepad-live-id"
 version = "1.0.0"
-source = "git+https://github.com/OctoSense-org/makepad.git?rev=a5a3cf5b0dbd1b56c25defe6d98479f25843e770#a5a3cf5b0dbd1b56c25defe6d98479f25843e770"
+source = "git+https://github.com/OctoSense-org/makepad.git?rev=1f3b1dedfbb81424eb8dbf69e5e2c634fa73dc54#1f3b1dedfbb81424eb8dbf69e5e2c634fa73dc54"
 dependencies = [
  "makepad-live-id-macros",
 ]
@@ -337,7 +337,7 @@ dependencies = [
 [[package]]
 name = "makepad-live-id-macros"
 version = "1.0.0"
-source = "git+https://github.com/OctoSense-org/makepad.git?rev=a5a3cf5b0dbd1b56c25defe6d98479f25843e770#a5a3cf5b0dbd1b56c25defe6d98479f25843e770"
+source = "git+https://github.com/OctoSense-org/makepad.git?rev=1f3b1dedfbb81424eb8dbf69e5e2c634fa73dc54#1f3b1dedfbb81424eb8dbf69e5e2c634fa73dc54"
 dependencies = [
  "makepad-micro-proc-macro",
 ]
@@ -345,7 +345,7 @@ dependencies = [
 [[package]]
 name = "makepad-math"
 version = "1.0.0"
-source = "git+https://github.com/OctoSense-org/makepad.git?rev=a5a3cf5b0dbd1b56c25defe6d98479f25843e770#a5a3cf5b0dbd1b56c25defe6d98479f25843e770"
+source = "git+https://github.com/OctoSense-org/makepad.git?rev=1f3b1dedfbb81424eb8dbf69e5e2c634fa73dc54#1f3b1dedfbb81424eb8dbf69e5e2c634fa73dc54"
 dependencies = [
  "makepad-micro-serde",
 ]
@@ -353,12 +353,12 @@ dependencies = [
 [[package]]
 name = "makepad-micro-proc-macro"
 version = "1.0.0"
-source = "git+https://github.com/OctoSense-org/makepad.git?rev=a5a3cf5b0dbd1b56c25defe6d98479f25843e770#a5a3cf5b0dbd1b56c25defe6d98479f25843e770"
+source = "git+https://github.com/OctoSense-org/makepad.git?rev=1f3b1dedfbb81424eb8dbf69e5e2c634fa73dc54#1f3b1dedfbb81424eb8dbf69e5e2c634fa73dc54"
 
 [[package]]
 name = "makepad-micro-serde"
 version = "1.0.0"
-source = "git+https://github.com/OctoSense-org/makepad.git?rev=a5a3cf5b0dbd1b56c25defe6d98479f25843e770#a5a3cf5b0dbd1b56c25defe6d98479f25843e770"
+source = "git+https://github.com/OctoSense-org/makepad.git?rev=1f3b1dedfbb81424eb8dbf69e5e2c634fa73dc54#1f3b1dedfbb81424eb8dbf69e5e2c634fa73dc54"
 dependencies = [
  "makepad-live-id",
  "makepad-micro-serde-derive",
@@ -367,7 +367,7 @@ dependencies = [
 [[package]]
 name = "makepad-micro-serde-derive"
 version = "1.0.0"
-source = "git+https://github.com/OctoSense-org/makepad.git?rev=a5a3cf5b0dbd1b56c25defe6d98479f25843e770#a5a3cf5b0dbd1b56c25defe6d98479f25843e770"
+source = "git+https://github.com/OctoSense-org/makepad.git?rev=1f3b1dedfbb81424eb8dbf69e5e2c634fa73dc54#1f3b1dedfbb81424eb8dbf69e5e2c634fa73dc54"
 dependencies = [
  "makepad-micro-proc-macro",
 ]
@@ -375,12 +375,12 @@ dependencies = [
 [[package]]
 name = "makepad-regex"
 version = "0.1.0"
-source = "git+https://github.com/OctoSense-org/makepad.git?rev=a5a3cf5b0dbd1b56c25defe6d98479f25843e770#a5a3cf5b0dbd1b56c25defe6d98479f25843e770"
+source = "git+https://github.com/OctoSense-org/makepad.git?rev=1f3b1dedfbb81424eb8dbf69e5e2c634fa73dc54#1f3b1dedfbb81424eb8dbf69e5e2c634fa73dc54"
 
 [[package]]
 name = "makepad-script"
 version = "1.0.0"
-source = "git+https://github.com/OctoSense-org/makepad.git?rev=a5a3cf5b0dbd1b56c25defe6d98479f25843e770#a5a3cf5b0dbd1b56c25defe6d98479f25843e770"
+source = "git+https://github.com/OctoSense-org/makepad.git?rev=1f3b1dedfbb81424eb8dbf69e5e2c634fa73dc54#1f3b1dedfbb81424eb8dbf69e5e2c634fa73dc54"
 dependencies = [
  "makepad-error-log",
  "makepad-html",
@@ -395,7 +395,7 @@ dependencies = [
 [[package]]
 name = "makepad-script-derive"
 version = "1.0.0"
-source = "git+https://github.com/OctoSense-org/makepad.git?rev=a5a3cf5b0dbd1b56c25defe6d98479f25843e770#a5a3cf5b0dbd1b56c25defe6d98479f25843e770"
+source = "git+https://github.com/OctoSense-org/makepad.git?rev=1f3b1dedfbb81424eb8dbf69e5e2c634fa73dc54#1f3b1dedfbb81424eb8dbf69e5e2c634fa73dc54"
 dependencies = [
  "makepad-micro-proc-macro",
 ]
@@ -403,7 +403,7 @@ dependencies = [
 [[package]]
 name = "makepad-stitch"
 version = "0.1.0"
-source = "git+https://github.com/OctoSense-org/makepad.git?rev=a5a3cf5b0dbd1b56c25defe6d98479f25843e770#a5a3cf5b0dbd1b56c25defe6d98479f25843e770"
+source = "git+https://github.com/OctoSense-org/makepad.git?rev=1f3b1dedfbb81424eb8dbf69e5e2c634fa73dc54#1f3b1dedfbb81424eb8dbf69e5e2c634fa73dc54"
 
 [[package]]
 name = "memchr"
@@ -721,7 +721,7 @@ checksum = "f8fadd59c855ef2080decdef8ff161eb6661b86933c9d82e5ba29dc602a55aba"
 [[package]]
 name = "smallvec"
 version = "1.15.1"
-source = "git+https://github.com/OctoSense-org/makepad.git?rev=a5a3cf5b0dbd1b56c25defe6d98479f25843e770#a5a3cf5b0dbd1b56c25defe6d98479f25843e770"
+source = "git+https://github.com/OctoSense-org/makepad.git?rev=1f3b1dedfbb81424eb8dbf69e5e2c634fa73dc54#1f3b1dedfbb81424eb8dbf69e5e2c634fa73dc54"
 
 [[package]]
 name = "subtle"