Commit Graph
23 Commits
Author SHA1 Message Date
bincxz 037a2f651b fix(sync): ignore peer no-op metadata in identity guard 2026-09-27 16:48:38 +08:00
bincxz 1a4a022a8e fix(sync): distinguish token refresh from provider switch 2026-09-27 16:36:42 +08:00
bincxz fd177e8453 fix(sync): detect provider changes before storage events arrive 2026-09-27 16:29:42 +08:00
bincxz dee468dcfa fix(sync): guard no-op persistence across provider changes 2026-09-27 16:25:40 +08:00
bincxz c666fdb156 fix(sync): keep newer provider credentials during no-op 2026-09-27 16:15:53 +08:00
bincxz b4111cf970 test(sync): verify two devices settle after shared edits 2026-09-27 16:03:39 +08:00
bincxz 8d6ef72006 fix(sync): stop upload when no-op state persistence fails 2026-09-27 14:30:07 +08:00
bincxz 598f5cf796 test(sync): cover vault lock during no-op base save 2026-09-25 17:51:51 +08:00
bincxz ed92944af0 fix(sync): stop no-op commit after vault security changes 2026-09-25 17:50:33 +08:00
bincxz e2b3daac9a test(sync): cover download-remote source no-op with stale peer 2026-09-25 17:44:26 +08:00
bincxz 105b7f16bc fix(sync): carry deletion records into later uploads 2026-09-24 17:14:24 +08:00
bincxz ec11989d52 fix(sync): reconcile remote deletion records in no-op base 2026-09-24 17:10:43 +08:00
bincxz fd3e82386a fix(sync): retain deletion records across no-op providers 2026-09-24 17:04:17 +08:00
bincxz 2b120c0d41 fix(sync): preserve discovered provider identity during no-op 2026-09-24 16:57:22 +08:00
bincxz 318577cd72 fix(sync): avoid version ping-pong for identical providers 2026-09-24 16:52:16 +08:00
netcatty-bot 9e07e9e7b9 fix(#3519): automated AI fix 2026-09-24 07:35:54 +00:00
904af93a1d fix(credentials): 防止解密失败后二次加密污染本地与云端 (#2702) (#2770)
* fix(credentials): stop double-encrypting undecryptable safeStorage blobs

When local decrypt failed (e.g. OSCrypt key churn after reboot), encrypt
used to wrap the leftover enc:v1 ciphertext again, permanently poisoning
the vault. Startup sync could also push those placeholders to cloud and
make download restore the same poison.

- Keep real enc:v1 blobs unchanged on encrypt (header check, no wrap)
- Strip device-bound placeholders when applying portable sync payloads
- Guard startup local-wins / merge round-trips before upload
- Skip vault init re-encrypt writes when secrets are still undecrypted

Fixes #2702

Co-authored-by: 陈大猫 <binaricat@users.noreply.github.com>

* fix(sync): strip enc:v1 secrets from smart-merge uploads

Bugbot found that after local apply sanitized placeholders, legacy v1
smart-merge could still decrypt an unstripped remote, merge it, and
re-upload the poison. Strip device-bound credentials on remote decrypt
and again on the merged payload before upload.

Co-authored-by: 陈大猫 <binaricat@users.noreply.github.com>

* fix(credentials): address Codex P2 review on #2702

- Always re-encrypt vault init batches so plaintext siblings are not
  left unprotected when one record is a stale enc:v1 placeholder
- Sanitize device-bound secrets before convergent restore prepare so
  CRDT replica commit matches vault import
- Require a complete safeStorage blob (header + min 31 bytes) before
  treating enc:v1 as ciphertext; encrypt header-only coincidences

Co-authored-by: 陈大猫 <binaricat@users.noreply.github.com>

* fix(credentials): address Codex P1 review on #2702

- Decode enc:v1 payloads with atob in the renderer-safe domain helper
- Heal poisoned remote secrets from local/base before smart-merge so
  good credentials are not discarded as remote-only deletions
- Keep post-merge strip so leftover enc:v1 never uploads

Co-authored-by: 陈大猫 <binaricat@users.noreply.github.com>

* fix(credentials): address Codex P1 CBC min and startup heal

- Accept 19-byte v10/v11 CBC OSCrypt blobs (not only 31-byte GCM)
- Heal poisoned remote secrets before startup smart-merge
- Strip unresolved placeholders on merge round-trip upload

Co-authored-by: 陈大猫 <binaricat@users.noreply.github.com>

* fix(sync): sanitize payloads at every apply/commit boundary

Codex P1: vault apply stripped enc:v1 while commitRemoteInspection and
convergent materialization could keep the poison. Sanitize merged/remote
payloads before apply+base commit, strip on CRDT materialization, and
sanitize convergent apply inputs.

Co-authored-by: 陈大猫 <binaricat@users.noreply.github.com>

* fix(sync): heal local and remote secrets before smart-merge

Smart-merge could select a locally-changed entity whose only secret
delta was enc:v1 poison, then strip and upload empty secrets. Heal
both sides from the opposite payload/base before merge on all sync
paths.

Co-authored-by: 陈大猫 <binaricat@users.noreply.github.com>

* fix(sync): keep enc:v1 intact during convergent materialize

Stripping device-bound secrets inside materializeSyncPayloadFromConvergentState
broke envelope validation for poisoned-but-consistent v2 snapshots, so decrypt
could not hydrate the clouds #2702 needs to recover. Portable stripping stays
at apply/upload boundaries.

Co-authored-by: 陈大猫 <binaricat@users.noreply.github.com>

* fix(credentials): detect Windows DPAPI by decoded header bytes

Real DPAPI blobs start with 01 00 00 00 d0 8c... and base64-encode as
AQAAANCM..., so the previous AQAAAA string prefix rejected them and
allowed double-wrapping after key rotation. Match decoded headers in
both the main-process bridge and renderer predicate.

Co-authored-by: 陈大猫 <binaricat@users.noreply.github.com>

* test(credentials): use complete enc:v1 fixtures for stricter detector

Short placeholders like enc:v1:djEwAAAA no longer pass the platform
header + minimum-size checks. Update auth/SFTP/proxy/sync fixtures to
full v10-shaped blobs so npm test matches production validation.

Co-authored-by: 陈大猫 <binaricat@users.noreply.github.com>

* fix(sync): treat preferred credential deletions as authoritative

When healing enc:v1 before merge, an empty/missing secret on a present
preferred entity is an intentional clear and must not be revived from
base. Only fall back to base when preferred is absent or also poisoned.

Co-authored-by: 陈大猫 <binaricat@users.noreply.github.com>

* fix(credentials): reject impossible v10/v11 ciphertext lengths

Accept only CBC-aligned sizes (19+16n) or GCM-sized blobs (>=31) so
coincidental enc:v1 plaintext of intermediate length is encrypted instead
of treated as an undecryptable placeholder.

Co-authored-by: 陈大猫 <binaricat@users.noreply.github.com>

* fix(credentials): require full DPAPI provider GUID signature

Accept Windows safeStorage blobs only when they start with version
01 00 00 00 plus provider GUID df9d8cd0-1501-11d1-8c7a-00c04fc297eb,
so coincidental 01 00 00 00 prefixes are not treated as ciphertext.

Co-authored-by: 陈大猫 <binaricat@users.noreply.github.com>

---------

Co-authored-by: Cursor Agent <cursoragent@cursor.com>
Co-authored-by: 陈大猫 <binaricat@users.noreply.github.com>
2026-08-06 13:17:24 +08:00
Netcatty-Botandnetcatty-bot e9ef296974 fix(cloud-sync): keep-local overwrite skips remote decrypt (#2469)
* fix(#2466): automated Cursor CLI fix

* fix: address Codex review on PR #2469

---------

Co-authored-by: netcatty-bot <308658023+netcatty-bot@users.noreply.github.com>
2026-07-25 18:40:01 +08:00
ryan-wong-coder e6ffbd3f68 feat(sync): integrate convergent multi-device sync (#2259)
* feat(sync): integrate convergent multi-device sync

* fix(sync): seed v1 migration baselines

* fix(sync): join providers before downgrade

* fix(sync): close downgrade and reauth gaps

* fix(sync): redact nested array secrets

* fix(sync): close migration consistency gaps

* fix(sync): preserve migration and retry state

* fix(sync): share convergent pause state

* fix(sync): preserve paused edits on downgrade

* fix(sync): preserve paused auto-sync edits

* fix(sync): publish migrations and preserve merges

* fix(sync): route convergent remote checks

* fix(sync): avoid no-op convergent writes

* fix(sync): preserve convergent recovery safeguards

* fix(sync): commit merged replicas after apply

* fix(sync): open empty convergent startup gate

* fix(sync): seed legacy downgrade baselines
2026-07-17 09:41:28 +08:00
ryan-wong-coder 6e55d2d498 feat(sync): add convergent sync migration (#2254)
* feat(sync): add convergent sync migration

* fix(sync): address convergent migration review

* fix(sync): normalize CRDT payload entities

* fix(sync): invalidate stale provider baselines

* fix(sync): harden convergent migration recovery

* fix(sync): close migration concurrency gaps

* fix(sync): guard seeded provider shrink

* fix(sync): preserve undefined legacy fields

* fix(sync): guard legacy v2 migration shrink

* fix(sync): harden migration apply transaction

* fix(sync): reject locked migration initialization

* fix(sync): block unbased divergent v1 migration
2026-07-16 20:03:32 +08:00
陈大猫 e3f68e1a3f [codex] fix cloud sync master key refresh (#1175)
* fix cloud sync master key refresh

* Protect first sync from default settings

* Avoid recovery prompt for settings-only sync

* Cancel stale syncs after master key changes
2026-06-01 19:29:53 +08:00
陈大猫 3c4746aea0 [codex] add sync reliability metadata (#1174)
* feat: add sync reliability metadata

* fix: preserve tombstones from checked remotes

* fix: keep conflict change counts typed
2026-06-01 18:40:19 +08:00
陈大猫 463dd4464f [codex] add cloud sync strategies (#1171)
* feat: add cloud sync strategies

* chore: clarify cloud sync strategy options

* chore: keep selected sync strategy concise

* fix: sync cloud-wins payload to remaining providers

* fix: apply cloud sync strategy during startup

* fix: retry partial startup cloud syncs
2026-06-01 17:07:07 +08:00