Cherry-pick abb8f6310: iOS: auto-load scoped gateway canvas with safe fallback#1336
Merged
alexey-pelykh merged 1 commit intomainfrom Mar 14, 2026
Merged
Conversation
…#40282) Merged via squash. - mb-server validation: `swift test --package-path apps/shared/OpenClawKit --filter GatewayNodeSessionTests` - mb-server validation: `pnpm build` - Scope note: top-level `RootTabs` shell change was intentionally removed from this PR before merge (cherry picked from commit abb8f63)
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Cherry-pick from upstream
abb8f6310Summary
Auto-loads the scoped gateway canvas with safe fallback. Adds
A2UIReadyStateenum andensureA2UIReadyWithCapabilityRefreshmethod for robust canvas host validation before A2UI operations.Conflict resolution
Three hunks resolved across two files:
NodeAppModel+Canvas.swift— fork removedimport OpenClawKitduring rebrand (not needed); took upstream's newA2UIReadyStateenumNodeAppModel.swifthunk 1 — fork hadRemoteClawCanvasA2UICommand(rebranded); took upstream's newensureA2UIReadyWithCapabilityRefreshflow with fork's namesNodeAppModel.swifthunk 2 — whitespace-only difference (blank line before case); kept fork's rebranded names + upstream's formattingDepends on #1335
Closes #914 — commit 2/4