diff --git a/Cargo.toml b/Cargo.toml index ffa82be8..d3a94dd4 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -56,24 +56,24 @@ authors = ["octos-app contributors"] [workspace.dependencies] # --- 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 = "6cf03859630761f5cb99ce7fcdfd8c30475d9ab8" } -makepad-code-editor = { git = "https://github.com/OctoSense-org/makepad.git", rev = "6cf03859630761f5cb99ce7fcdfd8c30475d9ab8" } -makepad-ai = { git = "https://github.com/OctoSense-org/makepad.git", rev = "6cf03859630761f5cb99ce7fcdfd8c30475d9ab8" } -makepad-studio-protocol = { git = "https://github.com/OctoSense-org/makepad.git", rev = "6cf03859630761f5cb99ce7fcdfd8c30475d9ab8" } -makepad-network = { git = "https://github.com/OctoSense-org/makepad.git", rev = "6cf03859630761f5cb99ce7fcdfd8c30475d9ab8" } -makepad-wm-api = { git = "https://github.com/OctoSense-org/makepad.git", rev = "6cf03859630761f5cb99ce7fcdfd8c30475d9ab8" } -makepad-ai-services = { git = "https://github.com/OctoSense-org/makepad.git", rev = "6cf03859630761f5cb99ce7fcdfd8c30475d9ab8" } -makepad-strict-json = { git = "https://github.com/OctoSense-org/makepad.git", rev = "6cf03859630761f5cb99ce7fcdfd8c30475d9ab8" } -makepad-app-module = { git = "https://github.com/OctoSense-org/makepad.git", rev = "6cf03859630761f5cb99ce7fcdfd8c30475d9ab8" } -makepad-wm-theme = { git = "https://github.com/OctoSense-org/makepad.git", rev = "6cf03859630761f5cb99ce7fcdfd8c30475d9ab8" } -makepad-map-nav = { git = "https://github.com/OctoSense-org/makepad.git", rev = "6cf03859630761f5cb99ce7fcdfd8c30475d9ab8" } -makepad-sheets = { git = "https://github.com/OctoSense-org/makepad.git", rev = "6cf03859630761f5cb99ce7fcdfd8c30475d9ab8", default-features = false } -makepad-aichat = { git = "https://github.com/OctoSense-org/makepad.git", rev = "6cf03859630761f5cb99ce7fcdfd8c30475d9ab8", default-features = false } +makepad-widgets = { git = "https://github.com/OctoSense-org/makepad.git", rev = "975c5630e01b0f3f3ae16cafd2e0fce3c9a5f7d9" } +makepad-code-editor = { git = "https://github.com/OctoSense-org/makepad.git", rev = "975c5630e01b0f3f3ae16cafd2e0fce3c9a5f7d9" } +makepad-ai = { git = "https://github.com/OctoSense-org/makepad.git", rev = "975c5630e01b0f3f3ae16cafd2e0fce3c9a5f7d9" } +makepad-studio-protocol = { git = "https://github.com/OctoSense-org/makepad.git", rev = "975c5630e01b0f3f3ae16cafd2e0fce3c9a5f7d9" } +makepad-network = { git = "https://github.com/OctoSense-org/makepad.git", rev = "975c5630e01b0f3f3ae16cafd2e0fce3c9a5f7d9" } +makepad-wm-api = { git = "https://github.com/OctoSense-org/makepad.git", rev = "975c5630e01b0f3f3ae16cafd2e0fce3c9a5f7d9" } +makepad-ai-services = { git = "https://github.com/OctoSense-org/makepad.git", rev = "975c5630e01b0f3f3ae16cafd2e0fce3c9a5f7d9" } +makepad-strict-json = { git = "https://github.com/OctoSense-org/makepad.git", rev = "975c5630e01b0f3f3ae16cafd2e0fce3c9a5f7d9" } +makepad-app-module = { git = "https://github.com/OctoSense-org/makepad.git", rev = "975c5630e01b0f3f3ae16cafd2e0fce3c9a5f7d9" } +makepad-wm-theme = { git = "https://github.com/OctoSense-org/makepad.git", rev = "975c5630e01b0f3f3ae16cafd2e0fce3c9a5f7d9" } +makepad-map-nav = { git = "https://github.com/OctoSense-org/makepad.git", rev = "975c5630e01b0f3f3ae16cafd2e0fce3c9a5f7d9" } +makepad-sheets = { git = "https://github.com/OctoSense-org/makepad.git", rev = "975c5630e01b0f3f3ae16cafd2e0fce3c9a5f7d9", default-features = false } +makepad-aichat = { git = "https://github.com/OctoSense-org/makepad.git", rev = "975c5630e01b0f3f3ae16cafd2e0fce3c9a5f7d9", default-features = false } # --- OctoScript (Octoscript 68f6a9df) and its Makepad runtime -# (Octoscript-Makepad 6881fb6c, native-runtime.lock.json). +# (Octoscript-Makepad 65d30a09, native-runtime.lock.json). octoscript-ui-l0 = { git = "https://github.com/OctoSense-org/Octoscript.git", rev = "68f6a9df55692b5d8ef8873a12721e279a3f40d6" } -octoscript-makepad = { git = "https://github.com/OctoSense-org/Octoscript-Makepad.git", rev = "6881fb6c3c3220e407633b0ba5211c3d42c7e625" } -octoscript-node = { git = "https://github.com/OctoSense-org/Octoscript-Makepad.git", rev = "6881fb6c3c3220e407633b0ba5211c3d42c7e625" } +octoscript-makepad = { git = "https://github.com/OctoSense-org/Octoscript-Makepad.git", rev = "65d30a091eee284ed45afe5b8502835563fb56f7" } +octoscript-node = { git = "https://github.com/OctoSense-org/Octoscript-Makepad.git", rev = "65d30a091eee284ed45afe5b8502835563fb56f7" } # --- App Hub: the shells' store/Card runner/system apps crate and the host # service registry the Mail and llm services register into. One revision. octosense-app-hub-app = { git = "https://github.com/OctoSense-org/OctoSense-App-Hub", rev = "46d67e51b62827a1224b1aacddc2a7b9e69185fc" } diff --git a/apps/appcard/native-runtime.lock.json b/apps/appcard/native-runtime.lock.json index 105eb060..b0606201 100644 --- a/apps/appcard/native-runtime.lock.json +++ b/apps/appcard/native-runtime.lock.json @@ -1,5 +1,5 @@ { "schema_version": 1, "url": "https://github.com/OctoSense-org/Octoscript-Makepad.git", - "revision": "6881fb6c3c3220e407633b0ba5211c3d42c7e625" + "revision": "65d30a091eee284ed45afe5b8502835563fb56f7" } diff --git a/native-runtime.lock.json b/native-runtime.lock.json index 105eb060..b0606201 100644 --- a/native-runtime.lock.json +++ b/native-runtime.lock.json @@ -1,5 +1,5 @@ { "schema_version": 1, "url": "https://github.com/OctoSense-org/Octoscript-Makepad.git", - "revision": "6881fb6c3c3220e407633b0ba5211c3d42c7e625" + "revision": "65d30a091eee284ed45afe5b8502835563fb56f7" } diff --git a/phone/docs/build-tool.md b/phone/docs/build-tool.md index f2c38c93..c024e3e5 100644 --- a/phone/docs/build-tool.md +++ b/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 `6cf03859`, which includes App Hub's +The shared release selects Makepad main `975c5630`, which includes App Hub's isolate containment (#22), contained script apps (#30), the QR scanner -(#31), Splash `reapply_text` (#35) and self-confirmed assistant tools (#36); 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 consumer lock needs no `makepad_override`. To see which checkout an installed tool reads its Java from: diff --git a/phone/docs/makepad-fork.md b/phone/docs/makepad-fork.md index 4b4a462b..b4f279d5 100644 --- a/phone/docs/makepad-fork.md +++ b/phone/docs/makepad-fork.md @@ -20,12 +20,14 @@ 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` (`6881fb6c`, its main). + `OctoSense-org/Octoscript-Makepad` (`65d30a09`, its main). 2. That repo's `runtime.json` names the Makepad fork revision - (`6cf03859`, Makepad main: the enforced isolate policy of PR #22, module + (`975c5630`, 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 and the self-confirmed assistant tools of PR #36) and the Octoscript revision + PR #35, the self-confirmed assistant tools of PR #36, the one-call-site + Slug, cursor and glass shaders of PRs #37 and #39 and the terminal module + of PRs #40 and #41) and the Octoscript revision (`68f6a9d`). 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 diff --git a/rom/docs/home-build.md b/rom/docs/home-build.md index 346bd300..02fdd47b 100644 --- a/rom/docs/home-build.md +++ b/rom/docs/home-build.md @@ -29,11 +29,13 @@ 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 `6cf03859`, OctoScript-Makepad `6881fb6c`) +The runtime's Makepad (main `975c5630`, OctoScript-Makepad `65d30a09`) 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, -and self-confirmed assistant tools (makepad#36). +self-confirmed assistant tools (makepad#36), the one-call-site Slug text, +cursor and glass shaders (makepad#37, #39) and the in-process terminal +module whose `run` the person confirms (makepad#40, #41). Rinx (`app-rinx`, in the default and `mobile-apps` builds) is linked as a native module with `octosense-module` only; CI checks that its standalone diff --git a/runtime-patches.lock.json b/runtime-patches.lock.json index 06b60187..b07bc8a4 100644 --- a/runtime-patches.lock.json +++ b/runtime-patches.lock.json @@ -1,10 +1,10 @@ { "schema_version": 1, "makepad": { - "base_revision": "6cf03859630761f5cb99ce7fcdfd8c30475d9ab8", + "base_revision": "975c5630e01b0f3f3ae16cafd2e0fce3c9a5f7d9", "patch": "tools/runtime-patches/makepad-settings.patch", "sha256": "ba59081fb600b022844db5882f969712275be7a7976be8cb5ced7eac1bfa26a5", - "tree": "372c98d06e3df0c20df7dcb2b898ea48508d28ff", + "tree": "95ffc39c57badc45a641ecb96fe5327ef628d668", "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."