Skip to content

Cherry-pick e806c479f: Gateway/iOS replay queued foreground actions after resume#1341

Merged
alexey-pelykh merged 2 commits intomainfrom
cherry-pick/e806c479f-ios-replay-queued-foreground
Mar 14, 2026
Merged

Cherry-pick e806c479f: Gateway/iOS replay queued foreground actions after resume#1341
alexey-pelykh merged 2 commits intomainfrom
cherry-pick/e806c479f-ios-replay-queued-foreground

Conversation

@alexey-pelykh
Copy link
Copy Markdown

Cherry-pick from upstream

Upstream commit: e806c479f
Author: steipete (Peter Steinberger)
Tier: AUTO-PICK (alive=11, rebranded=1)

Depends on #1338

Conflict resolution

This cherry-pick required conflict resolution:

  • method-scopes.ts: Fork already has node.pending.pull and node.pending.ack, removed duplicate skills.bins (gutted in fork)
  • types.ts: Fork already has all NodePending* types in fork's direct Static<typeof> style; kept ours
  • nodes.ts (conflict 1): Upstream added new helper functions (isForegroundRestrictedIosCommand, shouldQueueAsPendingForegroundAction, pending node action queue management). Merged upstream's new functions with fork's export keyword on maybeWakeNodeWithApns
  • nodes.ts (conflict 2): Upstream added node.pending.pull and node.pending.ack handlers after node.canvas.capability.refresh (which fork moved elsewhere). Kept fork's removal of node.canvas.capability.refresh, added the two new handlers
  • NodeAppModel.swift: Added upstream's new pendingActionLogger with fork's rebranded subsystem (org.remoteclaw.ios)
  • protocol-schemas.ts, index.ts: Fixed duplicate NodePendingAckParamsSchema and validateNodePendingAckParams declarations (fork already had these from a previous cherry-pick, auto-merge created duplicates)

Closes #914 — commit 4/4

mbelinky and others added 2 commits March 14, 2026 20:14
…enclaw#40281)

Merged via squash.

- Local validation: `pnpm exec vitest run --config vitest.gateway.config.ts src/gateway/server-methods/nodes.invoke-wake.test.ts`
- Local validation: `pnpm build`
- mb-server validation: `pnpm exec vitest run --config vitest.gateway.config.ts src/gateway/server-methods/nodes.invoke-wake.test.ts`
- mb-server validation: `pnpm build`
- mb-server validation: `pnpm protocol:check`

(cherry picked from commit e806c47)
@alexey-pelykh alexey-pelykh merged commit 9c7207a into main Mar 14, 2026
7 checks passed
@alexey-pelykh alexey-pelykh deleted the cherry-pick/e806c479f-ios-replay-queued-foreground branch March 14, 2026 19:30
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.

Cherry-pick: iOS/macOS gateway replay, tailscale discovery, canvas auto-load,

2 participants