Repin makepad bcb0583b (Terminal fixes #61-#65)

Cargo.toml

@@ -63,34 +63,34 @@ authors = ["octos-app contributors"]
 # BEGIN native-apps: pins (generated by tools/native_apps.py from native-apps.json; do not edit)
 rinx = { git = "https://github.com/hagency-org/Rinx.git", tag = "v1.0.0", default-features = false, features = ["octosense-module"] }
 octosense-reference = { path = "apps/reference" }
-makepad-sheets = { git = "https://github.com/OctoSense-org/makepad.git", rev = "a5a3cf5b0dbd1b56c25defe6d98479f25843e770", default-features = false }
-makepad-terminal = { git = "https://github.com/OctoSense-org/makepad.git", rev = "a5a3cf5b0dbd1b56c25defe6d98479f25843e770" }
+makepad-sheets = { git = "https://github.com/OctoSense-org/makepad.git", rev = "bcb0583b50a8de8cad912e6c1505f09d8f894431", default-features = false }
+makepad-terminal = { git = "https://github.com/OctoSense-org/makepad.git", rev = "bcb0583b50a8de8cad912e6c1505f09d8f894431" }
 octosense-appcard = { path = "apps/appcard/module" }
 octosense-app-hub-app = { git = "https://github.com/OctoSense-org/OctoSense-App-Hub", rev = "e8601b80ce104db2e48208094714bdcffdce6b5a" }
 # END native-apps: pins
 # --- Makepad (OctoSense-org/makepad), the revision Octoscript-Makepad's
 # runtime.json pins (native-runtime.lock.json); resolved to .sources/makepad.
-makepad-widgets = { git = "https://github.com/OctoSense-org/makepad.git", rev = "a5a3cf5b0dbd1b56c25defe6d98479f25843e770" }
-makepad-code-editor = { git = "https://github.com/OctoSense-org/makepad.git", rev = "a5a3cf5b0dbd1b56c25defe6d98479f25843e770" }
-makepad-ai = { git = "https://github.com/OctoSense-org/makepad.git", rev = "a5a3cf5b0dbd1b56c25defe6d98479f25843e770" }
-makepad-studio-protocol = { git = "https://github.com/OctoSense-org/makepad.git", rev = "a5a3cf5b0dbd1b56c25defe6d98479f25843e770" }
-makepad-network = { git = "https://github.com/OctoSense-org/makepad.git", rev = "a5a3cf5b0dbd1b56c25defe6d98479f25843e770" }
-makepad-wm-api = { git = "https://github.com/OctoSense-org/makepad.git", rev = "a5a3cf5b0dbd1b56c25defe6d98479f25843e770" }
-makepad-ai-services = { git = "https://github.com/OctoSense-org/makepad.git", rev = "a5a3cf5b0dbd1b56c25defe6d98479f25843e770" }
-makepad-strict-json = { git = "https://github.com/OctoSense-org/makepad.git", rev = "a5a3cf5b0dbd1b56c25defe6d98479f25843e770" }
-makepad-app-module = { git = "https://github.com/OctoSense-org/makepad.git", rev = "a5a3cf5b0dbd1b56c25defe6d98479f25843e770" }
-makepad-wm-theme = { git = "https://github.com/OctoSense-org/makepad.git", rev = "a5a3cf5b0dbd1b56c25defe6d98479f25843e770" }
-makepad-aichat = { git = "https://github.com/OctoSense-org/makepad.git", rev = "a5a3cf5b0dbd1b56c25defe6d98479f25843e770", default-features = false }
-# --- OctoScript (Octoscript 68f6a9df) and its Makepad runtime
-# (Octoscript-Makepad 65d30a09, native-runtime.lock.json).
-octoscript-ui-l0 = { git = "https://github.com/OctoSense-org/Octoscript.git", rev = "68f6a9df55692b5d8ef8873a12721e279a3f40d6" }
+makepad-widgets = { git = "https://github.com/OctoSense-org/makepad.git", rev = "bcb0583b50a8de8cad912e6c1505f09d8f894431" }
+makepad-code-editor = { git = "https://github.com/OctoSense-org/makepad.git", rev = "bcb0583b50a8de8cad912e6c1505f09d8f894431" }
+makepad-ai = { git = "https://github.com/OctoSense-org/makepad.git", rev = "bcb0583b50a8de8cad912e6c1505f09d8f894431" }
+makepad-studio-protocol = { git = "https://github.com/OctoSense-org/makepad.git", rev = "bcb0583b50a8de8cad912e6c1505f09d8f894431" }
+makepad-network = { git = "https://github.com/OctoSense-org/makepad.git", rev = "bcb0583b50a8de8cad912e6c1505f09d8f894431" }
+makepad-wm-api = { git = "https://github.com/OctoSense-org/makepad.git", rev = "bcb0583b50a8de8cad912e6c1505f09d8f894431" }
+makepad-ai-services = { git = "https://github.com/OctoSense-org/makepad.git", rev = "bcb0583b50a8de8cad912e6c1505f09d8f894431" }
+makepad-strict-json = { git = "https://github.com/OctoSense-org/makepad.git", rev = "bcb0583b50a8de8cad912e6c1505f09d8f894431" }
+makepad-app-module = { git = "https://github.com/OctoSense-org/makepad.git", rev = "bcb0583b50a8de8cad912e6c1505f09d8f894431" }
+makepad-wm-theme = { git = "https://github.com/OctoSense-org/makepad.git", rev = "bcb0583b50a8de8cad912e6c1505f09d8f894431" }
+makepad-aichat = { git = "https://github.com/OctoSense-org/makepad.git", rev = "bcb0583b50a8de8cad912e6c1505f09d8f894431", default-features = false }
+# --- OctoScript (Octoscript 76032ed4) and its Makepad runtime
+# (Octoscript-Makepad 4a641af1, native-runtime.lock.json).
+octoscript-ui-l0 = { git = "https://github.com/OctoSense-org/Octoscript.git", rev = "76032ed4b0a9cce346cbc9e4f9f30fe00d76e65b" }
 # The bounded VM, capability-leased host modules and executable JSON schemas
 # (the system toolbox's workflow templates, crates/toolbox).
-octoscript-core = { git = "https://github.com/OctoSense-org/Octoscript.git", rev = "68f6a9df55692b5d8ef8873a12721e279a3f40d6" }
-octoscript-capabilities = { git = "https://github.com/OctoSense-org/Octoscript.git", rev = "68f6a9df55692b5d8ef8873a12721e279a3f40d6" }
-octoscript-schema = { git = "https://github.com/OctoSense-org/Octoscript.git", rev = "68f6a9df55692b5d8ef8873a12721e279a3f40d6" }
-octoscript-makepad = { git = "https://github.com/OctoSense-org/Octoscript-Makepad.git", rev = "515acb4924ab441824b4006dd031d3508cd78adf" }
-octoscript-node = { git = "https://github.com/OctoSense-org/Octoscript-Makepad.git", rev = "515acb4924ab441824b4006dd031d3508cd78adf" }
+octoscript-core = { git = "https://github.com/OctoSense-org/Octoscript.git", rev = "76032ed4b0a9cce346cbc9e4f9f30fe00d76e65b" }
+octoscript-capabilities = { git = "https://github.com/OctoSense-org/Octoscript.git", rev = "76032ed4b0a9cce346cbc9e4f9f30fe00d76e65b" }
+octoscript-schema = { git = "https://github.com/OctoSense-org/Octoscript.git", rev = "76032ed4b0a9cce346cbc9e4f9f30fe00d76e65b" }
+octoscript-makepad = { git = "https://github.com/OctoSense-org/Octoscript-Makepad.git", rev = "4a641af1c6ca8de31408aacc7fc3063c6f52bf7d" }
+octoscript-node = { git = "https://github.com/OctoSense-org/Octoscript-Makepad.git", rev = "4a641af1c6ca8de31408aacc7fc3063c6f52bf7d" }
 # --- App Hub's host service registry the Mail and llm services register
 # into; the same revision as App Hub's app crate (a native app, above).
 octosense-appstore = { git = "https://github.com/OctoSense-org/OctoSense-App-Hub", rev = "e8601b80ce104db2e48208094714bdcffdce6b5a" }

apps/appcard/native-runtime.lock.json

@@ -1,5 +1,5 @@
 {
   "schema_version": 1,
   "url": "https://github.com/OctoSense-org/Octoscript-Makepad.git",
-  "revision": "515acb4924ab441824b4006dd031d3508cd78adf"
+  "revision": "4a641af1c6ca8de31408aacc7fc3063c6f52bf7d"
 }

native-apps.json

@@ -41,7 +41,7 @@
     {
       "id": "sheets",
       "crate": "makepad-sheets",
-      "source": { "git": "https://github.com/OctoSense-org/makepad.git", "rev": "a5a3cf5b0dbd1b56c25defe6d98479f25843e770", "local": ".sources/makepad/apps/sheets" },
+      "source": { "git": "https://github.com/OctoSense-org/makepad.git", "rev": "bcb0583b50a8de8cad912e6c1505f09d8f894431", "local": ".sources/makepad/apps/sheets" },
       "module": "makepad_sheets::SHEETS_MODULE",
       "bin": "sheets",
       "default_features": false,
@@ -57,7 +57,7 @@
     {
       "id": "terminal",
       "crate": "makepad-terminal",
-      "source": { "git": "https://github.com/OctoSense-org/makepad.git", "rev": "a5a3cf5b0dbd1b56c25defe6d98479f25843e770", "local": ".sources/makepad/apps/terminal" },
+      "source": { "git": "https://github.com/OctoSense-org/makepad.git", "rev": "bcb0583b50a8de8cad912e6c1505f09d8f894431", "local": ".sources/makepad/apps/terminal" },
       "module": "makepad_terminal::TERMINAL_MODULE",
       "bin": "terminal",
       "default_features": true,

native-runtime.lock.json

@@ -1,5 +1,5 @@
 {
   "schema_version": 1,
   "url": "https://github.com/OctoSense-org/Octoscript-Makepad.git",
-  "revision": "515acb4924ab441824b4006dd031d3508cd78adf"
+  "revision": "4d743aa6774b71ee6eaf6f105d6c7298baadcf83"
 }

phone/docs/build-tool.md

@@ -73,9 +73,9 @@ move that touches `tools/cargo_makepad` is the usual trigger):
 cargo install --path .sources/makepad/tools/cargo_makepad --force
 ```
 
-The shared release selects Makepad main `a5a3cf5b`, which includes App Hub's
+The shared release selects Makepad main `bcb0583b`, which includes App Hub's
 isolate containment (#22), contained script apps (#30), the QR scanner
-(#31), Splash `reapply_text` (#35) self-confirmed assistant tools (#36) and the one-call-site Slug, cursor and glass shaders (#37, #39), the terminal's confirmed runs (#41), trackpad scrolling (#42), gestures (#46), Chinese text (#48), tabs and installed fonts (#47), and every app's system-font fallback (#49, #51), WebReader's close ending the page (#43), the OpenHarmony packager's workspace target dir (#52), the `sys.dataset` and `sys.news_digest` helpers (#53) the peer-link client (#54), the Linux Vulkan build (#45), the map's hosted-archive source (#55) HTTPS on OpenHarmony (#56) and the keyboard's hide after a cancelled search (#57, #59); the consumer lock
+(#31), Splash `reapply_text` (#35) self-confirmed assistant tools (#36) and the one-call-site Slug, cursor and glass shaders (#37, #39), the terminal's confirmed runs (#41), trackpad scrolling (#42), gestures (#46), Chinese text (#48), tabs and installed fonts (#47), and every app's system-font fallback (#49, #51), WebReader's close ending the page (#43), the OpenHarmony packager's workspace target dir (#52), the `sys.dataset` and `sys.news_digest` helpers (#53) the peer-link client (#54), the Linux Vulkan build (#45), the map's hosted-archive source (#55) HTTPS on OpenHarmony (#56) the keyboard's hide after a cancelled search (#57, #59) and the terminal's tab titles, wide-character reflow, non-blocking PTY writes, control-request timeout and running-job close confirmation (#61–#65); the consumer lock
 needs no `makepad_override`.
 
 To see which checkout an installed tool reads its Java from:

phone/docs/makepad-fork.md

@@ -20,9 +20,9 @@ Makepad and that no fork is required do not.
 The revision is pinned as a chain, not in one place:
 
 1. `native-runtime.lock.json` here names one revision of
-   `OctoSense-org/Octoscript-Makepad` (`515acb49`, its main).
+   `OctoSense-org/Octoscript-Makepad` (`4a641af1`, its main).
 2. That repo's `runtime.json` names the Makepad fork revision
-   (`a5a3cf5b`, Makepad main: the enforced isolate policy of PR #22, module
+   (`bcb0583b`, Makepad main: the enforced isolate policy of PR #22, module
    windows, the ROM's Splash fixes, the contained script apps and host
    services of PR #30, the QR scanner of PR #31, Splash `reapply_text` of
    PR #35, the self-confirmed assistant tools of PR #36, the one-call-site
@@ -33,9 +33,9 @@ The revision is pinned as a chain, not in one place:
    packager's workspace target dir of PR #52, the `sys.dataset` and
    `sys.news_digest` helpers of PR #53, the peer-link client of PR #54, the Linux
    Vulkan build of PR #45, the map's hosted-archive source of PR #55, HTTPS on
-   OpenHarmony of PR #56 and the keyboard's hide after a cancelled search of
-   PRs #57 and #59) and the Octoscript revision
-   (`68f6a9d`). OctoSense, AppCard, Rinx and the ROM lock the same release.
+   OpenHarmony of PR #56, the keyboard's hide after a cancelled search of
+   PRs #57 and #59 and the terminal fixes and close veto of PRs #61–#65) and the Octoscript revision
+   (`76032ed`). OctoSense, AppCard, Rinx and the ROM lock the same release.
 3. The manifests repeat the Makepad revision as `rev = "…"`: here in
    `Cargo.toml` and `apps/*/Cargo.toml`. Octoscript-Makepad's unmodified
    manifests retain their release pin. `[patch]` sections redirect every one

rom/docs/home-build.md

@@ -29,7 +29,7 @@ assistant (`octos-app`, `apps/appcard/app/app`) is built
 only with `--features app-appcard`: it is not shipped for now, so default,
 `mobile-apps` and native mobile builds leave its UI out.
 
-The runtime's Makepad (main `a5a3cf5b`, OctoScript-Makepad `515acb49`)
+The runtime's Makepad (main `bcb0583b`, OctoScript-Makepad `4a641af1`)
 includes the contained-app and isolate controls from makepad#30, the camera
 QR scanner AI providers uses (makepad#31), Splash `reapply_text`
 (makepad#35) with stateful mini-app inputs (OctoScript-Makepad#46) for Rinx,

runtime-patches.lock.json

@@ -1,10 +1,10 @@
 {
   "schema_version": 1,
   "makepad": {
-    "base_revision": "a5a3cf5b0dbd1b56c25defe6d98479f25843e770",
+    "base_revision": "bcb0583b50a8de8cad912e6c1505f09d8f894431",
     "patch": "tools/runtime-patches/makepad-settings.patch",
     "sha256": "1bf3c9d5367bb35a0e2ab0eb92b614507817066d31d8030404cbb0655c758268",
-    "tree": "adaa51e2202979c80c8489f54fa20384f7f571f4",
+    "tree": "a5df85286a2f9d568068c276ccfaf9b0b131c366",
     "product_fixes": [
       "Settings integration: Android IME synchronization, accessibility and reduced motion, GLES program-cache validation, obscured-gesture cancellation and scroll-position observation.",
       "Contained-app isolation and secret-input restrictions come from the pinned upstream runtime; the Settings overlay preserves those gates.",