@daeda/mcp-pro 0.1.24 → 0.1.26

package/dist/index.js

@@ -1293,7 +1293,7 @@ import { z as z12 } from "zod";
 var ClientStateSchema = z12.object({
   selectedPortalId: z12.number().nullable()
 });
-var SyncStatusSchema = z12.enum(["NOT_STARTED", "DOWNLOADING", "PROCESSING", "SYNCED", "FAILED"]);
+var SyncStatusSchema = z12.enum(["NOT_STARTED", "DOWNLOADING", "PROCESSING", "PARTIAL", "SYNCED", "FAILED"]);
 var PluginSyncStatusSchema = z12.enum(["NOT_STARTED", "SYNCING", "SYNCED", "FAILED"]);
 var SyncPluginItemSchema = z12.object({
   name: z12.string(),
@@ -1467,9 +1467,11 @@ var insertAssociationRowSql = (tableName) => `
     label
   ) VALUES ($1, $2, $3, $4, $5, $6)
 `;
-var insertCsvIntoTableSql = (tableName, escapedPath) => `
+var HUBSPOT_GZIP_CSV_READ_OPTIONS = `all_varchar=true, header=true, compression='gzip', delim=',', quote='"', escape='"', max_line_size=8388608`;
+var readHubSpotGzipCsvSql = (escapedPath, rejectTables) => `read_csv('${escapedPath}', ${HUBSPOT_GZIP_CSV_READ_OPTIONS}${rejectTables ? `, ignore_errors=true, store_rejects=true, rejects_table='${rejectTables.rejectsTable}', rejects_scan='${rejectTables.rejectsScan}'` : ""})`;
+var insertCsvIntoTableSql = (tableName, escapedPath, rejectTables) => `
   INSERT INTO "${tableName}"
-  SELECT * FROM read_csv('${escapedPath}', all_varchar=true, header=true, compression='gzip')
+  SELECT * FROM ${readHubSpotGzipCsvSql(escapedPath, rejectTables)}
 `;
 var mergeAssociationStagingSql = (stagingTable, fromExpression, toExpression) => `
   INSERT OR IGNORE INTO associations
@@ -1484,9 +1486,9 @@ var mergeAssociationStagingSql = (stagingTable, fromExpression, toExpression) =>
 `;
 var countAssociationsForPairSql = () => `SELECT COUNT(*) as count FROM associations WHERE from_object_type = $1 AND to_object_type = $2`;
 var deleteAllRowsSql = (tableName) => `DELETE FROM "${tableName}"`;
-var insertOrReplaceObjectsFromCsvSql = (tableName, escapedPath) => `
+var insertOrReplaceObjectsFromCsvSql = (tableName, escapedPath, rejectTables) => `
   INSERT OR REPLACE INTO "${tableName}"
-  SELECT * FROM read_csv('${escapedPath}', all_varchar=true, header=true, compression='gzip')
+  SELECT * FROM ${readHubSpotGzipCsvSql(escapedPath, rejectTables)}
 `;
 var countRowsSql = (tableName) => `SELECT COUNT(*) as count FROM "${tableName}"`;
 
@@ -1524,6 +1526,7 @@ var SupabaseAssociationCsvSchema = z13.object({
 
 // src/effects/duck-db.ts
 var CHUNK_SIZE = 2048;
+var CSV_REJECT_SAMPLE_LIMIT = 5;
 var PLUGIN_ERROR_KEY = (name) => `plugin_error:${name}`;
 var SCHEMA_VERSION_KEY = (name) => `schema_version:plugin:${name}`;
 var databaseConnectionCache = /* @__PURE__ */ new Map();
@@ -1694,23 +1697,86 @@ async function safeRollback(connection) {
   } catch {
   }
 }
-async function readCsvColumns(connection, csvPath) {
+function makeCsvRejectTableNames(prefix) {
+  const suffix = `${Date.now()}_${Math.random().toString(36).slice(2, 10)}`;
+  const sanitizedPrefix = prefix.replace(/[^a-zA-Z0-9_]/g, "_");
+  return {
+    rejectsTable: `${sanitizedPrefix}_reject_errors_${suffix}`,
+    rejectsScan: `${sanitizedPrefix}_reject_scans_${suffix}`
+  };
+}
+async function cleanupCsvRejectTables(connection, rejectTables) {
+  try {
+    await connection.run(dropTableIfExistsSql(rejectTables.rejectsTable));
+  } catch {
+  }
+  try {
+    await connection.run(dropTableIfExistsSql(rejectTables.rejectsScan));
+  } catch {
+  }
+}
+function formatCsvRejectSummary(rejectCount, sampleRows) {
+  const samples = sampleRows.map((row) => {
+    const lineValue = typeof row.line === "number" ? row.line : typeof row.line === "bigint" ? Number(row.line) : typeof row.line_number === "number" ? row.line_number : typeof row.line_number === "bigint" ? Number(row.line_number) : null;
+    const errorType = typeof row.error_type === "string" ? row.error_type : typeof row.type === "string" ? row.type : null;
+    const errorMessage = typeof row.error_message === "string" ? row.error_message : typeof row.message === "string" ? row.message : "CSV row rejected by DuckDB";
+    return `${lineValue !== null ? `line ${lineValue}` : "unknown line"}${errorType ? ` (${errorType})` : ""}: ${errorMessage}`;
+  }).slice(0, CSV_REJECT_SAMPLE_LIMIT);
+  const message = samples.length > 0 ? `Skipped ${rejectCount} malformed CSV row${rejectCount === 1 ? "" : "s"} during import. Examples: ${samples.join(" | ")}` : `Skipped ${rejectCount} malformed CSV row${rejectCount === 1 ? "" : "s"} during import.`;
+  return { rejectCount, message };
+}
+async function readCsvRejectSummary(connection, rejectTables) {
+  try {
+    const countResult = await connection.runAndReadAll(
+      `SELECT COUNT(*) AS count FROM "${rejectTables.rejectsTable}"`
+    );
+    const countRows = countResult.getRowObjects();
+    const rejectCount = Number(countRows[0]?.count ?? 0);
+    if (rejectCount === 0) return null;
+    const sampleResult = await connection.runAndReadAll(
+      `SELECT * FROM "${rejectTables.rejectsTable}" LIMIT ${CSV_REJECT_SAMPLE_LIMIT}`
+    );
+    const sampleRows = sampleResult.getRowObjects();
+    return formatCsvRejectSummary(rejectCount, sampleRows);
+  } catch {
+    return null;
+  }
+}
+async function withCsvRejectTracking(connection, prefix, work) {
+  const rejectTables = makeCsvRejectTableNames(prefix);
+  try {
+    const result = await work(rejectTables);
+    const rejects = await readCsvRejectSummary(connection, rejectTables);
+    return { result, rejects };
+  } finally {
+    await cleanupCsvRejectTables(connection, rejectTables);
+  }
+}
+async function readCsvColumns(connection, csvPath, rejectTables) {
   const result = await connection.runAndReadAll(
-    `DESCRIBE SELECT * FROM read_csv('${escapeSqlString(csvPath)}', all_varchar=true, header=true, compression='gzip')`
+    `DESCRIBE SELECT * FROM ${readHubSpotGzipCsvSql(escapeSqlString(csvPath), rejectTables)}`
   );
   const rows = result.getRowObjects();
   return rows.map((row) => typeof row.column_name === "string" ? row.column_name : null).filter((value) => value !== null);
 }
 async function validateSupabaseCsvShape(connection, csvPath, kind) {
   const expectedColumns = kind === "object" ? OBJECT_CSV_COLUMNS : ASSOCIATION_CSV_COLUMNS;
-  const columns = await readCsvColumns(connection, csvPath);
+  const { result: columns } = await withCsvRejectTracking(
+    connection,
+    `validate_${kind}`,
+    (rejectTables) => readCsvColumns(connection, csvPath, rejectTables)
+  );
   if (columns.length !== expectedColumns.length || columns.some((column, index) => column !== expectedColumns[index])) {
     throw new Error(
       `Invalid ${kind} CSV columns for Supabase sync. Expected ${expectedColumns.join(", ")} but received ${columns.join(", ") || "(none)"}`
     );
   }
-  const sampleResult = await connection.runAndReadAll(
-    `SELECT * FROM read_csv('${escapeSqlString(csvPath)}', all_varchar=true, header=true, compression='gzip') LIMIT 1`
+  const { result: sampleResult } = await withCsvRejectTracking(
+    connection,
+    `validate_${kind}_sample`,
+    (rejectTables) => connection.runAndReadAll(
+      `SELECT * FROM ${readHubSpotGzipCsvSql(escapeSqlString(csvPath), rejectTables)} LIMIT 1`
+    )
   );
   const sampleRows = sampleResult.getRowObjects();
   if (sampleRows.length === 0) return;
@@ -1743,13 +1809,23 @@ async function withTransaction(connection, work) {
 async function atomicReplaceObjectsFromCsv(connection, tableName, csvPath) {
   const sanitizedTableName = sanitizeTableName(tableName);
   const escapedPath = escapeSqlString(csvPath);
-  return withTransaction(connection, async () => {
-    await connection.run(deleteAllRowsSql(sanitizedTableName));
-    await connection.run(insertOrReplaceObjectsFromCsvSql(sanitizedTableName, escapedPath));
-    const countResult = await connection.runAndReadAll(countRowsSql(sanitizedTableName));
-    const rows = countResult.getRowObjects();
-    return Number(rows[0]?.count ?? 0);
-  });
+  const { result, rejects } = await withCsvRejectTracking(
+    connection,
+    `objects_${sanitizedTableName}`,
+    (rejectTables) => withTransaction(connection, async () => {
+      await connection.run(deleteAllRowsSql(sanitizedTableName));
+      await connection.run(
+        insertOrReplaceObjectsFromCsvSql(sanitizedTableName, escapedPath, rejectTables)
+      );
+      const countResult = await connection.runAndReadAll(countRowsSql(sanitizedTableName));
+      const rows = countResult.getRowObjects();
+      return { rowCount: Number(rows[0]?.count ?? 0) };
+    })
+  );
+  return {
+    rowCount: result.rowCount,
+    rejects
+  };
 }
 async function deleteAssociationsForPair(connection, fromObjectType, toObjectType) {
   await connection.run(deleteAssociationsForPairSql(), [fromObjectType, toObjectType]);
@@ -1792,7 +1868,12 @@ async function loadAssociationRowsIntoStaging(connection, stagingTable, rows) {
   return insertAssociationsIntoTable(connection, rows, stagingTable);
 }
 async function loadAssociationCsvIntoStaging(connection, stagingTable, csvPath) {
-  await connection.run(insertCsvIntoTableSql(stagingTable, escapeSqlString(csvPath)));
+  const { rejects } = await withCsvRejectTracking(
+    connection,
+    `assoc_${stagingTable}`,
+    (rejectTables) => connection.run(insertCsvIntoTableSql(stagingTable, escapeSqlString(csvPath), rejectTables))
+  );
+  return rejects;
 }
 async function mergeAssociationStaging(connection, stagingTable, scope) {
   const fromExpression = scope._tag === "pair" ? `'${escapeSqlString(scope.fromObjectType)}'` : "from_object_type";
@@ -1816,15 +1897,17 @@ async function syncAssociations({
   const handle = await getDatabaseConnection(portalId, encryptionKey);
   const stagingTable = makeAssociationStagingTableName();
   try {
+    let rejects = null;
     await withTransaction(handle.connection, async () => {
       await ensureAssociationsTable(handle.connection);
       await deleteAssociationsForScope(handle.connection, scope);
       await createAssociationStagingTable(handle.connection, stagingTable);
-      await loadAssociationCsvIntoStaging(handle.connection, stagingTable, source.csvPath);
+      rejects = await loadAssociationCsvIntoStaging(handle.connection, stagingTable, source.csvPath);
       await mergeAssociationStaging(handle.connection, stagingTable, scope);
       await handle.connection.run(dropTableIfExistsSql(stagingTable));
     });
-    return scope._tag === "pair" ? countAssociationsForPair(handle.connection, scope.fromObjectType, scope.toObjectType) : 0;
+    const rowCount = scope._tag === "pair" ? await countAssociationsForPair(handle.connection, scope.fromObjectType, scope.toObjectType) : 0;
+    return { rowCount, rejects };
   } catch (error) {
     try {
       await handle.connection.run(dropTableIfExistsSql(stagingTable));
@@ -1845,8 +1928,13 @@ async function syncObjectArtifact({
   );
   await validateSupabaseCsvShape(handle.connection, csvPath, "object");
   await ensureObjectTable(handle.connection, objectType);
-  const rowCount = await atomicReplaceObjectsFromCsv(handle.connection, objectType, csvPath);
-  return { portalId, rowCount };
+  const { rowCount, rejects } = await atomicReplaceObjectsFromCsv(handle.connection, objectType, csvPath);
+  if (rejects) {
+    console.error(
+      `[duck-db] Object artifact import was partial for portal ${portalId}: ${objectType}. ${rejects.message}`
+    );
+  }
+  return { portalId, rowCount, rejects };
 }
 async function initializePortalSchema({
   masterLock,
@@ -1919,7 +2007,7 @@ async function syncAssociationArtifact({
     `[duck-db] Syncing association artifact for portal ${portalId}: ${fromObjectType}->${toObjectType} from ${csvPath}`
   );
   await validateSupabaseCsvShape(handle.connection, csvPath, "association");
-  const rowCount = await syncAssociations({
+  const { rowCount, rejects } = await syncAssociations({
     portalId,
     encryptionKey: encryptionKey ?? null,
     scope: {
@@ -1929,7 +2017,12 @@ async function syncAssociationArtifact({
     },
     source: { kind: "csv", csvPath }
   });
-  return { portalId, rowCount };
+  if (rejects) {
+    console.error(
+      `[duck-db] Association artifact import was partial for portal ${portalId}: ${fromObjectType}->${toObjectType}. ${rejects.message}`
+    );
+  }
+  return { portalId, rowCount, rejects };
 }
 async function syncPlugin({
   masterLock,
@@ -2236,60 +2329,105 @@ var buildCappedSelectSql = (sql, maxRows) => {
 };
 
 // src/layers/MasterLockLive.ts
-import { createRequire } from "module";
 import path2 from "path";
-import { mkdir, open } from "fs/promises";
 import { Effect as Effect24, Layer as Layer2, Ref, pipe as pipe13 } from "effect";
-var require2 = createRequire(import.meta.url);
-var { lock, unlock } = require2("os-lock");
+
+// src/layers/MasterLockDependencies.ts
+import { createRequire } from "module";
+import { mkdir } from "fs/promises";
+var loadProperLockfileModule = () => {
+  const requireFromHere = createRequire(import.meta.url);
+  return requireFromHere("proper-lockfile");
+};
+var resolveMasterLockDependencies = (config, defaults) => ({
+  ensurePortalsDir: config.ensurePortalsDir ?? (async (dirPath) => {
+    await mkdir(dirPath, { recursive: true });
+  }),
+  acquireLock: config.acquireLock ?? (async (dirPath, options2) => {
+    const release = await loadProperLockfileModule().lock(dirPath, options2);
+    return { release };
+  }),
+  setInterval: config.setInterval ?? ((callback, ms) => setInterval(callback, ms)),
+  clearInterval: config.clearInterval ?? ((timer) => clearInterval(timer)),
+  log: config.log ?? ((message) => console.error(message)),
+  promotionPollMs: config.promotionPollMs ?? defaults.promotionPollMs
+});
+
+// src/layers/MasterLockLive.ts
 var PROMOTION_POLL_MS = 3e3;
+var LOCK_STALE_MS = 5e3;
+var LOCK_UPDATE_MS = 2500;
 var lockFilePath = () => path2.join(PORTALS_DIR(), "master.lock");
-var logStderr3 = (message) => Effect24.sync(() => console.error(message));
+var logMessage = (runtime, message) => Effect24.sync(() => runtime.deps.log(message));
 var isLockConflictError = (error) => {
   const code = error?.code;
-  return code === "EACCES" || code === "EAGAIN" || code === "EBUSY";
+  return code === "ELOCKED";
 };
-var ensurePortalsDir = () => Effect24.tryPromise({
-  try: () => mkdir(PORTALS_DIR(), { recursive: true }),
+var ensurePortalsDir = (runtime) => Effect24.tryPromise({
+  try: () => runtime.deps.ensurePortalsDir(PORTALS_DIR()),
   catch: (cause) => new Error(`Failed to create portals directory: ${String(cause)}`)
 });
-var closeHandle = (handle) => Effect24.tryPromise({
+var releaseLease = (runtime, lease) => Effect24.tryPromise({
   try: async () => {
-    try {
-      await unlock(handle.fd);
-    } catch {
-    }
-    try {
-      await handle.close();
-    } catch {
-    }
+    await lease.release();
   },
-  catch: (cause) => new Error(`Failed to close master lock handle: ${String(cause)}`)
+  catch: (cause) => new Error(`Failed to release master lock lease: ${String(cause)}`)
 });
+var acquireLockOptions = (runtime) => ({
+  lockfilePath: lockFilePath(),
+  retries: 0,
+  stale: LOCK_STALE_MS,
+  update: LOCK_UPDATE_MS,
+  realpath: true,
+  onCompromised: (error) => {
+    Effect24.runFork(
+      pipe13(
+        handleCompromisedLease(runtime, error),
+        Effect24.catchAll(() => Effect24.void)
+      )
+    );
+  }
+});
+var handleCompromisedLease = (runtime, error) => pipe13(
+  Ref.get(runtime.releasedRef),
+  Effect24.flatMap((released) => {
+    if (released) return Effect24.void;
+    return pipe13(
+      Ref.getAndSet(runtime.lockLeaseRef, null),
+      Effect24.flatMap((lease) => {
+        if (lease === null) return Effect24.void;
+        return pipe13(
+          logMessage(
+            runtime,
+            `[master-lock] master lease compromised: ${error.message}`
+          ),
+          Effect24.flatMap(() => Ref.set(runtime.connectionTypeRef, "READ_ONLY")),
+          Effect24.flatMap(() => startPromotionPolling(runtime))
+        );
+      })
+    );
+  })
+);
 var tryAcquireMasterLock = (runtime) => pipe13(
-  Ref.get(runtime.lockHandleRef),
-  Effect24.flatMap((existingHandle) => {
-    if (existingHandle !== null) {
+  Ref.get(runtime.lockLeaseRef),
+  Effect24.flatMap((existingLease) => {
+    if (existingLease !== null) {
       return Ref.get(runtime.connectionTypeRef);
     }
     return pipe13(
-      ensurePortalsDir(),
+      ensurePortalsDir(runtime),
       Effect24.flatMap(
         () => Effect24.tryPromise({
-          try: () => open(lockFilePath(), "a+"),
-          catch: (cause) => new Error(`Failed to open master lock file: ${String(cause)}`)
-        })
-      ),
-      Effect24.flatMap(
-        (handle) => Effect24.tryPromise({
           try: async () => {
             try {
-              await lock(handle.fd, { exclusive: true, immediate: true });
-              return { connectionType: "MASTER", handle };
+              const lease = await runtime.deps.acquireLock(
+                PORTALS_DIR(),
+                acquireLockOptions(runtime)
+              );
+              return { connectionType: "MASTER", lease };
             } catch (error) {
-              await handle.close();
               if (isLockConflictError(error)) {
-                return { connectionType: "READ_ONLY", handle: null };
+                return { connectionType: "READ_ONLY", lease: null };
               }
               throw error;
             }
@@ -2298,10 +2436,21 @@ var tryAcquireMasterLock = (runtime) => pipe13(
         })
       ),
       Effect24.flatMap(
-        ({ connectionType, handle }) => pipe13(
-          Ref.set(runtime.connectionTypeRef, connectionType),
-          Effect24.flatMap(() => Ref.set(runtime.lockHandleRef, handle)),
-          Effect24.as(connectionType)
+        ({ connectionType, lease }) => pipe13(
+          Ref.get(runtime.releasedRef),
+          Effect24.flatMap((released) => {
+            if (!released || lease === null) {
+              return pipe13(
+                Ref.set(runtime.connectionTypeRef, connectionType),
+                Effect24.flatMap(() => Ref.set(runtime.lockLeaseRef, lease)),
+                Effect24.as(connectionType)
+              );
+            }
+            return pipe13(
+              releaseLease(runtime, lease),
+              Effect24.flatMap(() => Effect24.succeed("READ_ONLY"))
+            );
+          })
         )
       )
     );
@@ -2311,14 +2460,17 @@ var stopPromotionPolling = (runtime) => pipe13(
   Ref.getAndSet(runtime.promotionTimerRef, null),
   Effect24.flatMap(
     (timer) => timer === null ? Effect24.void : Effect24.sync(() => {
-      clearInterval(timer);
+      runtime.deps.clearInterval(timer);
     })
   )
 );
 var tryPromoteToMaster = (runtime) => pipe13(
-  Ref.get(runtime.promotingRef),
-  Effect24.flatMap((promoting) => {
-    if (promoting) return Effect24.void;
+  Effect24.all({
+    promoting: Ref.get(runtime.promotingRef),
+    released: Ref.get(runtime.releasedRef)
+  }),
+  Effect24.flatMap(({ promoting, released }) => {
+    if (promoting || released) return Effect24.void;
     return pipe13(
       Ref.set(runtime.promotingRef, true),
       Effect24.flatMap(
@@ -2327,11 +2479,19 @@ var tryPromoteToMaster = (runtime) => pipe13(
           Effect24.flatMap(
             (connectionType) => connectionType === "MASTER" ? pipe13(
               stopPromotionPolling(runtime),
-              Effect24.flatMap(() => logStderr3("[master-lock] promoted read-only client to master"))
+              Effect24.flatMap(
+                () => logMessage(
+                  runtime,
+                  "[master-lock] promoted read-only client to master"
+                )
+              )
             ) : Effect24.void
           ),
           Effect24.catchAll(
-            (error) => logStderr3(`[master-lock] promotion attempt failed: ${error.message}`)
+            (error) => logMessage(
+              runtime,
+              `[master-lock] promotion attempt failed: ${error.message}`
+            )
           ),
           Effect24.ensuring(Ref.set(runtime.promotingRef, false))
         )
@@ -2344,47 +2504,58 @@ var startPromotionPolling = (runtime) => pipe13(
   Effect24.flatMap((existingTimer) => {
     if (existingTimer !== null) return Effect24.void;
     return pipe13(
-      Effect24.sync(() => setInterval(() => {
-        Effect24.runFork(tryPromoteToMaster(runtime));
-      }, PROMOTION_POLL_MS)),
+      Effect24.sync(
+        () => runtime.deps.setInterval(() => {
+          Effect24.runFork(tryPromoteToMaster(runtime));
+        }, runtime.deps.promotionPollMs)
+      ),
       Effect24.flatMap((timer) => Ref.set(runtime.promotionTimerRef, timer)),
-      Effect24.flatMap(() => logStderr3(`[master-lock] another process is master; retrying promotion every ${PROMOTION_POLL_MS}ms`))
+      Effect24.flatMap(
+        () => logMessage(
+          runtime,
+          `[master-lock] another process is master; retrying promotion every ${runtime.deps.promotionPollMs}ms`
+        )
+      )
     );
   })
 );
 var releaseRuntime = (runtime) => pipe13(
-  stopPromotionPolling(runtime),
-  Effect24.flatMap(() => Ref.getAndSet(runtime.lockHandleRef, null)),
+  Ref.set(runtime.releasedRef, true),
+  Effect24.flatMap(() => stopPromotionPolling(runtime)),
+  Effect24.flatMap(() => Ref.getAndSet(runtime.lockLeaseRef, null)),
   Effect24.flatMap(
-    (handle) => handle === null ? Effect24.void : closeHandle(handle)
+    (lease) => lease === null ? Effect24.void : releaseLease(runtime, lease)
   ),
   Effect24.flatMap(() => Ref.set(runtime.connectionTypeRef, "READ_ONLY"))
 );
-var makeRuntime = pipe13(
+var makeRuntime = (config = {}) => pipe13(
   Effect24.all({
+    deps: Effect24.sync(
+      () => resolveMasterLockDependencies(config, {
+        promotionPollMs: PROMOTION_POLL_MS
+      })
+    ),
     connectionTypeRef: Ref.make("READ_ONLY"),
-    lockHandleRef: Ref.make(null),
+    lockLeaseRef: Ref.make(null),
     promotionTimerRef: Ref.make(null),
-    promotingRef: Ref.make(false)
+    promotingRef: Ref.make(false),
+    releasedRef: Ref.make(false)
   }),
   Effect24.tap(
     (runtime) => pipe13(
       tryAcquireMasterLock(runtime),
       Effect24.flatMap(
-        (connectionType) => connectionType === "MASTER" ? logStderr3("[master-lock] acquired master lock") : startPromotionPolling(runtime)
+        (connectionType) => connectionType === "MASTER" ? logMessage(runtime, "[master-lock] acquired master lock") : startPromotionPolling(runtime)
       )
     )
   )
 );
-var MasterLockLive = Layer2.scoped(
+var makeMasterLockLive = (config = {}) => Layer2.scoped(
   MasterLockService,
   pipe13(
     Effect24.acquireRelease(
-      makeRuntime,
-      (runtime) => pipe13(
-        releaseRuntime(runtime),
-        Effect24.catchAll(() => Effect24.void)
-      )
+      makeRuntime(config),
+      (runtime) => pipe13(releaseRuntime(runtime), Effect24.catchAll(() => Effect24.void))
     ),
     Effect24.map((runtime) => ({
       getConnectionType: Ref.get(runtime.connectionTypeRef),
@@ -2395,11 +2566,12 @@ var MasterLockLive = Layer2.scoped(
     }))
   )
 );
+var MasterLockLive = makeMasterLockLive();
 
 // src/layers/ReplicaLive.ts
 import { Effect as Effect25, Layer as Layer3, Ref as Ref2, pipe as pipe14 } from "effect";
 var DEFAULT_REPLICA_DEBOUNCE_MS = 6e4;
-var logStderr4 = (message) => Effect25.sync(() => console.error(message));
+var logStderr3 = (message) => Effect25.sync(() => console.error(message));
 var normalizeDebounceMs = (debounceMs) => debounceMs === void 0 ? DEFAULT_REPLICA_DEBOUNCE_MS : Math.max(0, debounceMs);
 var initialPortalReplicaState = () => ({
   dirty: false,
@@ -2443,7 +2615,7 @@ var makeReplicaLive = (config = {}) => {
             return Effect25.tryPromise({
               try: async () => {
                 await Effect25.runPromise(
-                  logStderr4(
+                  logStderr3(
                     `[replica] Publishing replica for portal ${portalId} (reason: ${reason})`
                   )
                 );
@@ -2504,7 +2676,7 @@ var makeReplicaLive = (config = {}) => {
                       dirty: true
                     })),
                     Effect25.flatMap(
-                      () => logStderr4(
+                      () => logStderr3(
                         `[replica] Failed to publish replica for portal ${portalId}: ${error.message}`
                       )
                     ),
@@ -3708,7 +3880,7 @@ var resetStuckPlugins = (plugins, updatedAt) => {
   return changed ? nextPlugins : plugins;
 };
 var upsertArtifact = (artifacts, input, updatedAt) => {
-  const errorValue = input.status === "FAILED" ? input.error ?? null : null;
+  const errorValue = input.status === "FAILED" || input.status === "PARTIAL" ? input.error ?? null : null;
   let didUpdate = false;
   const nextArtifacts = artifacts.map((artifact) => {
     if (artifact.object_type !== input.objectType) {
@@ -3938,6 +4110,15 @@ var toSyncFailure = (message, cause) => Effect33.fail(
   })
 );
 var swallowPortalFileStateError = (effect) => effect.pipe(Effect33.catchAll(() => Effect33.void));
+var summarizePartialImport = (results) => {
+  const rejectSummaries = results.map((result) => result.rejects).filter((rejects) => rejects !== null);
+  if (rejectSummaries.length === 0) return null;
+  const totalRejectedRows = rejectSummaries.reduce(
+    (sum, rejects) => sum + rejects.rejectCount,
+    0
+  );
+  return `Imported with partial data. Skipped ${totalRejectedRows} malformed CSV row${totalRejectedRows === 1 ? "" : "s"} across ${rejectSummaries.length} file${rejectSummaries.length === 1 ? "" : "s"}. ${rejectSummaries.map((rejects) => rejects.message).join(" ")}`;
+};
 var wrapSyncFailure = (message, effect) => effect.pipe(
   Effect33.catchAllCause((cause) => toSyncFailure(message, cause))
 );
@@ -4043,7 +4224,9 @@ var PortalDataLiveBase = Layer7.effect(
                 csvPath: downloaded.objectFile.path
               })
             ),
-            Effect33.flatMap(
+            Effect33.bindTo("objectResult"),
+            Effect33.bind(
+              "associationResults",
               () => Effect33.forEach(
                 downloaded.associationFiles,
                 (associationFile) => duckDb.syncAssociationArtifact({
@@ -4055,13 +4238,18 @@ var PortalDataLiveBase = Layer7.effect(
                 { concurrency: 1 }
               )
             ),
+            Effect33.bind(
+              "partialMessage",
+              ({ objectResult, associationResults }) => Effect33.succeed(summarizePartialImport([objectResult, ...associationResults]))
+            ),
             Effect33.flatMap(
-              () => swallowPortalFileStateError(
+              ({ partialMessage }) => swallowPortalFileStateError(
                 portalFileState.updateArtifactStatus({
                   portalId: input.portalId,
                   artifactId: input.artifactId,
                   objectType: input.objectType,
-                  status: "SYNCED",
+                  status: partialMessage === null ? "SYNCED" : "PARTIAL",
+                  error: partialMessage,
                   sourcePath: downloaded.sourcePath
                 })
               )
@@ -4113,13 +4301,19 @@ var PortalDataLiveBase = Layer7.effect(
                 csvPath: downloaded.sourcePath
               })
             ),
+            Effect33.bindTo("artifactResult"),
+            Effect33.bind(
+              "partialMessage",
+              ({ artifactResult }) => Effect33.succeed(summarizePartialImport([artifactResult]))
+            ),
             Effect33.flatMap(
-              () => swallowPortalFileStateError(
+              ({ partialMessage }) => swallowPortalFileStateError(
                 portalFileState.updateArtifactStatus({
                   portalId: input.portalId,
                   artifactId: input.artifactId,
                   objectType: input.objectType,
-                  status: "SYNCED",
+                  status: partialMessage === null ? "SYNCED" : "PARTIAL",
+                  error: partialMessage,
                   sourcePath: downloaded.sourcePath
                 })
               )
@@ -4276,7 +4470,7 @@ var filterUnsyncedArtifacts = (artifacts, allowedObjectTypes) => artifacts.filte
 );
 
 // src/effects/run-full-sync.ts
-var logStderr5 = (message) => Effect34.sync(() => console.error(message));
+var logStderr4 = (message) => Effect34.sync(() => console.error(message));
 var runFullSync = (ws, portalData, portalFileState, portalId, artifacts, objectTypesToSync) => pipe22(
   Ref3.make({
     totalArtifacts: 0,
@@ -4319,14 +4513,14 @@ var runFullSync = (ws, portalData, portalFileState, portalId, artifacts, objectT
               currentArtifact: artifact.object_type
             })),
             Effect34.tap(
-              () => logStderr5(
+              () => logStderr4(
                 `[sync] (${idx + 1}/${toSync.length}) Processing: ${artifact.object_type}`
               )
             ),
             Effect34.flatMap(() => {
               const plugin = findArtifactPlugin(artifact.object_type);
               if (!plugin) {
-                return logStderr5(`[sync] No artifact plugin found for ${artifact.object_type}, skipping`);
+                return logStderr4(`[sync] No artifact plugin found for ${artifact.object_type}, skipping`);
               }
               return plugin.processArtifact(artifactCtx, artifact);
             }),
@@ -4383,7 +4577,7 @@ var runFullSync = (ws, portalData, portalFileState, portalId, artifacts, objectT
 
 // src/effects/sync-message-plugins.ts
 import { Effect as Effect35, pipe as pipe23 } from "effect";
-var logStderr6 = (message) => Effect35.sync(() => console.error(message));
+var logStderr5 = (message) => Effect35.sync(() => console.error(message));
 var PLUGIN_ERROR_KEY2 = (name) => `plugin_error:${name}`;
 var extractMessage = (value) => {
   if (typeof value === "string") {
@@ -4429,7 +4623,7 @@ var syncMessagePlugin = (ws, portalData, portalFileState, portalId, plugin) => p
   Effect35.map((raw) => raw ? new Date(raw) : null),
   Effect35.flatMap((lastSynced) => {
     if (plugin.shouldSync && !plugin.shouldSync(lastSynced)) {
-      return logStderr6(`[sync] Skipping plugin ${plugin.name} (shouldSync returned false)`);
+      return logStderr5(`[sync] Skipping plugin ${plugin.name} (shouldSync returned false)`);
     }
     return pipe23(
       portalFileState.updatePluginStatus({
@@ -4455,7 +4649,7 @@ var syncMessagePlugin = (ws, portalData, portalFileState, portalId, plugin) => p
   }),
   Effect35.catchAll((error) => {
     if (isReadOnlySkipError(error)) {
-      return logStderr6(
+      return logStderr5(
         `[sync] Skipping message plugin ${plugin.name} for portal ${portalId} on read-only client`
       );
     }
@@ -4472,7 +4666,7 @@ var syncMessagePlugin = (ws, portalData, portalFileState, portalId, plugin) => p
         }).pipe(Effect35.catchAll(() => Effect35.void))
       ),
       Effect35.flatMap(
-        () => logStderr6(`[sync] Message plugin failed (${plugin.name}): ${message}`)
+        () => logStderr5(`[sync] Message plugin failed (${plugin.name}): ${message}`)
       )
     );
   })
@@ -4482,12 +4676,12 @@ var syncMessagePlugins = (ws, portalData, portalFileState, portalId, plugins) =>
     Effect35.as(true),
     Effect35.catchAll(
       (error) => isReadOnlySkipError(error) ? pipe23(
-        logStderr6(
+        logStderr5(
           `[sync] Skipping message plugin sync for portal ${portalId} on read-only client`
         ),
         Effect35.as(false)
       ) : pipe23(
-        logStderr6(
+        logStderr5(
           `[sync] Failed to initialize portal schema before message plugin sync for portal ${portalId}: ${error instanceof Error ? error.message : String(error)}`
         ),
         Effect35.as(true)
@@ -16668,12 +16862,12 @@ var mainProgram = Effect108.gen(function* () {
       Effect108.flatMap(() => portalFileState.get(portalId)),
       Effect108.map((portal) => {
         const status = portal.artifacts.find((a) => a.object_type === artifact.object_type)?.status;
-        if (status !== "SYNCED") {
+        if (status !== "SYNCED" && status !== "PARTIAL") {
           console.error(
             `[artifact-queue] Artifact ${artifact.object_type} for portal ${portalId} finished with status ${status ?? "MISSING"}`
           );
         }
-        return status === "SYNCED";
+        return status === "SYNCED" || status === "PARTIAL";
       }),
       Effect108.catchAll(
         (err) => Effect108.sync(() => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@daeda/mcp-pro",
-  "version": "0.1.24",
+  "version": "0.1.26",
   "description": "MCP server for HubSpot CRM — sync, query, and manage your portal data",
   "type": "module",
   "bin": {
@@ -35,8 +35,8 @@
     "@modelcontextprotocol/sdk": "^1.25.3",
     "effect": "3.19.15",
     "fflate": "^0.8.2",
-    "os-lock": "^2.0.0",
     "papaparse": "^5.5.3",
+    "proper-lockfile": "^4.1.2",
     "zod": "^3.23.8"
   },
   "devDependencies": {
@@ -49,6 +49,6 @@
   },
   "trustedDependencies": [
     "fs-ext",
-    "os-lock"
+    "proper-lockfile"
   ]
 }