supastash 0.2.8 → 0.2.10

package/dist/desktop/utils/sync/pushLocal/uploadChunk.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"uploadChunk.d.ts","sourceRoot":"","sources":["../../../../../src/desktop/utils/sync/pushLocal/uploadChunk.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,WAAW,EAAE,MAAM,sCAAsC,CAAC;AAgMnE;;;;GAIG;AACH,wBAAsB,UAAU,CAC9B,KAAK,EAAE,MAAM,EACb,eAAe,EAAE,WAAW,EAAE,EAC9B,cAAc,CAAC,EAAE,CAAC,OAAO,EAAE,GAAG,EAAE,KAAK,OAAO,CAAC,OAAO,CAAC,iBAetD"}
+{"version":3,"file":"uploadChunk.d.ts","sourceRoot":"","sources":["../../../../../src/desktop/utils/sync/pushLocal/uploadChunk.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,WAAW,EAAE,MAAM,sCAAsC,CAAC;AA6OnE;;;;GAIG;AACH,wBAAsB,UAAU,CAC9B,KAAK,EAAE,MAAM,EACb,eAAe,EAAE,WAAW,EAAE,EAC9B,cAAc,CAAC,EAAE,CAAC,OAAO,EAAE,GAAG,EAAE,KAAK,OAAO,CAAC,OAAO,CAAC,iBAetD"}

package/dist/desktop/utils/sync/pushLocal/uploadChunk.js

@@ -1,5 +1,6 @@
 import { DEFAULT_CHUNK_SIZE } from "../../../../shared/constants/syncDefaults";
 import { getSupastashConfig } from "../../../../shared/core/config";
+import { isOnline } from "../../../../shared/utils/connection";
 import { normalizeForSupabase } from "../../../../shared/utils/getSafeValues";
 import log from "../../../../shared/utils/logs";
 import { supabaseClientErr } from "../../../../shared/utils/supabaseClientErr";
@@ -28,6 +29,7 @@ async function uploadChunk(table, chunk, onPushToRemote) {
     const hasRPCPath = !!config.pushRPCPath;
     const ids = chunk.map((row) => row.id);
     const toPush = [];
+    let remoteExistsMap = new Map();
     // If we have a RPC path, we can push the whole chunk. Server validates freshness.
     if (hasRPCPath) {
         toPush.push(...chunk);
@@ -35,6 +37,8 @@ async function uploadChunk(table, chunk, onPushToRemote) {
     else {
         // Fetch remote data for the current chunk
         const remoteIds = await fetchRemoteHeadsChunked(table, ids, supabase);
+        for (const id of ids)
+            remoteExistsMap.set(id, remoteIds.has(id));
         // Loop through the initial chunk and check if the id is in the remote data
         const filtered = filterRowsByUpdatedAt(table, chunk, remoteIds);
         toPush.push(...filtered);
@@ -70,7 +74,7 @@ async function uploadChunk(table, chunk, onPushToRemote) {
         let batchOk = false;
         // RPC return values
         let completed = [];
-        let existsMap = new Map();
+        let existsMap = new Map(remoteExistsMap);
         if (onPushToRemote) {
             const ok = await onPushToRemote(pending);
             if (ok)
@@ -82,12 +86,43 @@ async function uploadChunk(table, chunk, onPushToRemote) {
             pending = [...res.data.skipped];
             existsMap = res.data.existsMap;
             batchOk = res.error == null && pending.length === 0;
-            // If there was an RPC error, we need to retry the main function
             if (res.error) {
-                attempts++;
-                await backoff(attempts);
-                pending = [...preflightOK];
-                continue;
+                if (!(await isOnline())) {
+                    attempts++;
+                    await backoff(attempts);
+                    pending = [...preflightOK];
+                    continue;
+                }
+                // Online: RPC failed — run per-row single upserts immediately, no retry.
+                // pending was reassigned to res.data.skipped (empty on error), so use preflightOK.
+                const rowsToProcess = [...preflightOK];
+                try {
+                    const heads = await fetchRemoteHeadsChunked(table, rowsToProcess.map((r) => r.id), supabase);
+                    for (const r of rowsToProcess)
+                        existsMap.set(r.id, heads.has(r.id));
+                }
+                catch {
+                    // existsMap stays empty — singleUpsert will fall back to upsert
+                }
+                const syncedNow = [];
+                const keep = [];
+                for (const row of rowsToProcess) {
+                    const rowRes = await singleUpsert(table, row, supabase, existsMap);
+                    if (!rowRes.error) {
+                        syncedNow.push(row.id);
+                        continue;
+                    }
+                    errorCount++;
+                    lastError = rowRes.error;
+                    const decision = await handleRowFailure(config, table, row, rowRes.error, supabase);
+                    if (decision !== "KEEP")
+                        continue;
+                    keep.push(row);
+                }
+                if (syncedNow.length)
+                    await markSynced(table, syncedNow);
+                pending = keep;
+                break;
             }
         }
         else {
@@ -115,7 +150,7 @@ async function uploadChunk(table, chunk, onPushToRemote) {
                 res = await rpcUpsertSingle({ table, row, supabase, existsMap });
             }
             else {
-                res = await singleUpsert(table, row, supabase);
+                res = await singleUpsert(table, row, supabase, existsMap);
             }
             if (!res.error) {
                 syncedNow.push(row.id);
@@ -133,10 +168,18 @@ async function uploadChunk(table, chunk, onPushToRemote) {
             await markSynced(table, syncedNow);
         if (keep.length === 0)
             return;
-        // Backoff before next batch round (exponential, bounded by policy)
-        attempts++;
-        await backoff(attempts);
-        pending = keep;
+        if (!(await isOnline())) {
+            attempts++;
+            await backoff(attempts);
+            pending = keep;
+        }
+        else {
+            // Online: errors are genuine failures, not network issues — don't retry
+            for (const r of keep)
+                setQueryStatus(r.id, table, "error");
+            pending = keep; // update pending so post-loop markLogError reflects only true failures
+            break;
+        }
     }
     if (pending.length > 0) {
         SyncInfoUpdater.markLogError({

package/dist/desktop/utils/sync/pushLocal/uploadHelpers.d.ts

@@ -1,8 +1,8 @@
 import { SupastashConfig } from "../../../../shared/types/supastashConfig.types";
 import { RowLike } from "../../../../shared/types/syncEngine.types";
-export declare function classifyFailure(cfg: SupastashConfig<any>, code?: string | number): "HTTP" | "UNKNOWN" | "NON_RETRYABLE" | "FK_BLOCK" | "RETRYABLE";
+export declare function classifyFailure(cfg: SupastashConfig<any>, code?: string | number): "HTTP" | "UNKNOWN" | "NON_RETRYABLE" | "FK_BLOCK" | "UNIQUE_VIOLATION" | "RETRYABLE";
 declare function batchUpsert(table: string, rows: RowLike[], supabase: any): Promise<any>;
-declare function singleUpsert(table: string, row: RowLike, supabase: any): Promise<any>;
+declare function singleUpsert(table: string, row: RowLike, supabase: any, existsMap?: Map<string, boolean>): Promise<any>;
 declare function backoff(attempts: number): Promise<void>;
 declare function rpcUpsert({ table, rows, supabase, }: {
     table: string;

package/dist/desktop/utils/sync/pushLocal/uploadHelpers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"uploadHelpers.d.ts","sourceRoot":"","sources":["../../../../../src/desktop/utils/sync/pushLocal/uploadHelpers.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,eAAe,EAAE,MAAM,gDAAgD,CAAC;AACjF,OAAO,EAAE,OAAO,EAAE,MAAM,2CAA2C,CAAC;AAOpE,wBAAgB,eAAe,CAC7B,GAAG,EAAE,eAAe,CAAC,GAAG,CAAC,EACzB,IAAI,CAAC,EAAE,MAAM,GAAG,MAAM,mEAWvB;AAED,iBAAe,WAAW,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE,QAAQ,EAAE,GAAG,gBAEvE;AAED,iBAAe,YAAY,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,OAAO,EAAE,QAAQ,EAAE,GAAG,gBAErE;AAED,iBAAe,OAAO,CAAC,QAAQ,EAAE,MAAM,iBAOtC;AAmBD,iBAAe,SAAS,CAAC,EACvB,KAAK,EACL,IAAI,EACJ,QAAQ,GACT,EAAE;IACD,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,OAAO,EAAE,CAAC;IAChB,QAAQ,EAAE,GAAG,CAAC;CACf;;;;;;;GA+CA;AAED,iBAAe,eAAe,CAAC,EAC7B,KAAK,EACL,GAAG,EACH,QAAQ,EACR,SAAS,GACV,EAAE;IACD,KAAK,EAAE,MAAM,CAAC;IACd,GAAG,EAAE,OAAO,CAAC;IACb,QAAQ,EAAE,GAAG,CAAC;IACd,SAAS,EAAE,GAAG,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CACjC;;;;;;GAaA;AAMD,iBAAe,UAAU,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,iBAIrD;AAWD,iBAAS,qBAAqB,CAC5B,KAAK,EAAE,MAAM,EACb,KAAK,EAAE,OAAO,EAAE,EAChB,WAAW,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,aAiCjC;AAMD,iBAAe,gBAAgB,CAC7B,GAAG,EAAE,eAAe,CAAC,GAAG,CAAC,EACzB,KAAK,EAAE,MAAM,EACb,GAAG,EAAE,OAAO,EACZ,GAAG,EAAE,GAAG,EACR,QAAQ,EAAE,GAAG,GACZ,OAAO,CAAC,MAAM,GAAG,MAAM,GAAG,UAAU,CAAC,CAkDvC;AAgBD,OAAO,EACL,OAAO,EACP,WAAW,EACX,qBAAqB,EACrB,gBAAgB,EAChB,UAAU,EACV,SAAS,EACT,eAAe,EACf,YAAY,GACb,CAAC;AAEF;;;GAGG;AACH,wBAAsB,kBAAkB,CACtC,KAAK,EAAE,MAAM,EACb,KAAK,EAAE,MAAM,EACb,QAAQ,EAAE,GAAG,iBAkBd;AASD,wBAAsB,uBAAuB,CAC3C,KAAK,EAAE,MAAM,EACb,GAAG,EAAE,MAAM,EAAE,EACb,QAAQ,EAAE,GAAG,gCAcd"}
+{"version":3,"file":"uploadHelpers.d.ts","sourceRoot":"","sources":["../../../../../src/desktop/utils/sync/pushLocal/uploadHelpers.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,eAAe,EAAE,MAAM,gDAAgD,CAAC;AACjF,OAAO,EAAE,OAAO,EAAE,MAAM,2CAA2C,CAAC;AAOpE,wBAAgB,eAAe,CAC7B,GAAG,EAAE,eAAe,CAAC,GAAG,CAAC,EACzB,IAAI,CAAC,EAAE,MAAM,GAAG,MAAM,wFAYvB;AAED,iBAAe,WAAW,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE,QAAQ,EAAE,GAAG,gBAEvE;AAED,iBAAe,YAAY,CACzB,KAAK,EAAE,MAAM,EACb,GAAG,EAAE,OAAO,EACZ,QAAQ,EAAE,GAAG,EACb,SAAS,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,OAAO,CAAC,gBAwBjC;AAED,iBAAe,OAAO,CAAC,QAAQ,EAAE,MAAM,iBAOtC;AAmBD,iBAAe,SAAS,CAAC,EACvB,KAAK,EACL,IAAI,EACJ,QAAQ,GACT,EAAE;IACD,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,OAAO,EAAE,CAAC;IAChB,QAAQ,EAAE,GAAG,CAAC;CACf;;;;;;;GA+CA;AAED,iBAAe,eAAe,CAAC,EAC7B,KAAK,EACL,GAAG,EACH,QAAQ,EACR,SAAS,GACV,EAAE;IACD,KAAK,EAAE,MAAM,CAAC;IACd,GAAG,EAAE,OAAO,CAAC;IACb,QAAQ,EAAE,GAAG,CAAC;IACd,SAAS,EAAE,GAAG,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CACjC;;;;;;GAaA;AAMD,iBAAe,UAAU,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,iBAIrD;AAWD,iBAAS,qBAAqB,CAC5B,KAAK,EAAE,MAAM,EACb,KAAK,EAAE,OAAO,EAAE,EAChB,WAAW,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,aAiCjC;AAMD,iBAAe,gBAAgB,CAC7B,GAAG,EAAE,eAAe,CAAC,GAAG,CAAC,EACzB,KAAK,EAAE,MAAM,EACb,GAAG,EAAE,OAAO,EACZ,GAAG,EAAE,GAAG,EACR,QAAQ,EAAE,GAAG,GACZ,OAAO,CAAC,MAAM,GAAG,MAAM,GAAG,UAAU,CAAC,CA4DvC;AAgBD,OAAO,EACL,OAAO,EACP,WAAW,EACX,qBAAqB,EACrB,gBAAgB,EAChB,UAAU,EACV,SAAS,EACT,eAAe,EACf,YAAY,GACb,CAAC;AAEF;;;GAGG;AACH,wBAAsB,kBAAkB,CACtC,KAAK,EAAE,MAAM,EACb,KAAK,EAAE,MAAM,EACb,QAAQ,EAAE,GAAG,iBAkBd;AASD,wBAAsB,uBAAuB,CAC3C,KAAK,EAAE,MAAM,EACb,GAAG,EAAE,MAAM,EAAE,EACb,QAAQ,EAAE,GAAG,gCAcd"}

package/dist/desktop/utils/sync/pushLocal/uploadHelpers.js

@@ -17,6 +17,8 @@ export function classifyFailure(cfg, code) {
         return "NON_RETRYABLE";
     if (s === (p.fkCode ?? "23503"))
         return "FK_BLOCK";
+    if (s === "23505")
+        return "UNIQUE_VIOLATION";
     if (p.retryableCodes?.has?.(s))
         return "RETRYABLE";
     return "UNKNOWN";
@@ -24,8 +26,30 @@ export function classifyFailure(cfg, code) {
 async function batchUpsert(table, rows, supabase) {
     return await supabase.from(table).upsert(rows);
 }
-async function singleUpsert(table, row, supabase) {
-    return await supabase.from(table).upsert(row).select("id").maybeSingle();
+async function singleUpsert(table, row, supabase, existsMap) {
+    const exists = existsMap?.get(row.id);
+    if (exists === true) {
+        const { data, error } = await supabase
+            .from(table)
+            .update(row)
+            .eq("id", row.id)
+            .select("id")
+            .maybeSingle();
+        if (!error)
+            return { data, error: null };
+        // RLS may block update — fall through to upsert
+    }
+    else if (exists === false) {
+        const { data, error } = await supabase
+            .from(table)
+            .insert(row)
+            .select("id")
+            .maybeSingle();
+        if (!error)
+            return { data, error: null };
+        // RLS may block insert — fall through to upsert
+    }
+    return supabase.from(table).upsert(row).select("id").maybeSingle();
 }
 async function backoff(attempts) {
     const config = getSupastashConfig();
@@ -170,6 +194,12 @@ async function handleRowFailure(cfg, table, row, err, supabase) {
             return "DROP";
         }
     }
+    if (klass === "UNIQUE_VIOLATION") {
+        logWarn(`[Supastash] Row ${row.id} on ${table} violated a unique constraint (23505) → deleting local copy`, JSON.stringify(err));
+        await deleteLocalRow(table, row.id, supabase);
+        cfg.syncPolicy?.onRowDroppedLocal?.(table, row.id);
+        return "DROP";
+    }
     if (klass === "FK_BLOCK") {
         // Parent missing (23503) -> KEEP for later;
         log(`Row ${row.id} on ${table} blocked by missing parent (FK) → will retry`, JSON.stringify(err));

package/dist/native/utils/sync/pushLocal/uploadChunk.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"uploadChunk.d.ts","sourceRoot":"","sources":["../../../../../src/native/utils/sync/pushLocal/uploadChunk.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,WAAW,EAAE,MAAM,sCAAsC,CAAC;AAmMnE;;;;GAIG;AACH,wBAAsB,UAAU,CAC9B,KAAK,EAAE,MAAM,EACb,eAAe,EAAE,WAAW,EAAE,EAC9B,cAAc,CAAC,EAAE,CAAC,OAAO,EAAE,GAAG,EAAE,KAAK,OAAO,CAAC,OAAO,CAAC,iBAetD"}
+{"version":3,"file":"uploadChunk.d.ts","sourceRoot":"","sources":["../../../../../src/native/utils/sync/pushLocal/uploadChunk.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,WAAW,EAAE,MAAM,sCAAsC,CAAC;AAgPnE;;;;GAIG;AACH,wBAAsB,UAAU,CAC9B,KAAK,EAAE,MAAM,EACb,eAAe,EAAE,WAAW,EAAE,EAC9B,cAAc,CAAC,EAAE,CAAC,OAAO,EAAE,GAAG,EAAE,KAAK,OAAO,CAAC,OAAO,CAAC,iBAetD"}

package/dist/native/utils/sync/pushLocal/uploadChunk.js

@@ -32,6 +32,7 @@ async function uploadChunk(table, chunk, onPushToRemote) {
     const hasRPCPath = !!config.pushRPCPath;
     const ids = chunk.map((row) => row.id);
     const toPush = [];
+    let remoteExistsMap = new Map();
     // If we have a RPC path, we can push the whole chunk. Server validates freshness.
     if (hasRPCPath) {
         toPush.push(...chunk);
@@ -39,6 +40,8 @@ async function uploadChunk(table, chunk, onPushToRemote) {
     else {
         // Fetch remote data for the current chunk
         const remoteIds = await fetchRemoteHeadsChunked(table, ids, supabase);
+        for (const id of ids)
+            remoteExistsMap.set(id, remoteIds.has(id));
         // Loop through the initial chunk and check if the id is in the remote data
         const filtered = filterRowsByUpdatedAt(table, chunk, remoteIds);
         toPush.push(...filtered);
@@ -74,7 +77,7 @@ async function uploadChunk(table, chunk, onPushToRemote) {
         let batchOk = false;
         // RPC return values
         let completed = [];
-        let existsMap = new Map();
+        let existsMap = new Map(remoteExistsMap);
         if (onPushToRemote) {
             const ok = await onPushToRemote(pending);
             if (ok)
@@ -86,12 +89,43 @@ async function uploadChunk(table, chunk, onPushToRemote) {
             pending = [...res.data.skipped];
             existsMap = res.data.existsMap;
             batchOk = res.error == null && pending.length === 0;
-            // If there was an RPC error, we need to retry the main function
             if (res.error) {
-                attempts++;
-                await backoff(attempts);
-                pending = [...preflightOK];
-                continue;
+                if (!(await isOnline())) {
+                    attempts++;
+                    await backoff(attempts);
+                    pending = [...preflightOK];
+                    continue;
+                }
+                // Online: RPC failed — run per-row single upserts immediately, no retry.
+                // pending was reassigned to res.data.skipped (empty on error), so use preflightOK.
+                const rowsToProcess = [...preflightOK];
+                try {
+                    const heads = await fetchRemoteHeadsChunked(table, rowsToProcess.map((r) => r.id), supabase);
+                    for (const r of rowsToProcess)
+                        existsMap.set(r.id, heads.has(r.id));
+                }
+                catch {
+                    // existsMap stays empty — singleUpsert will fall back to upsert
+                }
+                const syncedNow = [];
+                const keep = [];
+                for (const row of rowsToProcess) {
+                    const rowRes = await singleUpsert(table, row, supabase, existsMap);
+                    if (!rowRes.error) {
+                        syncedNow.push(row.id);
+                        continue;
+                    }
+                    errorCount++;
+                    lastError = rowRes.error;
+                    const decision = await handleRowFailure(config, table, row, rowRes.error, supabase);
+                    if (decision !== "KEEP")
+                        continue;
+                    keep.push(row);
+                }
+                if (syncedNow.length)
+                    await markSynced(table, syncedNow);
+                pending = keep;
+                break;
             }
         }
         else {
@@ -119,7 +153,7 @@ async function uploadChunk(table, chunk, onPushToRemote) {
                 res = await rpcUpsertSingle({ table, row, supabase, existsMap });
             }
             else {
-                res = await singleUpsert(table, row, supabase);
+                res = await singleUpsert(table, row, supabase, existsMap);
             }
             if (!res.error) {
                 syncedNow.push(row.id);
@@ -137,10 +171,18 @@ async function uploadChunk(table, chunk, onPushToRemote) {
             await markSynced(table, syncedNow);
         if (keep.length === 0)
             return;
-        // Backoff before next batch round (exponential, bounded by policy)
-        attempts++;
-        await backoff(attempts);
-        pending = keep;
+        if (!(await isOnline())) {
+            attempts++;
+            await backoff(attempts);
+            pending = keep;
+        }
+        else {
+            // Online: errors are genuine failures, not network issues — don't retry
+            for (const r of keep)
+                setQueryStatus(r.id, table, "error");
+            pending = keep; // update pending so post-loop markLogError reflects only true failures
+            break;
+        }
     }
     if (pending.length > 0) {
         SyncInfoUpdater.markLogError({

package/dist/native/utils/sync/pushLocal/uploadHelpers.d.ts

@@ -1,8 +1,8 @@
 import { SupastashConfig } from "../../../../shared/types/supastashConfig.types";
 import { RowLike } from "../../../../shared/types/syncEngine.types";
-export declare function classifyFailure(cfg: SupastashConfig<any>, code?: string | number): "HTTP" | "UNKNOWN" | "NON_RETRYABLE" | "FK_BLOCK" | "RETRYABLE";
+export declare function classifyFailure(cfg: SupastashConfig<any>, code?: string | number): "HTTP" | "UNKNOWN" | "NON_RETRYABLE" | "FK_BLOCK" | "UNIQUE_VIOLATION" | "RETRYABLE";
 declare function batchUpsert(table: string, rows: RowLike[], supabase: any): Promise<any>;
-declare function singleUpsert(table: string, row: RowLike, supabase: any): Promise<any>;
+declare function singleUpsert(table: string, row: RowLike, supabase: any, existsMap?: Map<string, boolean>): Promise<any>;
 declare function backoff(attempts: number): Promise<void>;
 declare function rpcUpsert({ table, rows, supabase, }: {
     table: string;

package/dist/native/utils/sync/pushLocal/uploadHelpers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"uploadHelpers.d.ts","sourceRoot":"","sources":["../../../../../src/native/utils/sync/pushLocal/uploadHelpers.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,eAAe,EAAE,MAAM,gDAAgD,CAAC;AACjF,OAAO,EAAE,OAAO,EAAE,MAAM,2CAA2C,CAAC;AAOpE,wBAAgB,eAAe,CAC7B,GAAG,EAAE,eAAe,CAAC,GAAG,CAAC,EACzB,IAAI,CAAC,EAAE,MAAM,GAAG,MAAM,mEAWvB;AAED,iBAAe,WAAW,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE,QAAQ,EAAE,GAAG,gBAEvE;AAED,iBAAe,YAAY,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,OAAO,EAAE,QAAQ,EAAE,GAAG,gBAErE;AAED,iBAAe,OAAO,CAAC,QAAQ,EAAE,MAAM,iBAOtC;AAmBD,iBAAe,SAAS,CAAC,EACvB,KAAK,EACL,IAAI,EACJ,QAAQ,GACT,EAAE;IACD,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,OAAO,EAAE,CAAC;IAChB,QAAQ,EAAE,GAAG,CAAC;CACf;;;;;;;GA+CA;AAED,iBAAe,eAAe,CAAC,EAC7B,KAAK,EACL,GAAG,EACH,QAAQ,EACR,SAAS,GACV,EAAE;IACD,KAAK,EAAE,MAAM,CAAC;IACd,GAAG,EAAE,OAAO,CAAC;IACb,QAAQ,EAAE,GAAG,CAAC;IACd,SAAS,EAAE,GAAG,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CACjC;;;;;;GAaA;AAMD,iBAAe,UAAU,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,iBAIrD;AAWD,iBAAS,qBAAqB,CAC5B,KAAK,EAAE,MAAM,EACb,KAAK,EAAE,OAAO,EAAE,EAChB,WAAW,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,aAiCjC;AAMD,iBAAe,gBAAgB,CAC7B,GAAG,EAAE,eAAe,CAAC,GAAG,CAAC,EACzB,KAAK,EAAE,MAAM,EACb,GAAG,EAAE,OAAO,EACZ,GAAG,EAAE,GAAG,EACR,QAAQ,EAAE,GAAG,GACZ,OAAO,CAAC,MAAM,GAAG,MAAM,GAAG,UAAU,CAAC,CAkDvC;AAgBD,OAAO,EACL,OAAO,EACP,WAAW,EACX,qBAAqB,EACrB,gBAAgB,EAChB,UAAU,EACV,SAAS,EACT,eAAe,EACf,YAAY,GACb,CAAC;AAEF;;;GAGG;AACH,wBAAsB,kBAAkB,CACtC,KAAK,EAAE,MAAM,EACb,KAAK,EAAE,MAAM,EACb,QAAQ,EAAE,GAAG,iBAkBd;AASD,wBAAsB,uBAAuB,CAC3C,KAAK,EAAE,MAAM,EACb,GAAG,EAAE,MAAM,EAAE,EACb,QAAQ,EAAE,GAAG,gCAcd"}
+{"version":3,"file":"uploadHelpers.d.ts","sourceRoot":"","sources":["../../../../../src/native/utils/sync/pushLocal/uploadHelpers.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,eAAe,EAAE,MAAM,gDAAgD,CAAC;AACjF,OAAO,EAAE,OAAO,EAAE,MAAM,2CAA2C,CAAC;AAOpE,wBAAgB,eAAe,CAC7B,GAAG,EAAE,eAAe,CAAC,GAAG,CAAC,EACzB,IAAI,CAAC,EAAE,MAAM,GAAG,MAAM,wFAYvB;AAED,iBAAe,WAAW,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE,QAAQ,EAAE,GAAG,gBAEvE;AAED,iBAAe,YAAY,CACzB,KAAK,EAAE,MAAM,EACb,GAAG,EAAE,OAAO,EACZ,QAAQ,EAAE,GAAG,EACb,SAAS,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,OAAO,CAAC,gBAwBjC;AAED,iBAAe,OAAO,CAAC,QAAQ,EAAE,MAAM,iBAOtC;AAmBD,iBAAe,SAAS,CAAC,EACvB,KAAK,EACL,IAAI,EACJ,QAAQ,GACT,EAAE;IACD,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,OAAO,EAAE,CAAC;IAChB,QAAQ,EAAE,GAAG,CAAC;CACf;;;;;;;GA+CA;AAED,iBAAe,eAAe,CAAC,EAC7B,KAAK,EACL,GAAG,EACH,QAAQ,EACR,SAAS,GACV,EAAE;IACD,KAAK,EAAE,MAAM,CAAC;IACd,GAAG,EAAE,OAAO,CAAC;IACb,QAAQ,EAAE,GAAG,CAAC;IACd,SAAS,EAAE,GAAG,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CACjC;;;;;;GAaA;AAMD,iBAAe,UAAU,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,iBAIrD;AAWD,iBAAS,qBAAqB,CAC5B,KAAK,EAAE,MAAM,EACb,KAAK,EAAE,OAAO,EAAE,EAChB,WAAW,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,aAiCjC;AAMD,iBAAe,gBAAgB,CAC7B,GAAG,EAAE,eAAe,CAAC,GAAG,CAAC,EACzB,KAAK,EAAE,MAAM,EACb,GAAG,EAAE,OAAO,EACZ,GAAG,EAAE,GAAG,EACR,QAAQ,EAAE,GAAG,GACZ,OAAO,CAAC,MAAM,GAAG,MAAM,GAAG,UAAU,CAAC,CA4DvC;AAgBD,OAAO,EACL,OAAO,EACP,WAAW,EACX,qBAAqB,EACrB,gBAAgB,EAChB,UAAU,EACV,SAAS,EACT,eAAe,EACf,YAAY,GACb,CAAC;AAEF;;;GAGG;AACH,wBAAsB,kBAAkB,CACtC,KAAK,EAAE,MAAM,EACb,KAAK,EAAE,MAAM,EACb,QAAQ,EAAE,GAAG,iBAkBd;AASD,wBAAsB,uBAAuB,CAC3C,KAAK,EAAE,MAAM,EACb,GAAG,EAAE,MAAM,EAAE,EACb,QAAQ,EAAE,GAAG,gCAcd"}

package/dist/native/utils/sync/pushLocal/uploadHelpers.js

@@ -17,6 +17,8 @@ export function classifyFailure(cfg, code) {
         return "NON_RETRYABLE";
     if (s === (p.fkCode ?? "23503"))
         return "FK_BLOCK";
+    if (s === "23505")
+        return "UNIQUE_VIOLATION";
     if (p.retryableCodes?.has?.(s))
         return "RETRYABLE";
     return "UNKNOWN";
@@ -24,8 +26,30 @@ export function classifyFailure(cfg, code) {
 async function batchUpsert(table, rows, supabase) {
     return await supabase.from(table).upsert(rows);
 }
-async function singleUpsert(table, row, supabase) {
-    return await supabase.from(table).upsert(row).select("id").maybeSingle();
+async function singleUpsert(table, row, supabase, existsMap) {
+    const exists = existsMap?.get(row.id);
+    if (exists === true) {
+        const { data, error } = await supabase
+            .from(table)
+            .update(row)
+            .eq("id", row.id)
+            .select("id")
+            .maybeSingle();
+        if (!error)
+            return { data, error: null };
+        // RLS may block update — fall through to upsert
+    }
+    else if (exists === false) {
+        const { data, error } = await supabase
+            .from(table)
+            .insert(row)
+            .select("id")
+            .maybeSingle();
+        if (!error)
+            return { data, error: null };
+        // RLS may block insert — fall through to upsert
+    }
+    return supabase.from(table).upsert(row).select("id").maybeSingle();
 }
 async function backoff(attempts) {
     const config = getSupastashConfig();
@@ -170,6 +194,12 @@ async function handleRowFailure(cfg, table, row, err, supabase) {
             return "DROP";
         }
     }
+    if (klass === "UNIQUE_VIOLATION") {
+        logWarn(`[Supastash] Row ${row.id} on ${table} violated a unique constraint (23505) → deleting local copy`, JSON.stringify(err));
+        await deleteLocalRow(table, row.id, supabase);
+        cfg.syncPolicy?.onRowDroppedLocal?.(table, row.id);
+        return "DROP";
+    }
     if (klass === "FK_BLOCK") {
         // Parent missing (23503) -> KEEP for later;
         log(`Row ${row.id} on ${table} blocked by missing parent (FK) → will retry`, JSON.stringify(err));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "supastash",
-  "version": "0.2.8",
+  "version": "0.2.10",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
   "type": "module",