diff --git a/drizzle-templates/0010_tranquil_squirrel_girl.sql b/drizzle-templates/0010_tranquil_squirrel_girl.sql
new file mode 100644
index 00000000..b6998ecb
--- /dev/null
+++ b/drizzle-templates/0010_tranquil_squirrel_girl.sql
@@ -0,0 +1,2 @@
+ALTER TABLE `agents` ADD `llmProvider` text;--> statement-breakpoint
+ALTER TABLE `agents` ADD `llmModel` text;
\ No newline at end of file
diff --git a/drizzle-templates/meta/0010_snapshot.json b/drizzle-templates/meta/0010_snapshot.json
new file mode 100644
index 00000000..101d616f
--- /dev/null
+++ b/drizzle-templates/meta/0010_snapshot.json
@@ -0,0 +1,182 @@
+{
+  "version": "6",
+  "dialect": "sqlite",
+  "id": "72edd5be-dee7-4479-9081-c6dcb39e81db",
+  "prevId": "32dafa3e-fb56-4423-b94d-875ae02b80db",
+  "tables": {
+    "agents": {
+      "name": "agents",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "displayName": {
+          "name": "displayName",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "options": {
+          "name": "options",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "events": {
+          "name": "events",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "tools": {
+          "name": "tools",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "prompt": {
+          "name": "prompt",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "flows": {
+          "name": "flows",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "published": {
+          "name": "published",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "defaultFlow": {
+          "name": "defaultFlow",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "inputs": {
+          "name": "inputs",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "agents": {
+          "name": "agents",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "expectedResult": {
+          "name": "expectedResult",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "safetyRules": {
+          "name": "safetyRules",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "status": {
+          "name": "status",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "locale": {
+          "name": "locale",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "agentType": {
+          "name": "agentType",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "llmProvider": {
+          "name": "llmProvider",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "llmModel": {
+          "name": "llmModel",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "createdAt": {
+          "name": "createdAt",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "CURRENT_TIMESTAMP"
+        },
+        "updatedAt": {
+          "name": "updatedAt",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "CURRENT_TIMESTAMP"
+        },
+        "icon": {
+          "name": "icon",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "extra": {
+          "name": "extra",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    }
+  },
+  "enums": {},
+  "_meta": {
+    "schemas": {},
+    "tables": {},
+    "columns": {}
+  },
+  "internal": {
+    "indexes": {}
+  }
+}
\ No newline at end of file
diff --git a/drizzle-templates/meta/_journal.json b/drizzle-templates/meta/_journal.json
index 4050c6b4..e03eccd9 100644
--- a/drizzle-templates/meta/_journal.json
+++ b/drizzle-templates/meta/_journal.json
@@ -71,6 +71,13 @@
       "when": 1741281961082,
       "tag": "0009_worried_lockheed",
       "breakpoints": true
+    },
+    {
+      "idx": 10,
+      "version": "6",
+      "when": 1745831549017,
+      "tag": "0010_tranquil_squirrel_girl",
+      "breakpoints": true
     }
   ]
 }
\ No newline at end of file
diff --git a/drizzle/meta/0023_snapshot.json b/drizzle/meta/0023_snapshot.json
new file mode 100644
index 00000000..7b92b009
--- /dev/null
+++ b/drizzle/meta/0023_snapshot.json
@@ -0,0 +1,796 @@
+{
+  "version": "6",
+  "dialect": "sqlite",
+  "id": "1fb6f1af-220d-43a4-8723-7cddfddae4ba",
+  "prevId": "435aa0a1-c1dc-45cd-8dc8-d77f248d4e3c",
+  "tables": {
+    "agents": {
+      "name": "agents",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "displayName": {
+          "name": "displayName",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "options": {
+          "name": "options",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "events": {
+          "name": "events",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "tools": {
+          "name": "tools",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "prompt": {
+          "name": "prompt",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "flows": {
+          "name": "flows",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "published": {
+          "name": "published",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "defaultFlow": {
+          "name": "defaultFlow",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "inputs": {
+          "name": "inputs",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "agents": {
+          "name": "agents",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "expectedResult": {
+          "name": "expectedResult",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "safetyRules": {
+          "name": "safetyRules",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "status": {
+          "name": "status",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "locale": {
+          "name": "locale",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "agentType": {
+          "name": "agentType",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "llmProvider": {
+          "name": "llmProvider",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "llmModel": {
+          "name": "llmModel",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "createdAt": {
+          "name": "createdAt",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "CURRENT_TIMESTAMP"
+        },
+        "updatedAt": {
+          "name": "updatedAt",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "CURRENT_TIMESTAMP"
+        },
+        "icon": {
+          "name": "icon",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "extra": {
+          "name": "extra",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "attachments": {
+      "name": "attachments",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "integer",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": true
+        },
+        "displayName": {
+          "name": "displayName",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "safeNameIdentifier": {
+          "name": "safeNameIdentifier",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "type": {
+          "name": "type",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "url": {
+          "name": "url",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "mimeType": {
+          "name": "mimeType",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "assignedTo": {
+          "name": "assignedTo",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "json": {
+          "name": "json",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "extra": {
+          "name": "extra",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "size": {
+          "name": "size",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "content": {
+          "name": "content",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "storageKey": {
+          "name": "storageKey",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "description": {
+          "name": "description",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "updatedAt": {
+          "name": "updatedAt",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "CURRENT_TIMESTAMP"
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "calendarEvents": {
+      "name": "calendarEvents",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "title": {
+          "name": "title",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "start": {
+          "name": "start",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "end": {
+          "name": "end",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "exclusive": {
+          "name": "exclusive",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "description": {
+          "name": "description",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "location": {
+          "name": "location",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "agentId": {
+          "name": "agentId",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "participants": {
+          "name": "participants",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "createdAt": {
+          "name": "createdAt",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "CURRENT_TIMESTAMP"
+        },
+        "updatedAt": {
+          "name": "updatedAt",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "CURRENT_TIMESTAMP"
+        },
+        "sessionId": {
+          "name": "sessionId",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "calendarEvents_agentId_agents_id_fk": {
+          "name": "calendarEvents_agentId_agents_id_fk",
+          "tableFrom": "calendarEvents",
+          "tableTo": "agents",
+          "columnsFrom": [
+            "agentId"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "config": {
+      "name": "config",
+      "columns": {
+        "key": {
+          "name": "key",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "value": {
+          "name": "value",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "updatedAt": {
+          "name": "updatedAt",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "CURRENT_TIMESTAMP"
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "keys": {
+      "name": "keys",
+      "columns": {
+        "keyLocatorHash": {
+          "name": "keyLocatorHash",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "displayName": {
+          "name": "displayName",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "databaseIdHash": {
+          "name": "databaseIdHash",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "keyHash": {
+          "name": "keyHash",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "keyHashParams": {
+          "name": "keyHashParams",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "encryptedMasterKey": {
+          "name": "encryptedMasterKey",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "acl": {
+          "name": "acl",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "extra": {
+          "name": "extra",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "expiryDate": {
+          "name": "expiryDate",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false,
+          "default": "CURRENT_TIMESTAMP"
+        },
+        "updatedAt": {
+          "name": "updatedAt",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "CURRENT_TIMESTAMP"
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "results": {
+      "name": "results",
+      "columns": {
+        "agentId": {
+          "name": "agentId",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "sessionId": {
+          "name": "sessionId",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "userName": {
+          "name": "userName",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "userEmail": {
+          "name": "userEmail",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "content": {
+          "name": "content",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "format": {
+          "name": "format",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "createdAt": {
+          "name": "createdAt",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "CURRENT_TIMESTAMP"
+        },
+        "updatedAt": {
+          "name": "updatedAt",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "CURRENT_TIMESTAMP"
+        },
+        "finalizedAt": {
+          "name": "finalizedAt",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "results_agentId_agents_id_fk": {
+          "name": "results_agentId_agents_id_fk",
+          "tableFrom": "results",
+          "tableTo": "agents",
+          "columnsFrom": [
+            "agentId"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        },
+        "results_sessionId_sessions_id_fk": {
+          "name": "results_sessionId_sessions_id_fk",
+          "tableFrom": "results",
+          "tableTo": "sessions",
+          "columnsFrom": [
+            "sessionId"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "sessions": {
+      "name": "sessions",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "agentId": {
+          "name": "agentId",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "userName": {
+          "name": "userName",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false,
+          "default": "''"
+        },
+        "userEmail": {
+          "name": "userEmail",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false,
+          "default": "''"
+        },
+        "acceptTerms": {
+          "name": "acceptTerms",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "completionTokens": {
+          "name": "completionTokens",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "promptTokens": {
+          "name": "promptTokens",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "messages": {
+          "name": "messages",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "createdAt": {
+          "name": "createdAt",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "CURRENT_TIMESTAMP"
+        },
+        "updatedAt": {
+          "name": "updatedAt",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "CURRENT_TIMESTAMP"
+        },
+        "finalizedAt": {
+          "name": "finalizedAt",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "sessions_agentId_agents_id_fk": {
+          "name": "sessions_agentId_agents_id_fk",
+          "tableFrom": "sessions",
+          "tableTo": "agents",
+          "columnsFrom": [
+            "agentId"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "terms": {
+      "name": "terms",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "integer",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": true
+        },
+        "content": {
+          "name": "content",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "code": {
+          "name": "code",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "key": {
+          "name": "key",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "signature": {
+          "name": "signature",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "ip": {
+          "name": "ip",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "ua": {
+          "name": "ua",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "email": {
+          "name": "email",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "signedAt": {
+          "name": "signedAt",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "CURRENT_TIMESTAMP"
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    }
+  },
+  "enums": {},
+  "_meta": {
+    "schemas": {},
+    "tables": {},
+    "columns": {}
+  },
+  "internal": {
+    "indexes": {}
+  }
+}
\ No newline at end of file
diff --git a/src/app/[locale]/admin/agent/[id]/general/page.tsx b/src/app/[locale]/admin/agent/[id]/general/page.tsx
index 20a9bb01..8d68cccc 100644
--- a/src/app/[locale]/admin/agent/[id]/general/page.tsx
+++ b/src/app/[locale]/admin/agent/[id]/general/page.tsx
@@ -1,32 +1,51 @@
-'use client'
-import { Input } from '@/components/ui/input';
-import { Textarea } from '@/components/ui/textarea';
-import { Button } from '@/components/ui/button';
-import { useTranslation } from 'react-i18next';
-import { useAgentContext } from '@/contexts/agent-context';
-import { use, useContext, useEffect, useState } from 'react';
-import { FormProvider, useForm, UseFormGetValues, UseFormSetValue, UseFormWatch } from 'react-hook-form';
-import { Agent } from '@/data/client/models';
-import { toast } from 'sonner';
-import { useParams, useRouter } from 'next/navigation';
-import { sha256 } from '@/lib/crypto';
-import { TFunction } from 'i18next';
-import { AgentStatus } from '@/components/layout/agent-status';
-import { MarkdownEditor } from '@/components/markdown-editor';
-import React from 'react';
-import { MDXEditorMethods } from '@mdxeditor/editor';
-import { LocaleSelect } from '@/components/locale-select';
-import { AgentTypeSelect } from '@/components/agent-type-select';
-import { SaveAgentAsTemplateButton } from '@/components/save-agent-as-template-button';
-import DataLoader from '@/components/data-loader';
-import { InfoIcon, TrashIcon } from 'lucide-react';
-import { AgentTypeDescriptor, agentTypesRegistry } from '@/agent-types/registry';
-import { AttachmentUploader } from '@/components/attachment-uploader';
-import { DatabaseContext } from '@/contexts/db-context';
-import { SaaSContext } from '@/contexts/saas-context';
-import ZoomableImage from '@/components/zoomable-image';
-
-export function onAgentSubmit(agent: Agent | null, watch: UseFormWatch<Record<string, any>>, setValue: UseFormSetValue<Record<string, any>>, getValues: UseFormGetValues<Record<string, any>>, updateAgent: (agent: Agent, setAsCurrent: boolean) => Promise<Agent>, t: TFunction<"translation", undefined>, router: any, editors: Record<string, React.RefObject<MDXEditorMethods>>) {
+"use client";
+import { Input } from "@/components/ui/input";
+import { Textarea } from "@/components/ui/textarea";
+import { Button } from "@/components/ui/button";
+import { useTranslation } from "react-i18next";
+import { useAgentContext } from "@/contexts/agent-context";
+import { use, useContext, useEffect, useState } from "react";
+import {
+  FormProvider,
+  useForm,
+  UseFormGetValues,
+  UseFormSetValue,
+  UseFormWatch,
+} from "react-hook-form";
+import { Agent } from "@/data/client/models";
+import { toast } from "sonner";
+import { useParams, useRouter } from "next/navigation";
+import { sha256 } from "@/lib/crypto";
+import { TFunction } from "i18next";
+import { AgentStatus } from "@/components/layout/agent-status";
+import { MarkdownEditor } from "@/components/markdown-editor";
+import React from "react";
+import { MDXEditorMethods } from "@mdxeditor/editor";
+import { LocaleSelect } from "@/components/locale-select";
+import { AgentTypeSelect } from "@/components/agent-type-select";
+import { SaveAgentAsTemplateButton } from "@/components/save-agent-as-template-button";
+import DataLoader from "@/components/data-loader";
+import { InfoIcon, TrashIcon } from "lucide-react";
+import {
+  AgentTypeDescriptor,
+  agentTypesRegistry,
+} from "@/agent-types/registry";
+import { AttachmentUploader } from "@/components/attachment-uploader";
+import { DatabaseContext } from "@/contexts/db-context";
+import { SaaSContext } from "@/contexts/saas-context";
+import ZoomableImage from "@/components/zoomable-image";
+import { LLMConfigSelect } from "@/components/llm-config-select";
+
+export function onAgentSubmit(
+  agent: Agent | null,
+  watch: UseFormWatch<Record<string, any>>,
+  setValue: UseFormSetValue<Record<string, any>>,
+  getValues: UseFormGetValues<Record<string, any>>,
+  updateAgent: (agent: Agent, setAsCurrent: boolean) => Promise<Agent>,
+  t: TFunction<"translation", undefined>,
+  router: any,
+  editors: Record<string, React.RefObject<MDXEditorMethods>>
+) {
   // eslint-disable-next-line
   const [isDirty, setIsDirty] = useState(false);
   // eslint-disable-next-line
@@ -34,46 +53,70 @@ export function onAgentSubmit(agent: Agent | null, watch: UseFormWatch<Record<st
   // eslint-disable-next-line
   const agentContext = useAgentContext();
   // keep the watch subscription to be able to unsubscribe when the record is saved
-  const watchSubscription = React.useRef<{ unsubscribe: () => void } | null>(null);
+  const watchSubscription = React.useRef<{ unsubscribe: () => void } | null>(
+    null
+  );
 
   // eslint-disable-next-line
   useEffect(() => {
-    if (agentContext.agents && agentContext.agents.length > 0 && !agent && params.id) { // agent does not exist, but id is provided
+    if (
+      agentContext.agents &&
+      agentContext.agents.length > 0 &&
+      !agent &&
+      params.id
+    ) {
+      // agent does not exist, but id is provided
       router.push(`/admin/agent/new/general`);
     }
   }, [agentContext.agents]);
 
   // eslint-disable-next-line
   useEffect(() => {
-    if (agent && agent.id === params.id) { // bind the tracking changes only for the currently selected agent
+    if (agent && agent.id === params.id) {
+      // bind the tracking changes only for the currently selected agent
       //agent.toForm(setValue); // load the database values
-      const dirtyCheck = (async (originalRecord: Record<string, any>, value: Record<string, any>) => {
-        const compareForms = async (editableForm: Record<string, any>, savedForm: Record<string, any>) => {
-          const sortedSavedState: Record<string, any> = {}
-          const sortedEditableState = Object.keys(editableForm).sort().reduce((acc: Record<string, any>, key: string) => {
-            acc[key] = editableForm[key];
-            sortedSavedState[key] = savedForm[key];
-            return acc;
-          }, {});
-
-          const editableEntriesString = Object.entries(sortedEditableState).map(([key, value]) => `${key}:${JSON.stringify(value)}`).join(',');
-          const savedEntriesString = Object.entries(sortedSavedState).map(([key, value]) => `${key}:${JSON.stringify(value)}`).join(',');
+      const dirtyCheck = async (
+        originalRecord: Record<string, any>,
+        value: Record<string, any>
+      ) => {
+        const compareForms = async (
+          editableForm: Record<string, any>,
+          savedForm: Record<string, any>
+        ) => {
+          const sortedSavedState: Record<string, any> = {};
+          const sortedEditableState = Object.keys(editableForm)
+            .sort()
+            .reduce((acc: Record<string, any>, key: string) => {
+              acc[key] = editableForm[key];
+              sortedSavedState[key] = savedForm[key];
+              return acc;
+            }, {});
+
+          const editableEntriesString = Object.entries(sortedEditableState)
+            .map(([key, value]) => `${key}:${JSON.stringify(value)}`)
+            .join(",");
+          const savedEntriesString = Object.entries(sortedSavedState)
+            .map(([key, value]) => `${key}:${JSON.stringify(value)}`)
+            .join(",");
           const [editableEntriesHash, savedEntriesHash] = await Promise.all([
-            sha256(editableEntriesString, ''),
-            sha256(savedEntriesString, '')
+            sha256(editableEntriesString, ""),
+            sha256(savedEntriesString, ""),
           ]);
 
           return editableEntriesHash === savedEntriesHash;
         };
 
-        const formChanged = !await compareForms(getValues(), originalRecord);
+        const formChanged = !(await compareForms(getValues(), originalRecord));
         if (formChanged) {
-          sessionStorage.setItem(`agent-${value['id']}`, JSON.stringify(getValues())); // save form values
+          sessionStorage.setItem(
+            `agent-${value["id"]}`,
+            JSON.stringify(getValues())
+          ); // save form values
         } else {
-          sessionStorage.removeItem(`agent-${value['id']}`);
+          sessionStorage.removeItem(`agent-${value["id"]}`);
         }
         setIsDirty(formChanged);
-      })
+      };
 
       const subscribeChanges = (originalRecord: Record<string, any>) => {
         // if there is already an active watcher – remove it before creating a new one
@@ -81,11 +124,15 @@ export function onAgentSubmit(agent: Agent | null, watch: UseFormWatch<Record<st
           watchSubscription.current.unsubscribe();
         }
 
-        agentContext.setDirtyAgent(Agent.fromForm(getValues(), agentContext.current));
+        agentContext.setDirtyAgent(
+          Agent.fromForm(getValues(), agentContext.current)
+        );
         dirtyCheck(originalRecord, getValues());
 
         const subscription = watch((value) => {
-          agentContext.setDirtyAgent(Agent.fromForm(getValues(), agentContext.current));
+          agentContext.setDirtyAgent(
+            Agent.fromForm(getValues(), agentContext.current)
+          );
           dirtyCheck(originalRecord, value);
         });
 
@@ -96,7 +143,8 @@ export function onAgentSubmit(agent: Agent | null, watch: UseFormWatch<Record<st
       };
 
       const savedState = sessionStorage.getItem(`agent-${agent.id}`);
-      if (savedState) { // the form is dirty - load state from session storage
+      if (savedState) {
+        // the form is dirty - load state from session storage
         const parsedState = JSON.parse(savedState);
         Object.keys(parsedState).forEach((key) => {
           setValue(key, parsedState[key]);
@@ -106,36 +154,44 @@ export function onAgentSubmit(agent: Agent | null, watch: UseFormWatch<Record<st
         });
       } else {
         agent.toForm((field, value) => {
-          if (editors && editors.hasOwnProperty(field) && editors[field].current) {
+          if (
+            editors &&
+            editors.hasOwnProperty(field) &&
+            editors[field].current
+          ) {
             editors[field].current?.setMarkdown(value);
           }
           setValue(field, value);
-        })
+        });
       }
       subscribeChanges(agent.toForm(null));
-
     }
   }, [agent]);
 
   const onSubmit = async (data: Record<string, any>) => {
-
-    const newAgent = agent?.id === 'new';
+    const newAgent = agent?.id === "new";
     const updatedAgent = Agent.fromForm(data, agent);
 
-    const agentTypeDescriptor = agentTypesRegistry.find(at => at.type === updatedAgent.agentType);
+    const agentTypeDescriptor = agentTypesRegistry.find(
+      (at) => at.type === updatedAgent.agentType
+    );
     if (agentTypeDescriptor) {
       for (const requiredField of agentTypeDescriptor.requiredTabs) {
         const valToCheck = updatedAgent.toForm()[requiredField];
-        if (!valToCheck || (Array.isArray(valToCheck) && valToCheck.length === 0)) {
-          router.push(`/admin/agent/${updatedAgent.id}/${requiredField.replace(/[A-Z]/g, m => `-${m.toLowerCase()}`)}`);
-          toast.error(t('Field ') + t(requiredField) + t(' is required'));
+        if (
+          !valToCheck ||
+          (Array.isArray(valToCheck) && valToCheck.length === 0)
+        ) {
+          router.push(
+            `/admin/agent/${updatedAgent.id}/${requiredField.replace(/[A-Z]/g, (m) => `-${m.toLowerCase()}`)}`
+          );
+          toast.error(t("Field ") + t(requiredField) + t(" is required"));
           agentContext.setStatus({
-            id: requiredField + '-required',
-            message: t('Field ') + t(requiredField) + t(' is required'),
-            type: 'error'
+            id: requiredField + "-required",
+            message: t("Field ") + t(requiredField) + t(" is required"),
+            type: "error",
           });
           return;
-
         }
       }
     }
@@ -145,85 +201,116 @@ export function onAgentSubmit(agent: Agent | null, watch: UseFormWatch<Record<st
       if (watchSubscription.current) watchSubscription.current.unsubscribe();
 
       const response = await updateAgent(updatedAgent, true);
-      toast.success(t('Agent updated successfully'));
+      toast.success(t("Agent updated successfully"));
       agentContext.setStatus({
-        id: 'agent-updated',
-        message: t('Agent updated successfully'),
-        type: 'success'
+        id: "agent-updated",
+        message: t("Agent updated successfully"),
+        type: "success",
       });
-      if (newAgent)
-        sessionStorage.removeItem(`agent-new`);
-      else
-        sessionStorage.removeItem(`agent-${updatedAgent.id}`);
+      if (newAgent) sessionStorage.removeItem(`agent-new`);
+      else sessionStorage.removeItem(`agent-${updatedAgent.id}`);
 
       if (newAgent) router.push(`/admin/agent/${response.id}/general`);
     } catch (e) {
       console.error(e);
-      toast.error(t('Failed to update agent'));
+      toast.error(t("Failed to update agent"));
     }
   };
-  return { onSubmit, isDirty, setIsDirty }
+  return { onSubmit, isDirty, setIsDirty };
 }
 
-
 export default function GeneralPage() {
-
-
   const { t } = useTranslation();
   const router = useRouter();
-  const { setStatus, status, removeStatus, current: agent, updateAgent, loaderStatus } = useAgentContext();
-  const [agentDescriptor, setAgentDescriptor] = useState<AgentTypeDescriptor>({});
+  const {
+    setStatus,
+    status,
+    removeStatus,
+    current: agent,
+    updateAgent,
+    loaderStatus,
+  } = useAgentContext();
+  const [agentDescriptor, setAgentDescriptor] = useState<AgentTypeDescriptor>(
+    {}
+  );
   const dbContext = useContext(DatabaseContext);
   const saasContext = useContext(SaaSContext);
 
   const methods = useForm({
     defaultValues: agent ? agent.toForm(null) : {},
   });
-  const { register, handleSubmit, setValue, getValues, formState: { errors }, watch } = methods;
+  const {
+    register,
+    handleSubmit,
+    setValue,
+    getValues,
+    formState: { errors },
+    watch,
+  } = methods;
 
   const editors = {
     welcomeInfo: React.useRef<MDXEditorMethods>(null),
-    termsConditions: React.useRef<MDXEditorMethods>(null)
-  }
-  register('icon');
-  register('welcomeInfo');
-  register('termsConditions', {
+    termsConditions: React.useRef<MDXEditorMethods>(null),
+  };
+  register("icon");
+  register("welcomeInfo");
+  register("termsConditions", {
     validate: {
-      termsConditions: (v) => (getValues('confirmTerms') === true && !v) ? false : true
-    }
+      termsConditions: (v) =>
+        getValues("confirmTerms") === true && !v ? false : true,
+    },
   });
 
-  const { onSubmit, isDirty } = onAgentSubmit(agent, watch, setValue, getValues, updateAgent, t, router, editors);
+  const { onSubmit, isDirty } = onAgentSubmit(
+    agent,
+    watch,
+    setValue,
+    getValues,
+    updateAgent,
+    t,
+    router,
+    editors
+  );
 
-  const agentTypeValue = watch('agentType');
+  const agentTypeValue = watch("agentType");
   useEffect(() => {
     if (agentTypeValue) {
-      const agentTypeDescriptor = agentTypesRegistry.find(at => at.type === agentTypeValue);
-      if (agentDescriptor) setAgentDescriptor(agentTypeDescriptor as AgentTypeDescriptor);
+      const agentTypeDescriptor = agentTypesRegistry.find(
+        (at) => at.type === agentTypeValue
+      );
+      if (agentDescriptor)
+        setAgentDescriptor(agentTypeDescriptor as AgentTypeDescriptor);
     }
   }, [agentTypeValue]);
 
-
   useEffect(() => {
     if (isDirty) {
-      setStatus({ id: 'dirty', message: t('You have unsaved changes'), type: 'warning' });
+      setStatus({
+        id: "dirty",
+        message: t("You have unsaved changes"),
+        type: "warning",
+      });
     } else {
-      removeStatus('dirty');
+      removeStatus("dirty");
     }
   }, [isDirty]);
 
   return (
     <div className="space-y-6">
-      {loaderStatus === 'loading' ? (
-
+      {loaderStatus === "loading" ? (
         <div className="fixed inset-0 bg-black bg-opacity-75 flex items-center justify-center">
           <DataLoader />
         </div>
-
-      ) : (null)}
+      ) : null}
 
       {isDirty ? (
-        <AgentStatus status={{ id: 'dirty', message: t('You have unsaved changes'), type: 'warning' }} />
+        <AgentStatus
+          status={{
+            id: "dirty",
+            message: t("You have unsaved changes"),
+            type: "warning",
+          }}
+        />
       ) : (
         <AgentStatus status={status} />
       )}
@@ -231,107 +318,177 @@ export default function GeneralPage() {
         <form className="space-y-4" onSubmit={handleSubmit(onSubmit)}>
           <div>
             <label htmlFor="displayName" className="block text-sm font-medium">
-              {t('Agent Name')}
+              {t("Agent Name")}
             </label>
-            <Input type='hidden' id="id" {...register('id')} />
+            <Input type="hidden" id="id" {...register("id")} />
             <Input
               type="text"
               id="displayName"
-              {...register('displayName', { required: t('This field is required') })}
+              {...register("displayName", {
+                required: t("This field is required"),
+              })}
               className="mt-1 block w-full rounded-md border-gray-300 shadow-sm focus:border-indigo-500 focus:ring-indigo-500 sm:text-sm"
             />
-            {errors.displayName && <p className="mt-2 text-sm text-red-600">{errors.displayName.message}</p>}
+            {errors.displayName && (
+              <p className="mt-2 text-sm text-red-600">
+                {errors.displayName.message}
+              </p>
+            )}
           </div>
           <div>
             <label htmlFor="agentType" className="block text-sm font-medium">
-              {t('Agent type')}
+              {t("Agent type")}
             </label>
-            <AgentTypeSelect fieldName='agentType' register={register} />
+            <AgentTypeSelect fieldName="agentType" register={register} />
           </div>
+          <LLMConfigSelect />
           <div>
             <label htmlFor="welcomeInfo" className="block text-sm font-medium">
-              {t(agentDescriptor?.supportsUserFacingUI ? 'Welcome Message' : 'Description')}
+              {t(
+                agentDescriptor?.supportsUserFacingUI
+                  ? "Welcome Message"
+                  : "Description"
+              )}
             </label>
-            <MarkdownEditor markdown={getValues('welcomeInfo') ?? agent?.options?.welcomeMessage ?? ''} ref={editors.welcomeInfo} onChange={(e) => setValue('welcomeInfo', e)} diffMarkdown={agent?.options?.welcomeMessage ?? ''} />
-            {errors.welcomeInfo && <p className="mt-2 text-sm text-red-600">{errors.welcomeInfo.message}</p>}
+            <MarkdownEditor
+              markdown={
+                getValues("welcomeInfo") ?? agent?.options?.welcomeMessage ?? ""
+              }
+              ref={editors.welcomeInfo}
+              onChange={(e) => setValue("welcomeInfo", e)}
+              diffMarkdown={agent?.options?.welcomeMessage ?? ""}
+            />
+            {errors.welcomeInfo && (
+              <p className="mt-2 text-sm text-red-600">
+                {errors.welcomeInfo.message}
+              </p>
+            )}
           </div>
           {agentDescriptor?.supportsUserFacingUI && (
             <div>
-              <label htmlFor="termsConditions" className="block text-sm font-medium">
-                {t('Terms and Conditions')}
+              <label
+                htmlFor="termsConditions"
+                className="block text-sm font-medium"
+              >
+                {t("Terms and Conditions")}
               </label>
-              <MarkdownEditor markdown={getValues('termsConditions') ?? agent?.options?.termsAndConditions} ref={editors.termsConditions ?? ''} onChange={(e) => setValue('termsConditions', e)} diffMarkdown={agent?.options?.termsAndConditions ?? ''} />
-              {errors.termsConditions && <p className="mt-2 text-sm text-red-600">{t('If you require terms to be accepted by the user, you should provide them.')}</p>}
+              <MarkdownEditor
+                markdown={
+                  getValues("termsConditions") ??
+                  agent?.options?.termsAndConditions
+                }
+                ref={editors.termsConditions ?? ""}
+                onChange={(e) => setValue("termsConditions", e)}
+                diffMarkdown={agent?.options?.termsAndConditions ?? ""}
+              />
+              {errors.termsConditions && (
+                <p className="mt-2 text-sm text-red-600">
+                  {t(
+                    "If you require terms to be accepted by the user, you should provide them."
+                  )}
+                </p>
+              )}
             </div>
           )}
           {agentDescriptor?.supportsUserFacingUI && (
             <div className="text-xs p-2 flex">
-              <div><InfoIcon className="w-4 h-4 mr-2" /></div>
-              <div><strong>{t('Important note on GDPR and Terms: ')}</strong> {t('if your agent is about to process the personal data of the users, you SHOULD provide the terms and conditions and ask for the user consent. If you offer a commerce service you SHOULD also apply the Consumer Laws and provide the user with the right to return the product.')}
+              <div>
+                <InfoIcon className="w-4 h-4 mr-2" />
+              </div>
+              <div>
+                <strong>{t("Important note on GDPR and Terms: ")}</strong>{" "}
+                {t(
+                  "if your agent is about to process the personal data of the users, you SHOULD provide the terms and conditions and ask for the user consent. If you offer a commerce service you SHOULD also apply the Consumer Laws and provide the user with the right to return the product."
+                )}
               </div>
             </div>
           )}
           {agentDescriptor?.supportsUserFacingUI && (
             <div>
-              <label htmlFor="confirmTerms" className="flex items-center text-sm font-medium">
+              <label
+                htmlFor="confirmTerms"
+                className="flex items-center text-sm font-medium"
+              >
                 <Input
                   type="checkbox"
                   id="confirmTerms"
-                  {...register('confirmTerms')}
+                  {...register("confirmTerms")}
                   className="mr-2 w-4"
                 />
-                {t('Must confirm terms and conditions')}
+                {t("Must confirm terms and conditions")}
               </label>
-              {errors.confirmTerms && <p className="mt-2 text-sm text-red-600">{errors.confirmTerms.message}</p>}
+              {errors.confirmTerms && (
+                <p className="mt-2 text-sm text-red-600">
+                  {errors.confirmTerms.message}
+                </p>
+              )}
             </div>
           )}
           {agentDescriptor?.supportsUserFacingUI && (
             <div>
-              <label htmlFor="resultEmail" className="block text-sm font-medium">
-                {t('Result Email')}
+              <label
+                htmlFor="resultEmail"
+                className="block text-sm font-medium"
+              >
+                {t("Result Email")}
               </label>
               <Input
                 type="email"
                 id="resultEmail"
-                {...register('resultEmail', { pattern: { value: /^\S+@\S+$/i, message: t('Invalid email address') } })}
+                {...register("resultEmail", {
+                  pattern: {
+                    value: /^\S+@\S+$/i,
+                    message: t("Invalid email address"),
+                  },
+                })}
                 className="mt-1 block w-full rounded-md border-gray-300 shadow-sm focus:border-indigo-500 focus:ring-indigo-500 sm:text-sm"
               />
-              {errors.resultEmail && <p className="mt-2 text-sm text-red-600">{errors.resultEmail.message}</p>}
+              {errors.resultEmail && (
+                <p className="mt-2 text-sm text-red-600">
+                  {errors.resultEmail.message}
+                </p>
+              )}
             </div>
           )}
           {agentDescriptor?.supportsUserFacingUI && (
             <div>
-              <label htmlFor="collectUserInfo" className="flex items-center text-sm font-medium">
+              <label
+                htmlFor="collectUserInfo"
+                className="flex items-center text-sm font-medium"
+              >
                 <Input
                   type="checkbox"
                   id="collectUserInfo"
-                  {...register('collectUserInfo')}
+                  {...register("collectUserInfo")}
                   className="mr-2 w-4"
                 />
-                {t('Collect user e-mail addresses and names')}
+                {t("Collect user e-mail addresses and names")}
               </label>
-              {errors.collectUserInfo && <p className="mt-2 text-sm text-red-600">{errors.collectUserInfo.message}</p>}
+              {errors.collectUserInfo && (
+                <p className="mt-2 text-sm text-red-600">
+                  {errors.collectUserInfo.message}
+                </p>
+              )}
             </div>
           )}
           {agentDescriptor?.supportsUserFacingUI && (
             <div>
               <label htmlFor="locale" className="block text-sm font-medium">
-                {t('Default language')}
+                {t("Default language")}
               </label>
-              <LocaleSelect fieldName='locale' register={register} />
+              <LocaleSelect fieldName="locale" register={register} />
             </div>
           )}
 
-
           {agentDescriptor?.supportsUserFacingUI && (
             <div>
               <label htmlFor="ogTitle" className="block text-sm font-medium">
-                {t('Open Graph Title')}
+                {t("Open Graph Title")}
               </label>
               <Input
                 type="text"
                 id="ogTitle"
-                {...register('ogTitle')}
+                {...register("ogTitle")}
                 className="mt-1 block w-full rounded-md border-gray-300 shadow-sm focus:border-indigo-500 focus:ring-indigo-500 sm:text-sm"
               />
             </div>
@@ -339,12 +496,15 @@ export default function GeneralPage() {
 
           {agentDescriptor?.supportsUserFacingUI && (
             <div>
-              <label htmlFor="ogDescription" className="block text-sm font-medium">
-                {t('Open Graph Description')}
+              <label
+                htmlFor="ogDescription"
+                className="block text-sm font-medium"
+              >
+                {t("Open Graph Description")}
               </label>
               <Textarea
                 rows={4}
-                {...register('ogDescription')}
+                {...register("ogDescription")}
                 id="ogDescription"
                 className="mt-1 block w-full rounded-md border-gray-300 shadow-sm focus:border-indigo-500 focus:ring-indigo-500 sm:text-sm"
               />
@@ -352,21 +512,30 @@ export default function GeneralPage() {
           )}
 
           {agentDescriptor?.supportsUserFacingUI && (
-
             <div>
-
-              <label htmlFor="published" className="flex items-center text-sm font-medium">
-                {t('Open Graph Image')}
+              <label
+                htmlFor="published"
+                className="flex items-center text-sm font-medium"
+              >
+                {t("Open Graph Image")}
               </label>
 
-              {getValues('icon') && (
+              {getValues("icon") && (
                 <div>
-                  <ZoomableImage src={getValues('icon')} alt={''} className="cursor-pointer w-full h-full object-cover" />
-                  <Button variant={"outline"} size="icon" className="relative top-[-38px] left-[2px]" onClick={(e) => {
-                    e.preventDefault();
-                    setValue('icon', '');
-                  }
-                  }>
+                  <ZoomableImage
+                    src={getValues("icon")}
+                    alt={""}
+                    className="cursor-pointer w-full h-full object-cover"
+                  />
+                  <Button
+                    variant={"outline"}
+                    size="icon"
+                    className="relative top-[-38px] left-[2px]"
+                    onClick={(e) => {
+                      e.preventDefault();
+                      setValue("icon", "");
+                    }}
+                  >
                     <TrashIcon className="w-4 h-4" />
                   </Button>
                 </div>
@@ -378,40 +547,51 @@ export default function GeneralPage() {
                 saasContext={saasContext}
                 onUploaded={(uploaded) => {
                   if (uploaded) {
-                    setValue('icon', `${process.env.NEXT_PUBLIC_APP_URL}/storage/attachment/${dbContext?.databaseIdHash}/${uploaded.storageKey}`)
+                    setValue(
+                      "icon",
+                      `${process.env.NEXT_PUBLIC_APP_URL}/storage/attachment/${dbContext?.databaseIdHash}/${uploaded.storageKey}`
+                    );
                   }
                 }}
               />
             </div>
           )}
 
-
           <div>
-            <label htmlFor="published" className="flex items-center text-sm font-medium">
+            <label
+              htmlFor="published"
+              className="flex items-center text-sm font-medium"
+            >
               <Input
                 type="checkbox"
                 id="published"
-                {...register('published')}
+                {...register("published")}
                 className="mr-2 w-4"
               />
-              {t('Agent is published')}
+              {t("Agent is published")}
             </label>
-            {errors.collectUserInfo && <p className="mt-2 text-sm text-red-600">{errors.collectUserInfo.message}</p>}
+            {errors.collectUserInfo && (
+              <p className="mt-2 text-sm text-red-600">
+                {errors.collectUserInfo.message}
+              </p>
+            )}
           </div>
           <div className="flex justify-between">
             <Button
               type="submit"
               className="inline-flex justify-center py-2 px-4 border border-transparent shadow-sm text-sm font-medium rounded-md text-white bg-indigo-600 hover:bg-indigo-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-indigo-500"
             >
-              {t('Save')}
+              {t("Save")}
             </Button>
 
-            <SaveAgentAsTemplateButton getFormValues={getValues} agent={agent} onSaved={function (): void {
-            }} />
+            <SaveAgentAsTemplateButton
+              getFormValues={getValues}
+              agent={agent}
+              onSaved={function (): void {}}
+            />
           </div>
         </form>
       </FormProvider>
     </div>
   );
 }
-
diff --git a/src/app/api/chat/route.ts b/src/app/api/chat/route.ts
index ab8b3917..554784f4 100644
--- a/src/app/api/chat/route.ts
+++ b/src/app/api/chat/route.ts
@@ -154,7 +154,7 @@ export async function POST(req: NextRequest) {
     });
 
     const result = await streamText({
-      model: llmProviderSetup(),
+      model: llmProviderSetup(agent.llmProvider || undefined, agent.llmModel || undefined),
       maxSteps: 10,
       onError: (error) => {
         console.error('Error in streaming:', error);
diff --git a/src/app/api/llm/openai-models/route.ts b/src/app/api/llm/openai-models/route.ts
new file mode 100644
index 00000000..3a23e7c8
--- /dev/null
+++ b/src/app/api/llm/openai-models/route.ts
@@ -0,0 +1,51 @@
+import { authorizeRequestContext } from "@/lib/authorization-api";
+import { getErrorMessage } from "@/lib/utils";
+import { NextRequest, NextResponse } from 'next/server';
+
+export async function GET(req: NextRequest, res: NextResponse) {
+  try {
+    console.log('Fetching OpenAI models...');
+    
+    // Authorize the request (following the exact pattern from other API routes)
+    const requestContext = await authorizeRequestContext(req, res);
+    console.log("OpenAI models API - Authorization successful:", requestContext?.databaseIdHash ? 'OK' : 'No database');
+    
+    if (!process.env.OPENAI_API_KEY) {
+      console.warn('OPENAI_API_KEY not set, returning default models');
+      return Response.json({ 
+        models: ["gpt-4o", "gpt-4-turbo", "gpt-3.5-turbo"]
+      });
+    }
+    
+    const response = await fetch('https://api.openai.com/v1/models', {
+      headers: {
+        'Authorization': `Bearer ${process.env.OPENAI_API_KEY}`,
+      },
+    });
+    
+    if (response.ok) {
+      const data = await response.json();
+      // Filter to only include GPT models and sort
+      const models = data.data
+        .filter((model: any) => model.id.includes('gpt'))
+        .map((model: any) => model.id)
+        .sort();
+      
+      console.log('OpenAI models fetched:', models.length);
+      return Response.json({ models });
+    } else {
+      console.error('OpenAI API error:', response.status);
+      // Return default models on API error
+      return Response.json({ 
+        models: ["gpt-4o", "gpt-4-turbo", "gpt-3.5-turbo"]
+      });
+    }
+  } catch (error) {
+    console.error('Error fetching OpenAI models:', error);
+    // Return error following the same pattern as other API routes
+    return Response.json({ 
+      message: getErrorMessage(error), 
+      status: 499 
+    }, { status: 499 });
+  }
+}
diff --git a/src/components/llm-config-select.tsx b/src/components/llm-config-select.tsx
new file mode 100644
index 00000000..79ff3457
--- /dev/null
+++ b/src/components/llm-config-select.tsx
@@ -0,0 +1,227 @@
+"use client";
+
+import React from "react";
+import { useEffect, useState, useContext } from "react";
+import { useTranslation } from "react-i18next";
+import { useFormContext, useController } from "react-hook-form";
+import {
+  Select,
+  SelectContent,
+  SelectItem,
+  SelectTrigger,
+  SelectValue,
+} from "@/components/ui/select";
+import { getAvailableProviders } from "@/lib/llm-provider";
+import { DatabaseContext } from "@/contexts/db-context";
+import { SaaSContext } from "@/contexts/saas-context";
+
+// Direct call to Ollama (local, no auth needed)
+const fetchOllamaModels = async (): Promise<string[]> => {
+  try {
+    const ollamaUrl =
+      process.env.NEXT_PUBLIC_OLLAMA_URL || "http://localhost:11434";
+    const response = await fetch(`${ollamaUrl}/api/tags`);
+
+    if (response.ok) {
+      const data = (await response.json()) as { models: { name: string }[] };
+      return data.models.map((model) => model.name);
+    }
+  } catch (error) {
+    console.error("Error fetching Ollama models:", error);
+  }
+
+  // Fallback to default models
+  return ["llama3.1", "gemma", "mistral"];
+};
+
+// Authenticated call to OpenAI models API
+const fetchOpenAIModels = async (
+  dbContext: any,
+  saasContext: any
+): Promise<string[]> => {
+  try {
+    const headers: Record<string, string> = {
+      "Content-Type": "application/json",
+    };
+
+    // Add authentication headers (following AdminApiClient pattern)
+    if (dbContext?.accessToken) {
+      headers["Authorization"] = `Bearer ${dbContext.accessToken}`;
+    }
+
+    if (dbContext?.databaseIdHash) {
+      headers["Database-Id-Hash"] = dbContext.databaseIdHash;
+    }
+
+    if (saasContext?.saasToken) {
+      headers["SaaS-Token"] = saasContext.saasToken;
+    }
+
+    const response = await fetch("/api/llm/openai-models", {
+      method: "GET",
+      headers,
+    });
+
+    if (response.ok) {
+      const data = await response.json();
+      return data.models || [];
+    } else {
+      console.error("Failed to fetch OpenAI models:", response.status);
+    }
+  } catch (error) {
+    console.error("Error fetching OpenAI models:", error);
+  }
+
+  // Fallback to default models
+  return ["gpt-4o", "gpt-4-turbo", "gpt-3.5-turbo"];
+};
+
+export function LLMConfigSelect() {
+  const { t } = useTranslation();
+  const { control } = useFormContext();
+  const [models, setModels] = useState<string[]>([]);
+  const [loadingModels, setLoadingModels] = useState(false);
+
+  // Get authentication contexts
+  const dbContext = useContext(DatabaseContext);
+  const saasContext = useContext(SaaSContext);
+
+  // Get static providers directly
+  const providers = getAvailableProviders();
+
+  // Use useController for form integration
+  const {
+    field: { onChange: onProviderChange, value: providerValue },
+    fieldState: { error: providerError },
+  } = useController({
+    name: "llmProvider",
+    control,
+  });
+
+  const {
+    field: { onChange: onModelChange, value: modelValue },
+    fieldState: { error: modelError },
+  } = useController({
+    name: "llmModel",
+    control,
+  });
+
+  // Fetch models when provider changes
+  useEffect(() => {
+    async function fetchModels(provider: string) {
+      if (!provider) {
+        setModels([]);
+        return;
+      }
+
+      setLoadingModels(true);
+      try {
+        console.log("Fetching models for provider:", provider);
+
+        let fetchedModels: string[] = [];
+        if (provider === "openai") {
+          fetchedModels = await fetchOpenAIModels(dbContext, saasContext);
+        } else if (provider === "ollama") {
+          fetchedModels = await fetchOllamaModels();
+        }
+
+        console.log("Models fetched:", fetchedModels);
+        setModels(fetchedModels);
+      } catch (error) {
+        console.error("Error fetching models:", error);
+        setModels([]);
+      } finally {
+        setLoadingModels(false);
+      }
+    }
+
+    if (providerValue) {
+      fetchModels(providerValue);
+      // Clear model selection when provider changes
+      onModelChange("");
+    } else {
+      setModels([]);
+    }
+  }, [providerValue, onModelChange, dbContext, saasContext]);
+
+  const handleProviderChange = (provider: string) => {
+    onProviderChange(provider);
+  };
+
+  const handleModelChange = (model: string) => {
+    onModelChange(model);
+  };
+
+  return (
+    <div className="space-y-4">
+      <div>
+        <label htmlFor="llmProvider" className="block text-sm font-medium">
+          {t("LLM Provider")}
+        </label>
+        <Select
+          value={providerValue || ""}
+          onValueChange={handleProviderChange}
+        >
+          <SelectTrigger className="mt-1">
+            <SelectValue placeholder={t("Select a provider")} />
+          </SelectTrigger>
+          <SelectContent>
+            {providers.map((provider) => (
+              <SelectItem key={provider} value={provider}>
+                {provider.toUpperCase()}
+              </SelectItem>
+            ))}
+          </SelectContent>
+        </Select>
+        {providerError && (
+          <p className="text-red-500 text-sm mt-1">{providerError.message}</p>
+        )}
+      </div>
+
+      <div>
+        <label htmlFor="llmModel" className="block text-sm font-medium">
+          {t("LLM Model")}
+        </label>
+        <Select
+          value={modelValue || ""}
+          onValueChange={handleModelChange}
+          disabled={!providerValue || loadingModels}
+        >
+          <SelectTrigger className="mt-1">
+            <SelectValue
+              placeholder={
+                !providerValue
+                  ? t("Select a provider first")
+                  : loadingModels
+                    ? t("Loading models...")
+                    : models.length === 0
+                      ? "No models available"
+                      : t("Select a model")
+              }
+            />
+          </SelectTrigger>
+          <SelectContent>
+            {loadingModels ? (
+              <SelectItem value="Loading models..." disabled>
+                {t("Loading models...")}
+              </SelectItem>
+            ) : models.length === 0 ? (
+              <SelectItem value="No models available" disabled>
+                No models available
+              </SelectItem>
+            ) : (
+              models.map((model) => (
+                <SelectItem key={model} value={model}>
+                  {model}
+                </SelectItem>
+              ))
+            )}
+          </SelectContent>
+        </Select>
+        {modelError && (
+          <p className="text-red-500 text-sm mt-1">{modelError.message}</p>
+        )}
+      </div>
+    </div>
+  );
+}
diff --git a/src/data/client/models.ts b/src/data/client/models.ts
index e32374f0..7088f8af 100644
--- a/src/data/client/models.ts
+++ b/src/data/client/models.ts
@@ -256,6 +256,8 @@ export class Agent {
     tools?: Record<string, ToolConfiguration>;
     locale: string;
     agentType?: string | null;
+    llmProvider?: string | null;
+    llmModel?: string | null;
     status: AgentStatus;
     createdAt: string;
     updatedAt: string;
@@ -284,6 +286,8 @@ export class Agent {
 
         this.locale = agentDTO.locale || 'en';
         this.agentType = agentDTO.agentType;
+        this.llmProvider = agentDTO.llmProvider;
+        this.llmModel = agentDTO.llmModel;
         this.status = agentDTO.status === 'deleted' ? AgentStatus.Deleted : AgentStatus.Active;
 
         this.icon = agentDTO.icon;
@@ -311,6 +315,8 @@ export class Agent {
             tools: JSON.stringify(this.tools),
             locale: this.locale,
             agentType: this.agentType,
+            llmProvider: this.llmProvider,
+            llmModel: this.llmModel,
             status: this.status,
             createdAt: this.createdAt,
             updatedAt: this.updatedAt,
@@ -338,6 +344,8 @@ export class Agent {
             resultEmail: this?.options?.resultEmail || '',
             collectUserInfo: this?.options?.collectUserEmail,
             agentType: this?.agentType,
+            llmProvider: this?.llmProvider,
+            llmModel: this?.llmModel,
             status: this?.status || AgentStatus.Active,
             locale: this?.locale || 'en',
             events: this?.events || {},
@@ -369,6 +377,8 @@ export class Agent {
             updatedAt: getCurrentTS(),
             locale: data.locale ?? agent?.locale,
             agentType: data.agentType ?? agent?.agentType,
+            llmProvider: data.llmProvider ?? agent?.llmProvider,
+            llmModel: data.llmModel ?? agent?.llmModel,
             status: data.status ?? agent?.status,
             events: data.events ?? agent?.events,
             agents: data.agents ?? agent?.agents,
diff --git a/src/data/dto.ts b/src/data/dto.ts
index 5281fedf..177499b7 100644
--- a/src/data/dto.ts
+++ b/src/data/dto.ts
@@ -226,6 +226,8 @@ export const agentDTOSchema = z.object({
   status: z.string().optional().nullable(),
   locale: z.string().optional().nullable(),
   agentType: z.string().optional().nullable(),
+  llmProvider: z.string().optional().nullable(),
+  llmModel: z.string().optional().nullable(),
   createdAt: z.string().default(() => getCurrentTS()),
   updatedAt: z.string().default(() => getCurrentTS()),
   inputs: z.string().optional().nullable(),
diff --git a/src/data/server/db-schema.ts b/src/data/server/db-schema.ts
index 8f351689..40da323e 100644
--- a/src/data/server/db-schema.ts
+++ b/src/data/server/db-schema.ts
@@ -26,6 +26,8 @@ export const agents = sqliteTable('agents', {
     status: text('status'),
     locale: text('locale'),
     agentType: text('agentType'),
+    llmProvider: text('llmProvider'),
+    llmModel: text('llmModel'),
     createdAt: text('createdAt').notNull().default(sql`CURRENT_TIMESTAMP`),
     updatedAt: text('updatedAt').notNull().default(sql`CURRENT_TIMESTAMP`),
     icon: text('icon'),
diff --git a/src/lib/llm-provider.ts b/src/lib/llm-provider.ts
index 4b97c377..bf52d3b1 100644
--- a/src/lib/llm-provider.ts
+++ b/src/lib/llm-provider.ts
@@ -24,8 +24,8 @@ const llmConfigurations: Record<LLMProviderType, LLMConfiguration> = {
   },
 };
 
-export function llmProviderSetup() {
-  const providerType = process.env.LLM_PROVIDER as LLMProviderType;
+export function llmProviderSetup(selectedProvider?: string, selectedModel?: string) {
+  const providerType = (selectedProvider || process.env.LLM_PROVIDER) as LLMProviderType;
   const configuration = llmConfigurations[providerType || "openai"];
 
   if (!configuration) {
@@ -35,7 +35,23 @@ export function llmProviderSetup() {
     );
   }
 
-  const { provider, model, settings } = configuration;
+  const { provider, settings } = configuration;
+  const model = selectedModel || configuration.model;
 
   return provider(model, settings);
 }
+
+export function getAvailableProviders(): string[] {
+  return Object.values(LLMProviderType);
+}
+
+export function getDefaultModels(provider: string): string[] {
+  switch (provider) {
+    case LLMProviderType.OPENAI:
+      return ["gpt-4o", "gpt-4-turbo", "gpt-3.5-turbo"];
+    case LLMProviderType.OLLAMA:
+      return ["llama3.1", "gemma", "mistral"];
+    default:
+      return [];
+  }
+}