Skip to content

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

Merged
ymote merged 2 commits into
mainfrom
chore/repin-makepad-bcb0583b
Sep 30, 2026
Merged

ymote merged 2 commits into
mainfrom
chore/repin-makepad-bcb0583b

Conversation

@ymote

@ymote ymote commented Sep 30, 2026

Copy link
Copy Markdown
Contributor

Repins the runtime to makepad main bcb0583b: terminal tab titles (makepad#61), wide-character reflow (#62), non-blocking PTY writes (#63), the control-request timeout (#64), and quit/close confirming running jobs with app_module's close-veto hook (#65). Part of #179.

Before merge: native-runtime.lock.json (and apps/appcard/native-runtime.lock.json, Cargo.toml) name Octoscript-Makepad 4a641af1, the head of OctoSense-org/OctoScript-Makepad#63. Once that PR merges, update them to its merge commit.

  • Octoscript-Makepad 515acb49 → 4a641af1. Its runtime.json also carries Octoscript 76032ed4 (from OctoScript-Makepad#62, already on its main), so the Octoscript pins move with it. Cargo.lock gains one edge: octoscript-schema now depends on serde.
  • Runtime patches: makepad-settings.patch and the stacked makepad-system-back.patch apply to bcb0583b unchanged, with the same sha256. None of the files they touch changed between a5a3cf5b and bcb0583b. Only base_revision and the stacked tree (a5df8528) change.
  • native-apps.json (sheets, terminal) and the regenerated Cargo.toml block; doc lines naming the release.

Checks (macOS)

  • python3 tools/setup.py --update, then --check --cargo: clean.
  • cargo check --locked -p octosense: ok.
  • cd phone && cargo test --locked --features mobile-apps -p octosense-shell: 584 passed.
  • cd phone && cargo test --locked --features mobile-apps,app-terminal -p octosense-shell terminal: 14 passed.
  • python3 tools/native_apps.py --check: ok.

The shell side of #65 (hosted close confirmation) is stacked on this branch as its own PR.

🤖 Generated with Claude Code

Moves Octoscript-Makepad to 4a641af1 (OctoScript-Makepad#63, the PR head:
update to its merge commit once it lands), which pins makepad main
bcb0583b: terminal tab titles (#61), wide-character reflow (#62),
non-blocking PTY writes (#63), the control-request timeout (#64) and the
running-job close confirmation with app_module's close-veto hook (#65).
Its runtime.json also carries Octoscript 76032ed4 (OctoScript-Makepad#62),
so the Octoscript pins move with it; Cargo.lock gains the one serde edge
octoscript-schema now declares.

The settings and system-back runtime patches apply to bcb0583b unchanged
(none of their files moved since a5a3cf5b); only the base revision and the
stacked tree (a5df8528) change.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Octoscript-Makepad #63 (makepad bcb0583b) is merged; the lock pointed at
its PR head until now. This commit also runs CI on the repin (the
earlier commit carried [skip ci] from the ADR 0004 period).

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
@ymote
ymote merged commit 3f1c2aa into main Sep 30, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant