appwrite-utils-cli 1.9.5 → 1.9.7

package/dist/adapters/AdapterFactory.d.ts

@@ -7,7 +7,7 @@
  */
 import type { AppwriteConfig } from "appwrite-utils";
 import { type ApiMode, type VersionDetectionResult } from "../utils/versionDetection.js";
-import type { DatabaseAdapter } from './DatabaseAdapter.js';
+import { type DatabaseAdapter } from './DatabaseAdapter.js';
 export interface AdapterFactoryConfig {
     appwriteEndpoint: string;
     appwriteProject: string;

package/dist/adapters/AdapterFactory.js

@@ -6,6 +6,7 @@
  * and provides a single entry point for all database operations.
  */
 import { detectAppwriteVersionCached, isVersionAtLeast } from "../utils/versionDetection.js";
+import { AdapterError } from './DatabaseAdapter.js';
 import { TablesDBAdapter } from './TablesDBAdapter.js';
 import { LegacyAdapter } from './LegacyAdapter.js';
 import { logger } from '../shared/logging.js';
@@ -161,36 +162,29 @@ export class AdapterFactory {
                 endpoint: config.appwriteEndpoint,
                 operation: 'createTablesDBAdapter'
             });
-            // Use pre-configured client or create session-aware client with TablesDB Client
-            let client;
-            if (config.preConfiguredClient) {
-                client = config.preConfiguredClient;
+            let client = new Client()
+                .setEndpoint(config.appwriteEndpoint)
+                .setProject(config.appwriteProject);
+            // Set authentication method with mode headers
+            // Prefer session with admin mode, fallback to API key with default mode
+            if (config.sessionCookie && isValidSessionCookie(config.sessionCookie)) {
+                client.setSession(config.sessionCookie);
+                client.headers['X-Appwrite-Mode'] = 'admin';
+                logger.debug('Using session authentication for TablesDB adapter', {
+                    project: config.appwriteProject,
+                    operation: 'createTablesDBAdapter'
+                });
+            }
+            else if (config.appwriteKey) {
+                client.setKey(config.appwriteKey);
+                client.headers['X-Appwrite-Mode'] = 'default';
+                logger.debug('Using API key authentication for TablesDB adapter', {
+                    project: config.appwriteProject,
+                    operation: 'createTablesDBAdapter'
+                });
             }
             else {
-                client = new Client()
-                    .setEndpoint(config.appwriteEndpoint)
-                    .setProject(config.appwriteProject);
-                // Set authentication method with mode headers
-                // Prefer session with admin mode, fallback to API key with default mode
-                if (config.sessionCookie && isValidSessionCookie(config.sessionCookie)) {
-                    client.setSession(config.sessionCookie);
-                    client.headers['X-Appwrite-Mode'] = 'admin';
-                    logger.debug('Using session authentication for TablesDB adapter', {
-                        project: config.appwriteProject,
-                        operation: 'createTablesDBAdapter'
-                    });
-                }
-                else if (config.appwriteKey) {
-                    client.setKey(config.appwriteKey);
-                    client.headers['X-Appwrite-Mode'] = 'default';
-                    logger.debug('Using API key authentication for TablesDB adapter', {
-                        project: config.appwriteProject,
-                        operation: 'createTablesDBAdapter'
-                    });
-                }
-                else {
-                    throw new Error("No authentication available for adapter");
-                }
+                throw new Error("No authentication available for adapter");
             }
             const adapter = new TablesDBAdapter(client);
             const totalDuration = Date.now() - startTime;
@@ -204,15 +198,36 @@ export class AdapterFactory {
         catch (error) {
             const errorDuration = Date.now() - startTime;
             const errorMessage = error instanceof Error ? error.message : 'Unknown error';
-            MessageFormatter.warning('Failed to create TablesDB adapter - falling back to legacy', { prefix: "Adapter" });
-            logger.warn('TablesDB adapter creation failed, falling back to legacy', {
-                error: errorMessage,
-                errorDuration,
-                endpoint: config.appwriteEndpoint,
-                operation: 'createTablesDBAdapter'
-            });
-            // Fallback to legacy adapter if TablesDB creation fails
-            return this.createLegacyAdapter(config);
+            // Analyze the error to determine if fallback is appropriate
+            const isAuthError = errorMessage.toLowerCase().includes('unauthorized') ||
+                errorMessage.toLowerCase().includes('forbidden') ||
+                errorMessage.toLowerCase().includes('invalid') ||
+                errorMessage.toLowerCase().includes('authentication');
+            const isVersionError = errorMessage.toLowerCase().includes('not found') ||
+                errorMessage.toLowerCase().includes('unsupported') ||
+                errorMessage.toLowerCase().includes('tablesdb');
+            // Only fallback to legacy if this is genuinely a TablesDB support issue
+            if (isVersionError) {
+                MessageFormatter.warning('TablesDB not supported on this server - using legacy adapter', { prefix: "Adapter" });
+                logger.warn('TablesDB not supported, falling back to legacy', {
+                    error: errorMessage,
+                    errorDuration,
+                    endpoint: config.appwriteEndpoint,
+                    operation: 'createTablesDBAdapter'
+                });
+                return this.createLegacyAdapter(config);
+            }
+            else {
+                // For auth or other errors, re-throw to surface the real problem
+                logger.error('TablesDB adapter creation failed with non-version error', {
+                    error: errorMessage,
+                    errorDuration,
+                    endpoint: config.appwriteEndpoint,
+                    operation: 'createTablesDBAdapter',
+                    isAuthError
+                });
+                throw new AdapterError(`TablesDB adapter creation failed: ${errorMessage}`, 'TABLESDB_ADAPTER_CREATION_FAILED', error instanceof Error ? error : undefined);
+            }
         }
     }
     /**

package/dist/adapters/DatabaseAdapter.d.ts

@@ -84,6 +84,7 @@ export interface CreateIndexParams {
     type: string;
     attributes: string[];
     orders?: string[];
+    lengths?: number[];
 }
 export interface ListIndexesParams {
     databaseId: string;

package/dist/adapters/LegacyAdapter.js

@@ -409,12 +409,15 @@ export class LegacyAdapter extends BaseAdapter {
                     break;
                 case 'enum':
                     const enumAttr = existingAttr;
-                    console.log('Updating enum attribute with params:', params);
+                    // Choose elements to send only when provided, otherwise preserve existing
+                    const provided = params.elements;
+                    const existing = enumAttr?.elements;
+                    const nextElements = (Array.isArray(provided) && provided.length > 0) ? provided : existing;
                     result = await this.databases.updateEnumAttribute({
                         databaseId: params.databaseId,
                         collectionId: params.tableId,
                         key: params.key,
-                        elements: enumAttr.elements || [],
+                        elements: nextElements,
                         required: params.required ?? enumAttr.required,
                         xdefault: params.default !== undefined ? params.default : enumAttr.default
                     });

package/dist/adapters/TablesDBAdapter.js

@@ -8,6 +8,7 @@
 import { IndexType, Query, RelationMutate, RelationshipType } from "node-appwrite";
 import { chunk } from "es-toolkit";
 import { BaseAdapter, AdapterError } from './DatabaseAdapter.js';
+import {} from 'appwrite-utils';
 import { TablesDB, Client } from "node-appwrite";
 /**
  * TablesDBAdapter implementation for native TablesDB API
@@ -156,8 +157,14 @@ export class TablesDBAdapter extends BaseAdapter {
     async listIndexes(params) {
         try {
             const result = await this.tablesDB.listIndexes(params);
+            // Normalize TablesDB response to expose a consistent 'attributes' array
+            const normalized = (result.indexes || []).map((idx) => ({
+                ...idx,
+                attributes: Array.isArray(idx?.attributes) ? idx.attributes : (Array.isArray(idx?.columns) ? idx.columns : []),
+                orders: Array.isArray(idx?.orders) ? idx.orders : (Array.isArray(idx?.directions) ? idx.directions : []),
+            }));
             return {
-                data: result.indexes,
+                data: normalized,
                 total: result.total
             };
         }
@@ -167,7 +174,15 @@ export class TablesDBAdapter extends BaseAdapter {
     }
     async createIndex(params) {
         try {
-            const result = await this.tablesDB.createIndex(params.databaseId, params.tableId, params.key, params.type, params.attributes, params.orders || []);
+            const result = await this.tablesDB.createIndex({
+                databaseId: params.databaseId,
+                tableId: params.tableId,
+                key: params.key,
+                type: params.type,
+                columns: params.attributes,
+                orders: params.orders || [],
+                lengths: params.lengths || [],
+            });
             return { data: result };
         }
         catch (error) {
@@ -338,7 +353,7 @@ export class TablesDBAdapter extends BaseAdapter {
             let result;
             // Use the appropriate updateXColumn method based on the column type
             // Cast column to proper Models type to access its specific properties
-            const columnType = column.type;
+            const columnType = (column.type === 'string' && !('format' in column)) || column.type !== 'string' ? column.type : 'enum';
             switch (columnType) {
                 case 'string':
                     const stringColumn = column;

package/dist/collections/attributes.js

@@ -474,12 +474,6 @@ const createLegacyAttribute = async (db, dbId, collectionId, attribute) => {
  * Legacy attribute update using type-specific methods
  */
 const updateLegacyAttribute = async (db, dbId, collectionId, attribute) => {
-    console.log(`DEBUG updateLegacyAttribute before normalizeMinMaxValues:`, {
-        key: attribute.key,
-        type: attribute.type,
-        min: attribute.min,
-        max: attribute.max
-    });
     const { min: normalizedMin, max: normalizedMax } = normalizeMinMaxValues(attribute);
     switch (attribute.type) {
         case "string":
@@ -981,35 +975,10 @@ export const createOrUpdateAttribute = async (db, dbId, collection, attribute) =
         // MessageFormatter.info(
         //   `Updating attribute with same key ${attribute.key} but different values`
         // );
-        // DEBUG: Log before object merge to detect corruption
-        if ((attribute.key === 'conversationType' || attribute.key === 'messageStreakCount')) {
-            console.log(`[DEBUG] MERGE - key="${attribute.key}"`, {
-                found: {
-                    elements: foundAttribute?.elements,
-                    min: foundAttribute?.min,
-                    max: foundAttribute?.max
-                },
-                desired: {
-                    elements: attribute?.elements,
-                    min: attribute?.min,
-                    max: attribute?.max
-                }
-            });
-        }
         finalAttribute = {
             ...foundAttribute,
             ...attribute,
         };
-        // DEBUG: Log after object merge to detect corruption
-        if ((finalAttribute.key === 'conversationType' || finalAttribute.key === 'messageStreakCount')) {
-            console.log(`[DEBUG] AFTER_MERGE - key="${finalAttribute.key}"`, {
-                merged: {
-                    elements: finalAttribute?.elements,
-                    min: finalAttribute?.min,
-                    max: finalAttribute?.max
-                }
-            });
-        }
         action = "update";
     }
     else if (!updateEnabled &&

package/dist/collections/methods.js

@@ -1,6 +1,6 @@
 import { Databases, ID, Permission, Query, } from "node-appwrite";
 import { getAdapterFromConfig } from "../utils/getClientFromConfig.js";
-import { nameToIdMapping, processQueue, queuedOperations, clearProcessingState, isCollectionProcessed, markCollectionProcessed } from "../shared/operationQueue.js";
+import { nameToIdMapping, processQueue, queuedOperations, clearProcessingState, isCollectionProcessed, markCollectionProcessed, enqueueOperation } from "../shared/operationQueue.js";
 import { logger } from "../shared/logging.js";
 // Legacy attribute/index helpers removed in favor of unified adapter path
 import { SchemaGenerator } from "../shared/schemaGenerator.js";
@@ -10,6 +10,7 @@ import { MessageFormatter } from "../shared/messageFormatter.js";
 import { isLegacyDatabases } from "../utils/typeGuards.js";
 import { mapToCreateAttributeParams, mapToUpdateAttributeParams } from "../shared/attributeMapper.js";
 import { diffTableColumns, isIndexEqualToIndex, diffColumnsDetailed, executeColumnOperations } from "./tableOperations.js";
+import { createOrUpdateIndexesViaAdapter, deleteObsoleteIndexesViaAdapter } from "../tables/indexManager.js";
 // Re-export wipe operations
 export { wipeDatabase, wipeCollection, wipeAllTables, wipeTableRows, } from "./wipeOperations.js";
 // Re-export transfer operations
@@ -287,63 +288,106 @@ export const createOrUpdateCollectionsViaAdapter = async (adapter, databaseId, c
             }
             MessageFormatter.info(`Summary → ➕  ${plan.toCreate.length}  |  🔧  ${plan.toUpdate.length}  |  ♻️  ${plan.toRecreate.length}  |  ⏭️  ${plan.unchanged.length}`, { prefix: 'Attributes' });
         }
-        // Relationship attributes — resolve relatedCollection to ID, then diff and create/update
-        const rels = (attributes || []).filter((a) => a.type === 'relationship');
-        if (rels.length > 0) {
-            for (const attr of rels) {
+        // Relationship attributes — resolve relatedCollection to ID, then diff and create/update with recreate support
+        const relsAll = (attributes || []).filter((a) => a.type === 'relationship');
+        if (relsAll.length > 0) {
+            const relsResolved = [];
+            const relsDeferred = [];
+            // Resolve related collections (names -> IDs) using cache or lookup.
+            // If not resolvable yet (target table created later in the same push), queue for later.
+            for (const attr of relsAll) {
                 const relNameOrId = attr.relatedCollection;
                 if (!relNameOrId)
                     continue;
                 let relId = nameToIdMapping.get(relNameOrId) || relNameOrId;
-                if (!nameToIdMapping.has(relNameOrId)) {
+                let resolved = false;
+                if (nameToIdMapping.has(relNameOrId)) {
+                    resolved = true;
+                }
+                else {
+                    // Try resolve by name
                     try {
                         const relList = await adapter.listTables({ databaseId, queries: [Query.equal('name', relNameOrId)] });
                         const relItems = relList.tables || [];
                         if (relItems[0]?.$id) {
                             relId = relItems[0].$id;
                             nameToIdMapping.set(relNameOrId, relId);
+                            resolved = true;
                         }
                     }
                     catch { }
+                    // If the relNameOrId looks like an ID but isn't resolved yet, attempt a direct get
+                    if (!resolved && relNameOrId && relNameOrId.length >= 10) {
+                        try {
+                            const probe = await adapter.getTable({ databaseId, tableId: relNameOrId });
+                            if (probe.data?.$id) {
+                                nameToIdMapping.set(relNameOrId, relNameOrId);
+                                relId = relNameOrId;
+                                resolved = true;
+                            }
+                        }
+                        catch { }
+                    }
                 }
-                if (relId && typeof relId === 'string')
+                if (resolved && relId && typeof relId === 'string') {
                     attr.relatedCollection = relId;
+                    relsResolved.push(attr);
+                }
+                else {
+                    // Defer until related table exists; queue a surgical operation
+                    enqueueOperation({
+                        type: 'attribute',
+                        collectionId: tableId,
+                        attribute: attr,
+                        dependencies: [relNameOrId]
+                    });
+                    relsDeferred.push(attr);
+                }
             }
+            // Compute a detailed plan for immediately resolvable relationships
             const tableInfo2 = await adapter.getTable({ databaseId, tableId });
             const existingCols2 = tableInfo2.data?.columns || tableInfo2.data?.attributes || [];
-            const { toCreate: relCreate, toUpdate: relUpdate, unchanged: relUnchanged } = diffTableColumns(existingCols2, rels);
-            // Relationship plan with icons
+            const relPlan = diffColumnsDetailed(relsResolved, existingCols2);
+            // Relationship plan with icons (includes recreates)
             {
                 const parts = [];
-                if (relCreate.length)
-                    parts.push(`➕  ${relCreate.length} (${relCreate.map((a) => a.key).join(', ')})`);
-                if (relUpdate.length)
-                    parts.push(`🔧  ${relUpdate.length} (${relUpdate.map((a) => a.key).join(', ')})`);
-                if (relUnchanged.length)
-                    parts.push(`⏭️  ${relUnchanged.length}`);
+                if (relPlan.toCreate.length)
+                    parts.push(`➕  ${relPlan.toCreate.length} (${relPlan.toCreate.map((a) => a.key).join(', ')})`);
+                if (relPlan.toUpdate.length)
+                    parts.push(`🔧  ${relPlan.toUpdate.length} (${relPlan.toUpdate.map((u) => u.attribute?.key ?? u.key).join(', ')})`);
+                if (relPlan.toRecreate.length)
+                    parts.push(`♻️  ${relPlan.toRecreate.length} (${relPlan.toRecreate.map((r) => r.newAttribute?.key ?? r?.key).join(', ')})`);
+                if (relPlan.unchanged.length)
+                    parts.push(`⏭️  ${relPlan.unchanged.length}`);
                 MessageFormatter.info(`Plan → ${parts.join('  |  ') || 'no changes'}`, { prefix: 'Relationships' });
             }
-            for (const attr of relUpdate) {
-                try {
-                    await updateAttr(tableId, attr);
+            // Execute plan using the same operation executor to properly handle deletes/recreates
+            const relResults = await executeColumnOperations(adapter, databaseId, tableId, relPlan);
+            if (relResults.success.length > 0) {
+                const totalRelationships = relPlan.toCreate.length + relPlan.toUpdate.length + relPlan.toRecreate.length + relPlan.unchanged.length;
+                const activeRelationships = relPlan.toCreate.length + relPlan.toUpdate.length + relPlan.toRecreate.length;
+                if (relResults.success.length !== activeRelationships) {
+                    // Show both counts when they differ (usually due to recreations)
+                    MessageFormatter.success(`Processed ${relResults.success.length} operations for ${activeRelationships} relationship${activeRelationships === 1 ? '' : 's'}`, { prefix: 'Relationships' });
                 }
-                catch (e) {
-                    MessageFormatter.error(`Failed to update relationship ${attr.key}`, e instanceof Error ? e : new Error(String(e)), { prefix: 'Attributes' });
+                else {
+                    MessageFormatter.success(`Processed ${relResults.success.length} relationship${relResults.success.length === 1 ? '' : 's'}`, { prefix: 'Relationships' });
                 }
             }
-            for (const attr of relCreate) {
-                try {
-                    await createAttr(tableId, attr);
-                }
-                catch (e) {
-                    MessageFormatter.error(`Failed to create relationship ${attr.key}`, e instanceof Error ? e : new Error(String(e)), { prefix: 'Attributes' });
+            if (relResults.errors.length > 0) {
+                MessageFormatter.error(`${relResults.errors.length} relationship operations failed:`, undefined, { prefix: 'Relationships' });
+                for (const err of relResults.errors) {
+                    MessageFormatter.error(`  ${err.column}: ${err.error}`, undefined, { prefix: 'Relationships' });
                 }
             }
+            if (relsDeferred.length > 0) {
+                MessageFormatter.info(`Deferred ${relsDeferred.length} relationship(s) until related tables become available`, { prefix: 'Relationships' });
+            }
         }
         // Wait for all attributes to become available before creating indexes
         const allAttrKeys = [
             ...nonRel.map((a) => a.key),
-            ...rels.filter((a) => a.relatedCollection).map((a) => a.key)
+            ...relsAll.filter((a) => a.relatedCollection).map((a) => a.key)
         ];
         if (allAttrKeys.length > 0) {
             for (const attrKey of allAttrKeys) {
@@ -378,164 +422,14 @@ export const createOrUpdateCollectionsViaAdapter = async (adapter, databaseId, c
                 }
             }
         }
-        // Prefer local config indexes, but fall back to collection's own indexes if no local config exists (TablesDB path)
+        // Index management: create/update indexes using clean adapter-based system
         const localTableConfig = config.collections?.find(c => c.name === collectionData.name || c.$id === collectionData.$id);
         const idxs = (localTableConfig?.indexes ?? indexes ?? []);
-        // Compare with existing indexes and create/update accordingly with status checks
-        try {
-            const existingIdxRes = await adapter.listIndexes({ databaseId, tableId });
-            const existingIdx = existingIdxRes.data || existingIdxRes.indexes || [];
-            MessageFormatter.debug(`Existing index keys: ${existingIdx.map((i) => i.key).join(', ')}`, undefined, { prefix: 'Indexes' });
-            // Show a concise plan with icons before executing
-            const idxPlanPlus = [];
-            const idxPlanPlusMinus = [];
-            const idxPlanSkip = [];
-            for (const idx of idxs) {
-                const found = existingIdx.find((i) => i.key === idx.key);
-                if (found) {
-                    if (isIndexEqualToIndex(found, idx))
-                        idxPlanSkip.push(idx.key);
-                    else
-                        idxPlanPlusMinus.push(idx.key);
-                }
-                else
-                    idxPlanPlus.push(idx.key);
-            }
-            const planParts = [];
-            if (idxPlanPlus.length)
-                planParts.push(`➕  ${idxPlanPlus.length} (${idxPlanPlus.join(', ')})`);
-            if (idxPlanPlusMinus.length)
-                planParts.push(`🔧  ${idxPlanPlusMinus.length} (${idxPlanPlusMinus.join(', ')})`);
-            if (idxPlanSkip.length)
-                planParts.push(`⏭️  ${idxPlanSkip.length}`);
-            MessageFormatter.info(`Plan → ${planParts.join('  |  ') || 'no changes'}`, { prefix: 'Indexes' });
-            const created = [];
-            const updated = [];
-            const skipped = [];
-            for (const idx of idxs) {
-                const found = existingIdx.find((i) => i.key === idx.key);
-                if (found) {
-                    if (isIndexEqualToIndex(found, idx)) {
-                        MessageFormatter.info(`Index ${idx.key} unchanged`, { prefix: 'Indexes' });
-                        skipped.push(idx.key);
-                    }
-                    else {
-                        try {
-                            await adapter.deleteIndex({ databaseId, tableId, key: idx.key });
-                            await delay(100);
-                        }
-                        catch { }
-                        try {
-                            await adapter.createIndex({ databaseId, tableId, key: idx.key, type: idx.type, attributes: idx.attributes, orders: idx.orders || [] });
-                            updated.push(idx.key);
-                        }
-                        catch (e) {
-                            const msg = (e?.message || '').toString().toLowerCase();
-                            if (msg.includes('already exists')) {
-                                MessageFormatter.info(`Index ${idx.key} already exists after delete attempt, skipping`, { prefix: 'Indexes' });
-                                skipped.push(idx.key);
-                            }
-                            else {
-                                throw e;
-                            }
-                        }
-                    }
-                }
-                else {
-                    try {
-                        await adapter.createIndex({ databaseId, tableId, key: idx.key, type: idx.type, attributes: idx.attributes, orders: idx.orders || [] });
-                        created.push(idx.key);
-                    }
-                    catch (e) {
-                        const msg = (e?.message || '').toString().toLowerCase();
-                        if (msg.includes('already exists')) {
-                            MessageFormatter.info(`Index ${idx.key} already exists (create), skipping`, { prefix: 'Indexes' });
-                            skipped.push(idx.key);
-                        }
-                        else {
-                            throw e;
-                        }
-                    }
-                }
-                // Wait for index availability
-                const maxWait = 60000;
-                const start = Date.now();
-                let lastStatus = '';
-                while (Date.now() - start < maxWait) {
-                    try {
-                        const li = await adapter.listIndexes({ databaseId, tableId });
-                        const list = li.data || li.indexes || [];
-                        const cur = list.find((i) => i.key === idx.key);
-                        if (cur) {
-                            if (cur.status === 'available')
-                                break;
-                            if (cur.status === 'failed' || cur.status === 'stuck') {
-                                throw new Error(cur.error || `Index ${idx.key} failed`);
-                            }
-                            lastStatus = cur.status;
-                        }
-                        await delay(2000);
-                    }
-                    catch {
-                        await delay(2000);
-                    }
-                }
-                await delay(150);
-            }
-            MessageFormatter.info(`Summary → ➕  ${created.length}  |  🔧  ${updated.length}  |  ⏭️  ${skipped.length}`, { prefix: 'Indexes' });
-        }
-        catch (e) {
-            MessageFormatter.error(`Failed to list/create indexes`, e instanceof Error ? e : new Error(String(e)), { prefix: 'Indexes' });
-        }
-        // Deletions for indexes: remove remote indexes not declared in YAML/config
-        try {
-            const desiredIndexKeys = new Set((indexes || []).map((i) => i.key));
-            const idxRes = await adapter.listIndexes({ databaseId, tableId });
-            const existingIdx = idxRes.data || idxRes.indexes || [];
-            const extraIdx = existingIdx
-                .filter((i) => i?.key && !desiredIndexKeys.has(i.key))
-                .map((i) => i.key);
-            if (extraIdx.length > 0) {
-                MessageFormatter.info(`Plan → 🗑️  ${extraIdx.length} indexes (${extraIdx.join(', ')})`, { prefix: 'Indexes' });
-                const deleted = [];
-                const errors = [];
-                for (const key of extraIdx) {
-                    try {
-                        await adapter.deleteIndex({ databaseId, tableId, key });
-                        // Optionally wait for index to disappear
-                        const start = Date.now();
-                        const maxWait = 30000;
-                        while (Date.now() - start < maxWait) {
-                            try {
-                                const li = await adapter.listIndexes({ databaseId, tableId });
-                                const list = li.data || li.indexes || [];
-                                if (!list.find((ix) => ix.key === key))
-                                    break;
-                            }
-                            catch { }
-                            await delay(1000);
-                        }
-                        deleted.push(key);
-                    }
-                    catch (e) {
-                        errors.push({ key, error: e?.message || String(e) });
-                    }
-                }
-                if (deleted.length) {
-                    MessageFormatter.success(`Deleted ${deleted.length} indexes: ${deleted.join(', ')}`, { prefix: 'Indexes' });
-                }
-                if (errors.length) {
-                    MessageFormatter.error(`${errors.length} index deletions failed`, undefined, { prefix: 'Indexes' });
-                    errors.forEach(er => MessageFormatter.error(`  ${er.key}: ${er.error}`, undefined, { prefix: 'Indexes' }));
-                }
-            }
-            else {
-                MessageFormatter.info(`Plan → 🗑️  0 indexes`, { prefix: 'Indexes' });
-            }
-        }
-        catch (e) {
-            MessageFormatter.warning(`Could not evaluate index deletions: ${e?.message || e}`, { prefix: 'Indexes' });
-        }
+        // Create/update indexes with proper planning and execution
+        await createOrUpdateIndexesViaAdapter(adapter, databaseId, tableId, idxs, indexes);
+        // Handle obsolete index deletions
+        const desiredIndexKeys = new Set((indexes || []).map((i) => i.key));
+        await deleteObsoleteIndexesViaAdapter(adapter, databaseId, tableId, desiredIndexKeys);
         // Deletions: remove columns/attributes that are present remotely but not in desired config
         try {
             const desiredKeys = new Set((attributes || []).map((a) => a.key));
@@ -555,7 +449,9 @@ export const createOrUpdateCollectionsViaAdapter = async (adapter, databaseId, c
                             const idxRes = await adapter.listIndexes({ databaseId, tableId });
                             const ilist = idxRes.data || idxRes.indexes || [];
                             for (const idx of ilist) {
-                                const attrs = Array.isArray(idx.attributes) ? idx.attributes : [];
+                                const attrs = Array.isArray(idx.attributes)
+                                    ? idx.attributes
+                                    : (Array.isArray(idx.columns) ? idx.columns : []);
                                 if (attrs.includes(key)) {
                                     MessageFormatter.info(`🗑️  Deleting index '${idx.key}' referencing '${key}'`, { prefix: 'Indexes' });
                                     await adapter.deleteIndex({ databaseId, tableId, key: idx.key });
@@ -647,6 +543,15 @@ export const createOrUpdateCollectionsViaAdapter = async (adapter, databaseId, c
             }
         }
     }
+    // Process any remaining queued operations to complete relationship sync
+    try {
+        MessageFormatter.info(`🔄 Processing final operation queue for database ${databaseId}`, { prefix: "Tables" });
+        await processQueue(adapter, databaseId);
+        MessageFormatter.info(`✅ Operation queue processing completed`, { prefix: "Tables" });
+    }
+    catch (error) {
+        MessageFormatter.error(`Failed to process operation queue`, error instanceof Error ? error : new Error(String(error)), { prefix: 'Tables' });
+    }
 };
 export const generateMockData = async (database, databaseId, configCollections) => {
     for (const { collection, mockFunction } of configCollections) {