Skip to content

chore: land #371 and #372 onto master - #373

Merged
plrthink merged 4 commits into
masterfrom
cursor/land-parity-on-master-b7ed
Aug 16, 2026
Merged

chore: land #371 and #372 onto master#373
plrthink merged 4 commits into
masterfrom
cursor/land-parity-on-master-b7ed

Conversation

@plrthink

@plrthink plrthink commented Aug 15, 2026

Copy link
Copy Markdown
Collaborator

Summary

#370 was squash-merged into master, but #371 and #372 were squash-merged into the stacked feature branches. The full 9.4.0 tree therefore lived on cursor/platform-parity-b7ed, not on master.

This PR cherry-picks those two squash commits onto current master. Follow-up commit restores the hardened Maestro E2E install from master, aligns iOS unzip failure progress with Android, and adds a MIGRATION.md note for the iOS file-array ZipCrypto default.

What this lands

master already has #369 (listContents) and #370 (cancel() + error codes).

Test plan

  • npm test (36 tests)
  • CI Android/iOS builds + E2E
Open in Web Open in Cursor 

Open in Devin Review

plrthink and others added 2 commits August 15, 2026 14:59
* fix(ios): zip interoperability for server-side unzippers (#367)

Rebased onto #370 after #369 was squash-merged.

Co-authored-by: Perry <plrthink@gmail.com>

* docs: file-array zipWithPassword honors encryptionType on iOS

The interoperability change writes ZipCrypto vs AES based on
encryptionType for file arrays; drop the outdated README callout.

Co-authored-by: Perry <plrthink@gmail.com>

* docs: note iOS file-array zipWithPassword default is now ZipCrypto

Omitting encryptionType used to always write WinZip-AES for iOS file
arrays. Callers who need AES must pass AES-128 or AES-256.

Co-authored-by: Perry <plrthink@gmail.com>

---------

Co-authored-by: Cursor Agent <cursoragent@cursor.com>
Rebased onto #371 after #369 was squash-merged.

Co-authored-by: Cursor Agent <cursoragent@cursor.com>
@cursor

cursor Bot commented Aug 15, 2026

Copy link
Copy Markdown
Contributor

Bugbot is not enabled for your account, so this pull request was not reviewed.

Enable Bugbot in the Cursor dashboard to get automatic reviews on future PRs.

@devin-ai-integration devin-ai-integration Bot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Devin Review found 3 potential issues.

View 1 additional finding in Devin Review.

Open in Devin Review

Comment thread .github/workflows/e2e.yml Outdated
Comment thread ios/RNZipArchive.mm
Comment thread ios/RNZipArchive.mm
cursoragent and others added 2 commits August 15, 2026 15:08
Keep the hardened E2E Maestro install from master (retry + version
check). Emit 0% progress when iOS unzip/unzipAssets fails, matching
Android. Document the iOS file-array ZipCrypto default in MIGRATION.md.

Co-authored-by: Perry <plrthink@gmail.com>
Co-authored-by: Perry <plrthink@gmail.com>
@plrthink
plrthink merged commit 99d2517 into master Aug 16, 2026
8 checks passed
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.

2 participants