From 94267e3e5e8239010b9d50cb866db92dd8acc9d7 Mon Sep 17 00:00:00 2001
From: harsh mahajan <harshmahajan2345@gmail.com>
Date: Mon, 27 Apr 2026 16:57:22 +0530
Subject: [PATCH 1/5] fix: stop auto sample data generation on table create

---
 .../database-[database]/(entity)/views/create.svelte       | 7 ++++++-
 .../database-[database]/(suggestions)/input.svelte         | 7 -------
 .../databases/database-[database]/+layout.svelte           | 7 -------
 3 files changed, 6 insertions(+), 15 deletions(-)

diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/(entity)/views/create.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/(entity)/views/create.svelte
index 1f3d84826a..9c7339dae4 100644
--- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/(entity)/views/create.svelte
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/(entity)/views/create.svelte
@@ -59,6 +59,7 @@
     async function createEntity() {
         error = null;
         creatingEntity = true;
+        let createdEntity = false;
         try {
             const finalId = id || ID.unique();
 
@@ -67,6 +68,7 @@
 
             // create entity.
             await onCreateEntity(finalId, name, isVectorsDb ? dimension : undefined);
+            createdEntity = true;
 
             // cleanup
             updateAndCleanup();
@@ -75,7 +77,10 @@
             trackError(e, analyticsCreateSubmit);
         } finally {
             creatingEntity = false;
-            resetSampleFieldsConfig();
+
+            if (!createdEntity || !$entityColumnSuggestions.enabled) {
+                resetSampleFieldsConfig();
+            }
         }
     }
 
diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/(suggestions)/input.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/(suggestions)/input.svelte
index a9c0b1e04c..6dee7bab04 100644
--- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/(suggestions)/input.svelte
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/(suggestions)/input.svelte
@@ -1,5 +1,4 @@
 <script lang="ts">
-    import { onMount } from 'svelte';
     import { isCloud } from '$lib/system';
     import IconAI from './icon/ai.svelte';
     import { slide } from 'svelte/transition';
@@ -21,12 +20,6 @@
         showSampleCountPicker?: boolean;
     } = $props();
 
-    onMount(() => {
-        if (featureActive) {
-            $entityColumnSuggestions.enabled = true;
-        }
-    });
-
     const featureActive = $derived(isCloud);
     const { terminology } = getTerminologies();
 
diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/+layout.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/+layout.svelte
index ca7bcdabc9..8a647bbe66 100644
--- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/+layout.svelte
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/+layout.svelte
@@ -11,7 +11,6 @@
     import { tablesSearcher } from '$lib/commandCenter/searchers';
     import { Dependencies } from '$lib/constants';
     import { showCreateEntity, randomDataModalState, resetSampleFieldsConfig } from './store';
-    import { entityColumnSuggestions } from './(suggestions)/store';
     import { TablesPanel } from '$lib/commandCenter/panels';
     import { canWriteTables, canWriteDatabases } from '$lib/stores/roles';
     import { showCreateBackup, showCreatePolicy } from './backups/store';
@@ -61,12 +60,6 @@
             )
         );
 
-        if ($entityColumnSuggestions.enabled) {
-            $randomDataModalState.columns = true;
-            await $randomDataModalState.onSubmit?.();
-        }
-
-        resetSampleFieldsConfig();
     }
 
     $effect(() => {

From 40b69207ebe37d097cadb7f9a1bc444cf05e8102 Mon Sep 17 00:00:00 2001
From: harsh mahajan <harshmahajan2345@gmail.com>
Date: Mon, 27 Apr 2026 17:01:48 +0530
Subject: [PATCH 2/5] fix: preserve ai suggestion handoff after table create

---
 .../databases/database-[database]/(entity)/views/create.svelte  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/(entity)/views/create.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/(entity)/views/create.svelte
index 9c7339dae4..4fff7ddda3 100644
--- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/(entity)/views/create.svelte
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/(entity)/views/create.svelte
@@ -108,7 +108,7 @@
 
     $effect(() => {
         // reset is OK here, we don't have to check for entity type!
-        if (show && isOnEntitiesPage && $entityColumnSuggestions.entity) {
+        if (show && !creatingEntity && isOnEntitiesPage && $entityColumnSuggestions.entity) {
             entityColumnSuggestions.update((store) => ({
                 ...store,
                 entity: null

From ad25dbf3ec75db7ecf601e3e48b5ef36a657582f Mon Sep 17 00:00:00 2001
From: harsh mahajan <harshmahajan2345@gmail.com>
Date: Mon, 27 Apr 2026 17:05:43 +0530
Subject: [PATCH 3/5] fix: restore post-create table ai suggestions

---
 .../database-[database]/+layout.svelte        | 19 +++++++++++++++++
 .../database-[database]/subNavigation.svelte  | 21 +++++++++++++++++++
 2 files changed, 40 insertions(+)

diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/+layout.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/+layout.svelte
index 8a647bbe66..e3459c229e 100644
--- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/+layout.svelte
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/+layout.svelte
@@ -11,6 +11,7 @@
     import { tablesSearcher } from '$lib/commandCenter/searchers';
     import { Dependencies } from '$lib/constants';
     import { showCreateEntity, randomDataModalState, resetSampleFieldsConfig } from './store';
+    import { entityColumnSuggestions } from './(suggestions)/store';
     import { TablesPanel } from '$lib/commandCenter/panels';
     import { canWriteTables, canWriteDatabases } from '$lib/stores/roles';
     import { showCreateBackup, showCreatePolicy } from './backups/store';
@@ -25,6 +26,7 @@
     import type { Snippet } from 'svelte';
     import { Input as SuggestionsInput } from '$database/(suggestions)/index';
     import { Modal } from '$lib/components';
+    import { subNavigation } from '$lib/stores/database';
 
     let {
         children
@@ -42,6 +44,7 @@
     $registerSearchers(tablesSearcher);
 
     async function createEntity(entityId: string, name: string, dimension?: number) {
+        const shouldSuggestColumns = $entityColumnSuggestions.enabled;
         const entity = await databaseSdk.createEntity({
             databaseId,
             entityId,
@@ -50,6 +53,7 @@
         });
 
         await invalidate(Dependencies.DATABASE);
+        await invalidate(Dependencies.TABLES);
         await goto(
             withPath(
                 resolveRoute(
@@ -60,6 +64,21 @@
             )
         );
 
+        subNavigation.update();
+
+        if (shouldSuggestColumns) {
+            entityColumnSuggestions.update((store) => ({
+                ...store,
+                enabled: true,
+                thinking: true,
+                force: true,
+                entity: {
+                    id: entity.$id,
+                    name: entity.name
+                }
+            }));
+        }
+
     }
 
     $effect(() => {
diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/subNavigation.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/subNavigation.svelte
index 011dc9a88a..b9b0b192e7 100644
--- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/subNavigation.svelte
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/subNavigation.svelte
@@ -27,6 +27,7 @@
     import { Query } from '@appwrite.io/console';
     import { onMount } from 'svelte';
     import { subNavigation } from '$lib/stores/database';
+    import { sleep } from '$lib/helpers/promises';
     import {
         type Entity,
         type EntityList,
@@ -83,6 +84,26 @@
                 databaseId: page.params.database,
                 queries: [Query.orderDesc(''), Query.limit(100)]
             });
+
+            const currentEntityId = page.params[entityTypeSingular];
+
+            if (
+                currentEntityId &&
+                !entities.entities.some((entity: Entity) => entity.$id === currentEntityId)
+            ) {
+                for (let attempt = 0; attempt < 3; attempt++) {
+                    await sleep(250);
+
+                    entities = await databaseSdk.listEntities({
+                        databaseId: page.params.database,
+                        queries: [Query.orderDesc(''), Query.limit(100)]
+                    });
+
+                    if (entities.entities.some((entity: Entity) => entity.$id === currentEntityId)) {
+                        break;
+                    }
+                }
+            }
         } finally {
             loading = false;
         }

From 64b8ede85a65da8326e1aad333479ab871585fcd Mon Sep 17 00:00:00 2001
From: harsh mahajan <harshmahajan2345@gmail.com>
Date: Mon, 27 Apr 2026 17:11:32 +0530
Subject: [PATCH 4/5] fix: sync new tables into database sidebar

---
 src/lib/stores/database.ts                    | 20 ++++++++--
 .../database-[database]/+layout.svelte        |  8 +++-
 .../database-[database]/subNavigation.svelte  | 37 ++++++++-----------
 3 files changed, 38 insertions(+), 27 deletions(-)

diff --git a/src/lib/stores/database.ts b/src/lib/stores/database.ts
index 648708bd05..d0d7e160f5 100644
--- a/src/lib/stores/database.ts
+++ b/src/lib/stores/database.ts
@@ -14,6 +14,18 @@ export const backupsBannerId = 'banner:databaseBackups';
 
 export const showPolicyAlert = writable<boolean>(false);
 
+type SubNavigationEntity = {
+    $id: string;
+    name: string;
+};
+
+type SubNavigationEvent =
+    | {
+          type: 'entity-created';
+          entity: SubNavigationEntity;
+      }
+    | undefined;
+
 export async function checkForDatabaseBackupPolicies(
     region: string,
     projectId: string,
@@ -50,17 +62,17 @@ export async function checkForDatabaseBackupPolicies(
 }
 
 function createSubNavigationTrigger() {
-    const subscribers = new Set<() => void>();
+    const subscribers = new Set<(event?: SubNavigationEvent) => void>();
 
     return {
-        subscribe: (callback: () => void) => {
+        subscribe: (callback: (event?: SubNavigationEvent) => void) => {
             subscribers.add(callback);
             return () => {
                 subscribers.delete(callback);
             };
         },
-        update: () => {
-            subscribers.forEach((callback) => callback());
+        update: (event?: SubNavigationEvent) => {
+            subscribers.forEach((callback) => callback(event));
         }
     };
 }
diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/+layout.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/+layout.svelte
index e3459c229e..73750f1ab5 100644
--- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/+layout.svelte
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/+layout.svelte
@@ -64,7 +64,13 @@
             )
         );
 
-        subNavigation.update();
+        subNavigation.update({
+            type: 'entity-created',
+            entity: {
+                $id: entity.$id,
+                name: entity.name
+            }
+        });
 
         if (shouldSuggestColumns) {
             entityColumnSuggestions.update((store) => ({
diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/subNavigation.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/subNavigation.svelte
index b9b0b192e7..f4084a02a2 100644
--- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/subNavigation.svelte
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/subNavigation.svelte
@@ -27,7 +27,6 @@
     import { Query } from '@appwrite.io/console';
     import { onMount } from 'svelte';
     import { subNavigation } from '$lib/stores/database';
-    import { sleep } from '$lib/helpers/promises';
     import {
         type Entity,
         type EntityList,
@@ -84,26 +83,6 @@
                 databaseId: page.params.database,
                 queries: [Query.orderDesc(''), Query.limit(100)]
             });
-
-            const currentEntityId = page.params[entityTypeSingular];
-
-            if (
-                currentEntityId &&
-                !entities.entities.some((entity: Entity) => entity.$id === currentEntityId)
-            ) {
-                for (let attempt = 0; attempt < 3; attempt++) {
-                    await sleep(250);
-
-                    entities = await databaseSdk.listEntities({
-                        databaseId: page.params.database,
-                        queries: [Query.orderDesc(''), Query.limit(100)]
-                    });
-
-                    if (entities.entities.some((entity: Entity) => entity.$id === currentEntityId)) {
-                        break;
-                    }
-                }
-            }
         } finally {
             loading = false;
         }
@@ -111,7 +90,21 @@
 
     onMount(() => {
         loadEntities();
-        return subNavigation.subscribe(loadEntities);
+        return subNavigation.subscribe(async (event) => {
+            if (event?.type === 'entity-created') {
+                if (!entities.entities.some((entity: Entity) => entity.$id === event.entity.$id)) {
+                    entities = {
+                        total: entities.total + 1,
+                        entities: [...entities.entities, event.entity as Entity]
+                    };
+                }
+
+                loading = false;
+                return;
+            }
+
+            await loadEntities();
+        });
     });
 
     function onResize() {

From 58730c3e2201f8f229b432e09b4dc316686fc7df Mon Sep 17 00:00:00 2001
From: harsh mahajan <harshmahajan2345@gmail.com>
Date: Mon, 27 Apr 2026 17:16:33 +0530
Subject: [PATCH 5/5] format

---
 .../databases/database-[database]/+layout.svelte                 | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/+layout.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/+layout.svelte
index 73750f1ab5..5109887944 100644
--- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/+layout.svelte
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/+layout.svelte
@@ -84,7 +84,6 @@
                 }
             }));
         }
-
     }
 
     $effect(() => {