Skip to content

Re-pin octoscript-core after the vendored VM removal - #57

Closed
ymote wants to merge 1 commit into
masterfrom
deps/octoscript-core-9069cfa
Closed

ymote wants to merge 1 commit into
masterfrom
deps/octoscript-core-9069cfa

Conversation

@ymote

@ymote ymote commented Sep 13, 2026 •

Copy link
Copy Markdown
Collaborator

Summary

cargo update -p octoscript-core against current Octoscript main:

  • octoscript-core (and octoscript-ui-l0, same git source): c0ec7fd -> 5379eed — the merge of Octoscript PR #23, which removes vendor/ and consumes the Makepad VM solely through the makepad-script git pin.
  • makepad-script and the other 12 packages from OctoSense-org/makepad stay at 1fdce273, because that is what Octoscript main pins today.

Only Cargo.lock changes (2 source lines); no package added or removed.

Verification

cargo metadata --locked           -> ok
cargo check -p octoscript-oh-core -> clean

Note: octoscript-oh-core does not depend on octoscript-core (only octoscript-oh-arkui and octoscript-oh-webview do), so that check does not exercise the re-pin.

Pre-existing breakage on master (not introduced here)

cargo check -p octoscript-oh-arkui (and therefore -p octoscript-oh-webview, which depends on arkui) fails with the same two errors on master's lockfile (octoscript-core c0ec7fd, makepad 1fdce27) as on this branch:

error[E0560]: struct `octoscript_core::makepad_script::ScriptVm<'_>` has no field named `std`
   --> crates/octoscript-oh-arkui/src/dsl.rs:229:9
error[E0277]: the trait bound `&mut {integer}: CoerceUnsized<&mut (dyn ScriptHost + 'static)>` is not satisfied
   --> crates/octoscript-oh-arkui/src/dsl.rs:228:15

dsl.rs:228-229 still constructs ScriptVm with the old (vendored-VM) field layout; it needs updating to the fork VM's ScriptVm constructor. That is a code fix for a separate PR, not something a lock re-pin can address.

Second re-pin needed after Octoscript #24

OH consumes octoscript-core by branch = "main", so it can only follow what Octoscript main has merged. Octoscript PR #24 moves the makepad-script pin to 9069cfaf (octoscript branch synced with upstream makepad work d476e52, 25 upstream commits; Octoscript verified at 988 passed / 2 pre-existing catalog-drift failures, no regression). Once that merges, a second cargo update -p octoscript-core is required here to pull the new makepad rev into this lockfile — this PR does not (and cannot yet) include it.

🤖 Generated with Claude Code

https://claude.ai/code/session_01JgSir4cQyaakzPju4h6smw

`cargo update -p octoscript-core`: Octoscript main c0ec7fd -> 5379eed
(merge of Octoscript PR #23, which removes vendor/ and consumes the VM
solely as the makepad-script git pin). octoscript-ui-l0 moves with it,
same source. makepad-script stays at 1fdce273 because that is what
Octoscript main pins today.

A second `cargo update -p octoscript-core` will be needed once
Octoscript PR #24 (makepad-script pin -> 9069cfa, synced with upstream
work d476e52) merges to main.

Verification:
  cargo metadata --locked: ok
  cargo check -p octoscript-oh-core: clean

Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01JgSir4cQyaakzPju4h6smw
@ymote

ymote commented Sep 13, 2026

Copy link
Copy Markdown
Collaborator Author

Superseded: Octoscript #24 merged, so the re-pin is redone together with the arkui ScriptVm fix in one PR.

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