@hasna/files 0.2.21 → 0.2.23

package/dist/cli/index.js

@@ -167800,7 +167800,7 @@ async function syncGoogleDriveSource(source) {
       seen.push({ drive_id: item.drive_id, file_id: item.id });
       try {
         const existing = getGoogleDriveImportedObject(source.id, item.drive_id, item.id);
-        if (existing && !shouldImport(config9, item, existing, destination.source.id, destination.storage_type))
+        if (existing && !shouldImport(config9, item, existing, destination.source, destination.storage_type))
           continue;
         const importResult = await importGoogleDriveItem(client2, item, config9, destination.source, destination.storage_type);
         const fileRecord = upsertFile({
@@ -168095,8 +168095,10 @@ function escapeDriveQueryValue(value) {
 function buildStorageKey(source, importedPath) {
   return source.prefix ? posix.join(source.prefix, importedPath) : importedPath;
 }
-function shouldImport(config9, item, existing, destinationSourceId, storageType) {
-  return existing.path !== buildImportedPath(config9, item, existing.name) || existing.hash !== item.hash || existing.modified_at !== item.modified_at || existing.version !== item.version || existing.destination_source_id !== destinationSourceId || existing.storage_type !== storageType || existing.deleted;
+function shouldImport(config9, item, existing, destinationSource, storageType) {
+  const importedPath = buildImportedPath(config9, item, existing.name);
+  const storageKey = storageType === "s3" || storageType === "local" ? buildStorageKey(destinationSource, importedPath) : importedPath;
+  return existing.path !== importedPath || existing.hash !== item.hash || existing.modified_at !== item.modified_at || existing.version !== item.version || existing.destination_source_id !== destinationSource.id || existing.storage_type !== storageType || existing.storage_key !== storageKey || existing.deleted;
 }
 function buildImportedPath(config9, item, importedName) {
   if (config9.path_mode === "id_based") {
@@ -168344,7 +168346,8 @@ sources.command("bootstrap-prod-files").description("Create or update the produc
   const activeDriveDestinationIds = new Set(allSources.filter((source2) => source2.enabled && source2.type === "google_drive").map((source2) => source2.config.destination_source_id).filter((id) => Boolean(id)));
   const configuredDefaultId = loadConfig().google_drive_default_destination_source_id;
   const candidates = allSources.filter((source2) => source2.type === "s3" && (legacyProductionNames.has(source2.name) || legacyProductionBuckets.has(source2.bucket ?? "")));
-  const existing = candidates.find((source2) => activeDriveDestinationIds.has(source2.id)) ?? candidates.find((source2) => configuredDefaultId === source2.id) ?? candidates.find((source2) => source2.enabled) ?? candidates[0];
+  const existing = candidates.find((source2) => activeDriveDestinationIds.has(source2.id) && source2.enabled) ?? candidates.find((source2) => configuredDefaultId === source2.id && source2.enabled) ?? candidates.find((source2) => source2.enabled && source2.bucket === opts.bucket) ?? candidates.find((source2) => source2.enabled) ?? candidates.find((source2) => configuredDefaultId === source2.id) ?? candidates.find((source2) => activeDriveDestinationIds.has(source2.id)) ?? candidates[0];
+  const candidateIds = new Set(candidates.map((source2) => source2.id));
   const source = existing ? updateSource(existing.id, {
     name: opts.name,
     bucket: opts.bucket,
@@ -168361,13 +168364,36 @@ sources.command("bootstrap-prod-files").description("Create or update the produc
     config: config9,
     machine_id: machine.id
   });
+  const updatedGoogleDriveSourceIds = [];
+  for (const driveSource of allSources.filter((source2) => source2.type === "google_drive")) {
+    const driveConfig = driveSource.config;
+    const shouldRepairDestination = !driveConfig.destination_source_id || candidateIds.has(driveConfig.destination_source_id);
+    if (!shouldRepairDestination || driveConfig.destination_source_id === source.id)
+      continue;
+    updateSource(driveSource.id, {
+      config: {
+        ...driveConfig,
+        destination_source_id: source.id
+      }
+    });
+    updatedGoogleDriveSourceIds.push(driveSource.id);
+  }
+  const disabledLegacySourceIds = [];
+  for (const candidate of candidates) {
+    if (candidate.id === source.id || !candidate.enabled)
+      continue;
+    updateSource(candidate.id, { enabled: false });
+    disabledLegacySourceIds.push(candidate.id);
+  }
   if (opts.googleDriveDefault !== false) {
     setConfigValue("google_drive_default_destination_source_id", source.id);
   }
   if (opts.json) {
     console.log(JSON.stringify({
       source,
-      google_drive_default_destination_source_id: opts.googleDriveDefault === false ? undefined : source.id
+      google_drive_default_destination_source_id: opts.googleDriveDefault === false ? undefined : source.id,
+      updated_google_drive_source_ids: updatedGoogleDriveSourceIds,
+      disabled_legacy_source_ids: disabledLegacySourceIds
     }, null, 2));
     return;
   }
@@ -168377,6 +168403,12 @@ sources.command("bootstrap-prod-files").description("Create or update the produc
   if (opts.googleDriveDefault !== false) {
     console.log(chalk.dim("  Google Drive default destination: set"));
   }
+  if (updatedGoogleDriveSourceIds.length) {
+    console.log(chalk.dim(`  Google Drive sources repaired: ${updatedGoogleDriveSourceIds.join(", ")}`));
+  }
+  if (disabledLegacySourceIds.length) {
+    console.log(chalk.dim(`  Legacy S3 sources disabled: ${disabledLegacySourceIds.join(", ")}`));
+  }
 });
 sources.command("google-drive-profiles").description("List Google Drive profiles available through connectors auth").option("--json", "Output as JSON").action(async (opts) => {
   const profiles = await listGoogleDriveProfiles();

package/dist/index.js

@@ -164393,7 +164393,7 @@ async function syncGoogleDriveSource(source) {
       seen.push({ drive_id: item.drive_id, file_id: item.id });
       try {
         const existing = getGoogleDriveImportedObject(source.id, item.drive_id, item.id);
-        if (existing && !shouldImport(config9, item, existing, destination.source.id, destination.storage_type))
+        if (existing && !shouldImport(config9, item, existing, destination.source, destination.storage_type))
           continue;
         const importResult = await importGoogleDriveItem(client2, item, config9, destination.source, destination.storage_type);
         const fileRecord = upsertFile({
@@ -164688,8 +164688,10 @@ function escapeDriveQueryValue(value) {
 function buildStorageKey(source, importedPath) {
   return source.prefix ? posix.join(source.prefix, importedPath) : importedPath;
 }
-function shouldImport(config9, item, existing, destinationSourceId, storageType) {
-  return existing.path !== buildImportedPath(config9, item, existing.name) || existing.hash !== item.hash || existing.modified_at !== item.modified_at || existing.version !== item.version || existing.destination_source_id !== destinationSourceId || existing.storage_type !== storageType || existing.deleted;
+function shouldImport(config9, item, existing, destinationSource, storageType) {
+  const importedPath = buildImportedPath(config9, item, existing.name);
+  const storageKey = storageType === "s3" || storageType === "local" ? buildStorageKey(destinationSource, importedPath) : importedPath;
+  return existing.path !== importedPath || existing.hash !== item.hash || existing.modified_at !== item.modified_at || existing.version !== item.version || existing.destination_source_id !== destinationSource.id || existing.storage_type !== storageType || existing.storage_key !== storageKey || existing.deleted;
 }
 function buildImportedPath(config9, item, importedName) {
   if (config9.path_mode === "id_based") {

package/dist/mcp/index.js

@@ -183324,7 +183324,7 @@ async function syncGoogleDriveSource(source) {
       seen.push({ drive_id: item.drive_id, file_id: item.id });
       try {
         const existing = getGoogleDriveImportedObject(source.id, item.drive_id, item.id);
-        if (existing && !shouldImport(config9, item, existing, destination.source.id, destination.storage_type))
+        if (existing && !shouldImport(config9, item, existing, destination.source, destination.storage_type))
           continue;
         const importResult = await importGoogleDriveItem(client2, item, config9, destination.source, destination.storage_type);
         const fileRecord = upsertFile({
@@ -183619,8 +183619,10 @@ function escapeDriveQueryValue(value) {
 function buildStorageKey(source, importedPath) {
   return source.prefix ? posix.join(source.prefix, importedPath) : importedPath;
 }
-function shouldImport(config9, item, existing, destinationSourceId, storageType) {
-  return existing.path !== buildImportedPath(config9, item, existing.name) || existing.hash !== item.hash || existing.modified_at !== item.modified_at || existing.version !== item.version || existing.destination_source_id !== destinationSourceId || existing.storage_type !== storageType || existing.deleted;
+function shouldImport(config9, item, existing, destinationSource, storageType) {
+  const importedPath = buildImportedPath(config9, item, existing.name);
+  const storageKey = storageType === "s3" || storageType === "local" ? buildStorageKey(destinationSource, importedPath) : importedPath;
+  return existing.path !== importedPath || existing.hash !== item.hash || existing.modified_at !== item.modified_at || existing.version !== item.version || existing.destination_source_id !== destinationSource.id || existing.storage_type !== storageType || existing.storage_key !== storageKey || existing.deleted;
 }
 function buildImportedPath(config9, item, importedName) {
   if (config9.path_mode === "id_based") {

package/dist/server/index.js

@@ -164080,7 +164080,7 @@ async function syncGoogleDriveSource(source) {
       seen.push({ drive_id: item.drive_id, file_id: item.id });
       try {
         const existing = getGoogleDriveImportedObject(source.id, item.drive_id, item.id);
-        if (existing && !shouldImport(config9, item, existing, destination.source.id, destination.storage_type))
+        if (existing && !shouldImport(config9, item, existing, destination.source, destination.storage_type))
           continue;
         const importResult = await importGoogleDriveItem(client2, item, config9, destination.source, destination.storage_type);
         const fileRecord = upsertFile({
@@ -164358,8 +164358,10 @@ function escapeDriveQueryValue(value) {
 function buildStorageKey(source, importedPath) {
   return source.prefix ? posix.join(source.prefix, importedPath) : importedPath;
 }
-function shouldImport(config9, item, existing, destinationSourceId, storageType) {
-  return existing.path !== buildImportedPath(config9, item, existing.name) || existing.hash !== item.hash || existing.modified_at !== item.modified_at || existing.version !== item.version || existing.destination_source_id !== destinationSourceId || existing.storage_type !== storageType || existing.deleted;
+function shouldImport(config9, item, existing, destinationSource, storageType) {
+  const importedPath = buildImportedPath(config9, item, existing.name);
+  const storageKey = storageType === "s3" || storageType === "local" ? buildStorageKey(destinationSource, importedPath) : importedPath;
+  return existing.path !== importedPath || existing.hash !== item.hash || existing.modified_at !== item.modified_at || existing.version !== item.version || existing.destination_source_id !== destinationSource.id || existing.storage_type !== storageType || existing.storage_key !== storageKey || existing.deleted;
 }
 function buildImportedPath(config9, item, importedName) {
   if (config9.path_mode === "id_based") {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hasna/files",
-  "version": "0.2.21",
+  "version": "0.2.23",
   "description": "Agent-first file management — index local folders and S3 buckets, sync Google Drive, tag, search, and retrieve files via CLI + MCP",
   "type": "module",
   "main": "dist/index.js",