From 5bdfd8e44721417982a676ae3db06cbec61dd0e0 Mon Sep 17 00:00:00 2001
From: ymote <151983+ymote@users.noreply.github.com>
Date: Sun, 27 Sep 2026 17:49:33 -0700
Subject: [PATCH 1/2] Repin the runtime: makepad 975c5630, Octoscript-Makepad
 65d30a09, App Hub 64bd6c01

makepad main 975c5630 adds #37 (Slug text in one supersample loop), #39
(cursor and glass shaders with one call site per figure and blur level),
#38 (PerfGraph quads) and #40 + #41 (in-process terminal module; its
`run` needs the person's confirmation). Octoscript-Makepad#49 releases it;
App Hub#21 pins the same set.

The makepad-settings runtime patch reapplies unchanged on the new base
(same sha256); runtime-patches.lock.json records the new base and tree.

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
---
 Cargo.lock                            | 25 +++++++++++++------
 Cargo.toml                            | 36 +++++++++++++--------------
 apps/README.md                        |  2 +-
 apps/README.zh-CN.md                  |  2 +-
 apps/appcard/native-runtime.lock.json |  2 +-
 native-runtime.lock.json              |  2 +-
 phone/README.md                       |  2 +-
 phone/README.zh-CN.md                 |  2 +-
 phone/docs/build-tool.md              |  4 +--
 phone/docs/design/app-hub/README.md   |  2 +-
 phone/docs/makepad-fork.md            |  8 +++---
 rom/docs/home-build.md                |  6 +++--
 runtime-patches.lock.json             |  4 +--
 13 files changed, 56 insertions(+), 41 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 1d258474..cea8924a 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -7139,13 +7139,13 @@ dependencies = [
 [[package]]
 name = "octosense-app-hub"
 version = "0.1.0"
-source = "git+https://github.com/OctoSense-org/OctoSense-App-Hub?rev=46d67e51b62827a1224b1aacddc2a7b9e69185fc#46d67e51b62827a1224b1aacddc2a7b9e69185fc"
+source = "git+https://github.com/OctoSense-org/OctoSense-App-Hub?rev=64bd6c01218010805116ae203edfb1f4b9e28fe6#64bd6c01218010805116ae203edfb1f4b9e28fe6"
 dependencies = [
  "base64 0.22.1",
  "blake3",
  "ed25519-dalek",
  "hex",
- "octosense-app-policy",
+ "octosense-app-policy 0.1.0 (git+https://github.com/OctoSense-org/OctoSense-App-Hub?rev=64bd6c01218010805116ae203edfb1f4b9e28fe6)",
  "rand_core 0.9.5",
  "serde",
  "serde_json",
@@ -7155,13 +7155,13 @@ dependencies = [
 [[package]]
 name = "octosense-app-hub-app"
 version = "0.1.0"
-source = "git+https://github.com/OctoSense-org/OctoSense-App-Hub?rev=46d67e51b62827a1224b1aacddc2a7b9e69185fc#46d67e51b62827a1224b1aacddc2a7b9e69185fc"
+source = "git+https://github.com/OctoSense-org/OctoSense-App-Hub?rev=64bd6c01218010805116ae203edfb1f4b9e28fe6#64bd6c01218010805116ae203edfb1f4b9e28fe6"
 dependencies = [
  "makepad-app-module",
  "makepad-widgets",
  "makepad-wm-theme",
  "octosense-app-hub",
- "octosense-app-policy",
+ "octosense-app-policy 0.1.0 (git+https://github.com/OctoSense-org/OctoSense-App-Hub?rev=64bd6c01218010805116ae203edfb1f4b9e28fe6)",
  "octosense-appstore",
  "serde_json",
 ]
@@ -7191,6 +7191,17 @@ dependencies = [
  "serde_json",
 ]
 
+[[package]]
+name = "octosense-app-policy"
+version = "0.1.0"
+source = "git+https://github.com/OctoSense-org/OctoSense-App-Hub?rev=64bd6c01218010805116ae203edfb1f4b9e28fe6#64bd6c01218010805116ae203edfb1f4b9e28fe6"
+dependencies = [
+ "blake3",
+ "makepad-widgets",
+ "serde",
+ "serde_json",
+]
+
 [[package]]
 name = "octosense-appcard"
 version = "0.1.0"
@@ -7204,14 +7215,14 @@ dependencies = [
 [[package]]
 name = "octosense-appstore"
 version = "0.1.0"
-source = "git+https://github.com/OctoSense-org/OctoSense-App-Hub?rev=46d67e51b62827a1224b1aacddc2a7b9e69185fc#46d67e51b62827a1224b1aacddc2a7b9e69185fc"
+source = "git+https://github.com/OctoSense-org/OctoSense-App-Hub?rev=64bd6c01218010805116ae203edfb1f4b9e28fe6#64bd6c01218010805116ae203edfb1f4b9e28fe6"
 dependencies = [
  "makepad-app-module",
  "makepad-widgets",
  "octoscript-makepad",
  "octoscript-widgets",
  "octosense-app-hub",
- "octosense-app-policy",
+ "octosense-app-policy 0.1.0 (git+https://github.com/OctoSense-org/OctoSense-App-Hub?rev=64bd6c01218010805116ae203edfb1f4b9e28fe6)",
  "serde_json",
 ]
 
@@ -8533,7 +8544,7 @@ dependencies = [
  "octoscript-ui-l0",
  "octoscript-widgets",
  "octosense-app-peers",
- "octosense-app-policy",
+ "octosense-app-policy 0.1.0 (git+https://github.com/OctoSense-org/OctoSense-App-Hub?rev=46d67e51b62827a1224b1aacddc2a7b9e69185fc)",
  "pulldown-cmark 0.13.4",
  "rand 0.8.8",
  "rangemap",
diff --git a/Cargo.toml b/Cargo.toml
index ffa82be8..4b0eb2ab 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -56,28 +56,28 @@ 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" }
-octosense-appstore = { git = "https://github.com/OctoSense-org/OctoSense-App-Hub", rev = "46d67e51b62827a1224b1aacddc2a7b9e69185fc" }
+octosense-app-hub-app = { git = "https://github.com/OctoSense-org/OctoSense-App-Hub", rev = "64bd6c01218010805116ae203edfb1f4b9e28fe6" }
+octosense-appstore = { git = "https://github.com/OctoSense-org/OctoSense-App-Hub", rev = "64bd6c01218010805116ae203edfb1f4b9e28fe6" }
 # --- octos: ONE source for every octos crate (octos-org/octos main at the
 # merge of octos#2541). Move octos-core and octos-cli together; the Android
 # kernel artifact (liboctos.so) is built from this same revision.
diff --git a/apps/README.md b/apps/README.md
index 646f650e..188e4f80 100644
--- a/apps/README.md
+++ b/apps/README.md
@@ -84,7 +84,7 @@ host's mail service, `llm` reaches the host's LLM-provider service. `net` reache
   end to end in the shell PRs' test runs (the test phone had no network).
 - **Mail**: verified with the demo mailbox on desktop and on the OnePlus 6.
   Mail's and the `llm` host services use the one App Hub revision the root
-  `Cargo.toml` pins (`46d67e51`, main after OctoSense-App-Hub#15; #11 added
+  `Cargo.toml` pins (`64bd6c01`, main after OctoSense-App-Hub#21; #11 added
   the `llm` capability, #14 the Matrix and Octos host-service capabilities),
   the same one the shells link, so a build has one `octosense-appstore` and
   one host-service registry.
diff --git a/apps/README.zh-CN.md b/apps/README.zh-CN.md
index 4932e3b2..d5bd9b82 100644
--- a/apps/README.zh-CN.md
+++ b/apps/README.zh-CN.md
@@ -73,7 +73,7 @@ OctoScript-App-Design-Flow 的 `AGENTS.md`，再读 `docs/QUICKSTART.md`），
 - **News、Maps**：开发时在 `card-host` 中运行过，但在 Shell PR 的测试中没有
   端到端验证（测试手机没有网络）。
 - **Mail**：已在桌面和 OnePlus 6 上用演示邮箱验证。Mail 与 `llm` 两个宿主服务使用根目录
-  `Cargo.toml` 固定的唯一 App Hub 版本（`46d67e51`，OctoSense-App-Hub#15 合并后的 main；#11 新增了 `llm` 能力，#14 新增了 Matrix 与 Octos 宿主服务能力），与 Shell 链接的版本相同，
+  `Cargo.toml` 固定的唯一 App Hub 版本（`64bd6c01`，OctoSense-App-Hub#21 合并后的 main；#11 新增了 `llm` 能力，#14 新增了 Matrix 与 Octos 宿主服务能力），与 Shell 链接的版本相同，
   因此一次构建中只有一份 `octosense-appstore` 和一个宿主服务注册表。
 - **脚本 bundle 没有 CI。** [`apps.yml`](../.github/workflows/apps.yml)
   测试宿主服务、AppCard 和 Shell 服务，不测试 bundle。
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/README.md b/phone/README.md
index 147c0725..25cfe732 100644
--- a/phone/README.md
+++ b/phone/README.md
@@ -237,7 +237,7 @@ by the default `app-hub` feature and on every mobile build. The **Preview
 catalog** switch shows the built-in apps while the live catalog is empty.
 
 See the crate's
-[README](https://github.com/OctoSense-org/OctoSense-App-Hub/blob/46d67e51b62827a1224b1aacddc2a7b9e69185fc/crates/app-hub-app/README.md)
+[README](https://github.com/OctoSense-org/OctoSense-App-Hub/blob/64bd6c01218010805116ae203edfb1f4b9e28fe6/crates/app-hub-app/README.md)
 at the pinned revision and the [native design evidence](docs/design/app-hub/README.md).
 App authors start with
 [OctoScript-App-Design-Flow](https://github.com/OctoSense-org/OctoScript-App-Design-Flow).
diff --git a/phone/README.zh-CN.md b/phone/README.zh-CN.md
index dd57e0e2..74c59c16 100644
--- a/phone/README.zh-CN.md
+++ b/phone/README.zh-CN.md
@@ -132,7 +132,7 @@ AI 提供商（`os.ai-providers`）通过 `llm` 宿主服务（[`apps/ai-provide
 
 App Hub（`apphub`）用于浏览已签名的 OctoSense 应用目录、搜索、查看应用详情、安装经过验证的应用包，并维护已安装应用的应用库。已安装的应用在隔离的 Card 实例（`card`）中打开，并在启动器和最近任务中单独显示。两者都来自 App Hub 的共享 Shell crate `octosense-app-hub-app`（OctoSense-App-Hub 中的 `crates/app-hub-app`），由默认的 `app-hub` feature 链接，且包含在所有移动端构建中。**预览目录**开关会在线上目录为空时显示内置应用。
 
-参见该 crate 在固定版本下的 [README（英文）](https://github.com/OctoSense-org/OctoSense-App-Hub/blob/46d67e51b62827a1224b1aacddc2a7b9e69185fc/crates/app-hub-app/README.md) 以及 [原生设计依据（英文）](docs/design/app-hub/README.md)。应用开发者可从 [OctoScript-App-Design-Flow](https://github.com/OctoSense-org/OctoScript-App-Design-Flow) 开始。
+参见该 crate 在固定版本下的 [README（英文）](https://github.com/OctoSense-org/OctoSense-App-Hub/blob/64bd6c01218010805116ae203edfb1f4b9e28fe6/crates/app-hub-app/README.md) 以及 [原生设计依据（英文）](docs/design/app-hub/README.md)。应用开发者可从 [OctoScript-App-Design-Flow](https://github.com/OctoSense-org/OctoScript-App-Design-Flow) 开始。
 
 ## 在桌面电脑上运行
 
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/design/app-hub/README.md b/phone/docs/design/app-hub/README.md
index f324dc13..ef9b5e9b 100644
--- a/phone/docs/design/app-hub/README.md
+++ b/phone/docs/design/app-hub/README.md
@@ -72,7 +72,7 @@ Each JSON sidecar preserves the instrument's capture receipt. Reviewed:
 
 `live-fixture`, `install-consent`, `installed-detail` and `library` use the
 optional local signed catalog described in the
-[App Hub crate README](https://github.com/OctoSense-org/OctoSense-App-Hub/blob/46d67e51b62827a1224b1aacddc2a7b9e69185fc/crates/app-hub-app/README.md). Those are development
+[App Hub crate README](https://github.com/OctoSense-org/OctoSense-App-Hub/blob/64bd6c01218010805116ae203edfb1f4b9e28fe6/crates/app-hub-app/README.md). Those are development
 fixtures, not production store listings. The production store remained empty.
 The fixtures deliberately use a fixed 360×640 artboard, visible inside the
 larger phone content area in their running-app captures.
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."

From d8aea848181159a1e78e174a1bf69efcdbabd683 Mon Sep 17 00:00:00 2001
From: ymote <151983+ymote@users.noreply.github.com>
Date: Sun, 27 Sep 2026 18:14:46 -0700
Subject: [PATCH 2/2] Keep App Hub at 46d67e51 for now: hosted Rinx pins
 octosense-app-policy there

Rinx a72e4b00 takes octosense-app-policy from App Hub 46d67e51, so moving
the shell's App Hub alone put two app-policy crates in the graph (phone CI:
"specification octosense-app-policy is ambiguous"). App Hub moves with the
next Rinx repin; makepad and Octoscript-Makepad still move here.

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
---
 Cargo.lock                          | 25 +++++++------------------
 Cargo.toml                          |  4 ++--
 apps/README.md                      |  2 +-
 apps/README.zh-CN.md                |  2 +-
 phone/README.md                     |  2 +-
 phone/README.zh-CN.md               |  2 +-
 phone/docs/design/app-hub/README.md |  2 +-
 7 files changed, 14 insertions(+), 25 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index cea8924a..1d258474 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -7139,13 +7139,13 @@ dependencies = [
 [[package]]
 name = "octosense-app-hub"
 version = "0.1.0"
-source = "git+https://github.com/OctoSense-org/OctoSense-App-Hub?rev=64bd6c01218010805116ae203edfb1f4b9e28fe6#64bd6c01218010805116ae203edfb1f4b9e28fe6"
+source = "git+https://github.com/OctoSense-org/OctoSense-App-Hub?rev=46d67e51b62827a1224b1aacddc2a7b9e69185fc#46d67e51b62827a1224b1aacddc2a7b9e69185fc"
 dependencies = [
  "base64 0.22.1",
  "blake3",
  "ed25519-dalek",
  "hex",
- "octosense-app-policy 0.1.0 (git+https://github.com/OctoSense-org/OctoSense-App-Hub?rev=64bd6c01218010805116ae203edfb1f4b9e28fe6)",
+ "octosense-app-policy",
  "rand_core 0.9.5",
  "serde",
  "serde_json",
@@ -7155,13 +7155,13 @@ dependencies = [
 [[package]]
 name = "octosense-app-hub-app"
 version = "0.1.0"
-source = "git+https://github.com/OctoSense-org/OctoSense-App-Hub?rev=64bd6c01218010805116ae203edfb1f4b9e28fe6#64bd6c01218010805116ae203edfb1f4b9e28fe6"
+source = "git+https://github.com/OctoSense-org/OctoSense-App-Hub?rev=46d67e51b62827a1224b1aacddc2a7b9e69185fc#46d67e51b62827a1224b1aacddc2a7b9e69185fc"
 dependencies = [
  "makepad-app-module",
  "makepad-widgets",
  "makepad-wm-theme",
  "octosense-app-hub",
- "octosense-app-policy 0.1.0 (git+https://github.com/OctoSense-org/OctoSense-App-Hub?rev=64bd6c01218010805116ae203edfb1f4b9e28fe6)",
+ "octosense-app-policy",
  "octosense-appstore",
  "serde_json",
 ]
@@ -7191,17 +7191,6 @@ dependencies = [
  "serde_json",
 ]
 
-[[package]]
-name = "octosense-app-policy"
-version = "0.1.0"
-source = "git+https://github.com/OctoSense-org/OctoSense-App-Hub?rev=64bd6c01218010805116ae203edfb1f4b9e28fe6#64bd6c01218010805116ae203edfb1f4b9e28fe6"
-dependencies = [
- "blake3",
- "makepad-widgets",
- "serde",
- "serde_json",
-]
-
 [[package]]
 name = "octosense-appcard"
 version = "0.1.0"
@@ -7215,14 +7204,14 @@ dependencies = [
 [[package]]
 name = "octosense-appstore"
 version = "0.1.0"
-source = "git+https://github.com/OctoSense-org/OctoSense-App-Hub?rev=64bd6c01218010805116ae203edfb1f4b9e28fe6#64bd6c01218010805116ae203edfb1f4b9e28fe6"
+source = "git+https://github.com/OctoSense-org/OctoSense-App-Hub?rev=46d67e51b62827a1224b1aacddc2a7b9e69185fc#46d67e51b62827a1224b1aacddc2a7b9e69185fc"
 dependencies = [
  "makepad-app-module",
  "makepad-widgets",
  "octoscript-makepad",
  "octoscript-widgets",
  "octosense-app-hub",
- "octosense-app-policy 0.1.0 (git+https://github.com/OctoSense-org/OctoSense-App-Hub?rev=64bd6c01218010805116ae203edfb1f4b9e28fe6)",
+ "octosense-app-policy",
  "serde_json",
 ]
 
@@ -8544,7 +8533,7 @@ dependencies = [
  "octoscript-ui-l0",
  "octoscript-widgets",
  "octosense-app-peers",
- "octosense-app-policy 0.1.0 (git+https://github.com/OctoSense-org/OctoSense-App-Hub?rev=46d67e51b62827a1224b1aacddc2a7b9e69185fc)",
+ "octosense-app-policy",
  "pulldown-cmark 0.13.4",
  "rand 0.8.8",
  "rangemap",
diff --git a/Cargo.toml b/Cargo.toml
index 4b0eb2ab..d3a94dd4 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -76,8 +76,8 @@ octoscript-makepad = { git = "https://github.com/OctoSense-org/Octoscript-Makepa
 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 = "64bd6c01218010805116ae203edfb1f4b9e28fe6" }
-octosense-appstore = { git = "https://github.com/OctoSense-org/OctoSense-App-Hub", rev = "64bd6c01218010805116ae203edfb1f4b9e28fe6" }
+octosense-app-hub-app = { git = "https://github.com/OctoSense-org/OctoSense-App-Hub", rev = "46d67e51b62827a1224b1aacddc2a7b9e69185fc" }
+octosense-appstore = { git = "https://github.com/OctoSense-org/OctoSense-App-Hub", rev = "46d67e51b62827a1224b1aacddc2a7b9e69185fc" }
 # --- octos: ONE source for every octos crate (octos-org/octos main at the
 # merge of octos#2541). Move octos-core and octos-cli together; the Android
 # kernel artifact (liboctos.so) is built from this same revision.
diff --git a/apps/README.md b/apps/README.md
index 188e4f80..646f650e 100644
--- a/apps/README.md
+++ b/apps/README.md
@@ -84,7 +84,7 @@ host's mail service, `llm` reaches the host's LLM-provider service. `net` reache
   end to end in the shell PRs' test runs (the test phone had no network).
 - **Mail**: verified with the demo mailbox on desktop and on the OnePlus 6.
   Mail's and the `llm` host services use the one App Hub revision the root
-  `Cargo.toml` pins (`64bd6c01`, main after OctoSense-App-Hub#21; #11 added
+  `Cargo.toml` pins (`46d67e51`, main after OctoSense-App-Hub#15; #11 added
   the `llm` capability, #14 the Matrix and Octos host-service capabilities),
   the same one the shells link, so a build has one `octosense-appstore` and
   one host-service registry.
diff --git a/apps/README.zh-CN.md b/apps/README.zh-CN.md
index d5bd9b82..4932e3b2 100644
--- a/apps/README.zh-CN.md
+++ b/apps/README.zh-CN.md
@@ -73,7 +73,7 @@ OctoScript-App-Design-Flow 的 `AGENTS.md`，再读 `docs/QUICKSTART.md`），
 - **News、Maps**：开发时在 `card-host` 中运行过，但在 Shell PR 的测试中没有
   端到端验证（测试手机没有网络）。
 - **Mail**：已在桌面和 OnePlus 6 上用演示邮箱验证。Mail 与 `llm` 两个宿主服务使用根目录
-  `Cargo.toml` 固定的唯一 App Hub 版本（`64bd6c01`，OctoSense-App-Hub#21 合并后的 main；#11 新增了 `llm` 能力，#14 新增了 Matrix 与 Octos 宿主服务能力），与 Shell 链接的版本相同，
+  `Cargo.toml` 固定的唯一 App Hub 版本（`46d67e51`，OctoSense-App-Hub#15 合并后的 main；#11 新增了 `llm` 能力，#14 新增了 Matrix 与 Octos 宿主服务能力），与 Shell 链接的版本相同，
   因此一次构建中只有一份 `octosense-appstore` 和一个宿主服务注册表。
 - **脚本 bundle 没有 CI。** [`apps.yml`](../.github/workflows/apps.yml)
   测试宿主服务、AppCard 和 Shell 服务，不测试 bundle。
diff --git a/phone/README.md b/phone/README.md
index 25cfe732..147c0725 100644
--- a/phone/README.md
+++ b/phone/README.md
@@ -237,7 +237,7 @@ by the default `app-hub` feature and on every mobile build. The **Preview
 catalog** switch shows the built-in apps while the live catalog is empty.
 
 See the crate's
-[README](https://github.com/OctoSense-org/OctoSense-App-Hub/blob/64bd6c01218010805116ae203edfb1f4b9e28fe6/crates/app-hub-app/README.md)
+[README](https://github.com/OctoSense-org/OctoSense-App-Hub/blob/46d67e51b62827a1224b1aacddc2a7b9e69185fc/crates/app-hub-app/README.md)
 at the pinned revision and the [native design evidence](docs/design/app-hub/README.md).
 App authors start with
 [OctoScript-App-Design-Flow](https://github.com/OctoSense-org/OctoScript-App-Design-Flow).
diff --git a/phone/README.zh-CN.md b/phone/README.zh-CN.md
index 74c59c16..dd57e0e2 100644
--- a/phone/README.zh-CN.md
+++ b/phone/README.zh-CN.md
@@ -132,7 +132,7 @@ AI 提供商（`os.ai-providers`）通过 `llm` 宿主服务（[`apps/ai-provide
 
 App Hub（`apphub`）用于浏览已签名的 OctoSense 应用目录、搜索、查看应用详情、安装经过验证的应用包，并维护已安装应用的应用库。已安装的应用在隔离的 Card 实例（`card`）中打开，并在启动器和最近任务中单独显示。两者都来自 App Hub 的共享 Shell crate `octosense-app-hub-app`（OctoSense-App-Hub 中的 `crates/app-hub-app`），由默认的 `app-hub` feature 链接，且包含在所有移动端构建中。**预览目录**开关会在线上目录为空时显示内置应用。
 
-参见该 crate 在固定版本下的 [README（英文）](https://github.com/OctoSense-org/OctoSense-App-Hub/blob/64bd6c01218010805116ae203edfb1f4b9e28fe6/crates/app-hub-app/README.md) 以及 [原生设计依据（英文）](docs/design/app-hub/README.md)。应用开发者可从 [OctoScript-App-Design-Flow](https://github.com/OctoSense-org/OctoScript-App-Design-Flow) 开始。
+参见该 crate 在固定版本下的 [README（英文）](https://github.com/OctoSense-org/OctoSense-App-Hub/blob/46d67e51b62827a1224b1aacddc2a7b9e69185fc/crates/app-hub-app/README.md) 以及 [原生设计依据（英文）](docs/design/app-hub/README.md)。应用开发者可从 [OctoScript-App-Design-Flow](https://github.com/OctoSense-org/OctoScript-App-Design-Flow) 开始。
 
 ## 在桌面电脑上运行
 
diff --git a/phone/docs/design/app-hub/README.md b/phone/docs/design/app-hub/README.md
index ef9b5e9b..f324dc13 100644
--- a/phone/docs/design/app-hub/README.md
+++ b/phone/docs/design/app-hub/README.md
@@ -72,7 +72,7 @@ Each JSON sidecar preserves the instrument's capture receipt. Reviewed:
 
 `live-fixture`, `install-consent`, `installed-detail` and `library` use the
 optional local signed catalog described in the
-[App Hub crate README](https://github.com/OctoSense-org/OctoSense-App-Hub/blob/64bd6c01218010805116ae203edfb1f4b9e28fe6/crates/app-hub-app/README.md). Those are development
+[App Hub crate README](https://github.com/OctoSense-org/OctoSense-App-Hub/blob/46d67e51b62827a1224b1aacddc2a7b9e69185fc/crates/app-hub-app/README.md). Those are development
 fixtures, not production store listings. The production store remained empty.
 The fixtures deliberately use a fixed 360×640 artboard, visible inside the
 larger phone content area in their running-app captures.