Skip to content

Repin the runtime: makepad 975c5630, Octoscript-Makepad 65d30a09 - #83

Merged
ymote merged 2 commits into
mainfrom
chore/runtime-makepad-975c5630
Sep 28, 2026
Merged

Repin the runtime: makepad 975c5630, Octoscript-Makepad 65d30a09#83
ymote merged 2 commits into
mainfrom
chore/runtime-makepad-975c5630

Conversation

@ymote

@ymote ymote commented Sep 28, 2026 •
edited
Loading

Copy link
Copy Markdown
Contributor

Moves the one runtime that every OctoSense-org repo pins:

Pin From To
makepad ([workspace.dependencies], runtime-patches.lock.json base) 6cf03859 975c5630 (makepad main)
Octoscript-Makepad (native-runtime.lock.json, apps/appcard/native-runtime.lock.json, workspace deps) 6881fb6c 65d30a09 (OctoScript-Makepad#49)

What the new makepad adds:

  • makepad#37: Slug text supersamples in one loop, so alpha_at is inlined once (cold compile on Adreno 630: 15.4 s to 4.3 s)
  • makepad#39: cursor and glass shaders have one call site per figure and per blur level
  • makepad#38: PerfGraph draws its bars as instanced quads
  • makepad#40 + Preserve mobile Back dispatch with hosted Rinx #41: the terminal can be hosted in-process (TERMINAL_MODULE), macOS runs the paint tick when a background signal wakes the loop, and the terminal's run tool needs the person's confirmation

tools/runtime-patches/makepad-settings.patch reapplies unchanged on 975c5630 (same sha256). The lock records the new base_revision and the patched tree (95ffc39c). None of its hunks overlap #37's Slug loop: its draw_text.rs changes are in the SDF/MSDF atlas branches. Cargo.lock is unchanged, because makepad and Octoscript-Makepad resolve from .sources/.

App Hub stays at 46d67e51. App Hub main is now 64bd6c01 (OctoSense-App-Hub#21, the same runtime pins). Hosted Rinx a72e4b00 still takes octosense-app-policy from App Hub 46d67e51, so moving only the shell's pin put two octosense-app-policy crates in the graph. The phone job failed on specification octosense-app-policy is ambiguous. App Hub should move together with the next Rinx repin. The graph guards only check octosense-appstore and octosense-app-hub-app, so they did not catch this.

Local checks:

  • python3 tools/setup.py --check --cargo passes
  • desktop: the three cargo check --locked builds and tools/check-shell-graph.sh -p octosense
  • phone: cargo check --locked -p octosense-home (with and without mobile-apps) and tools/check-shell-graph.sh -p octosense-home
  • desktop/scripts/smoke.py --styles with MAKEPAD_HIDE_WINDOWS=1 (release build) passes all 19 steps. That includes the OctoSense glass styles, dock and menu.
  • Terminal from the desktop catalog (MAKEPAD_WM_TEST_APP=terminal) builds from .sources/makepad, starts its shell and runs a typed command

Note for #70: it edits runtime-patches.lock.json and adds tools/runtime-patches/makepad-system-back.patch on the 6cf03859 base. After this merges, #70 needs to rebase onto main and set base_revision to 975c5630. makepad-system-back.patch still applies unchanged on top of makepad-settings at 975c5630 (checked with git apply --check). The resulting tree is 225620b55264771e2b4725e2f508d76b5805a1a1, and the stacked patch's sha256 stays the same.

🤖 Generated with Claude Code

ymote and others added 2 commits September 27, 2026 17:49
@ymote @claude
Repin the runtime: makepad 975c5630, Octoscript-Makepad 65d30a09, App…
5bdfd8e 
… 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>
@ymote @claude
Keep App Hub at 46d67e51 for now: hosted Rinx pins octosense-app-poli…
d8aea84 
…cy 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>
@ymote ymote changed the title Repin the runtime: makepad 975c5630, Octoscript-Makepad 65d30a09, App Hub 64bd6c01 Repin the runtime: makepad 975c5630, Octoscript-Makepad 65d30a09 Sep 28, 2026
@ymote
ymote merged commit ea863e8 into main Sep 28, 2026
6 checks passed
This was referenced Sep 28, 2026
Merged
Merged
ymote added a commit that referenced this pull request Oct 2, 2026
@ymote @claude
Repin the runtime to makepad 39a9de88 (OpenHarmony idle and input, GL…
5790b6d 
… GPU timing, terminal shortcuts)

Makepad main 39a9de88 adds a hidden map's idle frame loop fix (#79),
Android HTTP without redirects (#75), the sheets font by crate (#80),
Linux GL remote grabs (#93), Android Vulkan without a debug messenger
(#92), the touch-down power hint (#83), GL GPU timing (#81), atlas text
on phones (#82), the DrawText current-list fix (#89), terminal keyboard
shortcuts (#76) and the terminal on OpenHarmony (#91), and OpenHarmony's
keyboard, Studio, GL lifetimes and idle frames (#84, #85, #88, #87),
through Octoscript-Makepad 62760863 (#70). makepad #90 is not in it.

- root Cargo.toml: makepad and octoscript-makepad revisions together;
  native-apps.json (Sheets, Terminal), regenerated pins unchanged otherwise
- both native-runtime.lock.json files
- runtime-patches.lock.json: the settings patch is rebased onto 39a9de88
  with the same added and removed lines; its touch-down line in
  MakepadActivity.java now sits next to #83's hint, and draw_text.rs
  context follows #87's cfg. The system-back, IME and two Windows patches
  reapply unchanged. The map, OpenHarmony GL-lifetime and DrawText patches
  are dropped: they are makepad #79, #88 and #89, now upstream. New tree
  976bf55b.
- Cargo.lock: unchanged
- the three pinned-hash docs

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
ymote added a commit that referenced this pull request Oct 2, 2026
@ymote @claude
Repin the runtime to makepad 39a9de88 (OpenHarmony idle and input, GL…
c80c0a7 
… GPU timing, terminal shortcuts)

Makepad main 39a9de88 adds a hidden map's idle frame loop fix (#79),
Android HTTP without redirects (#75), the sheets font by crate (#80),
Linux GL remote grabs (#93), Android Vulkan without a debug messenger
(#92), the touch-down power hint (#83), GL GPU timing (#81), atlas text
on phones (#82), the DrawText current-list fix (#89), terminal keyboard
shortcuts (#76) and the terminal on OpenHarmony (#91), and OpenHarmony's
keyboard, Studio, GL lifetimes and idle frames (#84, #85, #88, #87),
through Octoscript-Makepad 62760863 (#70). makepad #90 is not in it.

- root Cargo.toml: makepad and octoscript-makepad revisions together;
  native-apps.json (Sheets, Terminal), regenerated pins unchanged otherwise
- both native-runtime.lock.json files
- runtime-patches.lock.json: the settings patch is rebased onto 39a9de88
  with the same added and removed lines; its touch-down line in
  MakepadActivity.java now sits next to #83's hint, and draw_text.rs
  context follows #87's cfg. The system-back, IME and two Windows patches
  reapply unchanged. The map, OpenHarmony GL-lifetime and DrawText patches
  are dropped: they are makepad #79, #88 and #89, now upstream. New tree
  976bf55b.
- Cargo.lock: unchanged
- the pinned-hash docs under phone/docs; rom/docs/home-build.md follows in
  its own change, so this one does not trigger rom.yml (whose jobs local
  CI cannot run)

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
ymote added a commit that referenced this pull request Oct 2, 2026
@ymote @claude
Repin the runtime to makepad 39a9de88 (OpenHarmony idle and input, GL…
01ca2c5 
… GPU timing, terminal shortcuts)

Makepad main 39a9de88 adds a hidden map's idle frame loop fix (#79),
Android HTTP without redirects (#75), the sheets font by crate (#80),
Linux GL remote grabs (#93), Android Vulkan without a debug messenger
(#92), the touch-down power hint (#83), GL GPU timing (#81), atlas text
on phones (#82), the DrawText current-list fix (#89), terminal keyboard
shortcuts (#76) and the terminal on OpenHarmony (#91), and OpenHarmony's
keyboard, Studio, GL lifetimes and idle frames (#84, #85, #88, #87),
through Octoscript-Makepad 62760863 (#70). makepad #90 is not in it.

- root Cargo.toml: makepad and octoscript-makepad revisions together;
  native-apps.json (Sheets, Terminal), regenerated pins unchanged otherwise
- both native-runtime.lock.json files
- runtime-patches.lock.json: the settings patch is rebased onto 39a9de88
  with the same added and removed lines; its touch-down line in
  MakepadActivity.java now sits next to #83's hint, and draw_text.rs
  context follows #87's cfg. The system-back, IME and two Windows patches
  reapply unchanged. The map, OpenHarmony GL-lifetime and DrawText patches
  are dropped: they are makepad #79, #88 and #89, now upstream. New tree
  976bf55b.
- Cargo.lock: unchanged
- the pinned-hash docs under phone/docs; rom/docs/home-build.md follows in
  its own change, so this one does not trigger rom.yml (whose jobs local
  CI cannot run)

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This was referenced Oct 10, 2026
Open
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

1 participant

@ymote