v0.3.43: added additional parsers, mysql block improvements, billing fixes, permission fixes

* fix md, pptx, html

* consolidate consts

apps/docs/content/docs/tools/meta.json

@@ -33,12 +33,15 @@
     "microsoft_planner",
     "microsoft_teams",
     "mistral_parse",
+    "mysql",
     "notion",
     "onedrive",
     "openai",
     "outlook",
+    "parallel_ai",
     "perplexity",
     "pinecone",
+    "postgresql",
     "qdrant",
     "reddit",
     "s3",

apps/docs/content/docs/tools/mysql.mdx

@@ -0,0 +1,180 @@
+---
+title: MySQL
+description: Connect to MySQL database
+---
+
+import { BlockInfoCard } from "@/components/ui/block-info-card"
+
+<BlockInfoCard 
+  type="mysql"
+  color="#E0E0E0"
+  icon={true}
+  iconSvg={`<svg className="block-icon"
+      
+      xmlns='http://www.w3.org/2000/svg'
+      
+      
+      viewBox='0 0 25.6 25.6'
+    >
+      <path
+        d='M179.076 94.886c-3.568-.1-6.336.268-8.656 1.25-.668.27-1.74.27-1.828 1.116.357.355.4.936.713 1.428.535.893 1.473 2.096 2.32 2.72l2.855 2.053c1.74 1.07 3.703 1.695 5.398 2.766.982.625 1.963 1.428 2.945 2.098.5.357.803.938 1.428 1.16v-.135c-.312-.4-.402-.98-.713-1.428l-1.34-1.293c-1.293-1.74-2.9-3.258-4.64-4.506-1.428-.982-4.55-2.32-5.13-3.97l-.088-.1c.98-.1 2.14-.447 3.078-.715 1.518-.4 2.9-.312 4.46-.713l2.143-.625v-.4c-.803-.803-1.383-1.874-2.23-2.632-2.275-1.963-4.775-3.882-7.363-5.488-1.383-.892-3.168-1.473-4.64-2.23-.537-.268-1.428-.402-1.74-.848-.805-.98-1.25-2.275-1.83-3.436l-3.658-7.763c-.803-1.74-1.295-3.48-2.275-5.086-4.596-7.585-9.594-12.18-17.268-16.687-1.65-.937-3.613-1.34-5.7-1.83l-3.346-.18c-.715-.312-1.428-1.16-2.053-1.562-2.543-1.606-9.102-5.086-10.977-.5-1.205 2.9 1.785 5.755 2.8 7.228.76 1.026 1.74 2.186 2.277 3.346.3.758.4 1.562.713 2.365.713 1.963 1.383 4.15 2.32 5.98.5.937 1.025 1.92 1.65 2.767.357.5.982.714 1.115 1.517-.625.893-.668 2.23-1.025 3.347-1.607 5.042-.982 11.288 1.293 15 .715 1.115 2.4 3.57 4.686 2.632 2.008-.803 1.56-3.346 2.14-5.577.135-.535.045-.892.312-1.25v.1l1.83 3.703c1.383 2.186 3.793 4.462 5.8 5.98 1.07.803 1.918 2.187 3.256 2.677v-.135h-.088c-.268-.4-.67-.58-1.027-.892-.803-.803-1.695-1.785-2.32-2.677-1.873-2.498-3.523-5.265-4.996-8.12-.715-1.383-1.34-2.9-1.918-4.283-.27-.536-.27-1.34-.715-1.606-.67.98-1.65 1.83-2.143 3.034-.848 1.918-.936 4.283-1.248 6.737-.18.045-.1 0-.18.1-1.426-.356-1.918-1.83-2.453-3.078-1.338-3.168-1.562-8.254-.402-11.913.312-.937 1.652-3.882 1.117-4.774-.27-.848-1.16-1.338-1.652-2.008-.58-.848-1.203-1.918-1.605-2.855-1.07-2.5-1.605-5.265-2.766-7.764-.537-1.16-1.473-2.365-2.232-3.435-.848-1.205-1.783-2.053-2.453-3.48-.223-.5-.535-1.294-.178-1.83.088-.357.268-.5.623-.58.58-.5 2.232.134 2.812.4 1.65.67 3.033 1.294 4.416 2.23.625.446 1.295 1.294 2.098 1.518h.938c1.428.312 3.033.1 4.37.5 2.365.76 4.506 1.874 6.426 3.08 5.844 3.703 10.664 8.968 13.92 15.26.535 1.026.758 1.963 1.25 3.034.938 2.187 2.098 4.417 3.033 6.56.938 2.097 1.83 4.24 3.168 5.98.67.937 3.346 1.427 4.55 1.918.893.4 2.275.76 3.08 1.25 1.516.937 3.033 2.008 4.46 3.034.713.534 2.945 1.65 3.078 2.54zm-45.5-38.772a7.09 7.09 0 0 0-1.828.223v.1h.088c.357.714.982 1.205 1.428 1.83l1.027 2.142.088-.1c.625-.446.938-1.16.938-2.23-.268-.312-.312-.625-.535-.937-.268-.446-.848-.67-1.206-1.026z'
+        transform='matrix(.390229 0 0 .38781 -46.300037 -16.856717)'
+        fillRule='evenodd'
+        fill='#00678c'
+      />
+    </svg>`}
+/>
+
+{/* MANUAL-CONTENT-START:intro */}
+The [MySQL](https://www.mysql.com/) tool enables you to connect to any MySQL database and perform a wide range of database operations directly within your agentic workflows. With secure connection handling and flexible configuration, you can easily manage and interact with your data.
+
+With the MySQL tool, you can:
+
+- **Query data**: Execute SELECT queries to retrieve data from your MySQL tables using the `mysql_query` operation.
+- **Insert records**: Add new rows to your tables with the `mysql_insert` operation by specifying the table and data to insert.
+- **Update records**: Modify existing data in your tables using the `mysql_update` operation, providing the table, new data, and WHERE conditions.
+- **Delete records**: Remove rows from your tables with the `mysql_delete` operation, specifying the table and WHERE conditions.
+- **Execute raw SQL**: Run any custom SQL command using the `mysql_execute` operation for advanced use cases.
+
+The MySQL tool is ideal for scenarios where your agents need to interact with structured data—such as automating reporting, syncing data between systems, or powering data-driven workflows. It streamlines database access, making it easy to read, write, and manage your MySQL data programmatically.
+{/* MANUAL-CONTENT-END */}
+
+
+## Usage Instructions
+
+Connect to any MySQL database to execute queries, manage data, and perform database operations. Supports SELECT, INSERT, UPDATE, DELETE operations with secure connection handling.
+
+
+
+## Tools
+
+### `mysql_query`
+
+Execute SELECT query on MySQL database
+
+#### Input
+
+| Parameter | Type | Required | Description |
+| --------- | ---- | -------- | ----------- |
+| `host` | string | Yes | MySQL server hostname or IP address |
+| `port` | number | Yes | MySQL server port \(default: 3306\) |
+| `database` | string | Yes | Database name to connect to |
+| `username` | string | Yes | Database username |
+| `password` | string | Yes | Database password |
+| `ssl` | string | No | SSL connection mode \(disabled, required, preferred\) |
+| `query` | string | Yes | SQL SELECT query to execute |
+
+#### Output
+
+| Parameter | Type | Description |
+| --------- | ---- | ----------- |
+| `message` | string | Operation status message |
+| `rows` | array | Array of rows returned from the query |
+| `rowCount` | number | Number of rows returned |
+
+### `mysql_insert`
+
+Insert new record into MySQL database
+
+#### Input
+
+| Parameter | Type | Required | Description |
+| --------- | ---- | -------- | ----------- |
+| `host` | string | Yes | MySQL server hostname or IP address |
+| `port` | number | Yes | MySQL server port \(default: 3306\) |
+| `database` | string | Yes | Database name to connect to |
+| `username` | string | Yes | Database username |
+| `password` | string | Yes | Database password |
+| `ssl` | string | No | SSL connection mode \(disabled, required, preferred\) |
+| `table` | string | Yes | Table name to insert into |
+| `data` | object | Yes | Data to insert as key-value pairs |
+
+#### Output
+
+| Parameter | Type | Description |
+| --------- | ---- | ----------- |
+| `message` | string | Operation status message |
+| `rows` | array | Array of inserted rows |
+| `rowCount` | number | Number of rows inserted |
+
+### `mysql_update`
+
+Update existing records in MySQL database
+
+#### Input
+
+| Parameter | Type | Required | Description |
+| --------- | ---- | -------- | ----------- |
+| `host` | string | Yes | MySQL server hostname or IP address |
+| `port` | number | Yes | MySQL server port \(default: 3306\) |
+| `database` | string | Yes | Database name to connect to |
+| `username` | string | Yes | Database username |
+| `password` | string | Yes | Database password |
+| `ssl` | string | No | SSL connection mode \(disabled, required, preferred\) |
+| `table` | string | Yes | Table name to update |
+| `data` | object | Yes | Data to update as key-value pairs |
+| `where` | string | Yes | WHERE clause condition \(without WHERE keyword\) |
+
+#### Output
+
+| Parameter | Type | Description |
+| --------- | ---- | ----------- |
+| `message` | string | Operation status message |
+| `rows` | array | Array of updated rows |
+| `rowCount` | number | Number of rows updated |
+
+### `mysql_delete`
+
+Delete records from MySQL database
+
+#### Input
+
+| Parameter | Type | Required | Description |
+| --------- | ---- | -------- | ----------- |
+| `host` | string | Yes | MySQL server hostname or IP address |
+| `port` | number | Yes | MySQL server port \(default: 3306\) |
+| `database` | string | Yes | Database name to connect to |
+| `username` | string | Yes | Database username |
+| `password` | string | Yes | Database password |
+| `ssl` | string | No | SSL connection mode \(disabled, required, preferred\) |
+| `table` | string | Yes | Table name to delete from |
+| `where` | string | Yes | WHERE clause condition \(without WHERE keyword\) |
+
+#### Output
+
+| Parameter | Type | Description |
+| --------- | ---- | ----------- |
+| `message` | string | Operation status message |
+| `rows` | array | Array of deleted rows |
+| `rowCount` | number | Number of rows deleted |
+
+### `mysql_execute`
+
+Execute raw SQL query on MySQL database
+
+#### Input
+
+| Parameter | Type | Required | Description |
+| --------- | ---- | -------- | ----------- |
+| `host` | string | Yes | MySQL server hostname or IP address |
+| `port` | number | Yes | MySQL server port \(default: 3306\) |
+| `database` | string | Yes | Database name to connect to |
+| `username` | string | Yes | Database username |
+| `password` | string | Yes | Database password |
+| `ssl` | string | No | SSL connection mode \(disabled, required, preferred\) |
+| `query` | string | Yes | Raw SQL query to execute |
+
+#### Output
+
+| Parameter | Type | Description |
+| --------- | ---- | ----------- |
+| `message` | string | Operation status message |
+| `rows` | array | Array of rows returned from the query |
+| `rowCount` | number | Number of rows affected |
+
+
+
+## Notes
+
+- Category: `tools`
+- Type: `mysql`

apps/docs/content/docs/tools/parallel_ai.mdx

@@ -0,0 +1,106 @@
+---
+title: Parallel AI
+description: Search with Parallel AI
+---
+
+import { BlockInfoCard } from "@/components/ui/block-info-card"
+
+<BlockInfoCard 
+  type="parallel_ai"
+  color="#E0E0E0"
+  icon={true}
+  iconSvg={`<svg className="block-icon"
+      
+      fill='currentColor'
+      
+      
+      viewBox='0 0 271 270'
+      xmlns='http://www.w3.org/2000/svg'
+    >
+      <path
+        d='M267.804 105.65H193.828C194.026 106.814 194.187 107.996 194.349 109.178H76.6703C76.4546 110.736 76.2388 112.312 76.0591 113.87H1.63342C1.27387 116.198 0.950289 118.543 0.698608 120.925H75.3759C75.2501 122.483 75.1602 124.059 75.0703 125.617H195.949C196.003 126.781 196.057 127.962 196.093 129.144H270.68V125.384C270.195 118.651 269.242 112.061 267.804 105.65Z'
+        fill='#1D1C1A'
+      />
+      <path
+        d='M195.949 144.401H75.0703C75.1422 145.977 75.2501 147.535 75.3759 149.093H0.698608C0.950289 151.457 1.2559 153.802 1.63342 156.148H76.0591C76.2388 157.724 76.4366 159.282 76.6703 160.84H194.349C194.187 162.022 194.008 163.186 193.828 164.367H267.804C269.242 157.957 270.195 151.367 270.68 144.634V140.874H196.093C196.057 142.055 196.003 143.219 195.949 144.401Z'
+        fill='#1D1C1A'
+      />
+      <path
+        d='M190.628 179.642H80.3559C80.7514 181.218 81.1828 182.776 81.6143 184.334H9.30994C10.2448 186.715 11.2515 189.061 12.3121 191.389H83.7536C84.2749 192.965 84.7962 194.523 85.3535 196.08H185.594C185.163 197.262 184.732 198.426 184.282 199.608H254.519C258.6 192.177 261.98 184.316 264.604 176.114H191.455C191.185 177.296 190.898 178.46 190.61 179.642H190.628Z'
+        fill='#1D1C1A'
+      />
+      <path
+        d='M177.666 214.883H93.3352C94.1082 216.458 94.9172 218.034 95.7441 219.574H29.8756C31.8351 221.992 33.8666 224.337 35.9699 226.63H99.6632C100.598 228.205 101.551 229.781 102.522 231.321H168.498C167.761 232.503 167.006 233.685 166.233 234.849H226.762C234.474 227.847 241.36 219.95 247.292 211.355H179.356C178.799 212.537 178.26 213.719 177.684 214.883H177.666Z'
+        fill='#1D1C1A'
+      />
+      <path
+        d='M154.943 250.106H116.058C117.371 251.699 118.701 253.257 120.067 254.797H73.021C91.6094 264.431 112.715 269.946 135.096 270C135.24 270 135.366 270 135.492 270C135.618 270 135.761 270 135.887 270C164.04 269.911 190.178 261.28 211.805 246.56H157.748C156.813 247.742 155.878 248.924 154.925 250.088L154.943 250.106Z'
+        fill='#1D1C1A'
+      />
+      <path
+        d='M116.059 19.9124H154.943C155.896 21.0764 156.831 22.2582 157.766 23.4401H211.823C190.179 8.72065 164.058 0.0895344 135.906 0C135.762 0 135.636 0 135.51 0C135.384 0 135.24 0 135.115 0C112.715 0.0716275 91.6277 5.56904 73.0393 15.2029H120.086C118.719 16.7429 117.389 18.3187 116.077 19.8945L116.059 19.9124Z'
+        fill='#1D1C1A'
+      />
+      <path
+        d='M93.3356 55.1532H177.667C178.242 56.3171 178.799 57.499 179.339 58.6808H247.274C241.342 50.0855 234.457 42.1886 226.744 35.187H166.215C166.988 36.351 167.743 37.5328 168.48 38.7147H102.504C101.533 40.2726 100.58 41.8305 99.6456 43.4063H35.9523C33.831 45.6804 31.7996 48.0262 29.858 50.4616H95.7265C94.8996 52.0195 94.1086 53.5774 93.3176 55.1532H93.3356Z'
+        fill='#1D1C1A'
+      />
+      <path
+        d='M80.3736 90.3758H190.646C190.933 91.5398 191.221 92.7216 191.491 93.9035H264.64C262.015 85.7021 258.636 77.841 254.555 70.4097H184.318C184.767 71.5736 185.199 72.7555 185.63 73.9373H85.3893C84.832 75.4952 84.2927 77.0531 83.7893 78.6289H12.3479C11.2872 80.9389 10.2805 83.2847 9.3457 85.6842H81.65C81.2186 87.2421 80.7871 88.8 80.3916 90.3758H80.3736Z'
+        fill='#1D1C1A'
+      />
+    </svg>`}
+/>
+
+{/* MANUAL-CONTENT-START:intro */}
+[Parallel AI](https://parallel.ai/) is an advanced web search and content extraction platform designed to deliver comprehensive, high-quality results for any query. By leveraging intelligent processing and large-scale data extraction, Parallel AI enables users and agents to access, analyze, and synthesize information from across the web with speed and accuracy.
+
+With Parallel AI, you can:
+
+- **Search the web intelligently**: Retrieve relevant, up-to-date information from a wide range of sources  
+- **Extract and summarize content**: Get concise, meaningful excerpts from web pages and documents  
+- **Customize search objectives**: Tailor queries to specific needs or questions for targeted results  
+- **Process results at scale**: Handle large volumes of search results with advanced processing options  
+- **Integrate with workflows**: Use Parallel AI within Sim to automate research, content gathering, and knowledge extraction  
+- **Control output granularity**: Specify the number of results and the amount of content per result  
+- **Secure API access**: Protect your searches and data with API key authentication
+
+In Sim, the Parallel AI integration empowers your agents to perform web searches and extract content programmatically. This enables powerful automation scenarios such as real-time research, competitive analysis, content monitoring, and knowledge base creation. By connecting Sim with Parallel AI, you unlock the ability for agents to gather, process, and utilize web data as part of your automated workflows.
+{/* MANUAL-CONTENT-END */}
+
+
+## Usage Instructions
+
+Search the web using Parallel AI's advanced search capabilities. Get comprehensive results with intelligent processing and content extraction.
+
+
+
+## Tools
+
+### `parallel_search`
+
+Search the web using Parallel AI. Provides comprehensive search results with intelligent processing and content extraction.
+
+#### Input
+
+| Parameter | Type | Required | Description |
+| --------- | ---- | -------- | ----------- |
+| `objective` | string | Yes | The search objective or question to answer |
+| `search_queries` | string | No | Optional comma-separated list of search queries to execute |
+| `processor` | string | No | Processing method: base or pro \(default: base\) |
+| `max_results` | number | No | Maximum number of results to return \(default: 5\) |
+| `max_chars_per_result` | number | No | Maximum characters per result \(default: 1500\) |
+| `apiKey` | string | Yes | Parallel AI API Key |
+
+#### Output
+
+| Parameter | Type | Description |
+| --------- | ---- | ----------- |
+| `results` | array | Search results with excerpts from relevant pages |
+
+
+
+## Notes
+
+- Category: `tools`
+- Type: `parallel_ai`

apps/docs/content/docs/tools/postgresql.mdx

@@ -0,0 +1,188 @@
+---
+title: PostgreSQL
+description: Connect to PostgreSQL database
+---
+
+import { BlockInfoCard } from "@/components/ui/block-info-card"
+
+<BlockInfoCard 
+  type="postgresql"
+  color="#336791"
+  icon={true}
+  iconSvg={`<svg className="block-icon"
+      
+      
+      
+      viewBox='-4 0 264 264'
+      xmlns='http://www.w3.org/2000/svg'
+      preserveAspectRatio='xMinYMin meet'
+    >
+      <path d='M255.008 158.086c-1.535-4.649-5.556-7.887-10.756-8.664-2.452-.366-5.26-.21-8.583.475-5.792 1.195-10.089 1.65-13.225 1.738 11.837-19.985 21.462-42.775 27.003-64.228 8.96-34.689 4.172-50.492-1.423-57.64C233.217 10.847 211.614.683 185.552.372c-13.903-.17-26.108 2.575-32.475 4.549-5.928-1.046-12.302-1.63-18.99-1.738-12.537-.2-23.614 2.533-33.079 8.15-5.24-1.772-13.65-4.27-23.362-5.864-22.842-3.75-41.252-.828-54.718 8.685C6.622 25.672-.937 45.684.461 73.634c.444 8.874 5.408 35.874 13.224 61.48 4.492 14.718 9.282 26.94 14.237 36.33 7.027 13.315 14.546 21.156 22.987 23.972 4.731 1.576 13.327 2.68 22.368-4.85 1.146 1.388 2.675 2.767 4.704 4.048 2.577 1.625 5.728 2.953 8.875 3.74 11.341 2.835 21.964 2.126 31.027-1.848.056 1.612.099 3.152.135 4.482.06 2.157.12 4.272.199 6.25.537 13.374 1.447 23.773 4.143 31.049.148.4.347 1.01.557 1.657 1.345 4.118 3.594 11.012 9.316 16.411 5.925 5.593 13.092 7.308 19.656 7.308 3.292 0 6.433-.432 9.188-1.022 9.82-2.105 20.973-5.311 29.041-16.799 7.628-10.86 11.336-27.217 12.007-52.99.087-.729.167-1.425.244-2.088l.16-1.362 1.797.158.463.031c10.002.456 22.232-1.665 29.743-5.154 5.935-2.754 24.954-12.795 20.476-26.351' />
+      <path
+        d='M237.906 160.722c-29.74 6.135-31.785-3.934-31.785-3.934 31.4-46.593 44.527-105.736 33.2-120.211-30.904-39.485-84.399-20.811-85.292-20.327l-.287.052c-5.876-1.22-12.451-1.946-19.842-2.067-13.456-.22-23.664 3.528-31.41 9.402 0 0-95.43-39.314-90.991 49.444.944 18.882 27.064 142.873 58.218 105.422 11.387-13.695 22.39-25.274 22.39-25.274 5.464 3.63 12.006 5.482 18.864 4.817l.533-.452c-.166 1.7-.09 3.363.213 5.332-8.026 8.967-5.667 10.541-21.711 13.844-16.235 3.346-6.698 9.302-.471 10.86 7.549 1.887 25.013 4.561 36.813-11.958l-.47 1.885c3.144 2.519 5.352 16.383 4.982 28.952-.37 12.568-.617 21.197 1.86 27.937 2.479 6.74 4.948 21.905 26.04 17.386 17.623-3.777 26.756-13.564 28.027-29.89.901-11.606 2.942-9.89 3.07-20.267l1.637-4.912c1.887-15.733.3-20.809 11.157-18.448l2.64.232c7.99.363 18.45-1.286 24.589-4.139 13.218-6.134 21.058-16.377 8.024-13.686h.002'
+        fill='#336791'
+      />
+      <path
+        d='M108.076 81.525c-2.68-.373-5.107-.028-6.335.902-.69.523-.904 1.129-.962 1.546-.154 1.105.62 2.327 1.096 2.957 1.346 1.784 3.312 3.01 5.258 3.28.282.04.563.058.842.058 3.245 0 6.196-2.527 6.456-4.392.325-2.336-3.066-3.893-6.355-4.35M196.86 81.599c-.256-1.831-3.514-2.353-6.606-1.923-3.088.43-6.082 1.824-5.832 3.659.2 1.427 2.777 3.863 5.827 3.863.258 0 .518-.017.78-.054 2.036-.282 3.53-1.575 4.24-2.32 1.08-1.136 1.706-2.402 1.591-3.225'
+        fill='#FFF'
+      />
+      <path
+        d='M247.802 160.025c-1.134-3.429-4.784-4.532-10.848-3.28-18.005 3.716-24.453 1.142-26.57-.417 13.995-21.32 25.508-47.092 31.719-71.137 2.942-11.39 4.567-21.968 4.7-30.59.147-9.463-1.465-16.417-4.789-20.665-13.402-17.125-33.072-26.311-56.882-26.563-16.369-.184-30.199 4.005-32.88 5.183-5.646-1.404-11.801-2.266-18.502-2.376-12.288-.199-22.91 2.743-31.704 8.74-3.82-1.422-13.692-4.811-25.765-6.756-20.872-3.36-37.458-.814-49.294 7.571-14.123 10.006-20.643 27.892-19.38 53.16.425 8.501 5.269 34.653 12.913 59.698 10.062 32.964 21 51.625 32.508 55.464 1.347.449 2.9.763 4.613.763 4.198 0 9.345-1.892 14.7-8.33a529.832 529.832 0 0 1 20.261-22.926c4.524 2.428 9.494 3.784 14.577 3.92.01.133.023.266.035.398a117.66 117.66 0 0 0-2.57 3.175c-3.522 4.471-4.255 5.402-15.592 7.736-3.225.666-11.79 2.431-11.916 8.435-.136 6.56 10.125 9.315 11.294 9.607 4.074 1.02 7.999 1.523 11.742 1.523 9.103 0 17.114-2.992 23.516-8.781-.197 23.386.778 46.43 3.586 53.451 2.3 5.748 7.918 19.795 25.664 19.794 2.604 0 5.47-.303 8.623-.979 18.521-3.97 26.564-12.156 29.675-30.203 1.665-9.645 4.522-32.676 5.866-45.03 2.836.885 6.487 1.29 10.434 1.289 8.232 0 17.731-1.749 23.688-4.514 6.692-3.108 18.768-10.734 16.578-17.36zm-44.106-83.48c-.061 3.647-.563 6.958-1.095 10.414-.573 3.717-1.165 7.56-1.314 12.225-.147 4.54.42 9.26.968 13.825 1.108 9.22 2.245 18.712-2.156 28.078a36.508 36.508 0 0 1-1.95-4.009c-.547-1.326-1.735-3.456-3.38-6.404-6.399-11.476-21.384-38.35-13.713-49.316 2.285-3.264 8.084-6.62 22.64-4.813zm-17.644-61.787c21.334.471 38.21 8.452 50.158 23.72 9.164 11.711-.927 64.998-30.14 110.969a171.33 171.33 0 0 0-.886-1.117l-.37-.462c7.549-12.467 6.073-24.802 4.759-35.738-.54-4.488-1.05-8.727-.92-12.709.134-4.22.692-7.84 1.232-11.34.663-4.313 1.338-8.776 1.152-14.037.139-.552.195-1.204.122-1.978-.475-5.045-6.235-20.144-17.975-33.81-6.422-7.475-15.787-15.84-28.574-21.482 5.5-1.14 13.021-2.203 21.442-2.016zM66.674 175.778c-5.9 7.094-9.974 5.734-11.314 5.288-8.73-2.912-18.86-21.364-27.791-50.624-7.728-25.318-12.244-50.777-12.602-57.916-1.128-22.578 4.345-38.313 16.268-46.769 19.404-13.76 51.306-5.524 64.125-1.347-.184.182-.376.352-.558.537-21.036 21.244-20.537 57.54-20.485 59.759-.002.856.07 2.068.168 3.735.362 6.105 1.036 17.467-.764 30.334-1.672 11.957 2.014 23.66 10.111 32.109a36.275 36.275 0 0 0 2.617 2.468c-3.604 3.86-11.437 12.396-19.775 22.426zm22.479-29.993c-6.526-6.81-9.49-16.282-8.133-25.99 1.9-13.592 1.199-25.43.822-31.79-.053-.89-.1-1.67-.127-2.285 3.073-2.725 17.314-10.355 27.47-8.028 4.634 1.061 7.458 4.217 8.632 9.645 6.076 28.103.804 39.816-3.432 49.229-.873 1.939-1.698 3.772-2.402 5.668l-.546 1.466c-1.382 3.706-2.668 7.152-3.465 10.424-6.938-.02-13.687-2.984-18.819-8.34zm1.065 37.9c-2.026-.506-3.848-1.385-4.917-2.114.893-.42 2.482-.992 5.238-1.56 13.337-2.745 15.397-4.683 19.895-10.394 1.031-1.31 2.2-2.794 3.819-4.602l.002-.002c2.411-2.7 3.514-2.242 5.514-1.412 1.621.67 3.2 2.702 3.84 4.938.303 1.056.643 3.06-.47 4.62-9.396 13.156-23.088 12.987-32.921 10.526zm69.799 64.952c-16.316 3.496-22.093-4.829-25.9-14.346-2.457-6.144-3.665-33.85-2.808-64.447.011-.407-.047-.8-.159-1.17a15.444 15.444 0 0 0-.456-2.162c-1.274-4.452-4.379-8.176-8.104-9.72-1.48-.613-4.196-1.738-7.46-.903.696-2.868 1.903-6.107 3.212-9.614l.549-1.475c.618-1.663 1.394-3.386 2.214-5.21 4.433-9.848 10.504-23.337 3.915-53.81-2.468-11.414-10.71-16.988-23.204-15.693-7.49.775-14.343 3.797-17.761 5.53-.735.372-1.407.732-2.035 1.082.954-11.5 4.558-32.992 18.04-46.59 8.489-8.56 19.794-12.788 33.568-12.56 27.14.444 44.544 14.372 54.366 25.979 8.464 10.001 13.047 20.076 14.876 25.51-13.755-1.399-23.11 1.316-27.852 8.096-10.317 14.748 5.644 43.372 13.315 57.129 1.407 2.521 2.621 4.7 3.003 5.626 2.498 6.054 5.732 10.096 8.093 13.046.724.904 1.426 1.781 1.96 2.547-4.166 1.201-11.649 3.976-10.967 17.847-.55 6.96-4.461 39.546-6.448 51.059-2.623 15.21-8.22 20.875-23.957 24.25zm68.104-77.936c-4.26 1.977-11.389 3.46-18.161 3.779-7.48.35-11.288-.838-12.184-1.569-.42-8.644 2.797-9.547 6.202-10.503.535-.15 1.057-.297 1.561-.473.313.255.656.508 1.032.756 6.012 3.968 16.735 4.396 31.874 1.271l.166-.033c-2.042 1.909-5.536 4.471-10.49 6.772z'
+        fill='#FFF'
+      />
+    </svg>`}
+/>
+
+{/* MANUAL-CONTENT-START:intro */}
+The [PostgreSQL](https://www.postgresql.org/) tool enables you to connect to any PostgreSQL database and perform a wide range of database operations directly within your agentic workflows. With secure connection handling and flexible configuration, you can easily manage and interact with your data.
+
+With the PostgreSQL tool, you can:
+
+- **Query data**: Execute SELECT queries to retrieve data from your PostgreSQL tables using the `postgresql_query` operation.
+- **Insert records**: Add new rows to your tables with the `postgresql_insert` operation by specifying the table and data to insert.
+- **Update records**: Modify existing data in your tables using the `postgresql_update` operation, providing the table, new data, and WHERE conditions.
+- **Delete records**: Remove rows from your tables with the `postgresql_delete` operation, specifying the table and WHERE conditions.
+- **Execute raw SQL**: Run any custom SQL command using the `postgresql_execute` operation for advanced use cases.
+
+The PostgreSQL tool is ideal for scenarios where your agents need to interact with structured data—such as automating reporting, syncing data between systems, or powering data-driven workflows. It streamlines database access, making it easy to read, write, and manage your PostgreSQL data programmatically.
+{/* MANUAL-CONTENT-END */}
+
+
+## Usage Instructions
+
+Connect to any PostgreSQL database to execute queries, manage data, and perform database operations. Supports SELECT, INSERT, UPDATE, DELETE operations with secure connection handling.
+
+
+
+## Tools
+
+### `postgresql_query`
+
+Execute a SELECT query on PostgreSQL database
+
+#### Input
+
+| Parameter | Type | Required | Description |
+| --------- | ---- | -------- | ----------- |
+| `host` | string | Yes | PostgreSQL server hostname or IP address |
+| `port` | number | Yes | PostgreSQL server port \(default: 5432\) |
+| `database` | string | Yes | Database name to connect to |
+| `username` | string | Yes | Database username |
+| `password` | string | Yes | Database password |
+| `ssl` | string | No | SSL connection mode \(disabled, required, preferred\) |
+| `query` | string | Yes | SQL SELECT query to execute |
+
+#### Output
+
+| Parameter | Type | Description |
+| --------- | ---- | ----------- |
+| `message` | string | Operation status message |
+| `rows` | array | Array of rows returned from the query |
+| `rowCount` | number | Number of rows returned |
+
+### `postgresql_insert`
+
+Insert data into PostgreSQL database
+
+#### Input
+
+| Parameter | Type | Required | Description |
+| --------- | ---- | -------- | ----------- |
+| `host` | string | Yes | PostgreSQL server hostname or IP address |
+| `port` | number | Yes | PostgreSQL server port \(default: 5432\) |
+| `database` | string | Yes | Database name to connect to |
+| `username` | string | Yes | Database username |
+| `password` | string | Yes | Database password |
+| `ssl` | string | No | SSL connection mode \(disabled, required, preferred\) |
+| `table` | string | Yes | Table name to insert data into |
+| `data` | object | Yes | Data object to insert \(key-value pairs\) |
+
+#### Output
+
+| Parameter | Type | Description |
+| --------- | ---- | ----------- |
+| `message` | string | Operation status message |
+| `rows` | array | Inserted data \(if RETURNING clause used\) |
+| `rowCount` | number | Number of rows inserted |
+
+### `postgresql_update`
+
+Update data in PostgreSQL database
+
+#### Input
+
+| Parameter | Type | Required | Description |
+| --------- | ---- | -------- | ----------- |
+| `host` | string | Yes | PostgreSQL server hostname or IP address |
+| `port` | number | Yes | PostgreSQL server port \(default: 5432\) |
+| `database` | string | Yes | Database name to connect to |
+| `username` | string | Yes | Database username |
+| `password` | string | Yes | Database password |
+| `ssl` | string | No | SSL connection mode \(disabled, required, preferred\) |
+| `table` | string | Yes | Table name to update data in |
+| `data` | object | Yes | Data object with fields to update \(key-value pairs\) |
+| `where` | string | Yes | WHERE clause condition \(without WHERE keyword\) |
+
+#### Output
+
+| Parameter | Type | Description |
+| --------- | ---- | ----------- |
+| `message` | string | Operation status message |
+| `rows` | array | Updated data \(if RETURNING clause used\) |
+| `rowCount` | number | Number of rows updated |
+
+### `postgresql_delete`
+
+Delete data from PostgreSQL database
+
+#### Input
+
+| Parameter | Type | Required | Description |
+| --------- | ---- | -------- | ----------- |
+| `host` | string | Yes | PostgreSQL server hostname or IP address |
+| `port` | number | Yes | PostgreSQL server port \(default: 5432\) |
+| `database` | string | Yes | Database name to connect to |
+| `username` | string | Yes | Database username |
+| `password` | string | Yes | Database password |
+| `ssl` | string | No | SSL connection mode \(disabled, required, preferred\) |
+| `table` | string | Yes | Table name to delete data from |
+| `where` | string | Yes | WHERE clause condition \(without WHERE keyword\) |
+
+#### Output
+
+| Parameter | Type | Description |
+| --------- | ---- | ----------- |
+| `message` | string | Operation status message |
+| `rows` | array | Deleted data \(if RETURNING clause used\) |
+| `rowCount` | number | Number of rows deleted |
+
+### `postgresql_execute`
+
+Execute raw SQL query on PostgreSQL database
+
+#### Input
+
+| Parameter | Type | Required | Description |
+| --------- | ---- | -------- | ----------- |
+| `host` | string | Yes | PostgreSQL server hostname or IP address |
+| `port` | number | Yes | PostgreSQL server port \(default: 5432\) |
+| `database` | string | Yes | Database name to connect to |
+| `username` | string | Yes | Database username |
+| `password` | string | Yes | Database password |
+| `ssl` | string | No | SSL connection mode \(disabled, required, preferred\) |
+| `query` | string | Yes | Raw SQL query to execute |
+
+#### Output
+
+| Parameter | Type | Description |
+| --------- | ---- | ----------- |
+| `message` | string | Operation status message |
+| `rows` | array | Array of rows returned from the query |
+| `rowCount` | number | Number of rows affected |
+
+
+
+## Notes
+
+- Category: `tools`
+- Type: `postgresql`

apps/sim/app/api/billing/route.ts

@@ -2,7 +2,7 @@ import { and, eq } from 'drizzle-orm'
 import { type NextRequest, NextResponse } from 'next/server'
 import { getSession } from '@/lib/auth'
 import { getSimplifiedBillingSummary } from '@/lib/billing/core/billing'
-import { getOrganizationBillingData } from '@/lib/billing/core/organization-billing'
+import { getOrganizationBillingData } from '@/lib/billing/core/organization'
 import { createLogger } from '@/lib/logs/console/logger'
 import { db } from '@/db'
 import { member, userStats } from '@/db/schema'

apps/sim/app/api/copilot/chat/route.ts

@@ -12,9 +12,9 @@ import {
 import { getCopilotModel } from '@/lib/copilot/config'
 import type { CopilotProviderConfig } from '@/lib/copilot/types'
 import { env } from '@/lib/env'
-import { generateChatTitle } from '@/lib/generate-chat-title'
 import { createLogger } from '@/lib/logs/console/logger'
 import { SIM_AGENT_API_URL_DEFAULT } from '@/lib/sim-agent'
+import { generateChatTitle } from '@/lib/sim-agent/utils'
 import { createFileContent, isSupportedFileType } from '@/lib/uploads/file-utils'
 import { S3_COPILOT_CONFIG } from '@/lib/uploads/setup'
 import { downloadFile, getStorageProvider } from '@/lib/uploads/storage-client'

apps/sim/app/api/files/parse/route.ts

@@ -76,11 +76,9 @@ export async function POST(request: NextRequest) {
 
     logger.info('File parse request received:', { filePath, fileType })
 
-    // Handle multiple files
     if (Array.isArray(filePath)) {
       const results = []
       for (const path of filePath) {
-        // Skip empty or invalid paths
         if (!path || (typeof path === 'string' && path.trim() === '')) {
           results.push({
             success: false,
@@ -91,12 +89,10 @@ export async function POST(request: NextRequest) {
         }
 
         const result = await parseFileSingle(path, fileType)
-        // Add processing time to metadata
         if (result.metadata) {
           result.metadata.processingTime = Date.now() - startTime
         }
 
-        // Transform each result to match expected frontend format
         if (result.success) {
           results.push({
             success: true,
@@ -105,7 +101,7 @@ export async function POST(request: NextRequest) {
               name: result.filePath.split('/').pop() || 'unknown',
               fileType: result.metadata?.fileType || 'application/octet-stream',
               size: result.metadata?.size || 0,
-              binary: false, // We only return text content
+              binary: false,
             },
             filePath: result.filePath,
           })
@@ -120,15 +116,12 @@ export async function POST(request: NextRequest) {
       })
     }
 
-    // Handle single file
     const result = await parseFileSingle(filePath, fileType)
 
-    // Add processing time to metadata
     if (result.metadata) {
       result.metadata.processingTime = Date.now() - startTime
     }
 
-    // Transform single file result to match expected frontend format
     if (result.success) {
       return NextResponse.json({
         success: true,
@@ -142,8 +135,6 @@ export async function POST(request: NextRequest) {
       })
     }
 
-    // Only return 500 for actual server errors, not file processing failures
-    // File processing failures (like file not found, parsing errors) should return 200 with success:false
     return NextResponse.json(result)
   } catch (error) {
     logger.error('Error in file parse API:', error)
@@ -164,7 +155,6 @@ export async function POST(request: NextRequest) {
 async function parseFileSingle(filePath: string, fileType?: string): Promise<ParseResult> {
   logger.info('Parsing file:', filePath)
 
-  // Validate that filePath is not empty
   if (!filePath || filePath.trim() === '') {
     return {
       success: false,
@@ -173,7 +163,6 @@ async function parseFileSingle(filePath: string, fileType?: string): Promise<Par
     }
   }
 
-  // Validate path for security before any processing
   const pathValidation = validateFilePath(filePath)
   if (!pathValidation.isValid) {
     return {
@@ -183,49 +172,40 @@ async function parseFileSingle(filePath: string, fileType?: string): Promise<Par
     }
   }
 
-  // Check if this is an external URL
   if (filePath.startsWith('http://') || filePath.startsWith('https://')) {
     return handleExternalUrl(filePath, fileType)
   }
 
-  // Check if this is a cloud storage path (S3 or Blob)
   const isS3Path = filePath.includes('/api/files/serve/s3/')
   const isBlobPath = filePath.includes('/api/files/serve/blob/')
 
-  // Use cloud handler if it's a cloud path or we're in cloud mode
   if (isS3Path || isBlobPath || isUsingCloudStorage()) {
     return handleCloudFile(filePath, fileType)
   }
 
-  // Use local handler for local files
   return handleLocalFile(filePath, fileType)
 }
 
 /**
- * Validate file path for security
+ * Validate file path for security - prevents null byte injection and path traversal attacks
  */
 function validateFilePath(filePath: string): { isValid: boolean; error?: string } {
-  // Check for null bytes
   if (filePath.includes('\0')) {
     return { isValid: false, error: 'Invalid path: null byte detected' }
   }
 
-  // Check for path traversal attempts
   if (filePath.includes('..')) {
     return { isValid: false, error: 'Access denied: path traversal detected' }
   }
 
-  // Check for tilde characters (home directory access)
   if (filePath.includes('~')) {
     return { isValid: false, error: 'Invalid path: tilde character not allowed' }
   }
 
-  // Check for absolute paths outside allowed directories
   if (filePath.startsWith('/') && !filePath.startsWith('/api/files/serve/')) {
     return { isValid: false, error: 'Path outside allowed directory' }
   }
 
-  // Check for Windows absolute paths
   if (/^[A-Za-z]:\\/.test(filePath)) {
     return { isValid: false, error: 'Path outside allowed directory' }
   }
@@ -260,12 +240,10 @@ async function handleExternalUrl(url: string, fileType?: string): Promise<ParseR
 
     logger.info(`Downloaded file from URL: ${url}, size: ${buffer.length} bytes`)
 
-    // Extract filename from URL
     const urlPath = new URL(url).pathname
     const filename = urlPath.split('/').pop() || 'download'
     const extension = path.extname(filename).toLowerCase().substring(1)
 
-    // Process the file based on its content type
     if (extension === 'pdf') {
       return await handlePdfBuffer(buffer, filename, fileType, url)
     }
@@ -276,7 +254,6 @@ async function handleExternalUrl(url: string, fileType?: string): Promise<ParseR
       return await handleGenericTextBuffer(buffer, filename, extension, fileType, url)
     }
 
-    // For binary or unknown files
     return handleGenericBuffer(buffer, filename, extension, fileType)
   } catch (error) {
     logger.error(`Error handling external URL ${url}:`, error)
@@ -289,35 +266,29 @@ async function handleExternalUrl(url: string, fileType?: string): Promise<ParseR
 }
 
 /**
- * Handle file stored in cloud storage (S3 or Azure Blob)
+ * Handle file stored in cloud storage
  */
 async function handleCloudFile(filePath: string, fileType?: string): Promise<ParseResult> {
   try {
-    // Extract the cloud key from the path
     let cloudKey: string
     if (filePath.includes('/api/files/serve/s3/')) {
       cloudKey = decodeURIComponent(filePath.split('/api/files/serve/s3/')[1])
     } else if (filePath.includes('/api/files/serve/blob/')) {
       cloudKey = decodeURIComponent(filePath.split('/api/files/serve/blob/')[1])
     } else if (filePath.startsWith('/api/files/serve/')) {
-      // Backwards-compatibility: path like "/api/files/serve/<key>"
       cloudKey = decodeURIComponent(filePath.substring('/api/files/serve/'.length))
     } else {
-      // Assume raw key provided
       cloudKey = filePath
     }
 
     logger.info('Extracted cloud key:', cloudKey)
 
-    // Download the file from cloud storage - this can throw for access errors
     const fileBuffer = await downloadFile(cloudKey)
     logger.info(`Downloaded file from cloud storage: ${cloudKey}, size: ${fileBuffer.length} bytes`)
 
-    // Extract the filename from the cloud key
     const filename = cloudKey.split('/').pop() || cloudKey
     const extension = path.extname(filename).toLowerCase().substring(1)
 
-    // Process the file based on its content type
     if (extension === 'pdf') {
       return await handlePdfBuffer(fileBuffer, filename, fileType, filePath)
     }
@@ -325,22 +296,19 @@ async function handleCloudFile(filePath: string, fileType?: string): Promise<Par
       return await handleCsvBuffer(fileBuffer, filename, fileType, filePath)
     }
     if (isSupportedFileType(extension)) {
-      // For other supported types that we have parsers for
       return await handleGenericTextBuffer(fileBuffer, filename, extension, fileType, filePath)
     }
-    // For binary or unknown files
     return handleGenericBuffer(fileBuffer, filename, extension, fileType)
   } catch (error) {
     logger.error(`Error handling cloud file ${filePath}:`, error)
 
-    // Check if this is a download/access error that should trigger a 500 response
+    // For download/access errors, throw to trigger 500 response
     const errorMessage = (error as Error).message
     if (errorMessage.includes('Access denied') || errorMessage.includes('Forbidden')) {
-      // For access errors, throw to trigger 500 response
       throw new Error(`Error accessing file from cloud storage: ${errorMessage}`)
     }
 
-    // For other errors (parsing, processing), return success:false
+    // For other errors (parsing, processing), return success:false and an error message
     return {
       success: false,
       error: `Error accessing file from cloud storage: ${errorMessage}`,
@@ -354,28 +322,23 @@ async function handleCloudFile(filePath: string, fileType?: string): Promise<Par
  */
 async function handleLocalFile(filePath: string, fileType?: string): Promise<ParseResult> {
   try {
-    // Extract filename from path
     const filename = filePath.split('/').pop() || filePath
     const fullPath = path.join(UPLOAD_DIR_SERVER, filename)
 
     logger.info('Processing local file:', fullPath)
 
-    // Check if file exists
     try {
       await fsPromises.access(fullPath)
     } catch {
       throw new Error(`File not found: ${filename}`)
     }
 
-    // Parse the file directly
     const result = await parseFile(fullPath)
 
-    // Get file stats for metadata
     const stats = await fsPromises.stat(fullPath)
     const fileBuffer = await readFile(fullPath)
     const hash = createHash('md5').update(fileBuffer).digest('hex')
 
-    // Extract file extension for type detection
     const extension = path.extname(filename).toLowerCase().substring(1)
 
     return {
@@ -386,7 +349,7 @@ async function handleLocalFile(filePath: string, fileType?: string): Promise<Par
         fileType: fileType || getMimeType(extension),
         size: stats.size,
         hash,
-        processingTime: 0, // Will be set by caller
+        processingTime: 0,
       },
     }
   } catch (error) {
@@ -425,15 +388,14 @@ async function handlePdfBuffer(
         fileType: fileType || 'application/pdf',
         size: fileBuffer.length,
         hash: createHash('md5').update(fileBuffer).digest('hex'),
-        processingTime: 0, // Will be set by caller
+        processingTime: 0,
       },
     }
   } catch (error) {
     logger.error('Failed to parse PDF in memory:', error)
 
-    // Create fallback message for PDF parsing failure
     const content = createPdfFailureMessage(
-      0, // We can't determine page count without parsing
+      0,
       fileBuffer.length,
       originalPath || filename,
       (error as Error).message
@@ -447,7 +409,7 @@ async function handlePdfBuffer(
         fileType: fileType || 'application/pdf',
         size: fileBuffer.length,
         hash: createHash('md5').update(fileBuffer).digest('hex'),
-        processingTime: 0, // Will be set by caller
+        processingTime: 0,
       },
     }
   }
@@ -465,7 +427,6 @@ async function handleCsvBuffer(
   try {
     logger.info(`Parsing CSV in memory: ${filename}`)
 
-    // Use the parseBuffer function from our library
     const { parseBuffer } = await import('@/lib/file-parsers')
     const result = await parseBuffer(fileBuffer, 'csv')
 
@@ -477,7 +438,7 @@ async function handleCsvBuffer(
         fileType: fileType || 'text/csv',
         size: fileBuffer.length,
         hash: createHash('md5').update(fileBuffer).digest('hex'),
-        processingTime: 0, // Will be set by caller
+        processingTime: 0,
       },
     }
   } catch (error) {
@@ -490,7 +451,7 @@ async function handleCsvBuffer(
         fileType: 'text/csv',
         size: 0,
         hash: '',
-        processingTime: 0, // Will be set by caller
+        processingTime: 0,
       },
     }
   }
@@ -509,7 +470,6 @@ async function handleGenericTextBuffer(
   try {
     logger.info(`Parsing text file in memory: ${filename}`)
 
-    // Try to use a specialized parser if available
     try {
       const { parseBuffer, isSupportedFileType } = await import('@/lib/file-parsers')
 
@@ -524,7 +484,7 @@ async function handleGenericTextBuffer(
             fileType: fileType || getMimeType(extension),
             size: fileBuffer.length,
             hash: createHash('md5').update(fileBuffer).digest('hex'),
-            processingTime: 0, // Will be set by caller
+            processingTime: 0,
           },
         }
       }
@@ -532,7 +492,6 @@ async function handleGenericTextBuffer(
       logger.warn('Specialized parser failed, falling back to generic parsing:', parserError)
     }
 
-    // Fallback to generic text parsing
     const content = fileBuffer.toString('utf-8')
 
     return {
@@ -543,7 +502,7 @@ async function handleGenericTextBuffer(
         fileType: fileType || getMimeType(extension),
         size: fileBuffer.length,
         hash: createHash('md5').update(fileBuffer).digest('hex'),
-        processingTime: 0, // Will be set by caller
+        processingTime: 0,
       },
     }
   } catch (error) {
@@ -556,7 +515,7 @@ async function handleGenericTextBuffer(
         fileType: 'text/plain',
         size: 0,
         hash: '',
-        processingTime: 0, // Will be set by caller
+        processingTime: 0,
       },
     }
   }
@@ -584,7 +543,7 @@ function handleGenericBuffer(
       fileType: fileType || getMimeType(extension),
       size: fileBuffer.length,
       hash: createHash('md5').update(fileBuffer).digest('hex'),
-      processingTime: 0, // Will be set by caller
+      processingTime: 0,
     },
   }
 }
@@ -594,8 +553,6 @@ function handleGenericBuffer(
  */
 async function parseBufferAsPdf(buffer: Buffer) {
   try {
-    // Import parsers dynamically to avoid initialization issues in tests
-    // First try to use the main PDF parser
     try {
       const { PdfParser } = await import('@/lib/file-parsers/pdf-parser')
       const parser = new PdfParser()
@@ -606,7 +563,6 @@ async function parseBufferAsPdf(buffer: Buffer) {
       }
       throw new Error('PDF parser does not support buffer parsing')
     } catch (error) {
-      // Fallback to raw PDF parser
       logger.warn('Main PDF parser failed, using raw parser for buffer:', error)
       const { RawPdfParser } = await import('@/lib/file-parsers/raw-pdf-parser')
       const rawParser = new RawPdfParser()
@@ -655,7 +611,7 @@ Please use a PDF viewer for best results.`
 }
 
 /**
- * Create error message for PDF parsing failure
+ * Create error message for PDF parsing failure and make it more readable
  */
 function createPdfFailureMessage(
   pageCount: number,

apps/sim/app/api/knowledge/[id]/documents/[documentId]/tag-definitions/route.ts

@@ -2,7 +2,7 @@ import { randomUUID } from 'crypto'
 import { type NextRequest, NextResponse } from 'next/server'
 import { z } from 'zod'
 import { getSession } from '@/lib/auth'
-import { SUPPORTED_FIELD_TYPES } from '@/lib/constants/knowledge'
+import { SUPPORTED_FIELD_TYPES } from '@/lib/knowledge/consts'
 import {
   cleanupUnusedTagDefinitions,
   createOrUpdateTagDefinitionsBulk,

apps/sim/app/api/knowledge/[id]/tag-definitions/route.ts

@@ -2,7 +2,7 @@ import { randomUUID } from 'crypto'
 import { type NextRequest, NextResponse } from 'next/server'
 import { z } from 'zod'
 import { getSession } from '@/lib/auth'
-import { SUPPORTED_FIELD_TYPES } from '@/lib/constants/knowledge'
+import { SUPPORTED_FIELD_TYPES } from '@/lib/knowledge/consts'
 import { createTagDefinition, getTagDefinitions } from '@/lib/knowledge/tags/service'
 import { createLogger } from '@/lib/logs/console/logger'
 import { checkKnowledgeBaseAccess } from '@/app/api/knowledge/utils'

apps/sim/app/api/knowledge/search/route.ts

@@ -1,6 +1,6 @@
 import { type NextRequest, NextResponse } from 'next/server'
 import { z } from 'zod'
-import { TAG_SLOTS } from '@/lib/constants/knowledge'
+import { TAG_SLOTS } from '@/lib/knowledge/consts'
 import { getDocumentTagDefinitions } from '@/lib/knowledge/tags/service'
 import { createLogger } from '@/lib/logs/console/logger'
 import { estimateTokenCount } from '@/lib/tokenization/estimators'

apps/sim/app/api/tools/mysql/delete/route.ts

@@ -0,0 +1,68 @@
+import { randomUUID } from 'crypto'
+import { type NextRequest, NextResponse } from 'next/server'
+import { z } from 'zod'
+import { createLogger } from '@/lib/logs/console/logger'
+import { buildDeleteQuery, createMySQLConnection, executeQuery } from '@/app/api/tools/mysql/utils'
+
+const logger = createLogger('MySQLDeleteAPI')
+
+const DeleteSchema = z.object({
+  host: z.string().min(1, 'Host is required'),
+  port: z.coerce.number().int().positive('Port must be a positive integer'),
+  database: z.string().min(1, 'Database name is required'),
+  username: z.string().min(1, 'Username is required'),
+  password: z.string().min(1, 'Password is required'),
+  ssl: z.enum(['disabled', 'required', 'preferred']).default('preferred'),
+  table: z.string().min(1, 'Table name is required'),
+  where: z.string().min(1, 'WHERE clause is required'),
+})
+
+export async function POST(request: NextRequest) {
+  const requestId = randomUUID().slice(0, 8)
+
+  try {
+    const body = await request.json()
+    const params = DeleteSchema.parse(body)
+
+    logger.info(
+      `[${requestId}] Deleting data from ${params.table} on ${params.host}:${params.port}/${params.database}`
+    )
+
+    const connection = await createMySQLConnection({
+      host: params.host,
+      port: params.port,
+      database: params.database,
+      username: params.username,
+      password: params.password,
+      ssl: params.ssl,
+    })
+
+    try {
+      const { query, values } = buildDeleteQuery(params.table, params.where)
+      const result = await executeQuery(connection, query, values)
+
+      logger.info(`[${requestId}] Delete executed successfully, ${result.rowCount} row(s) deleted`)
+
+      return NextResponse.json({
+        message: `Data deleted successfully. ${result.rowCount} row(s) affected.`,
+        rows: result.rows,
+        rowCount: result.rowCount,
+      })
+    } finally {
+      await connection.end()
+    }
+  } catch (error) {
+    if (error instanceof z.ZodError) {
+      logger.warn(`[${requestId}] Invalid request data`, { errors: error.errors })
+      return NextResponse.json(
+        { error: 'Invalid request data', details: error.errors },
+        { status: 400 }
+      )
+    }
+
+    const errorMessage = error instanceof Error ? error.message : 'Unknown error occurred'
+    logger.error(`[${requestId}] MySQL delete failed:`, error)
+
+    return NextResponse.json({ error: `MySQL delete failed: ${errorMessage}` }, { status: 500 })
+  }
+}

apps/sim/app/api/tools/mysql/execute/route.ts

@@ -0,0 +1,75 @@
+import { randomUUID } from 'crypto'
+import { type NextRequest, NextResponse } from 'next/server'
+import { z } from 'zod'
+import { createLogger } from '@/lib/logs/console/logger'
+import { createMySQLConnection, executeQuery, validateQuery } from '@/app/api/tools/mysql/utils'
+
+const logger = createLogger('MySQLExecuteAPI')
+
+const ExecuteSchema = z.object({
+  host: z.string().min(1, 'Host is required'),
+  port: z.coerce.number().int().positive('Port must be a positive integer'),
+  database: z.string().min(1, 'Database name is required'),
+  username: z.string().min(1, 'Username is required'),
+  password: z.string().min(1, 'Password is required'),
+  ssl: z.enum(['disabled', 'required', 'preferred']).default('preferred'),
+  query: z.string().min(1, 'Query is required'),
+})
+
+export async function POST(request: NextRequest) {
+  const requestId = randomUUID().slice(0, 8)
+
+  try {
+    const body = await request.json()
+    const params = ExecuteSchema.parse(body)
+
+    logger.info(
+      `[${requestId}] Executing raw SQL on ${params.host}:${params.port}/${params.database}`
+    )
+
+    const validation = validateQuery(params.query)
+    if (!validation.isValid) {
+      logger.warn(`[${requestId}] Query validation failed: ${validation.error}`)
+      return NextResponse.json(
+        { error: `Query validation failed: ${validation.error}` },
+        { status: 400 }
+      )
+    }
+
+    const connection = await createMySQLConnection({
+      host: params.host,
+      port: params.port,
+      database: params.database,
+      username: params.username,
+      password: params.password,
+      ssl: params.ssl,
+    })
+
+    try {
+      const result = await executeQuery(connection, params.query)
+
+      logger.info(`[${requestId}] SQL executed successfully, ${result.rowCount} row(s) affected`)
+
+      return NextResponse.json({
+        message: `SQL executed successfully. ${result.rowCount} row(s) affected.`,
+        rows: result.rows,
+        rowCount: result.rowCount,
+      })
+    } finally {
+      await connection.end()
+    }
+  } catch (error) {
+    if (error instanceof z.ZodError) {
+      logger.warn(`[${requestId}] Invalid request data`, { errors: error.errors })
+      return NextResponse.json(
+        { error: 'Invalid request data', details: error.errors },
+        { status: 400 }
+      )
+    }
+
+    const errorMessage = error instanceof Error ? error.message : 'Unknown error occurred'
+    logger.error(`[${requestId}] MySQL execute failed:`, error)
+
+    return NextResponse.json({ error: `MySQL execute failed: ${errorMessage}` }, { status: 500 })
+  }
+}

apps/sim/app/api/tools/mysql/insert/route.ts

@@ -0,0 +1,89 @@
+import { randomUUID } from 'crypto'
+import { type NextRequest, NextResponse } from 'next/server'
+import { z } from 'zod'
+import { createLogger } from '@/lib/logs/console/logger'
+import { buildInsertQuery, createMySQLConnection, executeQuery } from '@/app/api/tools/mysql/utils'
+
+const logger = createLogger('MySQLInsertAPI')
+
+const InsertSchema = z.object({
+  host: z.string().min(1, 'Host is required'),
+  port: z.coerce.number().int().positive('Port must be a positive integer'),
+  database: z.string().min(1, 'Database name is required'),
+  username: z.string().min(1, 'Username is required'),
+  password: z.string().min(1, 'Password is required'),
+  ssl: z.enum(['disabled', 'required', 'preferred']).default('preferred'),
+  table: z.string().min(1, 'Table name is required'),
+  data: z.union([
+    z
+      .record(z.unknown())
+      .refine((obj) => Object.keys(obj).length > 0, 'Data object cannot be empty'),
+    z
+      .string()
+      .min(1)
+      .transform((str) => {
+        try {
+          const parsed = JSON.parse(str)
+          if (typeof parsed !== 'object' || parsed === null || Array.isArray(parsed)) {
+            throw new Error('Data must be a JSON object')
+          }
+          return parsed
+        } catch (e) {
+          const errorMsg = e instanceof Error ? e.message : 'Unknown error'
+          throw new Error(
+            `Invalid JSON format in data field: ${errorMsg}. Received: ${str.substring(0, 100)}...`
+          )
+        }
+      }),
+  ]),
+})
+
+export async function POST(request: NextRequest) {
+  const requestId = randomUUID().slice(0, 8)
+
+  try {
+    const body = await request.json()
+    const params = InsertSchema.parse(body)
+
+    logger.info(
+      `[${requestId}] Inserting data into ${params.table} on ${params.host}:${params.port}/${params.database}`
+    )
+
+    const connection = await createMySQLConnection({
+      host: params.host,
+      port: params.port,
+      database: params.database,
+      username: params.username,
+      password: params.password,
+      ssl: params.ssl,
+    })
+
+    try {
+      const { query, values } = buildInsertQuery(params.table, params.data)
+      const result = await executeQuery(connection, query, values)
+
+      logger.info(`[${requestId}] Insert executed successfully, ${result.rowCount} row(s) inserted`)
+
+      return NextResponse.json({
+        message: `Data inserted successfully. ${result.rowCount} row(s) affected.`,
+        rows: result.rows,
+        rowCount: result.rowCount,
+      })
+    } finally {
+      await connection.end()
+    }
+  } catch (error) {
+    if (error instanceof z.ZodError) {
+      logger.warn(`[${requestId}] Invalid request data`, { errors: error.errors })
+      return NextResponse.json(
+        { error: 'Invalid request data', details: error.errors },
+        { status: 400 }
+      )
+    }
+
+    const errorMessage = error instanceof Error ? error.message : 'Unknown error occurred'
+    logger.error(`[${requestId}] MySQL insert failed:`, error)
+
+    return NextResponse.json({ error: `MySQL insert failed: ${errorMessage}` }, { status: 500 })
+  }
+}

apps/sim/app/api/tools/mysql/query/route.ts

@@ -0,0 +1,75 @@
+import { randomUUID } from 'crypto'
+import { type NextRequest, NextResponse } from 'next/server'
+import { z } from 'zod'
+import { createLogger } from '@/lib/logs/console/logger'
+import { createMySQLConnection, executeQuery, validateQuery } from '@/app/api/tools/mysql/utils'
+
+const logger = createLogger('MySQLQueryAPI')
+
+const QuerySchema = z.object({
+  host: z.string().min(1, 'Host is required'),
+  port: z.coerce.number().int().positive('Port must be a positive integer'),
+  database: z.string().min(1, 'Database name is required'),
+  username: z.string().min(1, 'Username is required'),
+  password: z.string().min(1, 'Password is required'),
+  ssl: z.enum(['disabled', 'required', 'preferred']).default('preferred'),
+  query: z.string().min(1, 'Query is required'),
+})
+
+export async function POST(request: NextRequest) {
+  const requestId = randomUUID().slice(0, 8)
+
+  try {
+    const body = await request.json()
+    const params = QuerySchema.parse(body)
+
+    logger.info(
+      `[${requestId}] Executing MySQL query on ${params.host}:${params.port}/${params.database}`
+    )
+
+    const validation = validateQuery(params.query)
+    if (!validation.isValid) {
+      logger.warn(`[${requestId}] Query validation failed: ${validation.error}`)
+      return NextResponse.json(
+        { error: `Query validation failed: ${validation.error}` },
+        { status: 400 }
+      )
+    }
+
+    const connection = await createMySQLConnection({
+      host: params.host,
+      port: params.port,
+      database: params.database,
+      username: params.username,
+      password: params.password,
+      ssl: params.ssl,
+    })
+
+    try {
+      const result = await executeQuery(connection, params.query)
+
+      logger.info(`[${requestId}] Query executed successfully, returned ${result.rowCount} rows`)
+
+      return NextResponse.json({
+        message: `Query executed successfully. ${result.rowCount} row(s) returned.`,
+        rows: result.rows,
+        rowCount: result.rowCount,
+      })
+    } finally {
+      await connection.end()
+    }
+  } catch (error) {
+    if (error instanceof z.ZodError) {
+      logger.warn(`[${requestId}] Invalid request data`, { errors: error.errors })
+      return NextResponse.json(
+        { error: 'Invalid request data', details: error.errors },
+        { status: 400 }
+      )
+    }
+
+    const errorMessage = error instanceof Error ? error.message : 'Unknown error occurred'
+    logger.error(`[${requestId}] MySQL query failed:`, error)
+
+    return NextResponse.json({ error: `MySQL query failed: ${errorMessage}` }, { status: 500 })
+  }
+}

apps/sim/app/api/tools/mysql/update/route.ts

@@ -0,0 +1,87 @@
+import { randomUUID } from 'crypto'
+import { type NextRequest, NextResponse } from 'next/server'
+import { z } from 'zod'
+import { createLogger } from '@/lib/logs/console/logger'
+import { buildUpdateQuery, createMySQLConnection, executeQuery } from '@/app/api/tools/mysql/utils'
+
+const logger = createLogger('MySQLUpdateAPI')
+
+const UpdateSchema = z.object({
+  host: z.string().min(1, 'Host is required'),
+  port: z.coerce.number().int().positive('Port must be a positive integer'),
+  database: z.string().min(1, 'Database name is required'),
+  username: z.string().min(1, 'Username is required'),
+  password: z.string().min(1, 'Password is required'),
+  ssl: z.enum(['disabled', 'required', 'preferred']).default('preferred'),
+  table: z.string().min(1, 'Table name is required'),
+  data: z.union([
+    z
+      .record(z.unknown())
+      .refine((obj) => Object.keys(obj).length > 0, 'Data object cannot be empty'),
+    z
+      .string()
+      .min(1)
+      .transform((str) => {
+        try {
+          const parsed = JSON.parse(str)
+          if (typeof parsed !== 'object' || parsed === null || Array.isArray(parsed)) {
+            throw new Error('Data must be a JSON object')
+          }
+          return parsed
+        } catch (e) {
+          throw new Error('Invalid JSON format in data field')
+        }
+      }),
+  ]),
+  where: z.string().min(1, 'WHERE clause is required'),
+})
+
+export async function POST(request: NextRequest) {
+  const requestId = randomUUID().slice(0, 8)
+
+  try {
+    const body = await request.json()
+    const params = UpdateSchema.parse(body)
+
+    logger.info(
+      `[${requestId}] Updating data in ${params.table} on ${params.host}:${params.port}/${params.database}`
+    )
+
+    const connection = await createMySQLConnection({
+      host: params.host,
+      port: params.port,
+      database: params.database,
+      username: params.username,
+      password: params.password,
+      ssl: params.ssl,
+    })
+
+    try {
+      const { query, values } = buildUpdateQuery(params.table, params.data, params.where)
+      const result = await executeQuery(connection, query, values)
+
+      logger.info(`[${requestId}] Update executed successfully, ${result.rowCount} row(s) updated`)
+
+      return NextResponse.json({
+        message: `Data updated successfully. ${result.rowCount} row(s) affected.`,
+        rows: result.rows,
+        rowCount: result.rowCount,
+      })
+    } finally {
+      await connection.end()
+    }
+  } catch (error) {
+    if (error instanceof z.ZodError) {
+      logger.warn(`[${requestId}] Invalid request data`, { errors: error.errors })
+      return NextResponse.json(
+        { error: 'Invalid request data', details: error.errors },
+        { status: 400 }
+      )
+    }
+
+    const errorMessage = error instanceof Error ? error.message : 'Unknown error occurred'
+    logger.error(`[${requestId}] MySQL update failed:`, error)
+
+    return NextResponse.json({ error: `MySQL update failed: ${errorMessage}` }, { status: 500 })
+  }
+}

apps/sim/app/api/tools/mysql/utils.ts

@@ -0,0 +1,175 @@
+import mysql from 'mysql2/promise'
+
+export interface MySQLConnectionConfig {
+  host: string
+  port: number
+  database: string
+  username: string
+  password: string
+  ssl?: 'disabled' | 'required' | 'preferred'
+}
+
+export async function createMySQLConnection(config: MySQLConnectionConfig) {
+  const connectionConfig: mysql.ConnectionOptions = {
+    host: config.host,
+    port: config.port,
+    database: config.database,
+    user: config.username,
+    password: config.password,
+  }
+
+  if (config.ssl === 'disabled') {
+    // Don't set ssl property at all to disable SSL
+  } else if (config.ssl === 'required') {
+    connectionConfig.ssl = { rejectUnauthorized: true }
+  } else if (config.ssl === 'preferred') {
+    connectionConfig.ssl = { rejectUnauthorized: false }
+  }
+
+  return mysql.createConnection(connectionConfig)
+}
+
+export async function executeQuery(
+  connection: mysql.Connection,
+  query: string,
+  values?: unknown[]
+) {
+  const [rows, fields] = await connection.execute(query, values)
+
+  if (Array.isArray(rows)) {
+    return {
+      rows: rows as unknown[],
+      rowCount: rows.length,
+      fields,
+    }
+  }
+
+  return {
+    rows: [],
+    rowCount: (rows as mysql.ResultSetHeader).affectedRows || 0,
+    fields,
+  }
+}
+
+export function validateQuery(query: string): { isValid: boolean; error?: string } {
+  const trimmedQuery = query.trim().toLowerCase()
+
+  const dangerousPatterns = [
+    /drop\s+database/i,
+    /drop\s+schema/i,
+    /drop\s+user/i,
+    /create\s+user/i,
+    /grant\s+/i,
+    /revoke\s+/i,
+    /alter\s+user/i,
+    /set\s+global/i,
+    /set\s+session/i,
+    /load\s+data/i,
+    /into\s+outfile/i,
+    /into\s+dumpfile/i,
+    /load_file\s*\(/i,
+    /system\s+/i,
+    /exec\s+/i,
+    /execute\s+immediate/i,
+    /xp_cmdshell/i,
+    /sp_configure/i,
+    /information_schema\.tables/i,
+    /mysql\.user/i,
+    /mysql\.db/i,
+    /mysql\.host/i,
+    /performance_schema/i,
+    /sys\./i,
+  ]
+
+  for (const pattern of dangerousPatterns) {
+    if (pattern.test(query)) {
+      return {
+        isValid: false,
+        error: `Query contains potentially dangerous operation: ${pattern.source}`,
+      }
+    }
+  }
+
+  const allowedStatements = /^(select|insert|update|delete|with|show|describe|explain)\s+/i
+  if (!allowedStatements.test(trimmedQuery)) {
+    return {
+      isValid: false,
+      error:
+        'Only SELECT, INSERT, UPDATE, DELETE, WITH, SHOW, DESCRIBE, and EXPLAIN statements are allowed',
+    }
+  }
+
+  return { isValid: true }
+}
+
+export function buildInsertQuery(table: string, data: Record<string, unknown>) {
+  const sanitizedTable = sanitizeIdentifier(table)
+  const columns = Object.keys(data)
+  const values = Object.values(data)
+  const placeholders = columns.map(() => '?').join(', ')
+
+  const query = `INSERT INTO ${sanitizedTable} (${columns.map(sanitizeIdentifier).join(', ')}) VALUES (${placeholders})`
+
+  return { query, values }
+}
+
+export function buildUpdateQuery(table: string, data: Record<string, unknown>, where: string) {
+  validateWhereClause(where)
+
+  const sanitizedTable = sanitizeIdentifier(table)
+  const columns = Object.keys(data)
+  const values = Object.values(data)
+
+  const setClause = columns.map((col) => `${sanitizeIdentifier(col)} = ?`).join(', ')
+  const query = `UPDATE ${sanitizedTable} SET ${setClause} WHERE ${where}`
+
+  return { query, values }
+}
+
+export function buildDeleteQuery(table: string, where: string) {
+  validateWhereClause(where)
+
+  const sanitizedTable = sanitizeIdentifier(table)
+  const query = `DELETE FROM ${sanitizedTable} WHERE ${where}`
+
+  return { query, values: [] }
+}
+
+function validateWhereClause(where: string): void {
+  const dangerousPatterns = [
+    /;\s*(drop|delete|insert|update|create|alter|grant|revoke)/i,
+    /union\s+select/i,
+    /into\s+outfile/i,
+    /load_file/i,
+    /--/,
+    /\/\*/,
+    /\*\//,
+  ]
+
+  for (const pattern of dangerousPatterns) {
+    if (pattern.test(where)) {
+      throw new Error('WHERE clause contains potentially dangerous operation')
+    }
+  }
+}
+
+export function sanitizeIdentifier(identifier: string): string {
+  if (identifier.includes('.')) {
+    const parts = identifier.split('.')
+    return parts.map((part) => sanitizeSingleIdentifier(part)).join('.')
+  }
+
+  return sanitizeSingleIdentifier(identifier)
+}
+
+function sanitizeSingleIdentifier(identifier: string): string {
+  const cleaned = identifier.replace(/`/g, '')
+
+  if (!/^[a-zA-Z_][a-zA-Z0-9_]*$/.test(cleaned)) {
+    throw new Error(
+      `Invalid identifier: ${identifier}. Identifiers must start with a letter or underscore and contain only letters, numbers, and underscores.`
+    )
+  }
+
+  return `\`${cleaned}\``
+}

apps/sim/app/api/tools/postgresql/delete/route.ts

@@ -0,0 +1,70 @@
+import { randomUUID } from 'crypto'
+import { type NextRequest, NextResponse } from 'next/server'
+import { z } from 'zod'
+import { createLogger } from '@/lib/logs/console/logger'
+import { createPostgresConnection, executeDelete } from '@/app/api/tools/postgresql/utils'
+
+const logger = createLogger('PostgreSQLDeleteAPI')
+
+const DeleteSchema = z.object({
+  host: z.string().min(1, 'Host is required'),
+  port: z.coerce.number().int().positive('Port must be a positive integer'),
+  database: z.string().min(1, 'Database name is required'),
+  username: z.string().min(1, 'Username is required'),
+  password: z.string().min(1, 'Password is required'),
+  ssl: z.enum(['disabled', 'required', 'preferred']).default('preferred'),
+  table: z.string().min(1, 'Table name is required'),
+  where: z.string().min(1, 'WHERE clause is required'),
+})
+
+export async function POST(request: NextRequest) {
+  const requestId = randomUUID().slice(0, 8)
+
+  try {
+    const body = await request.json()
+    const params = DeleteSchema.parse(body)
+
+    logger.info(
+      `[${requestId}] Deleting data from ${params.table} on ${params.host}:${params.port}/${params.database}`
+    )
+
+    const sql = createPostgresConnection({
+      host: params.host,
+      port: params.port,
+      database: params.database,
+      username: params.username,
+      password: params.password,
+      ssl: params.ssl,
+    })
+
+    try {
+      const result = await executeDelete(sql, params.table, params.where)
+
+      logger.info(`[${requestId}] Delete executed successfully, ${result.rowCount} row(s) deleted`)
+
+      return NextResponse.json({
+        message: `Data deleted successfully. ${result.rowCount} row(s) affected.`,
+        rows: result.rows,
+        rowCount: result.rowCount,
+      })
+    } finally {
+      await sql.end()
+    }
+  } catch (error) {
+    if (error instanceof z.ZodError) {
+      logger.warn(`[${requestId}] Invalid request data`, { errors: error.errors })
+      return NextResponse.json(
+        { error: 'Invalid request data', details: error.errors },
+        { status: 400 }
+      )
+    }
+
+    const errorMessage = error instanceof Error ? error.message : 'Unknown error occurred'
+    logger.error(`[${requestId}] PostgreSQL delete failed:`, error)
+
+    return NextResponse.json(
+      { error: `PostgreSQL delete failed: ${errorMessage}` },
+      { status: 500 }
+    )
+  }
+}

apps/sim/app/api/tools/postgresql/execute/route.ts

@@ -0,0 +1,82 @@
+import { randomUUID } from 'crypto'
+import { type NextRequest, NextResponse } from 'next/server'
+import { z } from 'zod'
+import { createLogger } from '@/lib/logs/console/logger'
+import {
+  createPostgresConnection,
+  executeQuery,
+  validateQuery,
+} from '@/app/api/tools/postgresql/utils'
+
+const logger = createLogger('PostgreSQLExecuteAPI')
+
+const ExecuteSchema = z.object({
+  host: z.string().min(1, 'Host is required'),
+  port: z.coerce.number().int().positive('Port must be a positive integer'),
+  database: z.string().min(1, 'Database name is required'),
+  username: z.string().min(1, 'Username is required'),
+  password: z.string().min(1, 'Password is required'),
+  ssl: z.enum(['disabled', 'required', 'preferred']).default('preferred'),
+  query: z.string().min(1, 'Query is required'),
+})
+
+export async function POST(request: NextRequest) {
+  const requestId = randomUUID().slice(0, 8)
+
+  try {
+    const body = await request.json()
+    const params = ExecuteSchema.parse(body)
+
+    logger.info(
+      `[${requestId}] Executing raw SQL on ${params.host}:${params.port}/${params.database}`
+    )
+
+    const validation = validateQuery(params.query)
+    if (!validation.isValid) {
+      logger.warn(`[${requestId}] Query validation failed: ${validation.error}`)
+      return NextResponse.json(
+        { error: `Query validation failed: ${validation.error}` },
+        { status: 400 }
+      )
+    }
+
+    const sql = createPostgresConnection({
+      host: params.host,
+      port: params.port,
+      database: params.database,
+      username: params.username,
+      password: params.password,
+      ssl: params.ssl,
+    })
+
+    try {
+      const result = await executeQuery(sql, params.query)
+
+      logger.info(`[${requestId}] SQL executed successfully, ${result.rowCount} row(s) affected`)
+
+      return NextResponse.json({
+        message: `SQL executed successfully. ${result.rowCount} row(s) affected.`,
+        rows: result.rows,
+        rowCount: result.rowCount,
+      })
+    } finally {
+      await sql.end()
+    }
+  } catch (error) {
+    if (error instanceof z.ZodError) {
+      logger.warn(`[${requestId}] Invalid request data`, { errors: error.errors })
+      return NextResponse.json(
+        { error: 'Invalid request data', details: error.errors },
+        { status: 400 }
+      )
+    }
+
+    const errorMessage = error instanceof Error ? error.message : 'Unknown error occurred'
+    logger.error(`[${requestId}] PostgreSQL execute failed:`, error)
+
+    return NextResponse.json(
+      { error: `PostgreSQL execute failed: ${errorMessage}` },
+      { status: 500 }
+    )
+  }
+}

apps/sim/app/api/tools/postgresql/insert/route.ts

@@ -0,0 +1,92 @@
+import { randomUUID } from 'crypto'
+import { type NextRequest, NextResponse } from 'next/server'
+import { z } from 'zod'
+import { createLogger } from '@/lib/logs/console/logger'
+import { createPostgresConnection, executeInsert } from '@/app/api/tools/postgresql/utils'
+
+const logger = createLogger('PostgreSQLInsertAPI')
+
+const InsertSchema = z.object({
+  host: z.string().min(1, 'Host is required'),
+  port: z.coerce.number().int().positive('Port must be a positive integer'),
+  database: z.string().min(1, 'Database name is required'),
+  username: z.string().min(1, 'Username is required'),
+  password: z.string().min(1, 'Password is required'),
+  ssl: z.enum(['disabled', 'required', 'preferred']).default('preferred'),
+  table: z.string().min(1, 'Table name is required'),
+  data: z.union([
+    z
+      .record(z.unknown())
+      .refine((obj) => Object.keys(obj).length > 0, 'Data object cannot be empty'),
+    z
+      .string()
+      .min(1)
+      .transform((str) => {
+        try {
+          const parsed = JSON.parse(str)
+          if (typeof parsed !== 'object' || parsed === null || Array.isArray(parsed)) {
+            throw new Error('Data must be a JSON object')
+          }
+          return parsed
+        } catch (e) {
+          const errorMsg = e instanceof Error ? e.message : 'Unknown error'
+          throw new Error(
+            `Invalid JSON format in data field: ${errorMsg}. Received: ${str.substring(0, 100)}...`
+          )
+        }
+      }),
+  ]),
+})
+
+export async function POST(request: NextRequest) {
+  const requestId = randomUUID().slice(0, 8)
+
+  try {
+    const body = await request.json()
+
+    const params = InsertSchema.parse(body)
+
+    logger.info(
+      `[${requestId}] Inserting data into ${params.table} on ${params.host}:${params.port}/${params.database}`
+    )
+
+    const sql = createPostgresConnection({
+      host: params.host,
+      port: params.port,
+      database: params.database,
+      username: params.username,
+      password: params.password,
+      ssl: params.ssl,
+    })
+
+    try {
+      const result = await executeInsert(sql, params.table, params.data)
+
+      logger.info(`[${requestId}] Insert executed successfully, ${result.rowCount} row(s) inserted`)
+
+      return NextResponse.json({
+        message: `Data inserted successfully. ${result.rowCount} row(s) affected.`,
+        rows: result.rows,
+        rowCount: result.rowCount,
+      })
+    } finally {
+      await sql.end()
+    }
+  } catch (error) {
+    if (error instanceof z.ZodError) {
+      logger.warn(`[${requestId}] Invalid request data`, { errors: error.errors })
+      return NextResponse.json(
+        { error: 'Invalid request data', details: error.errors },
+        { status: 400 }
+      )
+    }
+
+    const errorMessage = error instanceof Error ? error.message : 'Unknown error occurred'
+    logger.error(`[${requestId}] PostgreSQL insert failed:`, error)
+
+    return NextResponse.json(
+      { error: `PostgreSQL insert failed: ${errorMessage}` },
+      { status: 500 }
+    )
+  }
+}

apps/sim/app/api/tools/postgresql/query/route.ts

@@ -0,0 +1,66 @@
+import { randomUUID } from 'crypto'
+import { type NextRequest, NextResponse } from 'next/server'
+import { z } from 'zod'
+import { createLogger } from '@/lib/logs/console/logger'
+import { createPostgresConnection, executeQuery } from '@/app/api/tools/postgresql/utils'
+
+const logger = createLogger('PostgreSQLQueryAPI')
+
+const QuerySchema = z.object({
+  host: z.string().min(1, 'Host is required'),
+  port: z.coerce.number().int().positive('Port must be a positive integer'),
+  database: z.string().min(1, 'Database name is required'),
+  username: z.string().min(1, 'Username is required'),
+  password: z.string().min(1, 'Password is required'),
+  ssl: z.enum(['disabled', 'required', 'preferred']).default('preferred'),
+  query: z.string().min(1, 'Query is required'),
+})
+
+export async function POST(request: NextRequest) {
+  const requestId = randomUUID().slice(0, 8)
+
+  try {
+    const body = await request.json()
+    const params = QuerySchema.parse(body)
+
+    logger.info(
+      `[${requestId}] Executing PostgreSQL query on ${params.host}:${params.port}/${params.database}`
+    )
+
+    const sql = createPostgresConnection({
+      host: params.host,
+      port: params.port,
+      database: params.database,
+      username: params.username,
+      password: params.password,
+      ssl: params.ssl,
+    })
+
+    try {
+      const result = await executeQuery(sql, params.query)
+
+      logger.info(`[${requestId}] Query executed successfully, returned ${result.rowCount} rows`)
+
+      return NextResponse.json({
+        message: `Query executed successfully. ${result.rowCount} row(s) returned.`,
+        rows: result.rows,
+        rowCount: result.rowCount,
+      })
+    } finally {
+      await sql.end()
+    }
+  } catch (error) {
+    if (error instanceof z.ZodError) {
+      logger.warn(`[${requestId}] Invalid request data`, { errors: error.errors })
+      return NextResponse.json(
+        { error: 'Invalid request data', details: error.errors },
+        { status: 400 }
+      )
+    }
+
+    const errorMessage = error instanceof Error ? error.message : 'Unknown error occurred'
+    logger.error(`[${requestId}] PostgreSQL query failed:`, error)
+
+    return NextResponse.json({ error: `PostgreSQL query failed: ${errorMessage}` }, { status: 500 })
+  }
+}

apps/sim/app/api/tools/postgresql/update/route.ts

@@ -0,0 +1,89 @@
+import { randomUUID } from 'crypto'
+import { type NextRequest, NextResponse } from 'next/server'
+import { z } from 'zod'
+import { createLogger } from '@/lib/logs/console/logger'
+import { createPostgresConnection, executeUpdate } from '@/app/api/tools/postgresql/utils'
+
+const logger = createLogger('PostgreSQLUpdateAPI')
+
+const UpdateSchema = z.object({
+  host: z.string().min(1, 'Host is required'),
+  port: z.coerce.number().int().positive('Port must be a positive integer'),
+  database: z.string().min(1, 'Database name is required'),
+  username: z.string().min(1, 'Username is required'),
+  password: z.string().min(1, 'Password is required'),
+  ssl: z.enum(['disabled', 'required', 'preferred']).default('preferred'),
+  table: z.string().min(1, 'Table name is required'),
+  data: z.union([
+    z
+      .record(z.unknown())
+      .refine((obj) => Object.keys(obj).length > 0, 'Data object cannot be empty'),
+    z
+      .string()
+      .min(1)
+      .transform((str) => {
+        try {
+          const parsed = JSON.parse(str)
+          if (typeof parsed !== 'object' || parsed === null || Array.isArray(parsed)) {
+            throw new Error('Data must be a JSON object')
+          }
+          return parsed
+        } catch (e) {
+          throw new Error('Invalid JSON format in data field')
+        }
+      }),
+  ]),
+  where: z.string().min(1, 'WHERE clause is required'),
+})
+
+export async function POST(request: NextRequest) {
+  const requestId = randomUUID().slice(0, 8)
+
+  try {
+    const body = await request.json()
+    const params = UpdateSchema.parse(body)
+
+    logger.info(
+      `[${requestId}] Updating data in ${params.table} on ${params.host}:${params.port}/${params.database}`
+    )
+
+    const sql = createPostgresConnection({
+      host: params.host,
+      port: params.port,
+      database: params.database,
+      username: params.username,
+      password: params.password,
+      ssl: params.ssl,
+    })
+
+    try {
+      const result = await executeUpdate(sql, params.table, params.data, params.where)
+
+      logger.info(`[${requestId}] Update executed successfully, ${result.rowCount} row(s) updated`)
+
+      return NextResponse.json({
+        message: `Data updated successfully. ${result.rowCount} row(s) affected.`,
+        rows: result.rows,
+        rowCount: result.rowCount,
+      })
+    } finally {
+      await sql.end()
+    }
+  } catch (error) {
+    if (error instanceof z.ZodError) {
+      logger.warn(`[${requestId}] Invalid request data`, { errors: error.errors })
+      return NextResponse.json(
+        { error: 'Invalid request data', details: error.errors },
+        { status: 400 }
+      )
+    }
+
+    const errorMessage = error instanceof Error ? error.message : 'Unknown error occurred'
+    logger.error(`[${requestId}] PostgreSQL update failed:`, error)
+
+    return NextResponse.json(
+      { error: `PostgreSQL update failed: ${errorMessage}` },
+      { status: 500 }
+    )
+  }
+}

apps/sim/app/api/tools/postgresql/utils.ts

@@ -0,0 +1,194 @@
+import postgres from 'postgres'
+import type { PostgresConnectionConfig } from '@/tools/postgresql/types'
+
+export function createPostgresConnection(config: PostgresConnectionConfig) {
+  const sslConfig =
+    config.ssl === 'disabled'
+      ? false
+      : config.ssl === 'required'
+        ? 'require'
+        : config.ssl === 'preferred'
+          ? 'prefer'
+          : 'require'
+
+  const sql = postgres({
+    host: config.host,
+    port: config.port,
+    database: config.database,
+    username: config.username,
+    password: config.password,
+    ssl: sslConfig,
+    connect_timeout: 10, // 10 seconds
+    idle_timeout: 20, // 20 seconds
+    max_lifetime: 60 * 30, // 30 minutes
+    max: 1, // Single connection for tool usage
+  })
+
+  return sql
+}
+
+export async function executeQuery(
+  sql: any,
+  query: string,
+  params: unknown[] = []
+): Promise<{ rows: unknown[]; rowCount: number }> {
+  const result = await sql.unsafe(query, params)
+  return {
+    rows: Array.isArray(result) ? result : [result],
+    rowCount: Array.isArray(result) ? result.length : result ? 1 : 0,
+  }
+}
+
+export function validateQuery(query: string): { isValid: boolean; error?: string } {
+  const trimmedQuery = query.trim().toLowerCase()
+
+  // Block dangerous SQL operations
+  const dangerousPatterns = [
+    /drop\s+database/i,
+    /drop\s+schema/i,
+    /drop\s+user/i,
+    /create\s+user/i,
+    /create\s+role/i,
+    /grant\s+/i,
+    /revoke\s+/i,
+    /alter\s+user/i,
+    /alter\s+role/i,
+    /set\s+role/i,
+    /reset\s+role/i,
+    /copy\s+.*from/i,
+    /copy\s+.*to/i,
+    /lo_import/i,
+    /lo_export/i,
+    /pg_read_file/i,
+    /pg_write_file/i,
+    /pg_ls_dir/i,
+    /information_schema\.tables/i,
+    /pg_catalog/i,
+    /pg_user/i,
+    /pg_shadow/i,
+    /pg_roles/i,
+    /pg_authid/i,
+    /pg_stat_activity/i,
+    /dblink/i,
+    /\\\\copy/i,
+  ]
+
+  for (const pattern of dangerousPatterns) {
+    if (pattern.test(query)) {
+      return {
+        isValid: false,
+        error: `Query contains potentially dangerous operation: ${pattern.source}`,
+      }
+    }
+  }
+
+  const allowedStatements = /^(select|insert|update|delete|with|explain|analyze|show)\s+/i
+  if (!allowedStatements.test(trimmedQuery)) {
+    return {
+      isValid: false,
+      error:
+        'Only SELECT, INSERT, UPDATE, DELETE, WITH, EXPLAIN, ANALYZE, and SHOW statements are allowed',
+    }
+  }
+
+  return { isValid: true }
+}
+
+export function sanitizeIdentifier(identifier: string): string {
+  if (identifier.includes('.')) {
+    const parts = identifier.split('.')
+    return parts.map((part) => sanitizeSingleIdentifier(part)).join('.')
+  }
+
+  return sanitizeSingleIdentifier(identifier)
+}
+
+function validateWhereClause(where: string): void {
+  const dangerousPatterns = [
+    /;\s*(drop|delete|insert|update|create|alter|grant|revoke)/i,
+    /union\s+select/i,
+    /into\s+outfile/i,
+    /load_file/i,
+    /--/,
+    /\/\*/,
+    /\*\//,
+  ]
+
+  for (const pattern of dangerousPatterns) {
+    if (pattern.test(where)) {
+      throw new Error('WHERE clause contains potentially dangerous operation')
+    }
+  }
+}
+
+function sanitizeSingleIdentifier(identifier: string): string {
+  const cleaned = identifier.replace(/"/g, '')
+
+  if (!/^[a-zA-Z_][a-zA-Z0-9_]*$/.test(cleaned)) {
+    throw new Error(
+      `Invalid identifier: ${identifier}. Identifiers must start with a letter or underscore and contain only letters, numbers, and underscores.`
+    )
+  }
+
+  return `"${cleaned}"`
+}
+
+export async function executeInsert(
+  sql: any,
+  table: string,
+  data: Record<string, unknown>
+): Promise<{ rows: unknown[]; rowCount: number }> {
+  const sanitizedTable = sanitizeIdentifier(table)
+  const columns = Object.keys(data)
+  const sanitizedColumns = columns.map((col) => sanitizeIdentifier(col))
+  const placeholders = columns.map((_, index) => `$${index + 1}`)
+  const values = columns.map((col) => data[col])
+
+  const query = `INSERT INTO ${sanitizedTable} (${sanitizedColumns.join(', ')}) VALUES (${placeholders.join(', ')}) RETURNING *`
+  const result = await sql.unsafe(query, values)
+
+  return {
+    rows: Array.isArray(result) ? result : [result],
+    rowCount: Array.isArray(result) ? result.length : result ? 1 : 0,
+  }
+}
+
+export async function executeUpdate(
+  sql: any,
+  table: string,
+  data: Record<string, unknown>,
+  where: string
+): Promise<{ rows: unknown[]; rowCount: number }> {
+  validateWhereClause(where)
+
+  const sanitizedTable = sanitizeIdentifier(table)
+  const columns = Object.keys(data)
+  const sanitizedColumns = columns.map((col) => sanitizeIdentifier(col))
+  const setClause = sanitizedColumns.map((col, index) => `${col} = $${index + 1}`).join(', ')
+  const values = columns.map((col) => data[col])
+
+  const query = `UPDATE ${sanitizedTable} SET ${setClause} WHERE ${where} RETURNING *`
+  const result = await sql.unsafe(query, values)
+
+  return {
+    rows: Array.isArray(result) ? result : [result],
+    rowCount: Array.isArray(result) ? result.length : result ? 1 : 0,
+  }
+}
+
+export async function executeDelete(
+  sql: any,
+  table: string,
+  where: string
+): Promise<{ rows: unknown[]; rowCount: number }> {
+  validateWhereClause(where)
+
+  const sanitizedTable = sanitizeIdentifier(table)
+  const query = `DELETE FROM ${sanitizedTable} WHERE ${where} RETURNING *`
+  const result = await sql.unsafe(query, [])
+
+  return {
+    rows: Array.isArray(result) ? result : [result],
+    rowCount: Array.isArray(result) ? result.length : result ? 1 : 0,
+  }
+}

apps/sim/app/api/usage-limits/route.ts

@@ -1,9 +1,11 @@
 import { type NextRequest, NextResponse } from 'next/server'
 import { getSession } from '@/lib/auth'
 import { getUserUsageLimitInfo, updateUserUsageLimit } from '@/lib/billing'
-import { getOrganizationBillingData } from '@/lib/billing/core/organization-billing'
+import {
+  getOrganizationBillingData,
+  isOrganizationOwnerOrAdmin,
+} from '@/lib/billing/core/organization'
 import { createLogger } from '@/lib/logs/console/logger'
-import { isOrganizationOwnerOrAdmin } from '@/lib/permissions/utils'
 
 const logger = createLogger('UnifiedUsageLimitsAPI')
 
@@ -25,7 +27,6 @@ export async function GET(request: NextRequest) {
     const userId = searchParams.get('userId') || session.user.id
     const organizationId = searchParams.get('organizationId')
 
-    // Validate context
     if (!['user', 'organization'].includes(context)) {
       return NextResponse.json(
         { error: 'Invalid context. Must be "user" or "organization"' },
@@ -33,7 +34,6 @@ export async function GET(request: NextRequest) {
       )
     }
 
-    // For user context, ensure they can only view their own info
     if (context === 'user' && userId !== session.user.id) {
       return NextResponse.json(
         { error: "Cannot view other users' usage information" },
@@ -41,7 +41,6 @@ export async function GET(request: NextRequest) {
       )
     }
 
-    // Get usage limit info
     if (context === 'organization') {
       if (!organizationId) {
         return NextResponse.json(
@@ -107,10 +106,8 @@ export async function PUT(request: NextRequest) {
     }
 
     if (context === 'user') {
-      // Update user's own usage limit
       await updateUserUsageLimit(userId, limit)
     } else if (context === 'organization') {
-      // context === 'organization'
       if (!organizationId) {
         return NextResponse.json(
           { error: 'Organization ID is required when context=organization' },
@@ -123,10 +120,7 @@ export async function PUT(request: NextRequest) {
         return NextResponse.json({ error: 'Permission denied' }, { status: 403 })
       }
 
-      // Use the dedicated function to update org usage limit
-      const { updateOrganizationUsageLimit } = await import(
-        '@/lib/billing/core/organization-billing'
-      )
+      const { updateOrganizationUsageLimit } = await import('@/lib/billing/core/organization')
       const result = await updateOrganizationUsageLimit(organizationId, limit)
 
       if (!result.success) {
@@ -137,7 +131,6 @@ export async function PUT(request: NextRequest) {
       return NextResponse.json({ success: true, context, userId, organizationId, data: updated })
     }
 
-    // Return updated limit info
     const updatedInfo = await getUserUsageLimitInfo(userId)
 
     return NextResponse.json({

apps/sim/app/api/workspaces/[id]/permissions/route.ts

@@ -2,16 +2,19 @@ import crypto from 'crypto'
 import { and, eq } from 'drizzle-orm'
 import { type NextRequest, NextResponse } from 'next/server'
 import { getSession } from '@/lib/auth'
+import { createLogger } from '@/lib/logs/console/logger'
 import { getUsersWithPermissions, hasWorkspaceAdminAccess } from '@/lib/permissions/utils'
 import { db } from '@/db'
 import { permissions, type permissionTypeEnum } from '@/db/schema'
 
+const logger = createLogger('WorkspacesPermissionsAPI')
+
 type PermissionType = (typeof permissionTypeEnum.enumValues)[number]
 
 interface UpdatePermissionsRequest {
   updates: Array<{
     userId: string
-    permissions: PermissionType // Single permission type instead of object with booleans
+    permissions: PermissionType
   }>
 }
 
@@ -33,7 +36,6 @@ export async function GET(request: NextRequest, { params }: { params: Promise<{
       return NextResponse.json({ error: 'Authentication required' }, { status: 401 })
     }
 
-    // Verify the current user has access to this workspace
     const userPermission = await db
       .select()
       .from(permissions)
@@ -57,7 +59,7 @@ export async function GET(request: NextRequest, { params }: { params: Promise<{
       total: result.length,
     })
   } catch (error) {
-    console.error('Error fetching workspace permissions:', error)
+    logger.error('Error fetching workspace permissions:', error)
     return NextResponse.json({ error: 'Failed to fetch workspace permissions' }, { status: 500 })
   }
 }
@@ -81,7 +83,6 @@ export async function PATCH(request: NextRequest, { params }: { params: Promise<
       return NextResponse.json({ error: 'Authentication required' }, { status: 401 })
     }
 
-    // Verify the current user has admin access to this workspace (either direct or through organization)
     const hasAdminAccess = await hasWorkspaceAdminAccess(session.user.id, workspaceId)
 
     if (!hasAdminAccess) {
@@ -91,10 +92,8 @@ export async function PATCH(request: NextRequest, { params }: { params: Promise<
       )
     }
 
-    // Parse and validate request body
     const body: UpdatePermissionsRequest = await request.json()
 
-    // Prevent users from modifying their own admin permissions
     const selfUpdate = body.updates.find((update) => update.userId === session.user.id)
     if (selfUpdate && selfUpdate.permissions !== 'admin') {
       return NextResponse.json(
@@ -103,10 +102,8 @@ export async function PATCH(request: NextRequest, { params }: { params: Promise<
       )
     }
 
-    // Process updates in a transaction
     await db.transaction(async (tx) => {
       for (const update of body.updates) {
-        // Delete existing permissions for this user and workspace
         await tx
           .delete(permissions)
           .where(
@@ -117,7 +114,6 @@ export async function PATCH(request: NextRequest, { params }: { params: Promise<
             )
           )
 
-        // Insert the single new permission
         await tx.insert(permissions).values({
           id: crypto.randomUUID(),
           userId: update.userId,
@@ -138,7 +134,7 @@ export async function PATCH(request: NextRequest, { params }: { params: Promise<
       total: updatedUsers.length,
     })
   } catch (error) {
-    console.error('Error updating workspace permissions:', error)
+    logger.error('Error updating workspace permissions:', error)
     return NextResponse.json({ error: 'Failed to update workspace permissions' }, { status: 500 })
   }
 }

apps/sim/app/layout.tsx

@@ -11,7 +11,7 @@ import { createLogger } from '@/lib/logs/console/logger'
 import { getAssetUrl } from '@/lib/utils'
 import '@/app/globals.css'
 
-import { SessionProvider } from '@/lib/session-context'
+import { SessionProvider } from '@/lib/session/session-context'
 import { ThemeProvider } from '@/app/theme-provider'
 import { ZoomPrevention } from '@/app/zoom-prevention'
 

apps/sim/app/workspace/[workspaceId]/knowledge/[id]/components/upload-modal/upload-modal.tsx

@@ -7,22 +7,12 @@ import { Dialog, DialogContent, DialogHeader, DialogTitle } from '@/components/u
 import { Label } from '@/components/ui/label'
 import { Progress } from '@/components/ui/progress'
 import { createLogger } from '@/lib/logs/console/logger'
+import { ACCEPT_ATTRIBUTE, ACCEPTED_FILE_TYPES, MAX_FILE_SIZE } from '@/lib/uploads/validation'
 import { getDocumentIcon } from '@/app/workspace/[workspaceId]/knowledge/components'
 import { useKnowledgeUpload } from '@/app/workspace/[workspaceId]/knowledge/hooks/use-knowledge-upload'
 
 const logger = createLogger('UploadModal')
 
-const MAX_FILE_SIZE = 100 * 1024 * 1024 // 100MB
-const ACCEPTED_FILE_TYPES = [
-  'application/pdf',
-  'application/msword',
-  'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
-  'text/plain',
-  'text/csv',
-  'application/vnd.ms-excel',
-  'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
-]
-
 interface FileWithPreview extends File {
   preview: string
 }
@@ -74,7 +64,7 @@ export function UploadModal({
       return `File "${file.name}" is too large. Maximum size is 100MB.`
     }
     if (!ACCEPTED_FILE_TYPES.includes(file.type)) {
-      return `File "${file.name}" has an unsupported format. Please use PDF, DOC, DOCX, TXT, CSV, XLS, or XLSX files.`
+      return `File "${file.name}" has an unsupported format. Please use PDF, DOC, DOCX, TXT, CSV, XLS, XLSX, MD, PPT, PPTX, or HTML files.`
     }
     return null
   }
@@ -168,7 +158,7 @@ export function UploadModal({
 
   return (
     <Dialog open={open} onOpenChange={handleClose}>
-      <DialogContent className='flex max-h-[95vh] max-w-2xl flex-col overflow-hidden'>
+      <DialogContent className='flex max-h-[95vh] flex-col overflow-hidden sm:max-w-[600px]'>
         <DialogHeader>
           <DialogTitle>Upload Documents</DialogTitle>
         </DialogHeader>
@@ -193,7 +183,7 @@ export function UploadModal({
                 <input
                   ref={fileInputRef}
                   type='file'
-                  accept={ACCEPTED_FILE_TYPES.join(',')}
+                  accept={ACCEPT_ATTRIBUTE}
                   onChange={handleFileChange}
                   className='hidden'
                   multiple
@@ -203,7 +193,8 @@ export function UploadModal({
                     {isDragging ? 'Drop files here!' : 'Drop files here or click to browse'}
                   </p>
                   <p className='text-muted-foreground text-xs'>
-                    Supports PDF, DOC, DOCX, TXT, CSV, XLS, XLSX (max 100MB each)
+                    Supports PDF, DOC, DOCX, TXT, CSV, XLS, XLSX, MD, PPT, PPTX, HTML (max 100MB
+                    each)
                   </p>
                 </div>
               </div>
@@ -223,7 +214,7 @@ export function UploadModal({
                   <input
                     ref={fileInputRef}
                     type='file'
-                    accept={ACCEPTED_FILE_TYPES.join(',')}
+                    accept={ACCEPT_ATTRIBUTE}
                     onChange={handleFileChange}
                     className='hidden'
                     multiple
@@ -233,7 +224,7 @@ export function UploadModal({
                   </p>
                 </div>
 
-                <div className='max-h-60 space-y-2 overflow-auto'>
+                <div className='max-h-80 space-y-2 overflow-auto'>
                   {files.map((file, index) => {
                     const fileStatus = uploadProgress.fileStatuses?.[index]
                     const isCurrentlyUploading = fileStatus?.status === 'uploading'

apps/sim/app/workspace/[workspaceId]/knowledge/components/create-modal/create-modal.tsx

@@ -14,23 +14,13 @@ import { Label } from '@/components/ui/label'
 import { Progress } from '@/components/ui/progress'
 import { Textarea } from '@/components/ui/textarea'
 import { createLogger } from '@/lib/logs/console/logger'
+import { ACCEPT_ATTRIBUTE, ACCEPTED_FILE_TYPES, MAX_FILE_SIZE } from '@/lib/uploads/validation'
 import { getDocumentIcon } from '@/app/workspace/[workspaceId]/knowledge/components'
 import { useKnowledgeUpload } from '@/app/workspace/[workspaceId]/knowledge/hooks/use-knowledge-upload'
 import type { KnowledgeBaseData } from '@/stores/knowledge/store'
 
 const logger = createLogger('CreateModal')
 
-const MAX_FILE_SIZE = 100 * 1024 * 1024 // 100MB
-const ACCEPTED_FILE_TYPES = [
-  'application/pdf',
-  'application/msword',
-  'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
-  'text/plain',
-  'text/csv',
-  'application/vnd.ms-excel',
-  'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
-]
-
 interface FileWithPreview extends File {
   preview: string
 }
@@ -168,7 +158,7 @@ export function CreateModal({ open, onOpenChange, onKnowledgeBaseCreated }: Crea
         // Check file type
         if (!ACCEPTED_FILE_TYPES.includes(file.type)) {
           setFileError(
-            `File ${file.name} has an unsupported format. Please use PDF, DOC, DOCX, TXT, CSV, XLS, or XLSX.`
+            `File ${file.name} has an unsupported format. Please use PDF, DOC, DOCX, TXT, CSV, XLS, XLSX, MD, PPT, PPTX, or HTML.`
           )
           hasError = true
           continue
@@ -494,7 +484,7 @@ export function CreateModal({ open, onOpenChange, onKnowledgeBaseCreated }: Crea
                         <input
                           ref={fileInputRef}
                           type='file'
-                          accept={ACCEPTED_FILE_TYPES.join(',')}
+                          accept={ACCEPT_ATTRIBUTE}
                           onChange={handleFileChange}
                           className='hidden'
                           multiple
@@ -511,7 +501,8 @@ export function CreateModal({ open, onOpenChange, onKnowledgeBaseCreated }: Crea
                                 : 'Drop files here or click to browse'}
                             </p>
                             <p className='text-muted-foreground text-xs'>
-                              Supports PDF, DOC, DOCX, TXT, CSV, XLS, XLSX (max 100MB each)
+                              Supports PDF, DOC, DOCX, TXT, CSV, XLS, XLSX, MD, PPT, PPTX, HTML (max
+                              100MB each)
                             </p>
                           </div>
                         </div>
@@ -535,7 +526,7 @@ export function CreateModal({ open, onOpenChange, onKnowledgeBaseCreated }: Crea
                           <input
                             ref={fileInputRef}
                             type='file'
-                            accept={ACCEPTED_FILE_TYPES.join(',')}
+                            accept={ACCEPT_ATTRIBUTE}
                             onChange={handleFileChange}
                             className='hidden'
                             multiple
@@ -552,7 +543,8 @@ export function CreateModal({ open, onOpenChange, onKnowledgeBaseCreated }: Crea
                                   : 'Drop more files or click to browse'}
                               </p>
                               <p className='text-muted-foreground text-xs'>
-                                PDF, DOC, DOCX, TXT, CSV, XLS, XLSX (max 100MB each)
+                                PDF, DOC, DOCX, TXT, CSV, XLS, XLSX, MD, PPT, PPTX, HTML (max 100MB
+                                each)
                               </p>
                             </div>
                           </div>

apps/sim/app/workspace/[workspaceId]/knowledge/components/document-tag-entry/document-tag-entry.tsx

@@ -25,7 +25,7 @@ import {
   TooltipProvider,
   TooltipTrigger,
 } from '@/components/ui'
-import { MAX_TAG_SLOTS, type TagSlot } from '@/lib/constants/knowledge'
+import { MAX_TAG_SLOTS, type TagSlot } from '@/lib/knowledge/consts'
 import { createLogger } from '@/lib/logs/console/logger'
 import { useKnowledgeBaseTagDefinitions } from '@/hooks/use-knowledge-base-tag-definitions'
 import { useNextAvailableSlot } from '@/hooks/use-next-available-slot'

apps/sim/app/workspace/[workspaceId]/knowledge/components/tag-input/tag-input.tsx

@@ -6,7 +6,7 @@ import { Button } from '@/components/ui/button'
 import { Collapsible, CollapsibleContent, CollapsibleTrigger } from '@/components/ui/collapsible'
 import { Input } from '@/components/ui/input'
 import { Label } from '@/components/ui/label'
-import { TAG_SLOTS, type TagSlot } from '@/lib/constants/knowledge'
+import { TAG_SLOTS, type TagSlot } from '@/lib/knowledge/consts'
 import { useKnowledgeBaseTagDefinitions } from '@/hooks/use-knowledge-base-tag-definitions'
 
 export type TagData = {

apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/chat/chat.tsx

@@ -12,15 +12,17 @@ import {
   extractPathFromOutputId,
   parseOutputContentSafely,
 } from '@/lib/response-format'
-import { ChatMessage } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/chat/components/chat-message/chat-message'
-import { OutputSelect } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/chat/components/output-select/output-select'
+import {
+  ChatFileUpload,
+  ChatMessage,
+  OutputSelect,
+} from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/chat/components'
 import { useWorkflowExecution } from '@/app/workspace/[workspaceId]/w/[workflowId]/hooks/use-workflow-execution'
 import type { BlockLog, ExecutionResult } from '@/executor/types'
 import { useExecutionStore } from '@/stores/execution/store'
 import { useChatStore } from '@/stores/panel/chat/store'
 import { useConsoleStore } from '@/stores/panel/console/store'
 import { useWorkflowRegistry } from '@/stores/workflows/registry/store'
-import { ChatFileUpload } from './components/chat-file-upload'
 
 const logger = createLogger('ChatPanel')
 

apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/chat/components/index.ts

@@ -0,0 +1,3 @@
+export { ChatFileUpload } from './chat-file-upload/chat-file-upload'
+export { ChatMessage } from './chat-message/chat-message'
+export { OutputSelect } from './output-select/output-select'

apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/console/components/console-entry/console-entry.tsx

@@ -155,7 +155,7 @@ const ImagePreview = ({
         className='h-auto w-full rounded-lg border'
         unoptimized
         onError={(e) => {
-          console.error('Image failed to load:', imageSrc)
+          logger.error('Image failed to load:', imageSrc)
           setLoadError(true)
           onLoadError?.(true)
         }}
@@ -333,7 +333,7 @@ export function ConsoleEntry({ entry, consoleWidth }: ConsoleEntryProps) {
       // Clean up the URL
       setTimeout(() => URL.revokeObjectURL(url), 100)
     } catch (error) {
-      console.error('Error downloading image:', error)
+      logger.error('Error downloading image:', error)
       alert('Failed to download image. Please try again later.')
     }
   }

apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/panel.tsx

@@ -9,6 +9,7 @@ import {
 } from '@/components/ui/dropdown-menu'
 import { ScrollArea } from '@/components/ui/scroll-area'
 import { Tooltip, TooltipContent, TooltipTrigger } from '@/components/ui/tooltip'
+import { createLogger } from '@/lib/logs/console/logger'
 import { useCopilotStore } from '@/stores/copilot/store'
 import { useChatStore } from '@/stores/panel/chat/store'
 import { useConsoleStore } from '@/stores/panel/console/store'
@@ -19,6 +20,8 @@ import { Console } from './components/console/console'
 import { Copilot } from './components/copilot/copilot'
 import { Variables } from './components/variables/variables'
 
+const logger = createLogger('Panel')
+
 export function Panel() {
   const [chatMessage, setChatMessage] = useState<string>('')
   const [isHistoryDropdownOpen, setIsHistoryDropdownOpen] = useState(false)
@@ -67,7 +70,7 @@ export function Panel() {
       try {
         await deleteChat(chatId)
       } catch (error) {
-        console.error('Error deleting chat:', error)
+        logger.error('Error deleting chat:', error)
       }
     },
     [deleteChat]
@@ -101,7 +104,7 @@ export function Panel() {
           lastLoadedWorkflowRef.current = activeWorkflowId
         }
       } catch (error) {
-        console.error('Failed to load copilot data:', error)
+        logger.error('Failed to load copilot data:', error)
       }
     },
     [
@@ -134,14 +137,14 @@ export function Panel() {
         if (!areChatsFresh(activeWorkflowId)) {
           // Don't await - let it load in background while dropdown is already open
           ensureCopilotDataLoaded(false).catch((error) => {
-            console.error('Failed to load chat history:', error)
+            logger.error('Failed to load chat history:', error)
           })
         }
       }
 
       // If streaming, just log that we're showing cached data
       if (open && isSendingMessage) {
-        console.log('Chat history opened during stream - showing cached data only')
+        logger.info('Chat history opened during stream - showing cached data only')
       }
     },
     [ensureCopilotDataLoaded, activeWorkflowId, areChatsFresh, isSendingMessage]
@@ -278,7 +281,7 @@ export function Panel() {
       // This is a real workflow change, not just a tab switch
       if (copilotWorkflowId !== activeWorkflowId || !copilotWorkflowId) {
         ensureCopilotDataLoaded().catch((error) => {
-          console.error('Failed to auto-load copilot data on workflow change:', error)
+          logger.error('Failed to auto-load copilot data on workflow change:', error)
         })
       }
     }

apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/workflow-block/components/sub-block/components/code.tsx

@@ -385,16 +385,16 @@ export function Code({
 
       <div
         className={cn(
-          'group relative min-h-[100px] rounded-md border bg-background font-mono text-sm transition-colors',
+          'group relative min-h-[100px] rounded-md border border-input bg-background font-mono text-sm transition-colors',
           isConnecting && 'ring-2 ring-blue-500 ring-offset-2',
-          !isValidJson && 'border-2 border-destructive bg-destructive/10'
+          !isValidJson && 'border-destructive bg-destructive/10'
         )}
         title={!isValidJson ? 'Invalid JSON' : undefined}
         onDragOver={(e) => e.preventDefault()}
         onDrop={handleDrop}
       >
         <div className='absolute top-2 right-3 z-10 flex items-center gap-1 opacity-0 transition-opacity group-hover:opacity-100'>
-          {!isCollapsed && !isAiStreaming && !isPreview && (
+          {wandConfig?.enabled && !isCollapsed && !isAiStreaming && !isPreview && (
             <Button
               variant='ghost'
               size='icon'
@@ -486,7 +486,7 @@ export function Code({
               outline: 'none',
             }}
             className={cn(
-              'code-editor-area caret-primary',
+              'code-editor-area caret-primary dark:caret-white',
               'bg-transparent focus:outline-none',
               (isCollapsed || isAiStreaming) && 'cursor-not-allowed opacity-50'
             )}

apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/workflow-block/components/sub-block/components/document-tag-entry/document-tag-entry.tsx

@@ -6,7 +6,7 @@ import { Button } from '@/components/ui/button'
 import { formatDisplayText } from '@/components/ui/formatted-text'
 import { Input } from '@/components/ui/input'
 import { checkTagTrigger, TagDropdown } from '@/components/ui/tag-dropdown'
-import { MAX_TAG_SLOTS } from '@/lib/constants/knowledge'
+import { MAX_TAG_SLOTS } from '@/lib/knowledge/consts'
 import { cn } from '@/lib/utils'
 import { useSubBlockValue } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/workflow-block/components/sub-block/hooks/use-sub-block-value'
 import type { SubBlockConfig } from '@/blocks/types'

apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/workflow-block/components/sub-block/components/file-upload.tsx

@@ -235,7 +235,7 @@ export function FileUpload({
             })
           }
         } catch (error) {
-          console.error(`Error uploading ${file.name}:`, error)
+          logger.error(`Error uploading ${file.name}:`, error)
           const errorMessage = error instanceof Error ? error.message : 'Unknown error'
           uploadErrors.push(`${file.name}: ${errorMessage}`)
         }
@@ -428,7 +428,7 @@ export function FileUpload({
           deletionResults.failures.push(`${file.name}: ${errorMessage}`)
         }
       } catch (error) {
-        console.error(`Failed to delete file ${file.name}:`, error)
+        logger.error(`Failed to delete file ${file.name}:`, error)
         deletionResults.failures.push(
           `${file.name}: ${error instanceof Error ? error.message : 'Unknown error'}`
         )

apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/workflow-block/components/sub-block/components/short-input.tsx

@@ -1,12 +1,16 @@
 import { useEffect, useMemo, useRef, useState } from 'react'
+import { Wand2 } from 'lucide-react'
 import { useReactFlow } from 'reactflow'
+import { Button } from '@/components/ui/button'
 import { checkEnvVarTrigger, EnvVarDropdown } from '@/components/ui/env-var-dropdown'
 import { formatDisplayText } from '@/components/ui/formatted-text'
 import { Input } from '@/components/ui/input'
 import { checkTagTrigger, TagDropdown } from '@/components/ui/tag-dropdown'
 import { createLogger } from '@/lib/logs/console/logger'
 import { cn } from '@/lib/utils'
+import { WandPromptBar } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/wand-prompt-bar/wand-prompt-bar'
 import { useSubBlockValue } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/workflow-block/components/sub-block/hooks/use-sub-block-value'
+import { useWand } from '@/app/workspace/[workspaceId]/w/[workflowId]/hooks/use-wand'
 import type { SubBlockConfig } from '@/blocks/types'
 import { useTagSelection } from '@/hooks/use-tag-selection'
 import { useOperationQueueStore } from '@/stores/operation-queue/store'
@@ -40,19 +44,39 @@ export function ShortInput({
   previewValue,
   disabled = false,
 }: ShortInputProps) {
+  // Local state for immediate UI updates during streaming
+  const [localContent, setLocalContent] = useState<string>('')
   const [isFocused, setIsFocused] = useState(false)
   const [showEnvVars, setShowEnvVars] = useState(false)
   const [showTags, setShowTags] = useState(false)
-  const validatePropValue = (value: any): string => {
-    if (value === undefined || value === null) return ''
-    if (typeof value === 'string') return value
-    try {
-      return String(value)
-    } catch {
-      return ''
-    }
-  }
-  const [storeValue, setStoreValue] = useSubBlockValue(blockId, subBlockId)
+
+  // Wand functionality (only if wandConfig is enabled)
+  const wandHook = config.wandConfig?.enabled
+    ? useWand({
+        wandConfig: config.wandConfig,
+        currentValue: localContent,
+        onStreamStart: () => {
+          // Clear the content when streaming starts
+          setLocalContent('')
+        },
+        onStreamChunk: (chunk) => {
+          // Update local content with each chunk as it arrives
+          setLocalContent((current) => current + chunk)
+        },
+        onGeneratedContent: (content) => {
+          // Final content update
+          setLocalContent(content)
+        },
+      })
+    : null
+  // State management - useSubBlockValue with explicit streaming control
+  const [storeValue, setStoreValue] = useSubBlockValue(blockId, subBlockId, false, {
+    isStreaming: wandHook?.isStreaming || false,
+    onStreamingEnd: () => {
+      logger.debug('Wand streaming ended, value persisted', { blockId, subBlockId })
+    },
+  })
+
   const [searchTerm, setSearchTerm] = useState('')
   const [cursorPosition, setCursorPosition] = useState(0)
   const inputRef = useRef<HTMLInputElement>(null)
@@ -65,7 +89,29 @@ export function ShortInput({
   const reactFlowInstance = useReactFlow()
 
   // Use preview value when in preview mode, otherwise use store value or prop value
-  const value = isPreview ? previewValue : propValue !== undefined ? propValue : storeValue
+  const baseValue = isPreview ? previewValue : propValue !== undefined ? propValue : storeValue
+
+  // During streaming, use local content; otherwise use base value
+  const value = wandHook?.isStreaming ? localContent : baseValue
+
+  // Sync local content with base value when not streaming
+  useEffect(() => {
+    if (!wandHook?.isStreaming) {
+      const baseValueString = baseValue?.toString() ?? ''
+      if (baseValueString !== localContent) {
+        setLocalContent(baseValueString)
+      }
+    }
+  }, [baseValue, wandHook?.isStreaming])
+
+  // Update store value during streaming (but won't persist until streaming ends)
+  useEffect(() => {
+    if (wandHook?.isStreaming && localContent !== '') {
+      if (!isPreview && !disabled) {
+        setStoreValue(localContent)
+      }
+    }
+  }, [localContent, wandHook?.isStreaming, isPreview, disabled, setStoreValue])
 
   // Check if this input is API key related
   const isApiKeyField = useMemo(() => {
@@ -297,91 +343,130 @@ export function ShortInput({
   }
 
   return (
-    <div className='relative w-full'>
-      <Input
-        ref={inputRef}
-        className={cn(
-          'allow-scroll w-full overflow-auto text-transparent caret-foreground placeholder:text-muted-foreground/50',
-          isConnecting &&
-            config?.connectionDroppable !== false &&
-            'ring-2 ring-blue-500 ring-offset-2 focus-visible:ring-blue-500'
-        )}
-        placeholder={placeholder ?? ''}
-        type='text'
-        value={displayValue}
-        onChange={handleChange}
-        onFocus={() => {
-          setIsFocused(true)
+    <>
+      <WandPromptBar
+        isVisible={wandHook?.isPromptVisible || false}
+        isLoading={wandHook?.isLoading || false}
+        isStreaming={wandHook?.isStreaming || false}
+        promptValue={wandHook?.promptInputValue || ''}
+        onSubmit={(prompt: string) => wandHook?.generateStream({ prompt }) || undefined}
+        onCancel={
+          wandHook?.isStreaming
+            ? wandHook?.cancelGeneration
+            : wandHook?.hidePromptInline || (() => {})
+        }
+        onChange={(value: string) => wandHook?.updatePromptValue?.(value)}
+        placeholder={config.wandConfig?.placeholder || 'Describe what you want to generate...'}
+      />
 
-          // If this is an API key field, automatically show env vars dropdown
-          if (isApiKeyField) {
-            setShowEnvVars(true)
-            setSearchTerm('')
+      <div className='group relative w-full'>
+        <Input
+          ref={inputRef}
+          className={cn(
+            'allow-scroll w-full overflow-auto text-transparent caret-foreground placeholder:text-muted-foreground/50',
+            isConnecting &&
+              config?.connectionDroppable !== false &&
+              'ring-2 ring-blue-500 ring-offset-2 focus-visible:ring-blue-500'
+          )}
+          placeholder={placeholder ?? ''}
+          type='text'
+          value={displayValue}
+          onChange={handleChange}
+          onFocus={() => {
+            setIsFocused(true)
 
-            // Set cursor position to the end of the input
-            const inputLength = value?.toString().length ?? 0
-            setCursorPosition(inputLength)
-          } else {
+            // If this is an API key field, automatically show env vars dropdown
+            if (isApiKeyField) {
+              setShowEnvVars(true)
+              setSearchTerm('')
+
+              // Set cursor position to the end of the input
+              const inputLength = value?.toString().length ?? 0
+              setCursorPosition(inputLength)
+            } else {
+              setShowEnvVars(false)
+              setShowTags(false)
+              setSearchTerm('')
+            }
+          }}
+          onBlur={() => {
+            setIsFocused(false)
             setShowEnvVars(false)
-            setShowTags(false)
-            setSearchTerm('')
-          }
-        }}
-        onBlur={() => {
-          setIsFocused(false)
-          setShowEnvVars(false)
-          try {
-            useOperationQueueStore.getState().flushDebouncedForBlock(blockId)
-          } catch {}
-        }}
-        onDrop={handleDrop}
-        onDragOver={handleDragOver}
-        onScroll={handleScroll}
-        onPaste={handlePaste}
-        onWheel={handleWheel}
-        onKeyDown={handleKeyDown}
-        autoComplete='off'
-        style={{ overflowX: 'auto' }}
-        disabled={disabled}
-      />
-      <div
-        ref={overlayRef}
-        className='pointer-events-none absolute inset-0 flex items-center overflow-x-auto bg-transparent px-3 text-sm'
-        style={{ overflowX: 'auto' }}
-      >
+            try {
+              useOperationQueueStore.getState().flushDebouncedForBlock(blockId)
+            } catch {}
+          }}
+          onDrop={handleDrop}
+          onDragOver={handleDragOver}
+          onScroll={handleScroll}
+          onPaste={handlePaste}
+          onWheel={handleWheel}
+          onKeyDown={handleKeyDown}
+          autoComplete='off'
+          style={{ overflowX: 'auto' }}
+          disabled={disabled}
+        />
         <div
-          className='w-full whitespace-pre'
-          style={{ scrollbarWidth: 'none', minWidth: 'fit-content' }}
+          ref={overlayRef}
+          className='pointer-events-none absolute inset-0 flex items-center overflow-x-auto bg-transparent px-3 text-sm'
+          style={{ overflowX: 'auto' }}
         >
-          {password && !isFocused
-            ? '•'.repeat(value?.toString().length ?? 0)
-            : formatDisplayText(value?.toString() ?? '', true)}
+          <div
+            className='w-full whitespace-pre'
+            style={{ scrollbarWidth: 'none', minWidth: 'fit-content' }}
+          >
+            {password && !isFocused
+              ? '•'.repeat(value?.toString().length ?? 0)
+              : formatDisplayText(value?.toString() ?? '', true)}
+          </div>
         </div>
-      </div>
 
-      <EnvVarDropdown
-        visible={showEnvVars}
-        onSelect={handleEnvVarSelect}
-        searchTerm={searchTerm}
-        inputValue={value?.toString() ?? ''}
-        cursorPosition={cursorPosition}
-        onClose={() => {
-          setShowEnvVars(false)
-          setSearchTerm('')
-        }}
-      />
-      <TagDropdown
-        visible={showTags}
-        onSelect={handleEnvVarSelect}
-        blockId={blockId}
-        activeSourceBlockId={activeSourceBlockId}
-        inputValue={value?.toString() ?? ''}
-        cursorPosition={cursorPosition}
-        onClose={() => {
-          setShowTags(false)
-          setActiveSourceBlockId(null)
-        }}
-      />
-    </div>
+        {/* Wand Button */}
+        {wandHook && !isPreview && !wandHook.isStreaming && (
+          <div className='-translate-y-1/2 absolute top-1/2 right-3 z-10 flex items-center gap-1 opacity-0 transition-opacity group-hover:opacity-100'>
+            <Button
+              variant='ghost'
+              size='icon'
+              onClick={
+                wandHook.isPromptVisible ? wandHook.hidePromptInline : wandHook.showPromptInline
+              }
+              disabled={wandHook.isLoading || wandHook.isStreaming || disabled}
+              aria-label='Generate content with AI'
+              className='h-8 w-8 rounded-full border border-transparent bg-muted/80 text-muted-foreground shadow-sm transition-all duration-200 hover:border-primary/20 hover:bg-muted hover:text-primary hover:shadow'
+            >
+              <Wand2 className='h-4 w-4' />
+            </Button>
+          </div>
+        )}
+
+        {!wandHook?.isStreaming && (
+          <>
+            <EnvVarDropdown
+              visible={showEnvVars}
+              onSelect={handleEnvVarSelect}
+              searchTerm={searchTerm}
+              inputValue={value?.toString() ?? ''}
+              cursorPosition={cursorPosition}
+              onClose={() => {
+                setShowEnvVars(false)
+                setSearchTerm('')
+              }}
+            />
+            <TagDropdown
+              visible={showTags}
+              onSelect={handleEnvVarSelect}
+              blockId={blockId}
+              activeSourceBlockId={activeSourceBlockId}
+              inputValue={value?.toString() ?? ''}
+              cursorPosition={cursorPosition}
+              onClose={() => {
+                setShowTags(false)
+                setActiveSourceBlockId(null)
+              }}
+            />
+          </>
+        )}
+      </div>
+    </>
   )
 }

apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/workflow-block/components/sub-block/components/tool-input/tool-input.tsx

@@ -483,7 +483,7 @@ export function ToolInput({
       try {
         return block.tools.config.tool({ operation })
       } catch (error) {
-        console.error('Error selecting tool for operation:', error)
+        logger.error('Error selecting tool for operation:', error)
       }
     }
 

apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/workflow-block/components/sub-block/sub-block.tsx

@@ -486,10 +486,15 @@ export function SubBlock({
               </TooltipContent>
             </Tooltip>
           )}
-          {config.id === 'responseFormat' && !isValidJson && (
+          {config.id === 'responseFormat' && (
             <Tooltip>
               <TooltipTrigger asChild>
-                <AlertTriangle className='h-4 w-4 cursor-pointer text-destructive' />
+                <AlertTriangle
+                  className={cn(
+                    'h-4 w-4 cursor-pointer text-destructive',
+                    !isValidJson ? 'opacity-100' : 'opacity-0'
+                  )}
+                />
               </TooltipTrigger>
               <TooltipContent side='top'>
                 <p>Invalid JSON</p>

apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/workflow-block/workflow-block.tsx

@@ -6,6 +6,7 @@ import { Badge } from '@/components/ui/badge'
 import { Button } from '@/components/ui/button'
 import { Card } from '@/components/ui/card'
 import { Tooltip, TooltipContent, TooltipTrigger } from '@/components/ui/tooltip'
+import { createLogger } from '@/lib/logs/console/logger'
 import { parseCronToHumanReadable } from '@/lib/schedules/utils'
 import { cn, validateName } from '@/lib/utils'
 import { type DiffStatus, hasDiffStatus } from '@/lib/workflows/diff/types'
@@ -23,6 +24,8 @@ import { ActionBar } from './components/action-bar/action-bar'
 import { ConnectionBlocks } from './components/connection-blocks/connection-blocks'
 import { SubBlock } from './components/sub-block/sub-block'
 
+const logger = createLogger('WorkflowBlock')
+
 interface WorkflowBlockProps {
   type: string
   config: BlockConfig
@@ -232,10 +235,10 @@ export function WorkflowBlock({ id, data }: NodeProps<WorkflowBlockProps>) {
           fetchScheduleInfo(currentWorkflowId)
         }
       } else {
-        console.error('Failed to reactivate schedule')
+        logger.error('Failed to reactivate schedule')
       }
     } catch (error) {
-      console.error('Error reactivating schedule:', error)
+      logger.error('Error reactivating schedule:', error)
     }
   }
 
@@ -255,10 +258,10 @@ export function WorkflowBlock({ id, data }: NodeProps<WorkflowBlockProps>) {
           fetchScheduleInfo(currentWorkflowId)
         }
       } else {
-        console.error('Failed to disable schedule')
+        logger.error('Failed to disable schedule')
       }
     } catch (error) {
-      console.error('Error disabling schedule:', error)
+      logger.error('Error disabling schedule:', error)
     }
   }
 
@@ -328,12 +331,12 @@ export function WorkflowBlock({ id, data }: NodeProps<WorkflowBlockProps>) {
           return
         }
       } catch (err) {
-        console.error('Error fetching schedule status:', err)
+        logger.error('Error fetching schedule status:', err)
       }
 
       setScheduleInfo(baseInfo)
     } catch (error) {
-      console.error('Error fetching schedule info:', error)
+      logger.error('Error fetching schedule info:', error)
       setScheduleInfo(null)
     } finally {
       setIsLoadingScheduleInfo(false)

apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/knowledge-base-tags/knowledge-base-tags.tsx

@@ -26,7 +26,7 @@ import {
   AlertDialogTitle,
 } from '@/components/ui/alert-dialog'
 import { ScrollArea } from '@/components/ui/scroll-area'
-import { MAX_TAG_SLOTS } from '@/lib/constants/knowledge'
+import { MAX_TAG_SLOTS } from '@/lib/knowledge/consts'
 import { createLogger } from '@/lib/logs/console/logger'
 import { getDocumentIcon } from '@/app/workspace/[workspaceId]/knowledge/components/icons/document-icons'
 import { useUserPermissionsContext } from '@/app/workspace/[workspaceId]/providers/workspace-permissions-provider'

apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/knowledge-tags/knowledge-tags.tsx

@@ -17,7 +17,7 @@ import {
   SelectValue,
 } from '@/components/ui'
 import { ScrollArea } from '@/components/ui/scroll-area'
-import { MAX_TAG_SLOTS, TAG_SLOTS, type TagSlot } from '@/lib/constants/knowledge'
+import { MAX_TAG_SLOTS, TAG_SLOTS, type TagSlot } from '@/lib/knowledge/consts'
 import { createLogger } from '@/lib/logs/console/logger'
 import type { DocumentTag } from '@/app/workspace/[workspaceId]/knowledge/components/document-tag-entry/document-tag-entry'
 import { useUserPermissionsContext } from '@/app/workspace/[workspaceId]/providers/workspace-permissions-provider'

apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/settings-modal/components/environment/environment.tsx

@@ -15,9 +15,12 @@ import {
 import { Button } from '@/components/ui/button'
 import { Input } from '@/components/ui/input'
 import { Skeleton } from '@/components/ui/skeleton'
+import { createLogger } from '@/lib/logs/console/logger'
 import { useEnvironmentStore } from '@/stores/settings/environment/store'
 import type { EnvironmentVariable as StoreEnvironmentVariable } from '@/stores/settings/environment/types'
 
+const logger = createLogger('EnvironmentVariables')
+
 // Constants
 const GRID_COLS = 'grid grid-cols-[minmax(0,1fr),minmax(0,1fr),40px] gap-4'
 const INITIAL_ENV_VAR: UIEnvironmentVariable = { key: '', value: '' }
@@ -263,7 +266,7 @@ export function EnvironmentVariables({
       // Single store update that triggers sync
       useEnvironmentStore.getState().setVariables(validVariables)
     } catch (error) {
-      console.error('Failed to save environment variables:', error)
+      logger.error('Failed to save environment variables:', error)
     }
   }
 

apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/settings-modal/components/subscription/subscription.tsx

@@ -197,10 +197,10 @@ export function Subscription({ onOpenChange }: SubscriptionProps) {
   const activeOrgId = activeOrganization?.id
 
   useEffect(() => {
-    if (subscription.isTeam && activeOrgId) {
+    if ((subscription.isTeam || subscription.isEnterprise) && activeOrgId) {
       loadOrganizationBillingData(activeOrgId)
     }
-  }, [activeOrgId, subscription.isTeam, loadOrganizationBillingData])
+  }, [activeOrgId, subscription.isTeam, subscription.isEnterprise, loadOrganizationBillingData])
 
   // Auto-clear upgrade error
   useEffect(() => {
@@ -349,22 +349,39 @@ export function Subscription({ onOpenChange }: SubscriptionProps) {
             badgeText={badgeText}
             onBadgeClick={handleBadgeClick}
             seatsText={
-              permissions.canManageTeam
+              permissions.canManageTeam || subscription.isEnterprise
                 ? `${organizationBillingData?.totalSeats || subscription.seats || 1} seats`
                 : undefined
             }
-            current={usage.current}
+            current={
+              subscription.isEnterprise || subscription.isTeam
+                ? organizationBillingData?.totalCurrentUsage || 0
+                : usage.current
+            }
             limit={
-              !subscription.isFree &&
-              (permissions.canEditUsageLimit ||
-                permissions.showTeamMemberView ||
-                subscription.isEnterprise)
-                ? usage.current // placeholder; rightContent will render UsageLimit
-                : usage.limit
+              subscription.isEnterprise || subscription.isTeam
+                ? organizationBillingData?.totalUsageLimit ||
+                  organizationBillingData?.minimumBillingAmount ||
+                  0
+                : !subscription.isFree &&
+                    (permissions.canEditUsageLimit || permissions.showTeamMemberView)
+                  ? usage.current // placeholder; rightContent will render UsageLimit
+                  : usage.limit
             }
             isBlocked={Boolean(subscriptionData?.billingBlocked)}
             status={billingStatus === 'unknown' ? 'ok' : billingStatus}
-            percentUsed={Math.round(usage.percentUsed)}
+            percentUsed={
+              subscription.isEnterprise || subscription.isTeam
+                ? organizationBillingData?.totalUsageLimit &&
+                  organizationBillingData.totalUsageLimit > 0
+                  ? Math.round(
+                      (organizationBillingData.totalCurrentUsage /
+                        organizationBillingData.totalUsageLimit) *
+                        100
+                    )
+                  : 0
+                : Math.round(usage.percentUsed)
+            }
             onResolvePayment={async () => {
               try {
                 const res = await fetch('/api/billing/portal', {
@@ -387,9 +404,7 @@ export function Subscription({ onOpenChange }: SubscriptionProps) {
             }}
             rightContent={
               !subscription.isFree &&
-              (permissions.canEditUsageLimit ||
-                permissions.showTeamMemberView ||
-                subscription.isEnterprise) ? (
+              (permissions.canEditUsageLimit || permissions.showTeamMemberView) ? (
                 <UsageLimit
                   ref={usageLimitRef}
                   currentLimit={
@@ -398,7 +413,7 @@ export function Subscription({ onOpenChange }: SubscriptionProps) {
                       : usageLimitData?.currentLimit || usage.limit
                   }
                   currentUsage={usage.current}
-                  canEdit={permissions.canEditUsageLimit && !subscription.isEnterprise}
+                  canEdit={permissions.canEditUsageLimit}
                   minimumLimit={
                     subscription.isTeam && isTeamAdmin
                       ? organizationBillingData?.minimumBillingAmount ||

apps/sim/app/workspace/[workspaceId]/w/components/sidebar/sidebar.tsx

@@ -1039,6 +1039,7 @@ export function Sidebar() {
       <HelpModal open={showHelp} onOpenChange={setShowHelp} />
       <InviteModal open={showInviteMembers} onOpenChange={setShowInviteMembers} />
       <SubscriptionModal open={showSubscriptionModal} onOpenChange={setShowSubscriptionModal} />
+
       <SearchModal
         open={showSearchModal}
         onOpenChange={setShowSearchModal}

apps/sim/background/knowledge-processing.ts

@@ -1,4 +1,5 @@
 import { task } from '@trigger.dev/sdk'
+import { env } from '@/lib/env'
 import { processDocumentAsync } from '@/lib/knowledge/documents/service'
 import { createLogger } from '@/lib/logs/console/logger'
 
@@ -25,15 +26,15 @@ export type DocumentProcessingPayload = {
 
 export const processDocument = task({
   id: 'knowledge-process-document',
-  maxDuration: 300,
+  maxDuration: env.KB_CONFIG_MAX_DURATION || 300,
   retry: {
-    maxAttempts: 3,
-    factor: 2,
-    minTimeoutInMs: 1000,
-    maxTimeoutInMs: 10000,
+    maxAttempts: env.KB_CONFIG_MAX_ATTEMPTS || 3,
+    factor: env.KB_CONFIG_RETRY_FACTOR || 2,
+    minTimeoutInMs: env.KB_CONFIG_MIN_TIMEOUT || 1000,
+    maxTimeoutInMs: env.KB_CONFIG_MAX_TIMEOUT || 10000,
   },
   queue: {
-    concurrencyLimit: 20,
+    concurrencyLimit: env.KB_CONFIG_CONCURRENCY_LIMIT || 20,
     name: 'document-processing-queue',
   },
   run: async (payload: DocumentProcessingPayload) => {

apps/sim/blocks/blocks/mysql.ts

@@ -0,0 +1,387 @@
+import { MySQLIcon } from '@/components/icons'
+import type { BlockConfig } from '@/blocks/types'
+import type { MySQLResponse } from '@/tools/mysql/types'
+
+export const MySQLBlock: BlockConfig<MySQLResponse> = {
+  type: 'mysql',
+  name: 'MySQL',
+  description: 'Connect to MySQL database',
+  longDescription:
+    'Connect to any MySQL database to execute queries, manage data, and perform database operations. Supports SELECT, INSERT, UPDATE, DELETE operations with secure connection handling.',
+  docsLink: 'https://docs.sim.ai/tools/mysql',
+  category: 'tools',
+  bgColor: '#E0E0E0',
+  icon: MySQLIcon,
+  subBlocks: [
+    {
+      id: 'operation',
+      title: 'Operation',
+      type: 'dropdown',
+      layout: 'full',
+      options: [
+        { label: 'Query (SELECT)', id: 'query' },
+        { label: 'Insert Data', id: 'insert' },
+        { label: 'Update Data', id: 'update' },
+        { label: 'Delete Data', id: 'delete' },
+        { label: 'Execute Raw SQL', id: 'execute' },
+      ],
+      value: () => 'query',
+    },
+    {
+      id: 'host',
+      title: 'Host',
+      type: 'short-input',
+      layout: 'full',
+      placeholder: 'localhost or your.database.host',
+      required: true,
+    },
+    {
+      id: 'port',
+      title: 'Port',
+      type: 'short-input',
+      layout: 'full',
+      placeholder: '3306',
+      value: () => '3306',
+      required: true,
+    },
+    {
+      id: 'database',
+      title: 'Database Name',
+      type: 'short-input',
+      layout: 'full',
+      placeholder: 'your_database',
+      required: true,
+    },
+    {
+      id: 'username',
+      title: 'Username',
+      type: 'short-input',
+      layout: 'full',
+      placeholder: 'root',
+      required: true,
+    },
+    {
+      id: 'password',
+      title: 'Password',
+      type: 'short-input',
+      layout: 'full',
+      password: true,
+      placeholder: 'Your database password',
+      required: true,
+    },
+    {
+      id: 'ssl',
+      title: 'SSL Mode',
+      type: 'dropdown',
+      layout: 'full',
+      options: [
+        { label: 'Disabled', id: 'disabled' },
+        { label: 'Required', id: 'required' },
+        { label: 'Preferred', id: 'preferred' },
+      ],
+      value: () => 'preferred',
+    },
+    // Table field for insert/update/delete operations
+    {
+      id: 'table',
+      title: 'Table Name',
+      type: 'short-input',
+      layout: 'full',
+      placeholder: 'users',
+      condition: { field: 'operation', value: 'insert' },
+      required: true,
+    },
+    {
+      id: 'table',
+      title: 'Table Name',
+      type: 'short-input',
+      layout: 'full',
+      placeholder: 'users',
+      condition: { field: 'operation', value: 'update' },
+      required: true,
+    },
+    {
+      id: 'table',
+      title: 'Table Name',
+      type: 'short-input',
+      layout: 'full',
+      placeholder: 'users',
+      condition: { field: 'operation', value: 'delete' },
+      required: true,
+    },
+    // SQL Query field
+    {
+      id: 'query',
+      title: 'SQL Query',
+      type: 'code',
+      layout: 'full',
+      placeholder: 'SELECT * FROM users WHERE active = true',
+      condition: { field: 'operation', value: 'query' },
+      required: true,
+      wandConfig: {
+        enabled: true,
+        maintainHistory: true,
+        prompt: `You are an expert MySQL database developer. Write MySQL SQL queries based on the user's request.
+
+### CONTEXT
+{context}
+
+### CRITICAL INSTRUCTION
+Return ONLY the SQL query. Do not include any explanations, markdown formatting, comments, or additional text. Just the raw SQL query.
+
+### QUERY GUIDELINES
+1. **Syntax**: Use MySQL-specific syntax and functions
+2. **Performance**: Write efficient queries with proper indexing considerations
+3. **Security**: Use parameterized queries when applicable
+4. **Readability**: Format queries with proper indentation and spacing
+5. **Best Practices**: Follow MySQL naming conventions
+
+### MYSQL FEATURES
+- Use MySQL-specific functions (IFNULL, DATE_FORMAT, CONCAT, etc.)
+- Leverage MySQL features like GROUP_CONCAT, AUTO_INCREMENT
+- Use proper MySQL data types (VARCHAR, DATETIME, DECIMAL, JSON, etc.)
+- Include appropriate LIMIT clauses for large result sets
+
+### EXAMPLES
+
+**Simple Select**: "Get all active users"
+→ SELECT id, name, email, created_at 
+  FROM users 
+  WHERE active = 1 
+  ORDER BY created_at DESC;
+
+**Complex Join**: "Get users with their order counts and total spent"
+→ SELECT 
+      u.id,
+      u.name,
+      u.email,
+      COUNT(o.id) as order_count,
+      IFNULL(SUM(o.total), 0) as total_spent
+  FROM users u
+  LEFT JOIN orders o ON u.id = o.user_id
+  WHERE u.active = 1
+  GROUP BY u.id, u.name, u.email
+  HAVING COUNT(o.id) > 0
+  ORDER BY total_spent DESC;
+
+**With Subquery**: "Get top 10 products by sales"
+→ SELECT 
+      p.id,
+      p.name,
+      (SELECT SUM(oi.quantity * oi.price)
+       FROM order_items oi 
+       JOIN orders o ON oi.order_id = o.id
+       WHERE oi.product_id = p.id 
+       AND o.created_at >= DATE_SUB(NOW(), INTERVAL 30 DAY)
+      ) as total_sales
+  FROM products p
+  WHERE p.active = 1
+  ORDER BY total_sales DESC
+  LIMIT 10;
+
+### REMEMBER
+Return ONLY the SQL query - no explanations, no markdown, no extra text.`,
+        placeholder: 'Describe the SQL query you need...',
+        generationType: 'sql-query',
+      },
+    },
+    {
+      id: 'query',
+      title: 'SQL Query',
+      type: 'code',
+      layout: 'full',
+      placeholder: 'SELECT * FROM table_name',
+      condition: { field: 'operation', value: 'execute' },
+      required: true,
+      wandConfig: {
+        enabled: true,
+        maintainHistory: true,
+        prompt: `You are an expert MySQL database developer. Write MySQL SQL queries based on the user's request.
+
+### CONTEXT
+{context}
+
+### CRITICAL INSTRUCTION
+Return ONLY the SQL query. Do not include any explanations, markdown formatting, comments, or additional text. Just the raw SQL query.
+
+### QUERY GUIDELINES
+1. **Syntax**: Use MySQL-specific syntax and functions
+2. **Performance**: Write efficient queries with proper indexing considerations
+3. **Security**: Use parameterized queries when applicable
+4. **Readability**: Format queries with proper indentation and spacing
+5. **Best Practices**: Follow MySQL naming conventions
+
+### MYSQL FEATURES
+- Use MySQL-specific functions (IFNULL, DATE_FORMAT, CONCAT, etc.)
+- Leverage MySQL features like GROUP_CONCAT, AUTO_INCREMENT
+- Use proper MySQL data types (VARCHAR, DATETIME, DECIMAL, JSON, etc.)
+- Include appropriate LIMIT clauses for large result sets
+
+### EXAMPLES
+
+**Simple Select**: "Get all active users"
+→ SELECT id, name, email, created_at 
+  FROM users 
+  WHERE active = 1 
+  ORDER BY created_at DESC;
+
+**Complex Join**: "Get users with their order counts and total spent"
+→ SELECT 
+      u.id,
+      u.name,
+      u.email,
+      COUNT(o.id) as order_count,
+      IFNULL(SUM(o.total), 0) as total_spent
+  FROM users u
+  LEFT JOIN orders o ON u.id = o.user_id
+  WHERE u.active = 1
+  GROUP BY u.id, u.name, u.email
+  HAVING COUNT(o.id) > 0
+  ORDER BY total_spent DESC;
+
+**With Subquery**: "Get top 10 products by sales"
+→ SELECT 
+      p.id,
+      p.name,
+      (SELECT SUM(oi.quantity * oi.price)
+       FROM order_items oi 
+       JOIN orders o ON oi.order_id = o.id
+       WHERE oi.product_id = p.id 
+       AND o.created_at >= DATE_SUB(NOW(), INTERVAL 30 DAY)
+      ) as total_sales
+  FROM products p
+  WHERE p.active = 1
+  ORDER BY total_sales DESC
+  LIMIT 10;
+
+### REMEMBER
+Return ONLY the SQL query - no explanations, no markdown, no extra text.`,
+        placeholder: 'Describe the SQL query you need...',
+        generationType: 'sql-query',
+      },
+    },
+    // Data for insert operations
+    {
+      id: 'data',
+      title: 'Data (JSON)',
+      type: 'code',
+      layout: 'full',
+      placeholder: '{\n  "name": "John Doe",\n  "email": "john@example.com",\n  "active": true\n}',
+      condition: { field: 'operation', value: 'insert' },
+      required: true,
+    },
+    // Set clause for updates
+    {
+      id: 'data',
+      title: 'Update Data (JSON)',
+      type: 'code',
+      layout: 'full',
+      placeholder: '{\n  "name": "Jane Doe",\n  "email": "jane@example.com"\n}',
+      condition: { field: 'operation', value: 'update' },
+      required: true,
+    },
+    // Where clause for update/delete
+    {
+      id: 'where',
+      title: 'WHERE Condition',
+      type: 'short-input',
+      layout: 'full',
+      placeholder: 'id = 1',
+      condition: { field: 'operation', value: 'update' },
+      required: true,
+    },
+    {
+      id: 'where',
+      title: 'WHERE Condition',
+      type: 'short-input',
+      layout: 'full',
+      placeholder: 'id = 1',
+      condition: { field: 'operation', value: 'delete' },
+      required: true,
+    },
+  ],
+  tools: {
+    access: ['mysql_query', 'mysql_insert', 'mysql_update', 'mysql_delete', 'mysql_execute'],
+    config: {
+      tool: (params) => {
+        switch (params.operation) {
+          case 'query':
+            return 'mysql_query'
+          case 'insert':
+            return 'mysql_insert'
+          case 'update':
+            return 'mysql_update'
+          case 'delete':
+            return 'mysql_delete'
+          case 'execute':
+            return 'mysql_execute'
+          default:
+            throw new Error(`Invalid MySQL operation: ${params.operation}`)
+        }
+      },
+      params: (params) => {
+        const { operation, data, ...rest } = params
+
+        // Parse JSON data if it's a string
+        let parsedData
+        if (data && typeof data === 'string' && data.trim()) {
+          try {
+            parsedData = JSON.parse(data)
+          } catch (parseError) {
+            const errorMsg = parseError instanceof Error ? parseError.message : 'Unknown JSON error'
+            throw new Error(`Invalid JSON data format: ${errorMsg}. Please check your JSON syntax.`)
+          }
+        } else if (data && typeof data === 'object') {
+          parsedData = data
+        }
+
+        // Build connection config
+        const connectionConfig = {
+          host: rest.host,
+          port: typeof rest.port === 'string' ? Number.parseInt(rest.port, 10) : rest.port || 3306,
+          database: rest.database,
+          username: rest.username,
+          password: rest.password,
+          ssl: rest.ssl || 'preferred',
+        }
+
+        // Build params object
+        const result: any = { ...connectionConfig }
+
+        if (rest.table) result.table = rest.table
+        if (rest.query) result.query = rest.query
+        if (rest.where) result.where = rest.where
+        if (parsedData !== undefined) result.data = parsedData
+
+        return result
+      },
+    },
+  },
+  inputs: {
+    operation: { type: 'string', description: 'Database operation to perform' },
+    host: { type: 'string', description: 'Database host' },
+    port: { type: 'string', description: 'Database port' },
+    database: { type: 'string', description: 'Database name' },
+    username: { type: 'string', description: 'Database username' },
+    password: { type: 'string', description: 'Database password' },
+    ssl: { type: 'string', description: 'SSL mode' },
+    table: { type: 'string', description: 'Table name' },
+    query: { type: 'string', description: 'SQL query to execute' },
+    data: { type: 'json', description: 'Data for insert/update operations' },
+    where: { type: 'string', description: 'WHERE clause for update/delete' },
+  },
+  outputs: {
+    message: {
+      type: 'string',
+      description: 'Success or error message describing the operation outcome',
+    },
+    rows: {
+      type: 'array',
+      description: 'Array of rows returned from the query',
+    },
+    rowCount: {
+      type: 'number',
+      description: 'Number of rows affected by the operation',
+    },
+  },
+}

apps/sim/blocks/blocks/parallel.ts

@@ -0,0 +1,109 @@
+import { ParallelIcon } from '@/components/icons'
+import type { BlockConfig } from '@/blocks/types'
+import type { ToolResponse } from '@/tools/types'
+
+export const ParallelBlock: BlockConfig<ToolResponse> = {
+  type: 'parallel_ai',
+  name: 'Parallel AI',
+  description: 'Search with Parallel AI',
+  longDescription:
+    "Search the web using Parallel AI's advanced search capabilities. Get comprehensive results with intelligent processing and content extraction.",
+  docsLink: 'https://docs.parallel.ai/search-api/search-quickstart',
+  category: 'tools',
+  bgColor: '#E0E0E0',
+  icon: ParallelIcon,
+  subBlocks: [
+    {
+      id: 'objective',
+      title: 'Search Objective',
+      type: 'long-input',
+      layout: 'full',
+      placeholder: "When was the United Nations established? Prefer UN's websites.",
+      required: true,
+    },
+    {
+      id: 'search_queries',
+      title: 'Search Queries',
+      type: 'long-input',
+      layout: 'full',
+      placeholder:
+        'Enter search queries separated by commas (e.g., "Founding year UN", "Year of founding United Nations")',
+      required: false,
+    },
+    {
+      id: 'processor',
+      title: 'Processor',
+      type: 'dropdown',
+      layout: 'full',
+      options: [
+        { label: 'Base', id: 'base' },
+        { label: 'Pro', id: 'pro' },
+      ],
+      value: () => 'base',
+    },
+    {
+      id: 'max_results',
+      title: 'Max Results',
+      type: 'short-input',
+      layout: 'half',
+      placeholder: '5',
+    },
+    {
+      id: 'max_chars_per_result',
+      title: 'Max Chars',
+      type: 'short-input',
+      layout: 'half',
+      placeholder: '1500',
+    },
+    {
+      id: 'apiKey',
+      title: 'API Key',
+      type: 'short-input',
+      layout: 'full',
+      placeholder: 'Enter your Parallel AI API key',
+      password: true,
+      required: true,
+    },
+  ],
+  tools: {
+    access: ['parallel_search'],
+    config: {
+      tool: (params) => {
+        // Convert search_queries from comma-separated string to array (if provided)
+        if (params.search_queries && typeof params.search_queries === 'string') {
+          const queries = params.search_queries
+            .split(',')
+            .map((query: string) => query.trim())
+            .filter((query: string) => query.length > 0)
+          // Only set if we have actual queries
+          if (queries.length > 0) {
+            params.search_queries = queries
+          } else {
+            params.search_queries = undefined
+          }
+        }
+
+        // Convert numeric parameters
+        if (params.max_results) {
+          params.max_results = Number(params.max_results)
+        }
+        if (params.max_chars_per_result) {
+          params.max_chars_per_result = Number(params.max_chars_per_result)
+        }
+
+        return 'parallel_search'
+      },
+    },
+  },
+  inputs: {
+    objective: { type: 'string', description: 'Search objective or question' },
+    search_queries: { type: 'string', description: 'Comma-separated search queries' },
+    processor: { type: 'string', description: 'Processing method' },
+    max_results: { type: 'number', description: 'Maximum number of results' },
+    max_chars_per_result: { type: 'number', description: 'Maximum characters per result' },
+    apiKey: { type: 'string', description: 'Parallel AI API key' },
+  },
+  outputs: {
+    results: { type: 'array', description: 'Search results with excerpts from relevant pages' },
+  },
+}

apps/sim/blocks/blocks/postgresql.ts

@@ -0,0 +1,395 @@
+import { PostgresIcon } from '@/components/icons'
+import type { BlockConfig } from '@/blocks/types'
+import type { PostgresResponse } from '@/tools/postgresql/types'
+
+export const PostgreSQLBlock: BlockConfig<PostgresResponse> = {
+  type: 'postgresql',
+  name: 'PostgreSQL',
+  description: 'Connect to PostgreSQL database',
+  longDescription:
+    'Connect to any PostgreSQL database to execute queries, manage data, and perform database operations. Supports SELECT, INSERT, UPDATE, DELETE operations with secure connection handling.',
+  docsLink: 'https://docs.sim.ai/tools/postgresql',
+  category: 'tools',
+  bgColor: '#336791',
+  icon: PostgresIcon,
+  subBlocks: [
+    {
+      id: 'operation',
+      title: 'Operation',
+      type: 'dropdown',
+      layout: 'full',
+      options: [
+        { label: 'Query (SELECT)', id: 'query' },
+        { label: 'Insert Data', id: 'insert' },
+        { label: 'Update Data', id: 'update' },
+        { label: 'Delete Data', id: 'delete' },
+        { label: 'Execute Raw SQL', id: 'execute' },
+      ],
+      value: () => 'query',
+    },
+    {
+      id: 'host',
+      title: 'Host',
+      type: 'short-input',
+      layout: 'full',
+      placeholder: 'localhost or your.database.host',
+      required: true,
+    },
+    {
+      id: 'port',
+      title: 'Port',
+      type: 'short-input',
+      layout: 'full',
+      placeholder: '5432',
+      value: () => '5432',
+      required: true,
+    },
+    {
+      id: 'database',
+      title: 'Database Name',
+      type: 'short-input',
+      layout: 'full',
+      placeholder: 'your_database',
+      required: true,
+    },
+    {
+      id: 'username',
+      title: 'Username',
+      type: 'short-input',
+      layout: 'full',
+      placeholder: 'postgres',
+      required: true,
+    },
+    {
+      id: 'password',
+      title: 'Password',
+      type: 'short-input',
+      layout: 'full',
+      password: true,
+      placeholder: 'Your database password',
+      required: true,
+    },
+    {
+      id: 'ssl',
+      title: 'SSL Mode',
+      type: 'dropdown',
+      layout: 'full',
+      options: [
+        { label: 'Disabled', id: 'disabled' },
+        { label: 'Required', id: 'required' },
+        { label: 'Preferred', id: 'preferred' },
+      ],
+      value: () => 'preferred',
+    },
+    // Table field for insert/update/delete operations
+    {
+      id: 'table',
+      title: 'Table Name',
+      type: 'short-input',
+      layout: 'full',
+      placeholder: 'users',
+      condition: { field: 'operation', value: 'insert' },
+      required: true,
+    },
+    {
+      id: 'table',
+      title: 'Table Name',
+      type: 'short-input',
+      layout: 'full',
+      placeholder: 'users',
+      condition: { field: 'operation', value: 'update' },
+      required: true,
+    },
+    {
+      id: 'table',
+      title: 'Table Name',
+      type: 'short-input',
+      layout: 'full',
+      placeholder: 'users',
+      condition: { field: 'operation', value: 'delete' },
+      required: true,
+    },
+    // SQL Query field
+    {
+      id: 'query',
+      title: 'SQL Query',
+      type: 'code',
+      layout: 'full',
+      placeholder: 'SELECT * FROM users WHERE active = true',
+      condition: { field: 'operation', value: 'query' },
+      required: true,
+      wandConfig: {
+        enabled: true,
+        maintainHistory: true,
+        prompt: `You are an expert PostgreSQL database developer. Write PostgreSQL SQL queries based on the user's request.
+
+### CONTEXT
+{context}
+
+### CRITICAL INSTRUCTION
+Return ONLY the SQL query. Do not include any explanations, markdown formatting, comments, or additional text. Just the raw SQL query.
+
+### QUERY GUIDELINES
+1. **Syntax**: Use PostgreSQL-specific syntax and functions
+2. **Performance**: Write efficient queries with proper indexing considerations
+3. **Security**: Use parameterized queries when applicable
+4. **Readability**: Format queries with proper indentation and spacing
+5. **Best Practices**: Follow PostgreSQL naming conventions
+
+### POSTGRESQL FEATURES
+- Use PostgreSQL-specific functions (COALESCE, EXTRACT, etc.)
+- Leverage advanced features like CTEs, window functions, arrays
+- Use proper PostgreSQL data types (TEXT, TIMESTAMPTZ, JSONB, etc.)
+- Include appropriate LIMIT clauses for large result sets
+
+### EXAMPLES
+
+**Simple Select**: "Get all active users"
+→ SELECT id, name, email, created_at 
+  FROM users 
+  WHERE active = true 
+  ORDER BY created_at DESC;
+
+**Complex Join**: "Get users with their order counts and total spent"
+→ SELECT 
+      u.id,
+      u.name,
+      u.email,
+      COUNT(o.id) as order_count,
+      COALESCE(SUM(o.total), 0) as total_spent
+  FROM users u
+  LEFT JOIN orders o ON u.id = o.user_id
+  WHERE u.active = true
+  GROUP BY u.id, u.name, u.email
+  HAVING COUNT(o.id) > 0
+  ORDER BY total_spent DESC;
+
+**With CTE**: "Get top 10 products by sales"
+→ WITH product_sales AS (
+      SELECT 
+          p.id,
+          p.name,
+          SUM(oi.quantity * oi.price) as total_sales
+      FROM products p
+      JOIN order_items oi ON p.id = oi.product_id
+      JOIN orders o ON oi.order_id = o.id
+      WHERE o.created_at >= CURRENT_DATE - INTERVAL '30 days'
+      GROUP BY p.id, p.name
+  )
+  SELECT * FROM product_sales
+  ORDER BY total_sales DESC
+  LIMIT 10;
+
+### REMEMBER
+Return ONLY the SQL query - no explanations, no markdown, no extra text.`,
+        placeholder: 'Describe the SQL query you need...',
+        generationType: 'sql-query',
+      },
+    },
+    {
+      id: 'query',
+      title: 'SQL Query',
+      type: 'code',
+      layout: 'full',
+      placeholder: 'SELECT * FROM table_name',
+      condition: { field: 'operation', value: 'execute' },
+      required: true,
+      wandConfig: {
+        enabled: true,
+        maintainHistory: true,
+        prompt: `You are an expert PostgreSQL database developer. Write PostgreSQL SQL queries based on the user's request.
+
+### CONTEXT
+{context}
+
+### CRITICAL INSTRUCTION
+Return ONLY the SQL query. Do not include any explanations, markdown formatting, comments, or additional text. Just the raw SQL query.
+
+### QUERY GUIDELINES
+1. **Syntax**: Use PostgreSQL-specific syntax and functions
+2. **Performance**: Write efficient queries with proper indexing considerations
+3. **Security**: Use parameterized queries when applicable
+4. **Readability**: Format queries with proper indentation and spacing
+5. **Best Practices**: Follow PostgreSQL naming conventions
+
+### POSTGRESQL FEATURES
+- Use PostgreSQL-specific functions (COALESCE, EXTRACT, etc.)
+- Leverage advanced features like CTEs, window functions, arrays
+- Use proper PostgreSQL data types (TEXT, TIMESTAMPTZ, JSONB, etc.)
+- Include appropriate LIMIT clauses for large result sets
+
+### EXAMPLES
+
+**Simple Select**: "Get all active users"
+→ SELECT id, name, email, created_at 
+  FROM users 
+  WHERE active = true 
+  ORDER BY created_at DESC;
+
+**Complex Join**: "Get users with their order counts and total spent"
+→ SELECT 
+      u.id,
+      u.name,
+      u.email,
+      COUNT(o.id) as order_count,
+      COALESCE(SUM(o.total), 0) as total_spent
+  FROM users u
+  LEFT JOIN orders o ON u.id = o.user_id
+  WHERE u.active = true
+  GROUP BY u.id, u.name, u.email
+  HAVING COUNT(o.id) > 0
+  ORDER BY total_spent DESC;
+
+**With CTE**: "Get top 10 products by sales"
+→ WITH product_sales AS (
+      SELECT 
+          p.id,
+          p.name,
+          SUM(oi.quantity * oi.price) as total_sales
+      FROM products p
+      JOIN order_items oi ON p.id = oi.product_id
+      JOIN orders o ON oi.order_id = o.id
+      WHERE o.created_at >= CURRENT_DATE - INTERVAL '30 days'
+      GROUP BY p.id, p.name
+  )
+  SELECT * FROM product_sales
+  ORDER BY total_sales DESC
+  LIMIT 10;
+
+### REMEMBER
+Return ONLY the SQL query - no explanations, no markdown, no extra text.`,
+        placeholder: 'Describe the SQL query you need...',
+        generationType: 'sql-query',
+      },
+    },
+    // Data for insert operations
+    {
+      id: 'data',
+      title: 'Data (JSON)',
+      type: 'code',
+      layout: 'full',
+      placeholder: '{\n  "name": "John Doe",\n  "email": "john@example.com",\n  "active": true\n}',
+      condition: { field: 'operation', value: 'insert' },
+      required: true,
+    },
+    // Set clause for updates
+    {
+      id: 'data',
+      title: 'Update Data (JSON)',
+      type: 'code',
+      layout: 'full',
+      placeholder: '{\n  "name": "Jane Doe",\n  "email": "jane@example.com"\n}',
+      condition: { field: 'operation', value: 'update' },
+      required: true,
+    },
+    // Where clause for update/delete
+    {
+      id: 'where',
+      title: 'WHERE Condition',
+      type: 'short-input',
+      layout: 'full',
+      placeholder: 'id = 1',
+      condition: { field: 'operation', value: 'update' },
+      required: true,
+    },
+    {
+      id: 'where',
+      title: 'WHERE Condition',
+      type: 'short-input',
+      layout: 'full',
+      placeholder: 'id = 1',
+      condition: { field: 'operation', value: 'delete' },
+      required: true,
+    },
+  ],
+  tools: {
+    access: [
+      'postgresql_query',
+      'postgresql_insert',
+      'postgresql_update',
+      'postgresql_delete',
+      'postgresql_execute',
+    ],
+    config: {
+      tool: (params) => {
+        switch (params.operation) {
+          case 'query':
+            return 'postgresql_query'
+          case 'insert':
+            return 'postgresql_insert'
+          case 'update':
+            return 'postgresql_update'
+          case 'delete':
+            return 'postgresql_delete'
+          case 'execute':
+            return 'postgresql_execute'
+          default:
+            throw new Error(`Invalid PostgreSQL operation: ${params.operation}`)
+        }
+      },
+      params: (params) => {
+        const { operation, data, ...rest } = params
+
+        // Parse JSON data if it's a string
+        let parsedData
+        if (data && typeof data === 'string' && data.trim()) {
+          try {
+            parsedData = JSON.parse(data)
+          } catch (parseError) {
+            const errorMsg = parseError instanceof Error ? parseError.message : 'Unknown JSON error'
+            throw new Error(`Invalid JSON data format: ${errorMsg}. Please check your JSON syntax.`)
+          }
+        } else if (data && typeof data === 'object') {
+          parsedData = data
+        }
+
+        // Build connection config
+        const connectionConfig = {
+          host: rest.host,
+          port: typeof rest.port === 'string' ? Number.parseInt(rest.port, 10) : rest.port || 5432,
+          database: rest.database,
+          username: rest.username,
+          password: rest.password,
+          ssl: rest.ssl || 'preferred',
+        }
+
+        // Build params object
+        const result: any = { ...connectionConfig }
+
+        if (rest.table) result.table = rest.table
+        if (rest.query) result.query = rest.query
+        if (rest.where) result.where = rest.where
+        if (parsedData !== undefined) result.data = parsedData
+
+        return result
+      },
+    },
+  },
+  inputs: {
+    operation: { type: 'string', description: 'Database operation to perform' },
+    host: { type: 'string', description: 'Database host' },
+    port: { type: 'string', description: 'Database port' },
+    database: { type: 'string', description: 'Database name' },
+    username: { type: 'string', description: 'Database username' },
+    password: { type: 'string', description: 'Database password' },
+    ssl: { type: 'string', description: 'SSL mode' },
+    table: { type: 'string', description: 'Table name' },
+    query: { type: 'string', description: 'SQL query to execute' },
+    data: { type: 'json', description: 'Data for insert/update operations' },
+    where: { type: 'string', description: 'WHERE clause for update/delete' },
+  },
+  outputs: {
+    message: {
+      type: 'string',
+      description: 'Success or error message describing the operation outcome',
+    },
+    rows: {
+      type: 'array',
+      description: 'Array of rows returned from the query',
+    },
+    rowCount: {
+      type: 'number',
+      description: 'Number of rows affected by the operation',
+    },
+  },
+}

apps/sim/blocks/blocks/supabase.ts

@@ -94,6 +94,66 @@ export const SupabaseBlock: BlockConfig<SupabaseResponse> = {
       placeholder: 'id=eq.123',
       condition: { field: 'operation', value: 'get_row' },
       required: true,
+      wandConfig: {
+        enabled: true,
+        maintainHistory: true,
+        prompt: `You are an expert in PostgREST API syntax. Generate PostgREST filter expressions based on the user's request.
+
+### CONTEXT
+{context}
+
+### CRITICAL INSTRUCTION
+Return ONLY the PostgREST filter expression. Do not include any explanations, markdown formatting, or additional text. Just the raw filter expression.
+
+### POSTGREST FILTER SYNTAX
+PostgREST uses a specific syntax for filtering data. The format is:
+column=operator.value
+
+### OPERATORS
+- **eq** - equals: \`id=eq.123\`
+- **neq** - not equals: \`status=neq.inactive\`
+- **gt** - greater than: \`age=gt.18\`
+- **gte** - greater than or equal: \`score=gte.80\`
+- **lt** - less than: \`price=lt.100\`
+- **lte** - less than or equal: \`rating=lte.5\`
+- **like** - pattern matching: \`name=like.*john*\`
+- **ilike** - case-insensitive like: \`email=ilike.*@gmail.com\`
+- **in** - in list: \`category=in.(tech,science,art)\`
+- **is** - is null/not null: \`deleted_at=is.null\`
+- **not** - negation: \`not.and=(status.eq.active,verified.eq.true)\`
+
+### COMBINING FILTERS
+- **AND**: Use \`&\` or \`and=(...)\`: \`id=eq.123&status=eq.active\`
+- **OR**: Use \`or=(...)\`: \`or=(status.eq.active,status.eq.pending)\`
+
+### EXAMPLES
+
+**Simple equality**: "Find user with ID 123"
+→ id=eq.123
+
+**Text search**: "Find users with Gmail addresses"
+→ email=ilike.*@gmail.com
+
+**Range filter**: "Find products under $50"
+→ price=lt.50
+
+**Multiple conditions**: "Find active users over 18"
+→ age=gt.18&status=eq.active
+
+**OR condition**: "Find active or pending orders"
+→ or=(status.eq.active,status.eq.pending)
+
+**In list**: "Find posts in specific categories"
+→ category=in.(tech,science,health)
+
+**Null check**: "Find users without a profile picture"
+→ profile_image=is.null
+
+### REMEMBER
+Return ONLY the PostgREST filter expression - no explanations, no markdown, no extra text.`,
+        placeholder: 'Describe the filter condition you need...',
+        generationType: 'postgrest',
+      },
     },
     {
       id: 'filter',
@@ -103,6 +163,66 @@ export const SupabaseBlock: BlockConfig<SupabaseResponse> = {
       placeholder: 'id=eq.123',
       condition: { field: 'operation', value: 'update' },
       required: true,
+      wandConfig: {
+        enabled: true,
+        maintainHistory: true,
+        prompt: `You are an expert in PostgREST API syntax. Generate PostgREST filter expressions based on the user's request.
+
+### CONTEXT
+{context}
+
+### CRITICAL INSTRUCTION
+Return ONLY the PostgREST filter expression. Do not include any explanations, markdown formatting, or additional text. Just the raw filter expression.
+
+### POSTGREST FILTER SYNTAX
+PostgREST uses a specific syntax for filtering data. The format is:
+column=operator.value
+
+### OPERATORS
+- **eq** - equals: \`id=eq.123\`
+- **neq** - not equals: \`status=neq.inactive\`
+- **gt** - greater than: \`age=gt.18\`
+- **gte** - greater than or equal: \`score=gte.80\`
+- **lt** - less than: \`price=lt.100\`
+- **lte** - less than or equal: \`rating=lte.5\`
+- **like** - pattern matching: \`name=like.*john*\`
+- **ilike** - case-insensitive like: \`email=ilike.*@gmail.com\`
+- **in** - in list: \`category=in.(tech,science,art)\`
+- **is** - is null/not null: \`deleted_at=is.null\`
+- **not** - negation: \`not.and=(status.eq.active,verified.eq.true)\`
+
+### COMBINING FILTERS
+- **AND**: Use \`&\` or \`and=(...)\`: \`id=eq.123&status=eq.active\`
+- **OR**: Use \`or=(...)\`: \`or=(status.eq.active,status.eq.pending)\`
+
+### EXAMPLES
+
+**Simple equality**: "Find user with ID 123"
+→ id=eq.123
+
+**Text search**: "Find users with Gmail addresses"
+→ email=ilike.*@gmail.com
+
+**Range filter**: "Find products under $50"
+→ price=lt.50
+
+**Multiple conditions**: "Find active users over 18"
+→ age=gt.18&status=eq.active
+
+**OR condition**: "Find active or pending orders"
+→ or=(status.eq.active,status.eq.pending)
+
+**In list**: "Find posts in specific categories"
+→ category=in.(tech,science,health)
+
+**Null check**: "Find users without a profile picture"
+→ profile_image=is.null
+
+### REMEMBER
+Return ONLY the PostgREST filter expression - no explanations, no markdown, no extra text.`,
+        placeholder: 'Describe the filter condition you need...',
+        generationType: 'postgrest',
+      },
     },
     {
       id: 'filter',
@@ -112,6 +232,66 @@ export const SupabaseBlock: BlockConfig<SupabaseResponse> = {
       placeholder: 'id=eq.123',
       condition: { field: 'operation', value: 'delete' },
       required: true,
+      wandConfig: {
+        enabled: true,
+        maintainHistory: true,
+        prompt: `You are an expert in PostgREST API syntax. Generate PostgREST filter expressions based on the user's request.
+
+### CONTEXT
+{context}
+
+### CRITICAL INSTRUCTION
+Return ONLY the PostgREST filter expression. Do not include any explanations, markdown formatting, or additional text. Just the raw filter expression.
+
+### POSTGREST FILTER SYNTAX
+PostgREST uses a specific syntax for filtering data. The format is:
+column=operator.value
+
+### OPERATORS
+- **eq** - equals: \`id=eq.123\`
+- **neq** - not equals: \`status=neq.inactive\`
+- **gt** - greater than: \`age=gt.18\`
+- **gte** - greater than or equal: \`score=gte.80\`
+- **lt** - less than: \`price=lt.100\`
+- **lte** - less than or equal: \`rating=lte.5\`
+- **like** - pattern matching: \`name=like.*john*\`
+- **ilike** - case-insensitive like: \`email=ilike.*@gmail.com\`
+- **in** - in list: \`category=in.(tech,science,art)\`
+- **is** - is null/not null: \`deleted_at=is.null\`
+- **not** - negation: \`not.and=(status.eq.active,verified.eq.true)\`
+
+### COMBINING FILTERS
+- **AND**: Use \`&\` or \`and=(...)\`: \`id=eq.123&status=eq.active\`
+- **OR**: Use \`or=(...)\`: \`or=(status.eq.active,status.eq.pending)\`
+
+### EXAMPLES
+
+**Simple equality**: "Find user with ID 123"
+→ id=eq.123
+
+**Text search**: "Find users with Gmail addresses"
+→ email=ilike.*@gmail.com
+
+**Range filter**: "Find products under $50"
+→ price=lt.50
+
+**Multiple conditions**: "Find active users over 18"
+→ age=gt.18&status=eq.active
+
+**OR condition**: "Find active or pending orders"
+→ or=(status.eq.active,status.eq.pending)
+
+**In list**: "Find posts in specific categories"
+→ category=in.(tech,science,health)
+
+**Null check**: "Find users without a profile picture"
+→ profile_image=is.null
+
+### REMEMBER
+Return ONLY the PostgREST filter expression - no explanations, no markdown, no extra text.`,
+        placeholder: 'Describe the filter condition you need...',
+        generationType: 'postgrest',
+      },
     },
     // Optional filter for query operation
     {
@@ -121,6 +301,66 @@ export const SupabaseBlock: BlockConfig<SupabaseResponse> = {
       layout: 'full',
       placeholder: 'status=eq.active',
       condition: { field: 'operation', value: 'query' },
+      wandConfig: {
+        enabled: true,
+        maintainHistory: true,
+        prompt: `You are an expert in PostgREST API syntax. Generate PostgREST filter expressions based on the user's request.
+
+### CONTEXT
+{context}
+
+### CRITICAL INSTRUCTION
+Return ONLY the PostgREST filter expression. Do not include any explanations, markdown formatting, or additional text. Just the raw filter expression.
+
+### POSTGREST FILTER SYNTAX
+PostgREST uses a specific syntax for filtering data. The format is:
+column=operator.value
+
+### OPERATORS
+- **eq** - equals: \`id=eq.123\`
+- **neq** - not equals: \`status=neq.inactive\`
+- **gt** - greater than: \`age=gt.18\`
+- **gte** - greater than or equal: \`score=gte.80\`
+- **lt** - less than: \`price=lt.100\`
+- **lte** - less than or equal: \`rating=lte.5\`
+- **like** - pattern matching: \`name=like.*john*\`
+- **ilike** - case-insensitive like: \`email=ilike.*@gmail.com\`
+- **in** - in list: \`category=in.(tech,science,art)\`
+- **is** - is null/not null: \`deleted_at=is.null\`
+- **not** - negation: \`not.and=(status.eq.active,verified.eq.true)\`
+
+### COMBINING FILTERS
+- **AND**: Use \`&\` or \`and=(...)\`: \`id=eq.123&status=eq.active\`
+- **OR**: Use \`or=(...)\`: \`or=(status.eq.active,status.eq.pending)\`
+
+### EXAMPLES
+
+**Simple equality**: "Find user with ID 123"
+→ id=eq.123
+
+**Text search**: "Find users with Gmail addresses"
+→ email=ilike.*@gmail.com
+
+**Range filter**: "Find products under $50"
+→ price=lt.50
+
+**Multiple conditions**: "Find active users over 18"
+→ age=gt.18&status=eq.active
+
+**OR condition**: "Find active or pending orders"
+→ or=(status.eq.active,status.eq.pending)
+
+**In list**: "Find posts in specific categories"
+→ category=in.(tech,science,health)
+
+**Null check**: "Find users without a profile picture"
+→ profile_image=is.null
+
+### REMEMBER
+Return ONLY the PostgREST filter expression - no explanations, no markdown, no extra text.`,
+        placeholder: 'Describe the filter condition...',
+        generationType: 'postgrest',
+      },
     },
     // Optional order by for query operation
     {

apps/sim/blocks/registry.ts

@@ -40,12 +40,15 @@ import { MicrosoftExcelBlock } from '@/blocks/blocks/microsoft_excel'
 import { MicrosoftPlannerBlock } from '@/blocks/blocks/microsoft_planner'
 import { MicrosoftTeamsBlock } from '@/blocks/blocks/microsoft_teams'
 import { MistralParseBlock } from '@/blocks/blocks/mistral_parse'
+import { MySQLBlock } from '@/blocks/blocks/mysql'
 import { NotionBlock } from '@/blocks/blocks/notion'
 import { OneDriveBlock } from '@/blocks/blocks/onedrive'
 import { OpenAIBlock } from '@/blocks/blocks/openai'
 import { OutlookBlock } from '@/blocks/blocks/outlook'
+import { ParallelBlock } from '@/blocks/blocks/parallel'
 import { PerplexityBlock } from '@/blocks/blocks/perplexity'
 import { PineconeBlock } from '@/blocks/blocks/pinecone'
+import { PostgreSQLBlock } from '@/blocks/blocks/postgresql'
 import { QdrantBlock } from '@/blocks/blocks/qdrant'
 import { RedditBlock } from '@/blocks/blocks/reddit'
 import { ResponseBlock } from '@/blocks/blocks/response'
@@ -113,12 +116,15 @@ export const registry: Record<string, BlockConfig> = {
   microsoft_planner: MicrosoftPlannerBlock,
   microsoft_teams: MicrosoftTeamsBlock,
   mistral_parse: MistralParseBlock,
+  mysql: MySQLBlock,
   notion: NotionBlock,
   openai: OpenAIBlock,
   outlook: OutlookBlock,
   onedrive: OneDriveBlock,
+  parallel_ai: ParallelBlock,
   perplexity: PerplexityBlock,
   pinecone: PineconeBlock,
+  postgresql: PostgreSQLBlock,
   qdrant: QdrantBlock,
   memory: MemoryBlock,
   reddit: RedditBlock,

apps/sim/blocks/types.ts

@@ -4,7 +4,7 @@ import type { ToolResponse } from '@/tools/types'
 // Basic types
 export type BlockIcon = (props: SVGProps<SVGSVGElement>) => JSX.Element
 export type ParamType = 'string' | 'number' | 'boolean' | 'json'
-export type PrimitiveValueType = 'string' | 'number' | 'boolean' | 'json' | 'any'
+export type PrimitiveValueType = 'string' | 'number' | 'boolean' | 'json' | 'array' | 'any'
 
 // Block classification
 export type BlockCategory = 'blocks' | 'tools' | 'triggers'
@@ -17,6 +17,8 @@ export type GenerationType =
   | 'json-object'
   | 'system-prompt'
   | 'custom-tool-schema'
+  | 'sql-query'
+  | 'postgrest'
 
 // SubBlock types
 export type SubBlockType =

apps/sim/components/emails/enterprise-subscription-email.tsx

@@ -0,0 +1,122 @@
+import {
+  Body,
+  Column,
+  Container,
+  Head,
+  Html,
+  Img,
+  Link,
+  Preview,
+  Row,
+  Section,
+  Text,
+} from '@react-email/components'
+import { format } from 'date-fns'
+import { getBrandConfig } from '@/lib/branding/branding'
+import { env } from '@/lib/env'
+import { getAssetUrl } from '@/lib/utils'
+import { baseStyles } from './base-styles'
+import EmailFooter from './footer'
+
+interface EnterpriseSubscriptionEmailProps {
+  userName?: string
+  userEmail?: string
+  loginLink?: string
+  createdDate?: Date
+}
+
+const baseUrl = env.NEXT_PUBLIC_APP_URL || 'https://sim.ai'
+
+export const EnterpriseSubscriptionEmail = ({
+  userName = 'Valued User',
+  userEmail = '',
+  loginLink = `${baseUrl}/login`,
+  createdDate = new Date(),
+}: EnterpriseSubscriptionEmailProps) => {
+  const brand = getBrandConfig()
+
+  return (
+    <Html>
+      <Head />
+      <Body style={baseStyles.main}>
+        <Preview>Your Enterprise Plan is now active on Sim</Preview>
+        <Container style={baseStyles.container}>
+          <Section style={{ padding: '30px 0', textAlign: 'center' }}>
+            <Row>
+              <Column style={{ textAlign: 'center' }}>
+                <Img
+                  src={brand.logoUrl || getAssetUrl('static/sim.png')}
+                  width='114'
+                  alt={brand.name}
+                  style={{
+                    margin: '0 auto',
+                  }}
+                />
+              </Column>
+            </Row>
+          </Section>
+
+          <Section style={baseStyles.sectionsBorders}>
+            <Row>
+              <Column style={baseStyles.sectionBorder} />
+              <Column style={baseStyles.sectionCenter} />
+              <Column style={baseStyles.sectionBorder} />
+            </Row>
+          </Section>
+
+          <Section style={baseStyles.content}>
+            <Text style={baseStyles.paragraph}>Hello {userName},</Text>
+            <Text style={baseStyles.paragraph}>
+              Great news! Your <strong>Enterprise Plan</strong> has been activated on Sim. You now
+              have access to advanced features and increased capacity for your workflows.
+            </Text>
+
+            <Text style={baseStyles.paragraph}>
+              Your account has been set up with full access to your organization. Click below to log
+              in and start exploring your new Enterprise features:
+            </Text>
+
+            <Link href={loginLink} style={{ textDecoration: 'none' }}>
+              <Text style={baseStyles.button}>Access Your Enterprise Account</Text>
+            </Link>
+
+            <Text style={baseStyles.paragraph}>
+              <strong>What's next?</strong>
+            </Text>
+            <Text style={baseStyles.paragraph}>
+              • Invite team members to your organization
+              <br />• Begin building your workflows
+            </Text>
+
+            <Text style={baseStyles.paragraph}>
+              If you have any questions or need assistance getting started, our support team is here
+              to help.
+            </Text>
+
+            <Text style={baseStyles.paragraph}>
+              Welcome to Sim Enterprise!
+              <br />
+              The Sim Team
+            </Text>
+
+            <Text
+              style={{
+                ...baseStyles.footerText,
+                marginTop: '40px',
+                textAlign: 'left',
+                color: '#666666',
+              }}
+            >
+              This email was sent on {format(createdDate, 'MMMM do, yyyy')} to {userEmail}
+              regarding your Enterprise plan activation on Sim.
+            </Text>
+          </Section>
+        </Container>
+
+        <EmailFooter baseUrl={baseUrl} />
+      </Body>
+    </Html>
+  )
+}
+
+export default EnterpriseSubscriptionEmail

apps/sim/components/emails/index.ts

@@ -1,5 +1,6 @@
 export * from './base-styles'
 export { BatchInvitationEmail } from './batch-invitation-email'
+export { EnterpriseSubscriptionEmail } from './enterprise-subscription-email'
 export { default as EmailFooter } from './footer'
 export { HelpConfirmationEmail } from './help-confirmation-email'
 export { InvitationEmail } from './invitation-email'

apps/sim/components/emails/invitation-email.tsx

@@ -14,6 +14,7 @@ import {
 import { format } from 'date-fns'
 import { getBrandConfig } from '@/lib/branding/branding'
 import { env } from '@/lib/env'
+import { createLogger } from '@/lib/logs/console/logger'
 import { getAssetUrl } from '@/lib/utils'
 import { baseStyles } from './base-styles'
 import EmailFooter from './footer'
@@ -28,6 +29,8 @@ interface InvitationEmailProps {
 
 const baseUrl = env.NEXT_PUBLIC_APP_URL || 'https://sim.ai'
 
+const logger = createLogger('InvitationEmail')
+
 export const InvitationEmail = ({
   inviterName = 'A team member',
   organizationName = 'an organization',
@@ -49,7 +52,7 @@ export const InvitationEmail = ({
         enhancedLink = `${baseUrl}/invite/${invitationId}?token=${invitationId}`
       }
     } catch (e) {
-      console.error('Error parsing invite link:', e)
+      logger.error('Error parsing invite link:', e)
     }
   }
 

apps/sim/components/emails/render-email.ts

@@ -1,6 +1,7 @@
 import { render } from '@react-email/components'
 import {
   BatchInvitationEmail,
+  EnterpriseSubscriptionEmail,
   HelpConfirmationEmail,
   InvitationEmail,
   OTPVerificationEmail,
@@ -82,6 +83,23 @@ export async function renderHelpConfirmationEmail(
   )
 }
 
+export async function renderEnterpriseSubscriptionEmail(
+  userName: string,
+  userEmail: string
+): Promise<string> {
+  const baseUrl = process.env.NEXT_PUBLIC_APP_URL || 'https://sim.ai'
+  const loginLink = `${baseUrl}/login`
+
+  return await render(
+    EnterpriseSubscriptionEmail({
+      userName,
+      userEmail,
+      loginLink,
+      createdDate: new Date(),
+    })
+  )
+}
+
 export function getEmailSubject(
   type:
     | 'sign-in'
@@ -91,6 +109,7 @@ export function getEmailSubject(
     | 'invitation'
     | 'batch-invitation'
     | 'help-confirmation'
+    | 'enterprise-subscription'
 ): string {
   const brandName = getBrandConfig().name
 
@@ -109,6 +128,8 @@ export function getEmailSubject(
       return `You've been invited to join a team and workspaces on ${brandName}`
     case 'help-confirmation':
       return 'Your request has been received'
+    case 'enterprise-subscription':
+      return `Your Enterprise Plan is now active on ${brandName}`
     default:
       return brandName
   }

apps/sim/components/emails/workspace-invitation.tsx

@@ -13,10 +13,13 @@ import {
 } from '@react-email/components'
 import { getBrandConfig } from '@/lib/branding/branding'
 import { env } from '@/lib/env'
+import { createLogger } from '@/lib/logs/console/logger'
 import { getAssetUrl } from '@/lib/utils'
 import { baseStyles } from './base-styles'
 import EmailFooter from './footer'
 
+const logger = createLogger('WorkspaceInvitationEmail')
+
 interface WorkspaceInvitationEmailProps {
   workspaceName?: string
   inviterName?: string
@@ -45,7 +48,7 @@ export const WorkspaceInvitationEmail = ({
       }
     }
   } catch (e) {
-    console.error('Error enhancing invitation link:', e)
+    logger.error('Error enhancing invitation link:', e)
   }
 
   return (

apps/sim/components/icons.tsx

@@ -3345,6 +3345,98 @@ export function MicrosoftPlannerIcon(props: SVGProps<SVGSVGElement>) {
   )
 }
 
+export function ParallelIcon(props: SVGProps<SVGSVGElement>) {
+  return (
+    <svg
+      {...props}
+      fill='currentColor'
+      width='271'
+      height='270'
+      viewBox='0 0 271 270'
+      xmlns='http://www.w3.org/2000/svg'
+    >
+      <path
+        d='M267.804 105.65H193.828C194.026 106.814 194.187 107.996 194.349 109.178H76.6703C76.4546 110.736 76.2388 112.312 76.0591 113.87H1.63342C1.27387 116.198 0.950289 118.543 0.698608 120.925H75.3759C75.2501 122.483 75.1602 124.059 75.0703 125.617H195.949C196.003 126.781 196.057 127.962 196.093 129.144H270.68V125.384C270.195 118.651 269.242 112.061 267.804 105.65Z'
+        fill='#1D1C1A'
+      />
+      <path
+        d='M195.949 144.401H75.0703C75.1422 145.977 75.2501 147.535 75.3759 149.093H0.698608C0.950289 151.457 1.2559 153.802 1.63342 156.148H76.0591C76.2388 157.724 76.4366 159.282 76.6703 160.84H194.349C194.187 162.022 194.008 163.186 193.828 164.367H267.804C269.242 157.957 270.195 151.367 270.68 144.634V140.874H196.093C196.057 142.055 196.003 143.219 195.949 144.401Z'
+        fill='#1D1C1A'
+      />
+      <path
+        d='M190.628 179.642H80.3559C80.7514 181.218 81.1828 182.776 81.6143 184.334H9.30994C10.2448 186.715 11.2515 189.061 12.3121 191.389H83.7536C84.2749 192.965 84.7962 194.523 85.3535 196.08H185.594C185.163 197.262 184.732 198.426 184.282 199.608H254.519C258.6 192.177 261.98 184.316 264.604 176.114H191.455C191.185 177.296 190.898 178.46 190.61 179.642H190.628Z'
+        fill='#1D1C1A'
+      />
+      <path
+        d='M177.666 214.883H93.3352C94.1082 216.458 94.9172 218.034 95.7441 219.574H29.8756C31.8351 221.992 33.8666 224.337 35.9699 226.63H99.6632C100.598 228.205 101.551 229.781 102.522 231.321H168.498C167.761 232.503 167.006 233.685 166.233 234.849H226.762C234.474 227.847 241.36 219.95 247.292 211.355H179.356C178.799 212.537 178.26 213.719 177.684 214.883H177.666Z'
+        fill='#1D1C1A'
+      />
+      <path
+        d='M154.943 250.106H116.058C117.371 251.699 118.701 253.257 120.067 254.797H73.021C91.6094 264.431 112.715 269.946 135.096 270C135.24 270 135.366 270 135.492 270C135.618 270 135.761 270 135.887 270C164.04 269.911 190.178 261.28 211.805 246.56H157.748C156.813 247.742 155.878 248.924 154.925 250.088L154.943 250.106Z'
+        fill='#1D1C1A'
+      />
+      <path
+        d='M116.059 19.9124H154.943C155.896 21.0764 156.831 22.2582 157.766 23.4401H211.823C190.179 8.72065 164.058 0.0895344 135.906 0C135.762 0 135.636 0 135.51 0C135.384 0 135.24 0 135.115 0C112.715 0.0716275 91.6277 5.56904 73.0393 15.2029H120.086C118.719 16.7429 117.389 18.3187 116.077 19.8945L116.059 19.9124Z'
+        fill='#1D1C1A'
+      />
+      <path
+        d='M93.3356 55.1532H177.667C178.242 56.3171 178.799 57.499 179.339 58.6808H247.274C241.342 50.0855 234.457 42.1886 226.744 35.187H166.215C166.988 36.351 167.743 37.5328 168.48 38.7147H102.504C101.533 40.2726 100.58 41.8305 99.6456 43.4063H35.9523C33.831 45.6804 31.7996 48.0262 29.858 50.4616H95.7265C94.8996 52.0195 94.1086 53.5774 93.3176 55.1532H93.3356Z'
+        fill='#1D1C1A'
+      />
+      <path
+        d='M80.3736 90.3758H190.646C190.933 91.5398 191.221 92.7216 191.491 93.9035H264.64C262.015 85.7021 258.636 77.841 254.555 70.4097H184.318C184.767 71.5736 185.199 72.7555 185.63 73.9373H85.3893C84.832 75.4952 84.2927 77.0531 83.7893 78.6289H12.3479C11.2872 80.9389 10.2805 83.2847 9.3457 85.6842H81.65C81.2186 87.2421 80.7871 88.8 80.3916 90.3758H80.3736Z'
+        fill='#1D1C1A'
+      />
+    </svg>
+  )
+}
+
+export function PostgresIcon(props: SVGProps<SVGSVGElement>) {
+  return (
+    <svg
+      {...props}
+      width='800px'
+      height='800px'
+      viewBox='-4 0 264 264'
+      xmlns='http://www.w3.org/2000/svg'
+      preserveAspectRatio='xMinYMin meet'
+    >
+      <path d='M255.008 158.086c-1.535-4.649-5.556-7.887-10.756-8.664-2.452-.366-5.26-.21-8.583.475-5.792 1.195-10.089 1.65-13.225 1.738 11.837-19.985 21.462-42.775 27.003-64.228 8.96-34.689 4.172-50.492-1.423-57.64C233.217 10.847 211.614.683 185.552.372c-13.903-.17-26.108 2.575-32.475 4.549-5.928-1.046-12.302-1.63-18.99-1.738-12.537-.2-23.614 2.533-33.079 8.15-5.24-1.772-13.65-4.27-23.362-5.864-22.842-3.75-41.252-.828-54.718 8.685C6.622 25.672-.937 45.684.461 73.634c.444 8.874 5.408 35.874 13.224 61.48 4.492 14.718 9.282 26.94 14.237 36.33 7.027 13.315 14.546 21.156 22.987 23.972 4.731 1.576 13.327 2.68 22.368-4.85 1.146 1.388 2.675 2.767 4.704 4.048 2.577 1.625 5.728 2.953 8.875 3.74 11.341 2.835 21.964 2.126 31.027-1.848.056 1.612.099 3.152.135 4.482.06 2.157.12 4.272.199 6.25.537 13.374 1.447 23.773 4.143 31.049.148.4.347 1.01.557 1.657 1.345 4.118 3.594 11.012 9.316 16.411 5.925 5.593 13.092 7.308 19.656 7.308 3.292 0 6.433-.432 9.188-1.022 9.82-2.105 20.973-5.311 29.041-16.799 7.628-10.86 11.336-27.217 12.007-52.99.087-.729.167-1.425.244-2.088l.16-1.362 1.797.158.463.031c10.002.456 22.232-1.665 29.743-5.154 5.935-2.754 24.954-12.795 20.476-26.351' />
+      <path
+        d='M237.906 160.722c-29.74 6.135-31.785-3.934-31.785-3.934 31.4-46.593 44.527-105.736 33.2-120.211-30.904-39.485-84.399-20.811-85.292-20.327l-.287.052c-5.876-1.22-12.451-1.946-19.842-2.067-13.456-.22-23.664 3.528-31.41 9.402 0 0-95.43-39.314-90.991 49.444.944 18.882 27.064 142.873 58.218 105.422 11.387-13.695 22.39-25.274 22.39-25.274 5.464 3.63 12.006 5.482 18.864 4.817l.533-.452c-.166 1.7-.09 3.363.213 5.332-8.026 8.967-5.667 10.541-21.711 13.844-16.235 3.346-6.698 9.302-.471 10.86 7.549 1.887 25.013 4.561 36.813-11.958l-.47 1.885c3.144 2.519 5.352 16.383 4.982 28.952-.37 12.568-.617 21.197 1.86 27.937 2.479 6.74 4.948 21.905 26.04 17.386 17.623-3.777 26.756-13.564 28.027-29.89.901-11.606 2.942-9.89 3.07-20.267l1.637-4.912c1.887-15.733.3-20.809 11.157-18.448l2.64.232c7.99.363 18.45-1.286 24.589-4.139 13.218-6.134 21.058-16.377 8.024-13.686h.002'
+        fill='#336791'
+      />
+      <path
+        d='M108.076 81.525c-2.68-.373-5.107-.028-6.335.902-.69.523-.904 1.129-.962 1.546-.154 1.105.62 2.327 1.096 2.957 1.346 1.784 3.312 3.01 5.258 3.28.282.04.563.058.842.058 3.245 0 6.196-2.527 6.456-4.392.325-2.336-3.066-3.893-6.355-4.35M196.86 81.599c-.256-1.831-3.514-2.353-6.606-1.923-3.088.43-6.082 1.824-5.832 3.659.2 1.427 2.777 3.863 5.827 3.863.258 0 .518-.017.78-.054 2.036-.282 3.53-1.575 4.24-2.32 1.08-1.136 1.706-2.402 1.591-3.225'
+        fill='#FFF'
+      />
+      <path
+        d='M247.802 160.025c-1.134-3.429-4.784-4.532-10.848-3.28-18.005 3.716-24.453 1.142-26.57-.417 13.995-21.32 25.508-47.092 31.719-71.137 2.942-11.39 4.567-21.968 4.7-30.59.147-9.463-1.465-16.417-4.789-20.665-13.402-17.125-33.072-26.311-56.882-26.563-16.369-.184-30.199 4.005-32.88 5.183-5.646-1.404-11.801-2.266-18.502-2.376-12.288-.199-22.91 2.743-31.704 8.74-3.82-1.422-13.692-4.811-25.765-6.756-20.872-3.36-37.458-.814-49.294 7.571-14.123 10.006-20.643 27.892-19.38 53.16.425 8.501 5.269 34.653 12.913 59.698 10.062 32.964 21 51.625 32.508 55.464 1.347.449 2.9.763 4.613.763 4.198 0 9.345-1.892 14.7-8.33a529.832 529.832 0 0 1 20.261-22.926c4.524 2.428 9.494 3.784 14.577 3.92.01.133.023.266.035.398a117.66 117.66 0 0 0-2.57 3.175c-3.522 4.471-4.255 5.402-15.592 7.736-3.225.666-11.79 2.431-11.916 8.435-.136 6.56 10.125 9.315 11.294 9.607 4.074 1.02 7.999 1.523 11.742 1.523 9.103 0 17.114-2.992 23.516-8.781-.197 23.386.778 46.43 3.586 53.451 2.3 5.748 7.918 19.795 25.664 19.794 2.604 0 5.47-.303 8.623-.979 18.521-3.97 26.564-12.156 29.675-30.203 1.665-9.645 4.522-32.676 5.866-45.03 2.836.885 6.487 1.29 10.434 1.289 8.232 0 17.731-1.749 23.688-4.514 6.692-3.108 18.768-10.734 16.578-17.36zm-44.106-83.48c-.061 3.647-.563 6.958-1.095 10.414-.573 3.717-1.165 7.56-1.314 12.225-.147 4.54.42 9.26.968 13.825 1.108 9.22 2.245 18.712-2.156 28.078a36.508 36.508 0 0 1-1.95-4.009c-.547-1.326-1.735-3.456-3.38-6.404-6.399-11.476-21.384-38.35-13.713-49.316 2.285-3.264 8.084-6.62 22.64-4.813zm-17.644-61.787c21.334.471 38.21 8.452 50.158 23.72 9.164 11.711-.927 64.998-30.14 110.969a171.33 171.33 0 0 0-.886-1.117l-.37-.462c7.549-12.467 6.073-24.802 4.759-35.738-.54-4.488-1.05-8.727-.92-12.709.134-4.22.692-7.84 1.232-11.34.663-4.313 1.338-8.776 1.152-14.037.139-.552.195-1.204.122-1.978-.475-5.045-6.235-20.144-17.975-33.81-6.422-7.475-15.787-15.84-28.574-21.482 5.5-1.14 13.021-2.203 21.442-2.016zM66.674 175.778c-5.9 7.094-9.974 5.734-11.314 5.288-8.73-2.912-18.86-21.364-27.791-50.624-7.728-25.318-12.244-50.777-12.602-57.916-1.128-22.578 4.345-38.313 16.268-46.769 19.404-13.76 51.306-5.524 64.125-1.347-.184.182-.376.352-.558.537-21.036 21.244-20.537 57.54-20.485 59.759-.002.856.07 2.068.168 3.735.362 6.105 1.036 17.467-.764 30.334-1.672 11.957 2.014 23.66 10.111 32.109a36.275 36.275 0 0 0 2.617 2.468c-3.604 3.86-11.437 12.396-19.775 22.426zm22.479-29.993c-6.526-6.81-9.49-16.282-8.133-25.99 1.9-13.592 1.199-25.43.822-31.79-.053-.89-.1-1.67-.127-2.285 3.073-2.725 17.314-10.355 27.47-8.028 4.634 1.061 7.458 4.217 8.632 9.645 6.076 28.103.804 39.816-3.432 49.229-.873 1.939-1.698 3.772-2.402 5.668l-.546 1.466c-1.382 3.706-2.668 7.152-3.465 10.424-6.938-.02-13.687-2.984-18.819-8.34zm1.065 37.9c-2.026-.506-3.848-1.385-4.917-2.114.893-.42 2.482-.992 5.238-1.56 13.337-2.745 15.397-4.683 19.895-10.394 1.031-1.31 2.2-2.794 3.819-4.602l.002-.002c2.411-2.7 3.514-2.242 5.514-1.412 1.621.67 3.2 2.702 3.84 4.938.303 1.056.643 3.06-.47 4.62-9.396 13.156-23.088 12.987-32.921 10.526zm69.799 64.952c-16.316 3.496-22.093-4.829-25.9-14.346-2.457-6.144-3.665-33.85-2.808-64.447.011-.407-.047-.8-.159-1.17a15.444 15.444 0 0 0-.456-2.162c-1.274-4.452-4.379-8.176-8.104-9.72-1.48-.613-4.196-1.738-7.46-.903.696-2.868 1.903-6.107 3.212-9.614l.549-1.475c.618-1.663 1.394-3.386 2.214-5.21 4.433-9.848 10.504-23.337 3.915-53.81-2.468-11.414-10.71-16.988-23.204-15.693-7.49.775-14.343 3.797-17.761 5.53-.735.372-1.407.732-2.035 1.082.954-11.5 4.558-32.992 18.04-46.59 8.489-8.56 19.794-12.788 33.568-12.56 27.14.444 44.544 14.372 54.366 25.979 8.464 10.001 13.047 20.076 14.876 25.51-13.755-1.399-23.11 1.316-27.852 8.096-10.317 14.748 5.644 43.372 13.315 57.129 1.407 2.521 2.621 4.7 3.003 5.626 2.498 6.054 5.732 10.096 8.093 13.046.724.904 1.426 1.781 1.96 2.547-4.166 1.201-11.649 3.976-10.967 17.847-.55 6.96-4.461 39.546-6.448 51.059-2.623 15.21-8.22 20.875-23.957 24.25zm68.104-77.936c-4.26 1.977-11.389 3.46-18.161 3.779-7.48.35-11.288-.838-12.184-1.569-.42-8.644 2.797-9.547 6.202-10.503.535-.15 1.057-.297 1.561-.473.313.255.656.508 1.032.756 6.012 3.968 16.735 4.396 31.874 1.271l.166-.033c-2.042 1.909-5.536 4.471-10.49 6.772z'
+        fill='#FFF'
+      />
+    </svg>
+  )
+}
+
+export function MySQLIcon(props: SVGProps<SVGSVGElement>) {
+  return (
+    <svg
+      {...props}
+      xmlns='http://www.w3.org/2000/svg'
+      width='64'
+      height='64'
+      viewBox='0 0 25.6 25.6'
+    >
+      <path
+        d='M179.076 94.886c-3.568-.1-6.336.268-8.656 1.25-.668.27-1.74.27-1.828 1.116.357.355.4.936.713 1.428.535.893 1.473 2.096 2.32 2.72l2.855 2.053c1.74 1.07 3.703 1.695 5.398 2.766.982.625 1.963 1.428 2.945 2.098.5.357.803.938 1.428 1.16v-.135c-.312-.4-.402-.98-.713-1.428l-1.34-1.293c-1.293-1.74-2.9-3.258-4.64-4.506-1.428-.982-4.55-2.32-5.13-3.97l-.088-.1c.98-.1 2.14-.447 3.078-.715 1.518-.4 2.9-.312 4.46-.713l2.143-.625v-.4c-.803-.803-1.383-1.874-2.23-2.632-2.275-1.963-4.775-3.882-7.363-5.488-1.383-.892-3.168-1.473-4.64-2.23-.537-.268-1.428-.402-1.74-.848-.805-.98-1.25-2.275-1.83-3.436l-3.658-7.763c-.803-1.74-1.295-3.48-2.275-5.086-4.596-7.585-9.594-12.18-17.268-16.687-1.65-.937-3.613-1.34-5.7-1.83l-3.346-.18c-.715-.312-1.428-1.16-2.053-1.562-2.543-1.606-9.102-5.086-10.977-.5-1.205 2.9 1.785 5.755 2.8 7.228.76 1.026 1.74 2.186 2.277 3.346.3.758.4 1.562.713 2.365.713 1.963 1.383 4.15 2.32 5.98.5.937 1.025 1.92 1.65 2.767.357.5.982.714 1.115 1.517-.625.893-.668 2.23-1.025 3.347-1.607 5.042-.982 11.288 1.293 15 .715 1.115 2.4 3.57 4.686 2.632 2.008-.803 1.56-3.346 2.14-5.577.135-.535.045-.892.312-1.25v.1l1.83 3.703c1.383 2.186 3.793 4.462 5.8 5.98 1.07.803 1.918 2.187 3.256 2.677v-.135h-.088c-.268-.4-.67-.58-1.027-.892-.803-.803-1.695-1.785-2.32-2.677-1.873-2.498-3.523-5.265-4.996-8.12-.715-1.383-1.34-2.9-1.918-4.283-.27-.536-.27-1.34-.715-1.606-.67.98-1.65 1.83-2.143 3.034-.848 1.918-.936 4.283-1.248 6.737-.18.045-.1 0-.18.1-1.426-.356-1.918-1.83-2.453-3.078-1.338-3.168-1.562-8.254-.402-11.913.312-.937 1.652-3.882 1.117-4.774-.27-.848-1.16-1.338-1.652-2.008-.58-.848-1.203-1.918-1.605-2.855-1.07-2.5-1.605-5.265-2.766-7.764-.537-1.16-1.473-2.365-2.232-3.435-.848-1.205-1.783-2.053-2.453-3.48-.223-.5-.535-1.294-.178-1.83.088-.357.268-.5.623-.58.58-.5 2.232.134 2.812.4 1.65.67 3.033 1.294 4.416 2.23.625.446 1.295 1.294 2.098 1.518h.938c1.428.312 3.033.1 4.37.5 2.365.76 4.506 1.874 6.426 3.08 5.844 3.703 10.664 8.968 13.92 15.26.535 1.026.758 1.963 1.25 3.034.938 2.187 2.098 4.417 3.033 6.56.938 2.097 1.83 4.24 3.168 5.98.67.937 3.346 1.427 4.55 1.918.893.4 2.275.76 3.08 1.25 1.516.937 3.033 2.008 4.46 3.034.713.534 2.945 1.65 3.078 2.54zm-45.5-38.772a7.09 7.09 0 0 0-1.828.223v.1h.088c.357.714.982 1.205 1.428 1.83l1.027 2.142.088-.1c.625-.446.938-1.16.938-2.23-.268-.312-.312-.625-.535-.937-.268-.446-.848-.67-1.206-1.026z'
+        transform='matrix(.390229 0 0 .38781 -46.300037 -16.856717)'
+        fillRule='evenodd'
+        fill='#00678c'
+      />
+    </svg>
+  )
+}
+
 export function OpenRouterIcon(props: SVGProps<SVGSVGElement>) {
   return (
     <svg

apps/sim/components/ui/slider.tsx

@@ -14,9 +14,9 @@ const Slider = React.forwardRef<
     {...props}
   >
     <SliderPrimitive.Track className='relative h-2 w-full grow overflow-hidden rounded-full bg-secondary'>
-      <SliderPrimitive.Range className='absolute h-full bg-primary' />
+      <SliderPrimitive.Range className='absolute h-full bg-primary dark:bg-white' />
     </SliderPrimitive.Track>
-    <SliderPrimitive.Thumb className='block h-5 w-5 rounded-full border-2 border-primary bg-background ring-offset-background transition-colors focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:pointer-events-none disabled:opacity-50' />
+    <SliderPrimitive.Thumb className='block h-5 w-5 rounded-full border-2 border-primary bg-background ring-offset-background transition-colors focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:pointer-events-none disabled:opacity-50 dark:border-white dark:bg-black' />
   </SliderPrimitive.Root>
 ))
 Slider.displayName = SliderPrimitive.Root.displayName

apps/sim/executor/resolver/resolver.ts

@@ -1254,7 +1254,7 @@ export class InputResolver {
 
               return JSON.parse(normalizedExpression)
             } catch (jsonError) {
-              console.error('Error parsing JSON for loop:', jsonError)
+              logger.error('Error parsing JSON for loop:', jsonError)
               // If JSON parsing fails, continue with expression evaluation
             }
           }
@@ -1267,7 +1267,7 @@ export class InputResolver {
             }
           }
         } catch (e) {
-          console.error('Error evaluating forEach items:', e)
+          logger.error('Error evaluating forEach items:', e)
         }
       }
     }
@@ -1712,7 +1712,7 @@ export class InputResolver {
           }
         }
       } catch (e) {
-        console.error('Error evaluating parallel distribution items:', e)
+        logger.error('Error evaluating parallel distribution items:', e)
       }
     }
 

apps/sim/executor/tests/executor-layer-validation.test.ts

@@ -175,10 +175,7 @@ describe('Full Executor Test', () => {
       } else {
         expect(result).toBeDefined()
       }
-    } catch (error) {
-      console.error('Execution error:', error)
-      // Log the error but don't fail the test - we want to see what happens
-    }
+    } catch (error) {}
   })
 
   it('should test the executor getNextExecutionLayer method directly', async () => {

apps/sim/hooks/use-collaborative-workflow.ts

@@ -621,7 +621,7 @@ export function useCollaborativeWorkflow() {
       }
 
       if (!blockConfig) {
-        console.error(`Block type ${type} not found`)
+        logger.error(`Block type ${type} not found`)
         return
       }
 

apps/sim/hooks/use-knowledge-base-tag-definitions.ts

@@ -1,7 +1,7 @@
 'use client'
 
 import { useCallback, useEffect, useState } from 'react'
-import type { TagSlot } from '@/lib/constants/knowledge'
+import type { TagSlot } from '@/lib/knowledge/consts'
 import { createLogger } from '@/lib/logs/console/logger'
 
 const logger = createLogger('useKnowledgeBaseTagDefinitions')

apps/sim/hooks/use-knowledge.ts

@@ -1,7 +1,10 @@
 import { useCallback, useEffect, useMemo, useState } from 'react'
 import Fuse from 'fuse.js'
+import { createLogger } from '@/lib/logs/console/logger'
 import { type ChunkData, type DocumentData, useKnowledgeStore } from '@/stores/knowledge/store'
 
+const logger = createLogger('UseKnowledgeBase')
+
 export function useKnowledgeBase(id: string) {
   const { getKnowledgeBase, getCachedKnowledgeBase, loadingKnowledgeBases } = useKnowledgeStore()
 
@@ -22,6 +25,7 @@ export function useKnowledgeBase(id: string) {
       } catch (err) {
         if (isMounted) {
           setError(err instanceof Error ? err.message : 'Failed to load knowledge base')
+          logger.error(`Failed to load knowledge base ${id}:`, err)
         }
       }
     }
@@ -86,6 +90,7 @@ export function useKnowledgeBaseDocuments(
       } catch (err) {
         if (isMounted) {
           setError(err instanceof Error ? err.message : 'Failed to load documents')
+          logger.error(`Failed to load documents for knowledge base ${knowledgeBaseId}:`, err)
         }
       }
     }
@@ -127,6 +132,7 @@ export function useKnowledgeBaseDocuments(
       })
     } catch (err) {
       setError(err instanceof Error ? err.message : 'Failed to refresh documents')
+      logger.error(`Failed to refresh documents for knowledge base ${knowledgeBaseId}:`, err)
     }
   }, [
     knowledgeBaseId,
@@ -141,6 +147,7 @@ export function useKnowledgeBaseDocuments(
   const updateDocumentLocal = useCallback(
     (documentId: string, updates: Partial<DocumentData>) => {
       updateDocument(knowledgeBaseId, documentId, updates)
+      logger.info(`Updated document ${documentId} for knowledge base ${knowledgeBaseId}`)
     },
     [knowledgeBaseId, updateDocument]
   )
@@ -204,10 +211,11 @@ export function useKnowledgeBasesList(workspaceId?: string) {
           retryTimeoutId = setTimeout(() => {
             if (isMounted) {
               loadData(attempt + 1)
+              logger.warn(`Failed to load knowledge bases list, retrying... ${attempt + 1}`)
             }
           }, delay)
         } else {
-          console.error('All retry attempts failed for knowledge bases list:', err)
+          logger.error('All retry attempts failed for knowledge bases list:', err)
           setError(errorMessage)
           setRetryCount(maxRetries)
         }
@@ -235,7 +243,7 @@ export function useKnowledgeBasesList(workspaceId?: string) {
     } catch (err) {
       const errorMessage = err instanceof Error ? err.message : 'Failed to refresh knowledge bases'
       setError(errorMessage)
-      console.error('Error refreshing knowledge bases list:', err)
+      logger.error('Error refreshing knowledge bases list:', err)
     }
   }
 
@@ -257,7 +265,7 @@ export function useKnowledgeBasesList(workspaceId?: string) {
     } catch (err) {
       const errorMessage = err instanceof Error ? err.message : 'Failed to refresh knowledge bases'
       setError(errorMessage)
-      console.error('Error force refreshing knowledge bases list:', err)
+      logger.error('Error force refreshing knowledge bases list:', err)
     }
   }
 
@@ -361,6 +369,7 @@ export function useDocumentChunks(
       } catch (err) {
         if (isMounted) {
           setError(err instanceof Error ? err.message : 'Failed to load chunks')
+          logger.error(`Failed to load chunks for document ${documentId}:`, err)
         }
       } finally {
         if (isMounted) {
@@ -559,6 +568,7 @@ export function useDocumentChunks(
       } catch (err) {
         if (isMounted) {
           setError(err instanceof Error ? err.message : 'Failed to load chunks')
+          logger.error(`Failed to load chunks for document ${documentId}:`, err)
         }
       } finally {
         if (isMounted) {
@@ -599,6 +609,7 @@ export function useDocumentChunks(
 
     // Update loading state based on store
     if (!isStoreLoading && isLoading) {
+      logger.info(`Chunks loaded for document ${documentId}`)
       setIsLoading(false)
     }
   }, [documentId, isStoreLoading, isLoading, initialLoadDone, serverSearchQuery, serverCurrentPage])
@@ -629,6 +640,7 @@ export function useDocumentChunks(
       return fetchedChunks
     } catch (err) {
       setError(err instanceof Error ? err.message : 'Failed to load page')
+      logger.error(`Failed to load page for document ${documentId}:`, err)
       throw err
     } finally {
       setIsLoading(false)
@@ -676,6 +688,7 @@ export function useDocumentChunks(
       return fetchedChunks
     } catch (err) {
       setError(err instanceof Error ? err.message : 'Failed to refresh chunks')
+      logger.error(`Failed to refresh chunks for document ${documentId}:`, err)
       throw err
     } finally {
       setIsLoading(false)
@@ -704,6 +717,7 @@ export function useDocumentChunks(
       return searchResults
     } catch (err) {
       setError(err instanceof Error ? err.message : 'Failed to search chunks')
+      logger.error(`Failed to search chunks for document ${documentId}:`, err)
       throw err
     } finally {
       setIsLoading(false)

apps/sim/hooks/use-tag-definitions.ts

@@ -1,7 +1,7 @@
 'use client'
 
 import { useCallback, useEffect, useState } from 'react'
-import type { TagSlot } from '@/lib/constants/knowledge'
+import type { TagSlot } from '@/lib/knowledge/consts'
 import { createLogger } from '@/lib/logs/console/logger'
 
 const logger = createLogger('useTagDefinitions')

apps/sim/lib/auth-client.ts

@@ -10,7 +10,7 @@ import { createAuthClient } from 'better-auth/react'
 import type { auth } from '@/lib/auth'
 import { env, getEnv } from '@/lib/env'
 import { isProd } from '@/lib/environment'
-import { SessionContext, type SessionHookResult } from '@/lib/session-context'
+import { SessionContext, type SessionHookResult } from '@/lib/session/session-context'
 
 export function getBaseURL() {
   let baseURL

apps/sim/lib/auth.ts

@@ -24,7 +24,7 @@ import { authorizeSubscriptionReference } from '@/lib/billing/authorization'
 import { handleNewUser } from '@/lib/billing/core/usage'
 import { syncSubscriptionUsageLimits } from '@/lib/billing/organization'
 import { getPlans } from '@/lib/billing/plans'
-import type { EnterpriseSubscriptionMetadata } from '@/lib/billing/types'
+import { handleManualEnterpriseSubscription } from '@/lib/billing/webhooks/enterprise'
 import {
   handleInvoiceFinalized,
   handleInvoicePaymentFailed,
@@ -52,121 +52,6 @@ if (validStripeKey) {
   })
 }
 
-function isEnterpriseMetadata(value: unknown): value is EnterpriseSubscriptionMetadata {
-  return (
-    !!value &&
-    typeof (value as any).plan === 'string' &&
-    (value as any).plan.toLowerCase() === 'enterprise'
-  )
-}
-
-async function handleManualEnterpriseSubscription(event: Stripe.Event) {
-  const stripeSubscription = event.data.object as Stripe.Subscription
-
-  const metaPlan = (stripeSubscription.metadata?.plan as string | undefined)?.toLowerCase() || ''
-
-  if (metaPlan !== 'enterprise') {
-    logger.info('[subscription.created] Skipping non-enterprise subscription', {
-      subscriptionId: stripeSubscription.id,
-      plan: metaPlan || 'unknown',
-    })
-    return
-  }
-
-  const stripeCustomerId = stripeSubscription.customer as string
-
-  if (!stripeCustomerId) {
-    logger.error('[subscription.created] Missing Stripe customer ID', {
-      subscriptionId: stripeSubscription.id,
-    })
-    throw new Error('Missing Stripe customer ID on subscription')
-  }
-
-  const metadata = stripeSubscription.metadata || {}
-
-  const referenceId =
-    typeof metadata.referenceId === 'string' && metadata.referenceId.length > 0
-      ? metadata.referenceId
-      : null
-
-  if (!referenceId) {
-    logger.error('[subscription.created] Unable to resolve referenceId', {
-      subscriptionId: stripeSubscription.id,
-      stripeCustomerId,
-    })
-    throw new Error('Unable to resolve referenceId for subscription')
-  }
-
-  const firstItem = stripeSubscription.items?.data?.[0]
-  const seats = typeof firstItem?.quantity === 'number' ? firstItem.quantity : null
-
-  if (!isEnterpriseMetadata(metadata)) {
-    logger.error('[subscription.created] Invalid enterprise metadata shape', {
-      subscriptionId: stripeSubscription.id,
-      metadata,
-    })
-    throw new Error('Invalid enterprise metadata for subscription')
-  }
-  const enterpriseMetadata = metadata
-  const metadataJson: Record<string, unknown> = { ...enterpriseMetadata }
-
-  const subscriptionRow = {
-    id: crypto.randomUUID(),
-    plan: 'enterprise',
-    referenceId,
-    stripeCustomerId,
-    stripeSubscriptionId: stripeSubscription.id,
-    status: stripeSubscription.status || null,
-    periodStart: stripeSubscription.current_period_start
-      ? new Date(stripeSubscription.current_period_start * 1000)
-      : null,
-    periodEnd: stripeSubscription.current_period_end
-      ? new Date(stripeSubscription.current_period_end * 1000)
-      : null,
-    cancelAtPeriodEnd: stripeSubscription.cancel_at_period_end ?? null,
-    seats,
-    trialStart: stripeSubscription.trial_start
-      ? new Date(stripeSubscription.trial_start * 1000)
-      : null,
-    trialEnd: stripeSubscription.trial_end ? new Date(stripeSubscription.trial_end * 1000) : null,
-    metadata: metadataJson,
-  }
-
-  const existing = await db
-    .select({ id: schema.subscription.id })
-    .from(schema.subscription)
-    .where(eq(schema.subscription.stripeSubscriptionId, stripeSubscription.id))
-    .limit(1)
-
-  if (existing.length > 0) {
-    await db
-      .update(schema.subscription)
-      .set({
-        plan: subscriptionRow.plan,
-        referenceId: subscriptionRow.referenceId,
-        stripeCustomerId: subscriptionRow.stripeCustomerId,
-        status: subscriptionRow.status,
-        periodStart: subscriptionRow.periodStart,
-        periodEnd: subscriptionRow.periodEnd,
-        cancelAtPeriodEnd: subscriptionRow.cancelAtPeriodEnd,
-        seats: subscriptionRow.seats,
-        trialStart: subscriptionRow.trialStart,
-        trialEnd: subscriptionRow.trialEnd,
-        metadata: subscriptionRow.metadata,
-      })
-      .where(eq(schema.subscription.stripeSubscriptionId, stripeSubscription.id))
-  } else {
-    await db.insert(schema.subscription).values(subscriptionRow)
-  }
-
-  logger.info('[subscription.created] Upserted subscription', {
-    subscriptionId: subscriptionRow.id,
-    referenceId: subscriptionRow.referenceId,
-    plan: subscriptionRow.plan,
-    status: subscriptionRow.status,
-  })
-}
-
 export const auth = betterAuth({
   baseURL: getBaseURL(),
   trustedOrigins: [
@@ -1161,7 +1046,7 @@ export const auth = betterAuth({
 
               if (!response.ok) {
                 const errorText = await response.text()
-                console.error('Linear API error:', {
+                logger.error('Linear API error:', {
                   status: response.status,
                   statusText: response.statusText,
                   body: errorText,
@@ -1172,12 +1057,12 @@ export const auth = betterAuth({
               const { data, errors } = await response.json()
 
               if (errors) {
-                console.error('GraphQL errors:', errors)
+                logger.error('GraphQL errors:', errors)
                 throw new Error(`GraphQL errors: ${JSON.stringify(errors)}`)
               }
 
               if (!data?.viewer) {
-                console.error('No viewer data in response:', data)
+                logger.error('No viewer data in response:', data)
                 throw new Error('No viewer data in response')
               }
 
@@ -1193,7 +1078,7 @@ export const auth = betterAuth({
                 image: viewer.avatarUrl || null,
               }
             } catch (error) {
-              console.error('Error in getUserInfo:', error)
+              logger.error('Error in getUserInfo:', error)
               throw error
             }
           },

apps/sim/lib/billing/calculations/usage-monitor.ts

@@ -31,9 +31,7 @@ export async function checkUsageStatus(userId: string): Promise<UsageData> {
       const statsRecords = await db.select().from(userStats).where(eq(userStats.userId, userId))
       const currentUsage =
         statsRecords.length > 0
-          ? Number.parseFloat(
-              statsRecords[0].currentPeriodCost?.toString() || statsRecords[0].totalCost.toString()
-            )
+          ? Number.parseFloat(statsRecords[0].currentPeriodCost?.toString())
           : 0
 
       return {
@@ -117,7 +115,7 @@ export async function checkUsageStatus(userId: string): Promise<UsageData> {
               // Fall back to minimum billing amount from Stripe subscription
               const orgSub = await getOrganizationSubscription(org.id)
               if (orgSub?.seats) {
-                const { basePrice } = getPlanPricing(orgSub.plan, orgSub)
+                const { basePrice } = getPlanPricing(orgSub.plan)
                 orgCap = (orgSub.seats || 1) * basePrice
               } else {
                 // If no subscription, use team default

apps/sim/lib/billing/core/billing.ts

@@ -2,12 +2,10 @@ import { and, eq } from 'drizzle-orm'
 import { getHighestPrioritySubscription } from '@/lib/billing/core/subscription'
 import { getUserUsageData } from '@/lib/billing/core/usage'
 import {
-  getEnterpriseTierLimitPerSeat,
   getFreeTierLimit,
   getProTierLimit,
   getTeamTierLimitPerSeat,
 } from '@/lib/billing/subscriptions/utils'
-import type { EnterpriseSubscriptionMetadata } from '@/lib/billing/types'
 import { createLogger } from '@/lib/logs/console/logger'
 import { db } from '@/db'
 import { member, subscription, user } from '@/db/schema'
@@ -43,11 +41,8 @@ export async function getOrganizationSubscription(organizationId: string) {
 /**
  * Get plan pricing information
  */
-export function getPlanPricing(
-  plan: string,
-  subscription?: any
-): {
-  basePrice: number // What they pay upfront via Stripe subscription (per seat for team/enterprise)
+export function getPlanPricing(plan: string): {
+  basePrice: number // What they pay upfront via Stripe subscription
 } {
   switch (plan) {
     case 'free':
@@ -55,25 +50,7 @@ export function getPlanPricing(
     case 'pro':
       return { basePrice: getProTierLimit() }
     case 'team':
-      return { basePrice: getTeamTierLimitPerSeat() }
-    case 'enterprise':
-      // Enterprise uses per-seat pricing like Team plans
-      // Custom per-seat price can be set in metadata
-      if (subscription?.metadata) {
-        const metadata: EnterpriseSubscriptionMetadata =
-          typeof subscription.metadata === 'string'
-            ? JSON.parse(subscription.metadata)
-            : subscription.metadata
-
-        const perSeatPrice = metadata.perSeatPrice
-          ? Number.parseFloat(String(metadata.perSeatPrice))
-          : undefined
-        if (perSeatPrice && perSeatPrice > 0 && !Number.isNaN(perSeatPrice)) {
-          return { basePrice: perSeatPrice }
-        }
-      }
-      // Default enterprise per-seat pricing
-      return { basePrice: getEnterpriseTierLimitPerSeat() }
+      return { basePrice: getTeamTierLimitPerSeat() } // Per-seat pricing
     default:
       return { basePrice: 0 }
   }
@@ -103,7 +80,7 @@ export async function calculateUserOverage(userId: string): Promise<{
     }
 
     const plan = subscription?.plan || 'free'
-    const { basePrice } = getPlanPricing(plan, subscription)
+    const { basePrice } = getPlanPricing(plan)
     const actualUsage = usageData.currentUsage
 
     // Calculate overage: any usage beyond what they already paid for
@@ -197,7 +174,7 @@ export async function getSimplifiedBillingSummary(
         .from(member)
         .where(eq(member.organizationId, organizationId))
 
-      const { basePrice: basePricePerSeat } = getPlanPricing(subscription.plan, subscription)
+      const { basePrice: basePricePerSeat } = getPlanPricing(subscription.plan)
       // Use licensed seats from Stripe as source of truth
       const licensedSeats = subscription.seats || 1
       const totalBasePrice = basePricePerSeat * licensedSeats // Based on Stripe subscription
@@ -270,7 +247,7 @@ export async function getSimplifiedBillingSummary(
     }
 
     // Individual billing summary
-    const { basePrice } = getPlanPricing(plan, subscription)
+    const { basePrice } = getPlanPricing(plan)
 
     // For team and enterprise plans, calculate total team usage instead of individual usage
     let currentUsage = usageData.currentUsage

apps/sim/lib/billing/core/organization.ts

@@ -131,35 +131,38 @@ export async function getOrganizationBillingData(
     const totalCurrentUsage = members.reduce((sum, member) => sum + member.currentUsage, 0)
 
     // Get per-seat pricing for the plan
-    const { basePrice: pricePerSeat } = getPlanPricing(subscription.plan, subscription)
+    const { basePrice: pricePerSeat } = getPlanPricing(subscription.plan)
 
     // Use Stripe subscription seats as source of truth
     // Ensure we always have at least 1 seat (protect against 0 or falsy values)
     const licensedSeats = Math.max(subscription.seats || 1, 1)
 
-    // Validate seat capacity - warn if members exceed licensed seats
-    if (members.length > licensedSeats) {
-      logger.warn('Organization has more members than licensed seats', {
-        organizationId,
-        licensedSeats,
-        actualMembers: members.length,
-        plan: subscription.plan,
-      })
+    // Calculate minimum billing amount
+    let minimumBillingAmount: number
+    let totalUsageLimit: number
+
+    if (subscription.plan === 'enterprise') {
+      // Enterprise has fixed pricing set through custom Stripe product
+      // Their usage limit is configured to match their monthly cost
+      const configuredLimit = organizationData.orgUsageLimit
+        ? Number.parseFloat(organizationData.orgUsageLimit)
+        : 0
+      minimumBillingAmount = configuredLimit // For enterprise, this equals their fixed monthly cost
+      totalUsageLimit = configuredLimit // Same as their monthly cost
+    } else {
+      // Team plan: Billing is based on licensed seats from Stripe
+      minimumBillingAmount = licensedSeats * pricePerSeat
+
+      // Total usage limit: never below the minimum based on licensed seats
+      const configuredLimit = organizationData.orgUsageLimit
+        ? Number.parseFloat(organizationData.orgUsageLimit)
+        : null
+      totalUsageLimit =
+        configuredLimit !== null
+          ? Math.max(configuredLimit, minimumBillingAmount)
+          : minimumBillingAmount
     }
 
-    // Billing is based on licensed seats from Stripe, not actual member count
-    // This ensures organizations pay for their seat capacity regardless of utilization
-    const minimumBillingAmount = licensedSeats * pricePerSeat
-
-    // Total usage limit: never below the minimum based on licensed seats
-    const configuredLimit = organizationData.orgUsageLimit
-      ? Number.parseFloat(organizationData.orgUsageLimit)
-      : null
-    const totalUsageLimit =
-      configuredLimit !== null
-        ? Math.max(configuredLimit, minimumBillingAmount)
-        : minimumBillingAmount
-
     const averageUsagePerMember = members.length > 0 ? totalCurrentUsage / members.length : 0
 
     // Billing period comes from the organization's subscription
@@ -213,8 +216,24 @@ export async function updateOrganizationUsageLimit(
       return { success: false, error: 'No active subscription found' }
     }
 
-    // Calculate minimum based on seats
-    const { basePrice } = getPlanPricing(subscription.plan, subscription)
+    // Enterprise plans have fixed usage limits that cannot be changed
+    if (subscription.plan === 'enterprise') {
+      return {
+        success: false,
+        error: 'Enterprise plans have fixed usage limits that cannot be changed',
+      }
+    }
+
+    // Only team plans can update their usage limits
+    if (subscription.plan !== 'team') {
+      return {
+        success: false,
+        error: 'Only team organizations can update usage limits',
+      }
+    }
+
+    // Team plans have minimum based on seats
+    const { basePrice } = getPlanPricing(subscription.plan)
     const minimumLimit = Math.max(subscription.seats || 1, 1) * basePrice
 
     // Validate new limit is not below minimum
@@ -315,3 +334,33 @@ export async function getOrganizationBillingSummary(organizationId: string) {
     throw error
   }
 }
+
+/**
+ * Check if a user is an owner or admin of a specific organization
+ *
+ * @param userId - The ID of the user to check
+ * @param organizationId - The ID of the organization
+ * @returns Promise<boolean> - True if the user is an owner or admin of the organization
+ */
+export async function isOrganizationOwnerOrAdmin(
+  userId: string,
+  organizationId: string
+): Promise<boolean> {
+  try {
+    const memberRecord = await db
+      .select({ role: member.role })
+      .from(member)
+      .where(and(eq(member.userId, userId), eq(member.organizationId, organizationId)))
+      .limit(1)
+
+    if (memberRecord.length === 0) {
+      return false
+    }
+
+    const userRole = memberRecord[0].role
+    return ['owner', 'admin'].includes(userRole)
+  } catch (error) {
+    logger.error('Error checking organization ownership/admin status:', error)
+    return false
+  }
+}

apps/sim/lib/billing/core/subscription.ts

@@ -157,14 +157,26 @@ export async function hasExceededCostLimit(userId: string): Promise<boolean> {
 
     // Calculate usage limit
     let limit = getFreeTierLimit() // Default free tier limit
+
     if (subscription) {
-      limit = getPerUserMinimumLimit(subscription)
-      logger.info('Using subscription-based limit', {
-        userId,
-        plan: subscription.plan,
-        seats: subscription.seats || 1,
-        limit,
-      })
+      // Team/Enterprise: Use organization limit
+      if (subscription.plan === 'team' || subscription.plan === 'enterprise') {
+        const { getUserUsageLimit } = await import('@/lib/billing/core/usage')
+        limit = await getUserUsageLimit(userId)
+        logger.info('Using organization limit', {
+          userId,
+          plan: subscription.plan,
+          limit,
+        })
+      } else {
+        // Pro/Free: Use individual limit
+        limit = getPerUserMinimumLimit(subscription)
+        logger.info('Using subscription-based limit', {
+          userId,
+          plan: subscription.plan,
+          limit,
+        })
+      }
     } else {
       logger.info('Using free tier limit', { userId, limit })
     }
@@ -231,7 +243,14 @@ export async function getUserSubscriptionState(userId: string): Promise<UserSubs
     if (isProd && statsRecords.length > 0) {
       let limit = getFreeTierLimit() // Default free tier limit
       if (subscription) {
-        limit = getPerUserMinimumLimit(subscription)
+        // Team/Enterprise: Use organization limit
+        if (subscription.plan === 'team' || subscription.plan === 'enterprise') {
+          const { getUserUsageLimit } = await import('@/lib/billing/core/usage')
+          limit = await getUserUsageLimit(userId)
+        } else {
+          // Pro/Free: Use individual limit
+          limit = getPerUserMinimumLimit(subscription)
+        }
       }
 
       const currentCost = Number.parseFloat(

apps/sim/lib/billing/core/usage.ts

@@ -71,7 +71,7 @@ export async function getUserUsageData(userId: string): Promise<UsageData> {
         .limit(1)
 
       const { getPlanPricing } = await import('@/lib/billing/core/billing')
-      const { basePrice } = getPlanPricing(subscription.plan, subscription)
+      const { basePrice } = getPlanPricing(subscription.plan)
       const minimum = (subscription.seats || 1) * basePrice
 
       if (orgData.length > 0 && orgData[0].orgUsageLimit) {
@@ -144,7 +144,7 @@ export async function getUserUsageLimitInfo(userId: string): Promise<UsageLimitI
         .limit(1)
 
       const { getPlanPricing } = await import('@/lib/billing/core/billing')
-      const { basePrice } = getPlanPricing(subscription.plan, subscription)
+      const { basePrice } = getPlanPricing(subscription.plan)
       const minimum = (subscription.seats || 1) * basePrice
 
       if (orgData.length > 0 && orgData[0].orgUsageLimit) {
@@ -335,14 +335,14 @@ export async function getUserUsageLimit(userId: string): Promise<number> {
   if (orgData[0].orgUsageLimit) {
     const configured = Number.parseFloat(orgData[0].orgUsageLimit)
     const { getPlanPricing } = await import('@/lib/billing/core/billing')
-    const { basePrice } = getPlanPricing(subscription.plan, subscription)
+    const { basePrice } = getPlanPricing(subscription.plan)
     const minimum = (subscription.seats || 1) * basePrice
     return Math.max(configured, minimum)
   }
 
   // If org hasn't set a custom limit, use minimum (seats × cost per seat)
   const { getPlanPricing } = await import('@/lib/billing/core/billing')
-  const { basePrice } = getPlanPricing(subscription.plan, subscription)
+  const { basePrice } = getPlanPricing(subscription.plan)
   return (subscription.seats || 1) * basePrice
 }
 

apps/sim/lib/billing/index.ts

@@ -5,7 +5,7 @@
 
 export * from '@/lib/billing/calculations/usage-monitor'
 export * from '@/lib/billing/core/billing'
-export * from '@/lib/billing/core/organization-billing'
+export * from '@/lib/billing/core/organization'
 export * from '@/lib/billing/core/subscription'
 export {
   getHighestPrioritySubscription as getActiveSubscription,
@@ -23,10 +23,6 @@ export {
   updateUserUsageLimit as updateUsageLimit,
 } from '@/lib/billing/core/usage'
 export * from '@/lib/billing/subscriptions/utils'
-export {
-  canEditUsageLimit as canEditLimit,
-  getMinimumUsageLimit as getMinimumLimit,
-  getSubscriptionAllowance as getDefaultLimit,
-} from '@/lib/billing/subscriptions/utils'
+export { canEditUsageLimit as canEditLimit } from '@/lib/billing/subscriptions/utils'
 export * from '@/lib/billing/types'
 export * from '@/lib/billing/validation/seat-management'

apps/sim/lib/billing/subscriptions/utils.test.ts

@@ -1,77 +0,0 @@
-import { describe, expect, it, vi } from 'vitest'
-import { checkEnterprisePlan, getSubscriptionAllowance } from '@/lib/billing/subscriptions/utils'
-
-vi.mock('@/lib/env', () => ({
-  env: {
-    FREE_TIER_COST_LIMIT: 10,
-    PRO_TIER_COST_LIMIT: 20,
-    TEAM_TIER_COST_LIMIT: 40,
-    ENTERPRISE_TIER_COST_LIMIT: 200,
-  },
-  isTruthy: (value: string | boolean | number | undefined) =>
-    typeof value === 'string' ? value.toLowerCase() === 'true' || value === '1' : Boolean(value),
-  getEnv: (variable: string) => process.env[variable],
-}))
-
-describe('Subscription Utilities', () => {
-  describe('checkEnterprisePlan', () => {
-    it.concurrent('returns true for active enterprise subscription', () => {
-      expect(checkEnterprisePlan({ plan: 'enterprise', status: 'active' })).toBeTruthy()
-    })
-
-    it.concurrent('returns false for inactive enterprise subscription', () => {
-      expect(checkEnterprisePlan({ plan: 'enterprise', status: 'canceled' })).toBeFalsy()
-    })
-
-    it.concurrent('returns false when plan is not enterprise', () => {
-      expect(checkEnterprisePlan({ plan: 'pro', status: 'active' })).toBeFalsy()
-    })
-  })
-
-  describe('getSubscriptionAllowance', () => {
-    it.concurrent('returns free-tier limit when subscription is null', () => {
-      expect(getSubscriptionAllowance(null)).toBe(10)
-    })
-
-    it.concurrent('returns free-tier limit when subscription is undefined', () => {
-      expect(getSubscriptionAllowance(undefined)).toBe(10)
-    })
-
-    it.concurrent('returns free-tier limit when subscription is not active', () => {
-      expect(getSubscriptionAllowance({ plan: 'pro', status: 'canceled', seats: 1 })).toBe(10)
-    })
-
-    it.concurrent('returns pro limit for active pro plan', () => {
-      expect(getSubscriptionAllowance({ plan: 'pro', status: 'active', seats: 1 })).toBe(20)
-    })
-
-    it.concurrent('returns team limit multiplied by seats', () => {
-      expect(getSubscriptionAllowance({ plan: 'team', status: 'active', seats: 3 })).toBe(3 * 40)
-    })
-
-    it.concurrent('returns enterprise limit using perSeatPrice metadata', () => {
-      const sub = {
-        plan: 'enterprise',
-        status: 'active',
-        seats: 10,
-        metadata: { perSeatPrice: 150 },
-      }
-      expect(getSubscriptionAllowance(sub)).toBe(10 * 150)
-    })
-
-    it.concurrent('returns enterprise limit using perSeatPrice as string', () => {
-      const sub = {
-        plan: 'enterprise',
-        status: 'active',
-        seats: 8,
-        metadata: { perSeatPrice: '250' },
-      }
-      expect(getSubscriptionAllowance(sub)).toBe(8 * 250)
-    })
-
-    it.concurrent('falls back to default enterprise tier when metadata missing', () => {
-      const sub = { plan: 'enterprise', status: 'active', seats: 2, metadata: {} }
-      expect(getSubscriptionAllowance(sub)).toBe(2 * 200)
-    })
-  })
-})

apps/sim/lib/billing/subscriptions/utils.ts

@@ -4,7 +4,6 @@ import {
   DEFAULT_PRO_TIER_COST_LIMIT,
   DEFAULT_TEAM_TIER_COST_LIMIT,
 } from '@/lib/billing/constants'
-import type { EnterpriseSubscriptionMetadata } from '@/lib/billing/types'
 import { env } from '@/lib/env'
 
 /**
@@ -47,51 +46,10 @@ export function checkTeamPlan(subscription: any): boolean {
   return subscription?.plan === 'team' && subscription?.status === 'active'
 }
 
-/**
- * Calculate the total subscription-level allowance (what the org/user gets for their base payment)
- * - Pro: Fixed amount per user
- * - Team: Seats * base price (pooled for the org)
- * - Enterprise: Seats * per-seat price (pooled, with optional custom pricing in metadata)
- * @param subscription The subscription object
- * @returns The total subscription allowance in dollars
- */
-export function getSubscriptionAllowance(subscription: any): number {
-  if (!subscription || subscription.status !== 'active') {
-    return getFreeTierLimit()
-  }
-
-  const seats = subscription.seats || 1
-
-  if (subscription.plan === 'pro') {
-    return getProTierLimit()
-  }
-  if (subscription.plan === 'team') {
-    return seats * getTeamTierLimitPerSeat()
-  }
-  if (subscription.plan === 'enterprise') {
-    const metadata = subscription.metadata as EnterpriseSubscriptionMetadata | undefined
-
-    // Enterprise uses per-seat pricing (pooled like Team)
-    // Custom per-seat price can be set in metadata
-    let perSeatPrice = getEnterpriseTierLimitPerSeat()
-    if (metadata?.perSeatPrice) {
-      const parsed = Number.parseFloat(String(metadata.perSeatPrice))
-      if (parsed > 0 && !Number.isNaN(parsed)) {
-        perSeatPrice = parsed
-      }
-    }
-
-    return seats * perSeatPrice
-  }
-
-  return getFreeTierLimit()
-}
-
 /**
  * Get the minimum usage limit for an individual user (used for validation)
- * - Pro: User's plan minimum
- * - Team: 0 (pooled model, no individual minimums)
- * - Enterprise: 0 (pooled model, no individual minimums)
+ * Only applicable for plans with individual limits (Free/Pro)
+ * Team and Enterprise plans use organization-level limits instead
  * @param subscription The subscription object
  * @returns The per-user minimum limit in dollars
  */
@@ -100,27 +58,15 @@ export function getPerUserMinimumLimit(subscription: any): number {
     return getFreeTierLimit()
   }
 
-  const seats = subscription.seats || 1
-
   if (subscription.plan === 'pro') {
     return getProTierLimit()
   }
-  if (subscription.plan === 'team') {
-    // For team plans, return the total pooled limit (seats * cost per seat)
-    // This becomes the user's individual limit representing their share of the team pool
-    return seats * getTeamTierLimitPerSeat()
-  }
-  if (subscription.plan === 'enterprise') {
-    // For enterprise plans, return the total pooled limit (seats * cost per seat)
-    // This becomes the user's individual limit representing their share of the enterprise pool
-    let perSeatPrice = getEnterpriseTierLimitPerSeat()
-    if (subscription.metadata?.perSeatPrice) {
-      const parsed = Number.parseFloat(String(subscription.metadata.perSeatPrice))
-      if (parsed > 0 && !Number.isNaN(parsed)) {
-        perSeatPrice = parsed
-      }
-    }
-    return seats * perSeatPrice
+
+  if (subscription.plan === 'team' || subscription.plan === 'enterprise') {
+    // Team and Enterprise don't have individual limits - they use organization limits
+    // This function should not be called for these plans
+    // Returning 0 to indicate no individual minimum
+    return 0
   }
 
   return getFreeTierLimit()
@@ -128,7 +74,8 @@ export function getPerUserMinimumLimit(subscription: any): number {
 
 /**
  * Check if a user can edit their usage limits based on their subscription
- * Free plan users cannot edit limits, paid plan users can
+ * Free and Enterprise plans cannot edit limits
+ * Pro and Team plans can increase their limits
  * @param subscription The subscription object
  * @returns Whether the user can edit their usage limits
  */
@@ -137,19 +84,7 @@ export function canEditUsageLimit(subscription: any): boolean {
     return false // Free plan users cannot edit limits
   }
 
-  return (
-    subscription.plan === 'pro' ||
-    subscription.plan === 'team' ||
-    subscription.plan === 'enterprise'
-  )
-}
-
-/**
- * Get the minimum allowed usage limit for a subscription
- * This prevents users from setting limits below their plan's base amount
- * @param subscription The subscription object
- * @returns The minimum allowed usage limit in dollars
- */
-export function getMinimumUsageLimit(subscription: any): number {
-  return getPerUserMinimumLimit(subscription)
+  // Only Pro and Team plans can edit limits
+  // Enterprise has fixed limits that match their monthly cost
+  return subscription.plan === 'pro' || subscription.plan === 'team'
 }

apps/sim/lib/billing/types/index.ts

@@ -5,15 +5,15 @@
 
 export interface EnterpriseSubscriptionMetadata {
   plan: 'enterprise'
-  // Custom per-seat pricing (defaults to DEFAULT_ENTERPRISE_TIER_COST_LIMIT)
+  // The referenceId must be provided in Stripe metadata to link to the organization
+  // This gets stored in the subscription.referenceId column
   referenceId: string
-  perSeatPrice?: number
-
-  // Maximum allowed seats (defaults to subscription.seats)
-  maxSeats?: number
-
-  // Whether seats are fixed and cannot be changed
-  fixedSeats?: boolean
+  // The fixed monthly price for this enterprise customer (as string from Stripe metadata)
+  // This will be used to set the organization's usage limit
+  monthlyPrice: string
+  // Number of seats for invitation limits (not for billing) (as string from Stripe metadata)
+  // We set Stripe quantity to 1 and use this for actual seat count
+  seats: string
 }
 
 export interface UsageData {

apps/sim/lib/billing/validation/seat-management.ts

@@ -1,6 +1,5 @@
 import { and, count, eq } from 'drizzle-orm'
 import { getOrganizationSubscription } from '@/lib/billing/core/billing'
-import type { EnterpriseSubscriptionMetadata } from '@/lib/billing/types'
 import { quickValidateEmail } from '@/lib/email/validation'
 import { createLogger } from '@/lib/logs/console/logger'
 import { db } from '@/db'
@@ -67,26 +66,9 @@ export async function validateSeatAvailability(
     const currentSeats = memberCount[0]?.count || 0
 
     // Determine seat limits based on subscription
-    let maxSeats = subscription.seats || 1
-
-    // For enterprise plans, check metadata for custom seat allowances
-    if (subscription.plan === 'enterprise' && subscription.metadata) {
-      try {
-        const metadata: EnterpriseSubscriptionMetadata =
-          typeof subscription.metadata === 'string'
-            ? JSON.parse(subscription.metadata)
-            : subscription.metadata
-        if (metadata.maxSeats && typeof metadata.maxSeats === 'number') {
-          maxSeats = metadata.maxSeats
-        }
-      } catch (error) {
-        logger.warn('Failed to parse enterprise subscription metadata', {
-          organizationId,
-          metadata: subscription.metadata,
-          error,
-        })
-      }
-    }
+    // Team: seats from Stripe subscription quantity
+    // Enterprise: seats from metadata (stored in subscription.seats)
+    const maxSeats = subscription.seats || 1
 
     const availableSeats = Math.max(0, maxSeats - currentSeats)
     const canInvite = availableSeats >= additionalSeats
@@ -162,24 +144,11 @@ export async function getOrganizationSeatInfo(
     const currentSeats = memberCount[0]?.count || 0
 
     // Determine seat limits
-    let maxSeats = subscription.seats || 1
-    let canAddSeats = true
+    const maxSeats = subscription.seats || 1
 
-    if (subscription.plan === 'enterprise' && subscription.metadata) {
-      try {
-        const metadata: EnterpriseSubscriptionMetadata =
-          typeof subscription.metadata === 'string'
-            ? JSON.parse(subscription.metadata)
-            : subscription.metadata
-        if (metadata.maxSeats && typeof metadata.maxSeats === 'number') {
-          maxSeats = metadata.maxSeats
-        }
-        // Enterprise plans might have fixed seat counts
-        canAddSeats = !metadata.fixedSeats
-      } catch (error) {
-        logger.warn('Failed to parse enterprise subscription metadata', { organizationId, error })
-      }
-    }
+    // Enterprise plans have fixed seats (can't self-serve changes)
+    // Team plans can add seats through Stripe
+    const canAddSeats = subscription.plan !== 'enterprise'
 
     const availableSeats = Math.max(0, maxSeats - currentSeats)
 

apps/sim/lib/billing/webhooks/enterprise.ts

@@ -0,0 +1,251 @@
+import { eq } from 'drizzle-orm'
+import type Stripe from 'stripe'
+import {
+  getEmailSubject,
+  renderEnterpriseSubscriptionEmail,
+} from '@/components/emails/render-email'
+import { sendEmail } from '@/lib/email/mailer'
+import { getFromEmailAddress } from '@/lib/email/utils'
+import { createLogger } from '@/lib/logs/console/logger'
+import { db } from '@/db'
+import { organization, subscription, user } from '@/db/schema'
+import type { EnterpriseSubscriptionMetadata } from '../types'
+
+const logger = createLogger('BillingEnterprise')
+
+function isEnterpriseMetadata(value: unknown): value is EnterpriseSubscriptionMetadata {
+  return (
+    !!value &&
+    typeof value === 'object' &&
+    'plan' in value &&
+    'referenceId' in value &&
+    'monthlyPrice' in value &&
+    'seats' in value &&
+    typeof value.plan === 'string' &&
+    value.plan.toLowerCase() === 'enterprise' &&
+    typeof value.referenceId === 'string' &&
+    typeof value.monthlyPrice === 'string' &&
+    typeof value.seats === 'string'
+  )
+}
+
+export async function handleManualEnterpriseSubscription(event: Stripe.Event) {
+  const stripeSubscription = event.data.object as Stripe.Subscription
+
+  const metaPlan = (stripeSubscription.metadata?.plan as string | undefined)?.toLowerCase() || ''
+
+  if (metaPlan !== 'enterprise') {
+    logger.info('[subscription.created] Skipping non-enterprise subscription', {
+      subscriptionId: stripeSubscription.id,
+      plan: metaPlan || 'unknown',
+    })
+    return
+  }
+
+  const stripeCustomerId = stripeSubscription.customer as string
+
+  if (!stripeCustomerId) {
+    logger.error('[subscription.created] Missing Stripe customer ID', {
+      subscriptionId: stripeSubscription.id,
+    })
+    throw new Error('Missing Stripe customer ID on subscription')
+  }
+
+  const metadata = stripeSubscription.metadata || {}
+
+  const referenceId =
+    typeof metadata.referenceId === 'string' && metadata.referenceId.length > 0
+      ? metadata.referenceId
+      : null
+
+  if (!referenceId) {
+    logger.error('[subscription.created] Unable to resolve referenceId', {
+      subscriptionId: stripeSubscription.id,
+      stripeCustomerId,
+    })
+    throw new Error('Unable to resolve referenceId for subscription')
+  }
+
+  if (!isEnterpriseMetadata(metadata)) {
+    logger.error('[subscription.created] Invalid enterprise metadata shape', {
+      subscriptionId: stripeSubscription.id,
+      metadata,
+    })
+    throw new Error('Invalid enterprise metadata for subscription')
+  }
+  const enterpriseMetadata = metadata
+  const metadataJson: Record<string, unknown> = { ...enterpriseMetadata }
+
+  // Extract and parse seats and monthly price from metadata (they come as strings from Stripe)
+  const seats = Number.parseInt(enterpriseMetadata.seats, 10)
+  const monthlyPrice = Number.parseFloat(enterpriseMetadata.monthlyPrice)
+
+  if (!seats || seats <= 0 || Number.isNaN(seats)) {
+    logger.error('[subscription.created] Invalid or missing seats in enterprise metadata', {
+      subscriptionId: stripeSubscription.id,
+      seatsRaw: enterpriseMetadata.seats,
+      seatsParsed: seats,
+    })
+    throw new Error('Enterprise subscription must include valid seats in metadata')
+  }
+
+  if (!monthlyPrice || monthlyPrice <= 0 || Number.isNaN(monthlyPrice)) {
+    logger.error('[subscription.created] Invalid or missing monthlyPrice in enterprise metadata', {
+      subscriptionId: stripeSubscription.id,
+      monthlyPriceRaw: enterpriseMetadata.monthlyPrice,
+      monthlyPriceParsed: monthlyPrice,
+    })
+    throw new Error('Enterprise subscription must include valid monthlyPrice in metadata')
+  }
+
+  const subscriptionRow = {
+    id: crypto.randomUUID(),
+    plan: 'enterprise',
+    referenceId,
+    stripeCustomerId,
+    stripeSubscriptionId: stripeSubscription.id,
+    status: stripeSubscription.status || null,
+    periodStart: stripeSubscription.current_period_start
+      ? new Date(stripeSubscription.current_period_start * 1000)
+      : null,
+    periodEnd: stripeSubscription.current_period_end
+      ? new Date(stripeSubscription.current_period_end * 1000)
+      : null,
+    cancelAtPeriodEnd: stripeSubscription.cancel_at_period_end ?? null,
+    seats,
+    trialStart: stripeSubscription.trial_start
+      ? new Date(stripeSubscription.trial_start * 1000)
+      : null,
+    trialEnd: stripeSubscription.trial_end ? new Date(stripeSubscription.trial_end * 1000) : null,
+    metadata: metadataJson,
+  }
+
+  const existing = await db
+    .select({ id: subscription.id })
+    .from(subscription)
+    .where(eq(subscription.stripeSubscriptionId, stripeSubscription.id))
+    .limit(1)
+
+  if (existing.length > 0) {
+    await db
+      .update(subscription)
+      .set({
+        plan: subscriptionRow.plan,
+        referenceId: subscriptionRow.referenceId,
+        stripeCustomerId: subscriptionRow.stripeCustomerId,
+        status: subscriptionRow.status,
+        periodStart: subscriptionRow.periodStart,
+        periodEnd: subscriptionRow.periodEnd,
+        cancelAtPeriodEnd: subscriptionRow.cancelAtPeriodEnd,
+        seats: subscriptionRow.seats,
+        trialStart: subscriptionRow.trialStart,
+        trialEnd: subscriptionRow.trialEnd,
+        metadata: subscriptionRow.metadata,
+      })
+      .where(eq(subscription.stripeSubscriptionId, stripeSubscription.id))
+  } else {
+    await db.insert(subscription).values(subscriptionRow)
+  }
+
+  // Update the organization's usage limit to match the monthly price
+  // The referenceId for enterprise plans is the organization ID
+  try {
+    await db
+      .update(organization)
+      .set({
+        orgUsageLimit: monthlyPrice.toFixed(2),
+        updatedAt: new Date(),
+      })
+      .where(eq(organization.id, referenceId))
+
+    logger.info('[subscription.created] Updated organization usage limit', {
+      organizationId: referenceId,
+      usageLimit: monthlyPrice,
+    })
+  } catch (error) {
+    logger.error('[subscription.created] Failed to update organization usage limit', {
+      organizationId: referenceId,
+      usageLimit: monthlyPrice,
+      error,
+    })
+    // Don't throw - the subscription was created successfully, just log the error
+  }
+
+  logger.info('[subscription.created] Upserted enterprise subscription', {
+    subscriptionId: subscriptionRow.id,
+    referenceId: subscriptionRow.referenceId,
+    plan: subscriptionRow.plan,
+    status: subscriptionRow.status,
+    monthlyPrice,
+    seats,
+    note: 'Seats from metadata, Stripe quantity set to 1',
+  })
+
+  try {
+    const userDetails = await db
+      .select({
+        id: user.id,
+        name: user.name,
+        email: user.email,
+      })
+      .from(user)
+      .where(eq(user.stripeCustomerId, stripeCustomerId))
+      .limit(1)
+
+    const orgDetails = await db
+      .select({
+        id: organization.id,
+        name: organization.name,
+      })
+      .from(organization)
+      .where(eq(organization.id, referenceId))
+      .limit(1)
+
+    if (userDetails.length > 0 && orgDetails.length > 0) {
+      const user = userDetails[0]
+      const org = orgDetails[0]
+
+      const html = await renderEnterpriseSubscriptionEmail(user.name || user.email, user.email)
+
+      const emailResult = await sendEmail({
+        to: user.email,
+        subject: getEmailSubject('enterprise-subscription'),
+        html,
+        from: getFromEmailAddress(),
+        emailType: 'transactional',
+      })
+
+      if (emailResult.success) {
+        logger.info('[subscription.created] Enterprise subscription email sent successfully', {
+          userId: user.id,
+          email: user.email,
+          organizationId: org.id,
+          subscriptionId: subscriptionRow.id,
+        })
+      } else {
+        logger.warn('[subscription.created] Failed to send enterprise subscription email', {
+          userId: user.id,
+          email: user.email,
+          error: emailResult.message,
+        })
+      }
+    } else {
+      logger.warn(
+        '[subscription.created] Could not find user or organization for email notification',
+        {
+          userFound: userDetails.length > 0,
+          orgFound: orgDetails.length > 0,
+          stripeCustomerId,
+          referenceId,
+        }
+      )
+    }
+  } catch (emailError) {
+    logger.error('[subscription.created] Error sending enterprise subscription email', {
+      error: emailError,
+      stripeCustomerId,
+      referenceId,
+      subscriptionId: subscriptionRow.id,
+    })
+  }
+}

apps/sim/lib/billing/webhooks/invoices.ts

@@ -197,6 +197,7 @@ export async function handleInvoicePaymentFailed(event: Stripe.Event) {
 
 /**
  * Handle base invoice finalized → create a separate overage-only invoice
+ * Note: Enterprise plans no longer have overages
  */
 export async function handleInvoiceFinalized(event: Stripe.Event) {
   try {
@@ -215,14 +216,22 @@ export async function handleInvoiceFinalized(event: Stripe.Event) {
     if (records.length === 0) return
     const sub = records[0]
 
+    // Always reset usage at cycle end for all plans
+    await resetUsageForSubscription({ plan: sub.plan, referenceId: sub.referenceId })
+
+    // Enterprise plans have no overages - skip overage invoice creation
+    if (sub.plan === 'enterprise') {
+      return
+    }
+
     const stripe = requireStripeClient()
     const periodEnd =
       invoice.lines?.data?.[0]?.period?.end || invoice.period_end || Math.floor(Date.now() / 1000)
     const billingPeriod = new Date(periodEnd * 1000).toISOString().slice(0, 7)
 
-    // Compute overage
+    // Compute overage (only for team and pro plans)
     let totalOverage = 0
-    if (sub.plan === 'team' || sub.plan === 'enterprise') {
+    if (sub.plan === 'team') {
       const members = await db
         .select({ userId: member.userId })
         .from(member)
@@ -235,19 +244,16 @@ export async function handleInvoiceFinalized(event: Stripe.Event) {
       }
 
       const { getPlanPricing } = await import('@/lib/billing/core/billing')
-      const { basePrice } = getPlanPricing(sub.plan, sub)
+      const { basePrice } = getPlanPricing(sub.plan)
       const baseSubscriptionAmount = (sub.seats || 1) * basePrice
       totalOverage = Math.max(0, totalTeamUsage - baseSubscriptionAmount)
     } else {
       const usage = await getUserUsageData(sub.referenceId)
       const { getPlanPricing } = await import('@/lib/billing/core/billing')
-      const { basePrice } = getPlanPricing(sub.plan, sub)
+      const { basePrice } = getPlanPricing(sub.plan)
       totalOverage = Math.max(0, usage.currentUsage - basePrice)
     }
 
-    // Always reset usage at cycle end, regardless of whether overage > 0
-    await resetUsageForSubscription({ plan: sub.plan, referenceId: sub.referenceId })
-
     if (totalOverage <= 0) return
 
     const customerId = String(invoice.customer)

apps/sim/lib/constants/knowledge.ts

@@ -1,53 +0,0 @@
-/**
- * Knowledge base and document constants
- */
-
-// Tag slot configuration by field type
-// Each field type maps to specific database columns
-export const TAG_SLOT_CONFIG = {
-  text: {
-    slots: ['tag1', 'tag2', 'tag3', 'tag4', 'tag5', 'tag6', 'tag7'] as const,
-    maxSlots: 7,
-  },
-  // Future field types would be added here with their own database columns
-  // date: {
-  //   slots: ['tag8', 'tag9'] as const,
-  //   maxSlots: 2,
-  // },
-  // number: {
-  //   slots: ['tag10', 'tag11'] as const,
-  //   maxSlots: 2,
-  // },
-} as const
-
-// Currently supported field types
-export const SUPPORTED_FIELD_TYPES = Object.keys(TAG_SLOT_CONFIG) as Array<
-  keyof typeof TAG_SLOT_CONFIG
->
-
-// All tag slots (for backward compatibility)
-export const TAG_SLOTS = TAG_SLOT_CONFIG.text.slots
-
-// Maximum number of tag slots for text type (for backward compatibility)
-export const MAX_TAG_SLOTS = TAG_SLOT_CONFIG.text.maxSlots
-
-// Type for tag slot names
-export type TagSlot = (typeof TAG_SLOTS)[number]
-
-// Helper function to get available slots for a field type
-export function getSlotsForFieldType(fieldType: string): readonly string[] {
-  const config = TAG_SLOT_CONFIG[fieldType as keyof typeof TAG_SLOT_CONFIG]
-  if (!config) {
-    return [] // Return empty array for unsupported field types - system will naturally handle this
-  }
-  return config.slots
-}
-
-// Helper function to get max slots for a field type
-export function getMaxSlotsForFieldType(fieldType: string): number {
-  const config = TAG_SLOT_CONFIG[fieldType as keyof typeof TAG_SLOT_CONFIG]
-  if (!config) {
-    return 0 // Return 0 for unsupported field types
-  }
-  return config.maxSlots
-}

apps/sim/lib/env.ts

@@ -139,6 +139,17 @@ export const env = createEnv({
     RATE_LIMIT_ENTERPRISE_SYNC:            z.string().optional().default('150'),   // Enterprise tier sync API executions per minute
     RATE_LIMIT_ENTERPRISE_ASYNC:           z.string().optional().default('1000'),  // Enterprise tier async API executions per minute
 
+    // Knowledge Base Processing Configuration - Shared across all processing methods
+    KB_CONFIG_MAX_DURATION:                z.number().optional().default(300),     // Max processing duration in s
+    KB_CONFIG_MAX_ATTEMPTS:                z.number().optional().default(3),       // Max retry attempts
+    KB_CONFIG_RETRY_FACTOR:                z.number().optional().default(2),       // Retry backoff factor
+    KB_CONFIG_MIN_TIMEOUT:                 z.number().optional().default(1000),    // Min timeout in ms
+    KB_CONFIG_MAX_TIMEOUT:                 z.number().optional().default(10000),   // Max timeout in ms
+    KB_CONFIG_CONCURRENCY_LIMIT:           z.number().optional().default(20),      // Queue concurrency limit
+    KB_CONFIG_BATCH_SIZE:                  z.number().optional().default(20),      // Processing batch size
+    KB_CONFIG_DELAY_BETWEEN_BATCHES:       z.number().optional().default(100),     // Delay between batches in ms
+    KB_CONFIG_DELAY_BETWEEN_DOCUMENTS:     z.number().optional().default(50),      // Delay between documents in ms
+
     // Real-time Communication
     SOCKET_SERVER_URL:                     z.string().url().optional(),            // WebSocket server URL for real-time features
     SOCKET_PORT:                           z.number().optional(),                  // Port for WebSocket server

apps/sim/lib/file-parsers/csv-parser.ts

@@ -1,139 +1,108 @@
-import { createReadStream, existsSync } from 'fs'
-import { Readable } from 'stream'
-import csvParser from 'csv-parser'
+import { existsSync, readFileSync } from 'fs'
+import * as Papa from 'papaparse'
 import type { FileParseResult, FileParser } from '@/lib/file-parsers/types'
 import { sanitizeTextForUTF8 } from '@/lib/file-parsers/utils'
 import { createLogger } from '@/lib/logs/console/logger'
 
 const logger = createLogger('CsvParser')
 
+const PARSE_OPTIONS = {
+  header: true,
+  skipEmptyLines: true,
+  transformHeader: (header: string) => sanitizeTextForUTF8(String(header)),
+  transform: (value: string) => sanitizeTextForUTF8(String(value || '')),
+}
+
 export class CsvParser implements FileParser {
   async parseFile(filePath: string): Promise<FileParseResult> {
-    return new Promise((resolve, reject) => {
-      try {
-        // Validate input
-        if (!filePath) {
-          return reject(new Error('No file path provided'))
-        }
-
-        // Check if file exists
-        if (!existsSync(filePath)) {
-          return reject(new Error(`File not found: ${filePath}`))
-        }
-
-        const results: Record<string, any>[] = []
-        const headers: string[] = []
-
-        createReadStream(filePath)
-          .on('error', (error: Error) => {
-            logger.error('CSV stream error:', error)
-            reject(new Error(`Failed to read CSV file: ${error.message}`))
-          })
-          .pipe(csvParser())
-          .on('headers', (headerList: string[]) => {
-            headers.push(...headerList)
-          })
-          .on('data', (data: Record<string, any>) => {
-            results.push(data)
-          })
-          .on('end', () => {
-            // Convert CSV data to a formatted string representation
-            let content = ''
-
-            // Add headers
-            if (headers.length > 0) {
-              const cleanHeaders = headers.map((h) => sanitizeTextForUTF8(String(h)))
-              content += `${cleanHeaders.join(', ')}\n`
-            }
-
-            // Add rows
-            results.forEach((row) => {
-              const cleanValues = Object.values(row).map((v) =>
-                sanitizeTextForUTF8(String(v || ''))
-              )
-              content += `${cleanValues.join(', ')}\n`
-            })
-
-            resolve({
-              content: sanitizeTextForUTF8(content),
-              metadata: {
-                rowCount: results.length,
-                headers: headers,
-                rawData: results,
-              },
-            })
-          })
-          .on('error', (error: Error) => {
-            logger.error('CSV parsing error:', error)
-            reject(new Error(`Failed to parse CSV file: ${error.message}`))
-          })
-      } catch (error) {
-        logger.error('CSV general error:', error)
-        reject(new Error(`Failed to process CSV file: ${(error as Error).message}`))
+    try {
+      if (!filePath) {
+        throw new Error('No file path provided')
       }
-    })
+
+      if (!existsSync(filePath)) {
+        throw new Error(`File not found: ${filePath}`)
+      }
+
+      const fileContent = readFileSync(filePath, 'utf8')
+
+      const parseResult = Papa.parse(fileContent, PARSE_OPTIONS)
+
+      if (parseResult.errors && parseResult.errors.length > 0) {
+        const errorMessages = parseResult.errors.map((err) => err.message).join(', ')
+        logger.error('CSV parsing errors:', parseResult.errors)
+        throw new Error(`Failed to parse CSV file: ${errorMessages}`)
+      }
+
+      const results = parseResult.data as Record<string, any>[]
+      const headers = parseResult.meta.fields || []
+
+      let content = ''
+
+      if (headers.length > 0) {
+        const cleanHeaders = headers.map((h) => sanitizeTextForUTF8(String(h)))
+        content += `${cleanHeaders.join(', ')}\n`
+      }
+
+      results.forEach((row) => {
+        const cleanValues = Object.values(row).map((v) => sanitizeTextForUTF8(String(v || '')))
+        content += `${cleanValues.join(', ')}\n`
+      })
+
+      return {
+        content: sanitizeTextForUTF8(content),
+        metadata: {
+          rowCount: results.length,
+          headers: headers,
+          rawData: results,
+        },
+      }
+    } catch (error) {
+      logger.error('CSV general error:', error)
+      throw new Error(`Failed to process CSV file: ${(error as Error).message}`)
+    }
   }
 
   async parseBuffer(buffer: Buffer): Promise<FileParseResult> {
-    return new Promise((resolve, reject) => {
-      try {
-        logger.info('Parsing buffer, size:', buffer.length)
+    try {
+      logger.info('Parsing buffer, size:', buffer.length)
 
-        const results: Record<string, any>[] = []
-        const headers: string[] = []
+      const fileContent = buffer.toString('utf8')
 
-        // Create a readable stream from the buffer
-        const bufferStream = new Readable()
-        bufferStream.push(buffer)
-        bufferStream.push(null) // Signal the end of the stream
+      const parseResult = Papa.parse(fileContent, PARSE_OPTIONS)
 
-        bufferStream
-          .on('error', (error: Error) => {
-            logger.error('CSV buffer stream error:', error)
-            reject(new Error(`Failed to read CSV buffer: ${error.message}`))
-          })
-          .pipe(csvParser())
-          .on('headers', (headerList: string[]) => {
-            headers.push(...headerList)
-          })
-          .on('data', (data: Record<string, any>) => {
-            results.push(data)
-          })
-          .on('end', () => {
-            // Convert CSV data to a formatted string representation
-            let content = ''
-
-            // Add headers
-            if (headers.length > 0) {
-              const cleanHeaders = headers.map((h) => sanitizeTextForUTF8(String(h)))
-              content += `${cleanHeaders.join(', ')}\n`
-            }
-
-            // Add rows
-            results.forEach((row) => {
-              const cleanValues = Object.values(row).map((v) =>
-                sanitizeTextForUTF8(String(v || ''))
-              )
-              content += `${cleanValues.join(', ')}\n`
-            })
-
-            resolve({
-              content: sanitizeTextForUTF8(content),
-              metadata: {
-                rowCount: results.length,
-                headers: headers,
-                rawData: results,
-              },
-            })
-          })
-          .on('error', (error: Error) => {
-            logger.error('CSV parsing error:', error)
-            reject(new Error(`Failed to parse CSV buffer: ${error.message}`))
-          })
-      } catch (error) {
-        logger.error('CSV buffer parsing error:', error)
-        reject(new Error(`Failed to process CSV buffer: ${(error as Error).message}`))
+      if (parseResult.errors && parseResult.errors.length > 0) {
+        const errorMessages = parseResult.errors.map((err) => err.message).join(', ')
+        logger.error('CSV parsing errors:', parseResult.errors)
+        throw new Error(`Failed to parse CSV buffer: ${errorMessages}`)
       }
-    })
+
+      const results = parseResult.data as Record<string, any>[]
+      const headers = parseResult.meta.fields || []
+
+      let content = ''
+
+      if (headers.length > 0) {
+        const cleanHeaders = headers.map((h) => sanitizeTextForUTF8(String(h)))
+        content += `${cleanHeaders.join(', ')}\n`
+      }
+
+      results.forEach((row) => {
+        const cleanValues = Object.values(row).map((v) => sanitizeTextForUTF8(String(v || '')))
+        content += `${cleanValues.join(', ')}\n`
+      })
+
+      return {
+        content: sanitizeTextForUTF8(content),
+        metadata: {
+          rowCount: results.length,
+          headers: headers,
+          rawData: results,
+        },
+      }
+    } catch (error) {
+      logger.error('CSV buffer parsing error:', error)
+      throw new Error(`Failed to process CSV buffer: ${(error as Error).message}`)
+    }
   }
 }

apps/sim/lib/file-parsers/doc-parser.ts

@@ -9,19 +9,16 @@ const logger = createLogger('DocParser')
 export class DocParser implements FileParser {
   async parseFile(filePath: string): Promise<FileParseResult> {
     try {
-      // Validate input
       if (!filePath) {
         throw new Error('No file path provided')
       }
 
-      // Check if file exists
       if (!existsSync(filePath)) {
         throw new Error(`File not found: ${filePath}`)
       }
 
       logger.info(`Parsing DOC file: ${filePath}`)
 
-      // Read the file
       const buffer = await readFile(filePath)
       return this.parseBuffer(buffer)
     } catch (error) {
@@ -38,45 +35,37 @@ export class DocParser implements FileParser {
         throw new Error('Empty buffer provided')
       }
 
-      // Try to dynamically import the word extractor
-      let WordExtractor
+      let parseOfficeAsync
       try {
-        WordExtractor = (await import('word-extractor')).default
+        const officeParser = await import('officeparser')
+        parseOfficeAsync = officeParser.parseOfficeAsync
       } catch (importError) {
-        logger.warn('word-extractor not available, using fallback extraction')
+        logger.warn('officeparser not available, using fallback extraction')
         return this.fallbackExtraction(buffer)
       }
 
       try {
-        const extractor = new WordExtractor()
-        const extracted = await extractor.extract(buffer)
+        const result = await parseOfficeAsync(buffer)
 
-        const content = sanitizeTextForUTF8(extracted.getBody())
-        const headers = extracted.getHeaders()
-        const footers = extracted.getFooters()
-
-        // Combine body with headers/footers if they exist
-        let fullContent = content
-        if (headers?.trim()) {
-          fullContent = `${sanitizeTextForUTF8(headers)}\n\n${fullContent}`
-        }
-        if (footers?.trim()) {
-          fullContent = `${fullContent}\n\n${sanitizeTextForUTF8(footers)}`
+        if (!result) {
+          throw new Error('officeparser returned no result')
         }
 
-        logger.info('DOC parsing completed successfully')
+        const resultString = typeof result === 'string' ? result : String(result)
+
+        const content = sanitizeTextForUTF8(resultString.trim())
+
+        logger.info('DOC parsing completed successfully with officeparser')
 
         return {
-          content: fullContent.trim(),
+          content: content,
           metadata: {
-            hasHeaders: !!headers?.trim(),
-            hasFooters: !!footers?.trim(),
-            characterCount: fullContent.length,
-            extractionMethod: 'word-extractor',
+            characterCount: content.length,
+            extractionMethod: 'officeparser',
           },
         }
       } catch (extractError) {
-        logger.warn('word-extractor failed, using fallback:', extractError)
+        logger.warn('officeparser failed, using fallback:', extractError)
         return this.fallbackExtraction(buffer)
       }
     } catch (error) {
@@ -85,25 +74,16 @@ export class DocParser implements FileParser {
     }
   }
 
-  /**
-   * Fallback extraction method for when word-extractor is not available
-   * This is a very basic extraction that looks for readable text in the binary
-   */
   private fallbackExtraction(buffer: Buffer): FileParseResult {
     logger.info('Using fallback text extraction for DOC file')
 
-    // Convert buffer to string and try to extract readable text
-    // This is very basic and won't work well for complex DOC files
-    const text = buffer.toString('utf8', 0, Math.min(buffer.length, 100000)) // Limit to first 100KB
+    const text = buffer.toString('utf8', 0, Math.min(buffer.length, 100000))
 
-    // Extract sequences of printable ASCII characters
     const readableText = text
-      .match(/[\x20-\x7E\s]{4,}/g) // Find sequences of 4+ printable characters
+      .match(/[\x20-\x7E\s]{4,}/g)
       ?.filter(
         (chunk) =>
-          chunk.trim().length > 10 && // Minimum length
-          /[a-zA-Z]/.test(chunk) && // Must contain letters
-          !/^[\x00-\x1F]*$/.test(chunk) // Not just control characters
+          chunk.trim().length > 10 && /[a-zA-Z]/.test(chunk) && !/^[\x00-\x1F]*$/.test(chunk)
       )
       .join(' ')
       .replace(/\s+/g, ' ')
@@ -118,8 +98,7 @@ export class DocParser implements FileParser {
       metadata: {
         extractionMethod: 'fallback',
         characterCount: content.length,
-        warning:
-          'Basic text extraction used. For better results, install word-extractor package or convert to DOCX format.',
+        warning: 'Basic text extraction used. For better results, convert to DOCX format.',
       },
     }
   }

apps/sim/lib/file-parsers/docx-parser.ts

@@ -14,15 +14,12 @@ interface MammothResult {
 export class DocxParser implements FileParser {
   async parseFile(filePath: string): Promise<FileParseResult> {
     try {
-      // Validate input
       if (!filePath) {
         throw new Error('No file path provided')
       }
 
-      // Read the file
       const buffer = await readFile(filePath)
 
-      // Use parseBuffer for consistent implementation
       return this.parseBuffer(buffer)
     } catch (error) {
       logger.error('DOCX file error:', error)
@@ -34,10 +31,8 @@ export class DocxParser implements FileParser {
     try {
       logger.info('Parsing buffer, size:', buffer.length)
 
-      // Extract text with mammoth
       const result = await mammoth.extractRawText({ buffer })
 
-      // Extract HTML for metadata (optional - won't fail if this fails)
       let htmlResult: MammothResult = { value: '', messages: [] }
       try {
         htmlResult = await mammoth.convertToHtml({ buffer })

apps/sim/lib/file-parsers/html-parser.ts

@@ -0,0 +1,283 @@
+import { readFile } from 'fs/promises'
+import * as cheerio from 'cheerio'
+import type { FileParseResult, FileParser } from '@/lib/file-parsers/types'
+import { sanitizeTextForUTF8 } from '@/lib/file-parsers/utils'
+import { createLogger } from '@/lib/logs/console/logger'
+
+const logger = createLogger('HtmlParser')
+
+export class HtmlParser implements FileParser {
+  async parseFile(filePath: string): Promise<FileParseResult> {
+    try {
+      if (!filePath) {
+        throw new Error('No file path provided')
+      }
+
+      const buffer = await readFile(filePath)
+      return this.parseBuffer(buffer)
+    } catch (error) {
+      logger.error('HTML file error:', error)
+      throw new Error(`Failed to parse HTML file: ${(error as Error).message}`)
+    }
+  }
+
+  async parseBuffer(buffer: Buffer): Promise<FileParseResult> {
+    try {
+      logger.info('Parsing HTML buffer, size:', buffer.length)
+
+      const htmlContent = buffer.toString('utf-8')
+      const $ = cheerio.load(htmlContent)
+
+      // Extract meta information before removing tags
+      const title = $('title').text().trim()
+      const metaDescription = $('meta[name="description"]').attr('content') || ''
+
+      $('script, style, noscript, meta, link, iframe, object, embed, svg').remove()
+
+      $.root()
+        .contents()
+        .filter(function () {
+          return this.type === 'comment'
+        })
+        .remove()
+
+      const content = this.extractStructuredText($)
+
+      const sanitizedContent = sanitizeTextForUTF8(content)
+
+      const characterCount = sanitizedContent.length
+      const wordCount = sanitizedContent.split(/\s+/).filter((word) => word.length > 0).length
+      const estimatedTokenCount = Math.ceil(characterCount / 4)
+
+      const headings = this.extractHeadings($)
+
+      const links = this.extractLinks($)
+
+      return {
+        content: sanitizedContent,
+        metadata: {
+          title,
+          metaDescription,
+          characterCount,
+          wordCount,
+          tokenCount: estimatedTokenCount,
+          headings,
+          links: links.slice(0, 50),
+          hasImages: $('img').length > 0,
+          imageCount: $('img').length,
+          hasTable: $('table').length > 0,
+          tableCount: $('table').length,
+          hasList: $('ul, ol').length > 0,
+          listCount: $('ul, ol').length,
+        },
+      }
+    } catch (error) {
+      logger.error('HTML buffer parsing error:', error)
+      throw new Error(`Failed to parse HTML buffer: ${(error as Error).message}`)
+    }
+  }
+
+  /**
+   * Extract structured text content preserving document hierarchy
+   */
+  private extractStructuredText($: cheerio.CheerioAPI): string {
+    const contentParts: string[] = []
+
+    const rootElement = $('body').length > 0 ? $('body') : $.root()
+
+    this.processElement($, rootElement, contentParts, 0)
+
+    return contentParts.join('\n').trim()
+  }
+
+  /**
+   * Recursively process elements to extract text with structure
+   */
+  private processElement(
+    $: cheerio.CheerioAPI,
+    element: cheerio.Cheerio<any>,
+    contentParts: string[],
+    depth: number
+  ): void {
+    element.contents().each((_, node) => {
+      if (node.type === 'text') {
+        const text = $(node).text().trim()
+        if (text) {
+          contentParts.push(text)
+        }
+      } else if (node.type === 'tag') {
+        const $node = $(node)
+        const tagName = node.tagName?.toLowerCase()
+
+        switch (tagName) {
+          case 'h1':
+          case 'h2':
+          case 'h3':
+          case 'h4':
+          case 'h5':
+          case 'h6': {
+            const headingText = $node.text().trim()
+            if (headingText) {
+              contentParts.push(`\n${headingText}\n`)
+            }
+            break
+          }
+
+          case 'p': {
+            const paragraphText = $node.text().trim()
+            if (paragraphText) {
+              contentParts.push(`${paragraphText}\n`)
+            }
+            break
+          }
+
+          case 'br':
+            contentParts.push('\n')
+            break
+
+          case 'hr':
+            contentParts.push('\n---\n')
+            break
+
+          case 'li': {
+            const listItemText = $node.text().trim()
+            if (listItemText) {
+              const indent = '  '.repeat(Math.min(depth, 3))
+              contentParts.push(`${indent}• ${listItemText}`)
+            }
+            break
+          }
+
+          case 'ul':
+          case 'ol':
+            contentParts.push('\n')
+            this.processElement($, $node, contentParts, depth + 1)
+            contentParts.push('\n')
+            break
+
+          case 'table':
+            this.processTable($, $node, contentParts)
+            break
+
+          case 'blockquote': {
+            const quoteText = $node.text().trim()
+            if (quoteText) {
+              contentParts.push(`\n> ${quoteText}\n`)
+            }
+            break
+          }
+
+          case 'pre':
+          case 'code': {
+            const codeText = $node.text().trim()
+            if (codeText) {
+              contentParts.push(`\n\`\`\`\n${codeText}\n\`\`\`\n`)
+            }
+            break
+          }
+
+          case 'div':
+          case 'section':
+          case 'article':
+          case 'main':
+          case 'aside':
+          case 'nav':
+          case 'header':
+          case 'footer':
+            this.processElement($, $node, contentParts, depth)
+            break
+
+          case 'a': {
+            const linkText = $node.text().trim()
+            const href = $node.attr('href')
+            if (linkText) {
+              if (href?.startsWith('http')) {
+                contentParts.push(`${linkText} (${href})`)
+              } else {
+                contentParts.push(linkText)
+              }
+            }
+            break
+          }
+
+          case 'img': {
+            const alt = $node.attr('alt')
+            if (alt) {
+              contentParts.push(`[Image: ${alt}]`)
+            }
+            break
+          }
+
+          default:
+            this.processElement($, $node, contentParts, depth)
+        }
+      }
+    })
+  }
+
+  /**
+   * Process table elements to extract structured data
+   */
+  private processTable(
+    $: cheerio.CheerioAPI,
+    table: cheerio.Cheerio<any>,
+    contentParts: string[]
+  ): void {
+    contentParts.push('\n[Table]')
+
+    table.find('tr').each((_, row) => {
+      const $row = $(row)
+      const cells: string[] = []
+
+      $row.find('td, th').each((_, cell) => {
+        const cellText = $(cell).text().trim()
+        cells.push(cellText || '')
+      })
+
+      if (cells.length > 0) {
+        contentParts.push(`| ${cells.join(' | ')} |`)
+      }
+    })
+
+    contentParts.push('[/Table]\n')
+  }
+
+  /**
+   * Extract heading structure for metadata
+   */
+  private extractHeadings($: cheerio.CheerioAPI): Array<{ level: number; text: string }> {
+    const headings: Array<{ level: number; text: string }> = []
+
+    $('h1, h2, h3, h4, h5, h6').each((_, element) => {
+      const $element = $(element)
+      const tagName = element.tagName?.toLowerCase()
+      const level = Number.parseInt(tagName?.charAt(1) || '1', 10)
+      const text = $element.text().trim()
+
+      if (text) {
+        headings.push({ level, text })
+      }
+    })
+
+    return headings
+  }
+
+  /**
+   * Extract links from the document
+   */
+  private extractLinks($: cheerio.CheerioAPI): Array<{ text: string; href: string }> {
+    const links: Array<{ text: string; href: string }> = []
+
+    $('a[href]').each((_, element) => {
+      const $element = $(element)
+      const href = $element.attr('href')
+      const text = $element.text().trim()
+
+      if (href && text && href.startsWith('http')) {
+        links.push({ text, href })
+      }
+    })
+
+    return links
+  }
+}

apps/sim/lib/file-parsers/index.test.ts

@@ -51,6 +51,23 @@ const mockMdParseFile = vi.fn().mockResolvedValue({
   },
 })
 
+const mockPptxParseFile = vi.fn().mockResolvedValue({
+  content: 'Parsed PPTX content',
+  metadata: {
+    slideCount: 5,
+    extractionMethod: 'officeparser',
+  },
+})
+
+const mockHtmlParseFile = vi.fn().mockResolvedValue({
+  content: 'Parsed HTML content',
+  metadata: {
+    title: 'Test HTML Document',
+    headingCount: 3,
+    linkCount: 2,
+  },
+})
+
 const createMockModule = () => {
   const mockParsers: Record<string, FileParser> = {
     pdf: { parseFile: mockPdfParseFile },
@@ -58,6 +75,10 @@ const createMockModule = () => {
     docx: { parseFile: mockDocxParseFile },
     txt: { parseFile: mockTxtParseFile },
     md: { parseFile: mockMdParseFile },
+    pptx: { parseFile: mockPptxParseFile },
+    ppt: { parseFile: mockPptxParseFile },
+    html: { parseFile: mockHtmlParseFile },
+    htm: { parseFile: mockHtmlParseFile },
   }
 
   return {
@@ -143,6 +164,18 @@ describe('File Parsers', () => {
       })),
     }))
 
+    vi.doMock('@/lib/file-parsers/pptx-parser', () => ({
+      PptxParser: vi.fn().mockImplementation(() => ({
+        parseFile: mockPptxParseFile,
+      })),
+    }))
+
+    vi.doMock('@/lib/file-parsers/html-parser', () => ({
+      HtmlParser: vi.fn().mockImplementation(() => ({
+        parseFile: mockHtmlParseFile,
+      })),
+    }))
+
     global.console = {
       ...console,
       log: vi.fn(),
@@ -261,6 +294,82 @@ describe('File Parsers', () => {
 
       const { parseFile } = await import('@/lib/file-parsers/index')
       const result = await parseFile('/test/files/document.md')
+
+      expect(result).toEqual(expectedResult)
+    })
+
+    it('should parse PPTX files successfully', async () => {
+      const expectedResult = {
+        content: 'Parsed PPTX content',
+        metadata: {
+          slideCount: 5,
+          extractionMethod: 'officeparser',
+        },
+      }
+
+      mockPptxParseFile.mockResolvedValueOnce(expectedResult)
+      mockExistsSync.mockReturnValue(true)
+
+      const { parseFile } = await import('@/lib/file-parsers/index')
+      const result = await parseFile('/test/files/presentation.pptx')
+
+      expect(result).toEqual(expectedResult)
+    })
+
+    it('should parse PPT files successfully', async () => {
+      const expectedResult = {
+        content: 'Parsed PPTX content',
+        metadata: {
+          slideCount: 5,
+          extractionMethod: 'officeparser',
+        },
+      }
+
+      mockPptxParseFile.mockResolvedValueOnce(expectedResult)
+      mockExistsSync.mockReturnValue(true)
+
+      const { parseFile } = await import('@/lib/file-parsers/index')
+      const result = await parseFile('/test/files/presentation.ppt')
+
+      expect(result).toEqual(expectedResult)
+    })
+
+    it('should parse HTML files successfully', async () => {
+      const expectedResult = {
+        content: 'Parsed HTML content',
+        metadata: {
+          title: 'Test HTML Document',
+          headingCount: 3,
+          linkCount: 2,
+        },
+      }
+
+      mockHtmlParseFile.mockResolvedValueOnce(expectedResult)
+      mockExistsSync.mockReturnValue(true)
+
+      const { parseFile } = await import('@/lib/file-parsers/index')
+      const result = await parseFile('/test/files/document.html')
+
+      expect(result).toEqual(expectedResult)
+    })
+
+    it('should parse HTM files successfully', async () => {
+      const expectedResult = {
+        content: 'Parsed HTML content',
+        metadata: {
+          title: 'Test HTML Document',
+          headingCount: 3,
+          linkCount: 2,
+        },
+      }
+
+      mockHtmlParseFile.mockResolvedValueOnce(expectedResult)
+      mockExistsSync.mockReturnValue(true)
+
+      const { parseFile } = await import('@/lib/file-parsers/index')
+      const result = await parseFile('/test/files/document.htm')
+
+      expect(result).toEqual(expectedResult)
     })
 
     it('should throw error for unsupported file types', async () => {
@@ -292,6 +401,10 @@ describe('File Parsers', () => {
       expect(isSupportedFileType('docx')).toBe(true)
       expect(isSupportedFileType('txt')).toBe(true)
       expect(isSupportedFileType('md')).toBe(true)
+      expect(isSupportedFileType('pptx')).toBe(true)
+      expect(isSupportedFileType('ppt')).toBe(true)
+      expect(isSupportedFileType('html')).toBe(true)
+      expect(isSupportedFileType('htm')).toBe(true)
     })
 
     it('should return false for unsupported file types', async () => {
@@ -308,6 +421,8 @@ describe('File Parsers', () => {
       expect(isSupportedFileType('CSV')).toBe(true)
       expect(isSupportedFileType('TXT')).toBe(true)
       expect(isSupportedFileType('MD')).toBe(true)
+      expect(isSupportedFileType('PPTX')).toBe(true)
+      expect(isSupportedFileType('HTML')).toBe(true)
     })
 
     it('should handle errors gracefully', async () => {

apps/sim/lib/file-parsers/index.ts

@@ -7,7 +7,6 @@ import { createLogger } from '@/lib/logs/console/logger'
 
 const logger = createLogger('FileParser')
 
-// Lazy-loaded parsers to avoid initialization issues
 let parserInstances: Record<string, FileParser> | null = null
 
 /**
@@ -18,25 +17,20 @@ function getParserInstances(): Record<string, FileParser> {
     parserInstances = {}
 
     try {
-      // Import parsers only when needed - with try/catch for each one
       try {
         logger.info('Attempting to load PDF parser...')
         try {
-          // First try to use the pdf-parse library
-          // Import the PdfParser using ES module import to avoid test file access
           const { PdfParser } = require('@/lib/file-parsers/pdf-parser')
           parserInstances.pdf = new PdfParser()
           logger.info('PDF parser loaded successfully')
-        } catch (pdfParseError) {
-          // If that fails, fallback to our raw PDF parser
-          logger.error('Failed to load primary PDF parser:', pdfParseError)
+        } catch (pdfLibError) {
+          logger.error('Failed to load primary PDF parser:', pdfLibError)
           logger.info('Falling back to raw PDF parser')
           parserInstances.pdf = new RawPdfParser()
           logger.info('Raw PDF parser loaded successfully')
         }
       } catch (error) {
         logger.error('Failed to load any PDF parser:', error)
-        // Create a simple fallback that just returns the file size and a message
         parserInstances.pdf = {
           async parseFile(filePath: string): Promise<FileParseResult> {
             const buffer = await readFile(filePath)
@@ -100,10 +94,26 @@ function getParserInstances(): Record<string, FileParser> {
       try {
         const { XlsxParser } = require('@/lib/file-parsers/xlsx-parser')
         parserInstances.xlsx = new XlsxParser()
-        parserInstances.xls = new XlsxParser() // Both xls and xlsx use the same parser
+        parserInstances.xls = new XlsxParser()
       } catch (error) {
         logger.error('Failed to load XLSX parser:', error)
       }
+
+      try {
+        const { PptxParser } = require('@/lib/file-parsers/pptx-parser')
+        parserInstances.pptx = new PptxParser()
+        parserInstances.ppt = new PptxParser()
+      } catch (error) {
+        logger.error('Failed to load PPTX parser:', error)
+      }
+
+      try {
+        const { HtmlParser } = require('@/lib/file-parsers/html-parser')
+        parserInstances.html = new HtmlParser()
+        parserInstances.htm = new HtmlParser()
+      } catch (error) {
+        logger.error('Failed to load HTML parser:', error)
+      }
     } catch (error) {
       logger.error('Error loading file parsers:', error)
     }
@@ -119,12 +129,10 @@ function getParserInstances(): Record<string, FileParser> {
  */
 export async function parseFile(filePath: string): Promise<FileParseResult> {
   try {
-    // Validate input
     if (!filePath) {
       throw new Error('No file path provided')
     }
 
-    // Check if file exists
     if (!existsSync(filePath)) {
       throw new Error(`File not found: ${filePath}`)
     }
@@ -158,7 +166,6 @@ export async function parseFile(filePath: string): Promise<FileParseResult> {
  */
 export async function parseBuffer(buffer: Buffer, extension: string): Promise<FileParseResult> {
   try {
-    // Validate input
     if (!buffer || buffer.length === 0) {
       throw new Error('Empty buffer provided')
     }
@@ -182,7 +189,6 @@ export async function parseBuffer(buffer: Buffer, extension: string): Promise<Fi
     logger.info('Using parser for extension:', normalizedExtension)
     const parser = parsers[normalizedExtension]
 
-    // Check if parser supports buffer parsing
     if (parser.parseBuffer) {
       return await parser.parseBuffer(buffer)
     }
@@ -207,5 +213,4 @@ export function isSupportedFileType(extension: string): extension is SupportedFi
   }
 }
 
-// Type exports
 export type { FileParseResult, FileParser, SupportedFileType }

apps/sim/lib/file-parsers/md-parser.ts

@@ -1,5 +1,6 @@
 import { readFile } from 'fs/promises'
 import type { FileParseResult, FileParser } from '@/lib/file-parsers/types'
+import { sanitizeTextForUTF8 } from '@/lib/file-parsers/utils'
 import { createLogger } from '@/lib/logs/console/logger'
 
 const logger = createLogger('MdParser')
@@ -7,15 +8,12 @@ const logger = createLogger('MdParser')
 export class MdParser implements FileParser {
   async parseFile(filePath: string): Promise<FileParseResult> {
     try {
-      // Validate input
       if (!filePath) {
         throw new Error('No file path provided')
       }
 
-      // Read the file
       const buffer = await readFile(filePath)
 
-      // Use parseBuffer for consistent implementation
       return this.parseBuffer(buffer)
     } catch (error) {
       logger.error('MD file error:', error)
@@ -27,14 +25,14 @@ export class MdParser implements FileParser {
     try {
       logger.info('Parsing buffer, size:', buffer.length)
 
-      // Extract content
       const result = buffer.toString('utf-8')
+      const content = sanitizeTextForUTF8(result)
 
       return {
-        content: result,
+        content,
         metadata: {
-          characterCount: result.length,
-          tokenCount: result.length / 4,
+          characterCount: content.length,
+          tokenCount: Math.floor(content.length / 4),
         },
       }
     } catch (error) {

apps/sim/lib/file-parsers/pdf-parser.ts

@@ -1,22 +1,21 @@
 import { readFile } from 'fs/promises'
-// @ts-ignore
-import * as pdfParseLib from 'pdf-parse/lib/pdf-parse.js'
+import { PDFDocument } from 'pdf-lib'
 import type { FileParseResult, FileParser } from '@/lib/file-parsers/types'
 import { createLogger } from '@/lib/logs/console/logger'
+import { RawPdfParser } from './raw-pdf-parser'
 
 const logger = createLogger('PdfParser')
+const rawPdfParser = new RawPdfParser()
 
 export class PdfParser implements FileParser {
   async parseFile(filePath: string): Promise<FileParseResult> {
     try {
       logger.info('Starting to parse file:', filePath)
 
-      // Make sure we're only parsing the provided file path
       if (!filePath) {
         throw new Error('No file path provided')
       }
 
-      // Read the file
       logger.info('Reading file...')
       const dataBuffer = await readFile(filePath)
       logger.info('File read successfully, size:', dataBuffer.length)
@@ -32,93 +31,66 @@ export class PdfParser implements FileParser {
     try {
       logger.info('Starting to parse buffer, size:', dataBuffer.length)
 
-      // Try to parse with pdf-parse library first
       try {
-        logger.info('Attempting to parse with pdf-parse library...')
+        logger.info('Attempting to parse with pdf-lib library...')
 
-        // Parse PDF with direct function call to avoid test file access
         logger.info('Starting PDF parsing...')
-        const data = await pdfParseLib.default(dataBuffer)
-        logger.info('PDF parsed successfully with pdf-parse, pages:', data.numpages)
+        const pdfDoc = await PDFDocument.load(dataBuffer)
+        const pages = pdfDoc.getPages()
+        const pageCount = pages.length
+
+        logger.info('PDF parsed successfully with pdf-lib, pages:', pageCount)
+
+        const metadata: Record<string, any> = {
+          pageCount,
+        }
+
+        try {
+          const title = pdfDoc.getTitle()
+          const author = pdfDoc.getAuthor()
+          const subject = pdfDoc.getSubject()
+          const creator = pdfDoc.getCreator()
+          const producer = pdfDoc.getProducer()
+          const creationDate = pdfDoc.getCreationDate()
+          const modificationDate = pdfDoc.getModificationDate()
+
+          if (title) metadata.title = title
+          if (author) metadata.author = author
+          if (subject) metadata.subject = subject
+          if (creator) metadata.creator = creator
+          if (producer) metadata.producer = producer
+          if (creationDate) metadata.creationDate = creationDate.toISOString()
+          if (modificationDate) metadata.modificationDate = modificationDate.toISOString()
+        } catch (metadataError) {
+          logger.warn('Could not extract PDF metadata:', metadataError)
+        }
+
+        logger.info(
+          'pdf-lib loaded successfully, but text extraction requires fallback to raw parser'
+        )
+        const rawResult = await rawPdfParser.parseBuffer(dataBuffer)
 
         return {
-          content: data.text,
+          content: rawResult.content,
           metadata: {
-            pageCount: data.numpages,
-            info: data.info,
-            version: data.version,
+            ...rawResult.metadata,
+            ...metadata,
+            source: 'pdf-lib + raw-parser',
           },
         }
-      } catch (pdfParseError: unknown) {
-        logger.error('PDF-parse library failed:', pdfParseError)
+      } catch (pdfLibError: unknown) {
+        logger.error('PDF-lib library failed:', pdfLibError)
 
-        // Fallback to manual text extraction
-        logger.info('Falling back to manual text extraction...')
-
-        // Extract basic PDF info from raw content
-        const rawContent = dataBuffer.toString('utf-8', 0, Math.min(10000, dataBuffer.length))
-
-        let version = 'Unknown'
-        let pageCount = 0
-
-        // Try to extract PDF version
-        const versionMatch = rawContent.match(/%PDF-(\d+\.\d+)/)
-        if (versionMatch?.[1]) {
-          version = versionMatch[1]
-        }
-
-        // Try to get page count
-        const pageMatches = rawContent.match(/\/Type\s*\/Page\b/g)
-        if (pageMatches) {
-          pageCount = pageMatches.length
-        }
-
-        // Try to extract text by looking for text-related operators in the PDF
-        let extractedText = ''
-
-        // Look for text in the PDF content using common patterns
-        const textMatches = rawContent.match(/BT[\s\S]*?ET/g)
-        if (textMatches && textMatches.length > 0) {
-          extractedText = textMatches
-            .map((textBlock) => {
-              // Extract text objects (Tj, TJ) from the text block
-              const textObjects = textBlock.match(/\([^)]*\)\s*Tj|\[[^\]]*\]\s*TJ/g)
-              if (textObjects) {
-                return textObjects
-                  .map((obj) => {
-                    // Clean up text objects
-                    return (
-                      obj
-                        .replace(
-                          /\(([^)]*)\)\s*Tj|\[([^\]]*)\]\s*TJ/g,
-                          (match, p1, p2) => p1 || p2 || ''
-                        )
-                        // Clean up PDF escape sequences
-                        .replace(/\\(\d{3}|[()\\])/g, '')
-                        .replace(/\\\\/g, '\\')
-                        .replace(/\\\(/g, '(')
-                        .replace(/\\\)/g, ')')
-                    )
-                  })
-                  .join(' ')
-              }
-              return ''
-            })
-            .join('\n')
-        }
-
-        // If we couldn't extract text or the text is too short, return a fallback message
-        if (!extractedText || extractedText.length < 50) {
-          extractedText = `This PDF contains ${pageCount} page(s) but text extraction was not successful.`
-        }
+        logger.info('Falling back to raw PDF parser...')
+        const rawResult = await rawPdfParser.parseBuffer(dataBuffer)
 
         return {
-          content: extractedText,
+          ...rawResult,
           metadata: {
-            pageCount,
-            version,
+            ...rawResult.metadata,
             fallback: true,
-            error: (pdfParseError as Error).message || 'Unknown error',
+            source: 'raw-parser-only',
+            error: (pdfLibError as Error).message || 'Unknown error',
           },
         }
       }

apps/sim/lib/file-parsers/pptx-parser.ts

@@ -0,0 +1,106 @@
+import { existsSync } from 'fs'
+import { readFile } from 'fs/promises'
+import type { FileParseResult, FileParser } from '@/lib/file-parsers/types'
+import { sanitizeTextForUTF8 } from '@/lib/file-parsers/utils'
+import { createLogger } from '@/lib/logs/console/logger'
+
+const logger = createLogger('PptxParser')
+
+export class PptxParser implements FileParser {
+  async parseFile(filePath: string): Promise<FileParseResult> {
+    try {
+      if (!filePath) {
+        throw new Error('No file path provided')
+      }
+
+      if (!existsSync(filePath)) {
+        throw new Error(`File not found: ${filePath}`)
+      }
+
+      logger.info(`Parsing PowerPoint file: ${filePath}`)
+
+      const buffer = await readFile(filePath)
+      return this.parseBuffer(buffer)
+    } catch (error) {
+      logger.error('PowerPoint file parsing error:', error)
+      throw new Error(`Failed to parse PowerPoint file: ${(error as Error).message}`)
+    }
+  }
+
+  async parseBuffer(buffer: Buffer): Promise<FileParseResult> {
+    try {
+      logger.info('Parsing PowerPoint buffer, size:', buffer.length)
+
+      if (!buffer || buffer.length === 0) {
+        throw new Error('Empty buffer provided')
+      }
+
+      let parseOfficeAsync
+      try {
+        const officeParser = await import('officeparser')
+        parseOfficeAsync = officeParser.parseOfficeAsync
+      } catch (importError) {
+        logger.warn('officeparser not available, using fallback extraction')
+        return this.fallbackExtraction(buffer)
+      }
+
+      try {
+        const result = await parseOfficeAsync(buffer)
+
+        if (!result || typeof result !== 'string') {
+          throw new Error('officeparser returned invalid result')
+        }
+
+        const content = sanitizeTextForUTF8(result.trim())
+
+        logger.info('PowerPoint parsing completed successfully with officeparser')
+
+        return {
+          content: content,
+          metadata: {
+            characterCount: content.length,
+            extractionMethod: 'officeparser',
+          },
+        }
+      } catch (extractError) {
+        logger.warn('officeparser failed, using fallback:', extractError)
+        return this.fallbackExtraction(buffer)
+      }
+    } catch (error) {
+      logger.error('PowerPoint buffer parsing error:', error)
+      throw new Error(`Failed to parse PowerPoint buffer: ${(error as Error).message}`)
+    }
+  }
+
+  private fallbackExtraction(buffer: Buffer): FileParseResult {
+    logger.info('Using fallback text extraction for PowerPoint file')
+
+    const text = buffer.toString('utf8', 0, Math.min(buffer.length, 200000))
+
+    const readableText = text
+      .match(/[\x20-\x7E\s]{4,}/g)
+      ?.filter(
+        (chunk) =>
+          chunk.trim().length > 10 &&
+          /[a-zA-Z]/.test(chunk) &&
+          !/^[\x00-\x1F]*$/.test(chunk) &&
+          !/^[^\w\s]*$/.test(chunk)
+      )
+      .join(' ')
+      .replace(/\s+/g, ' ')
+      .trim()
+
+    const content = readableText
+      ? sanitizeTextForUTF8(readableText)
+      : 'Unable to extract text from PowerPoint file. Please ensure the file contains readable text content.'
+
+    return {
+      content,
+      metadata: {
+        extractionMethod: 'fallback',
+        characterCount: content.length,
+        warning: 'Basic text extraction used',
+      },
+    }
+  }
+}

apps/sim/lib/file-parsers/raw-pdf-parser.ts

@@ -6,14 +6,9 @@ import { createLogger } from '@/lib/logs/console/logger'
 
 const logger = createLogger('RawPdfParser')
 
-// Promisify zlib functions
 const inflateAsync = promisify(zlib.inflate)
 const unzipAsync = promisify(zlib.unzip)
 
-/**
- * A simple PDF parser that extracts readable text from a PDF file.
- * This is used as a fallback when the pdf-parse library fails.
- */
 export class RawPdfParser implements FileParser {
   async parseFile(filePath: string): Promise<FileParseResult> {
     try {
@@ -23,7 +18,6 @@ export class RawPdfParser implements FileParser {
         throw new Error('No file path provided')
       }
 
-      // Read the file
       logger.info('Reading file...')
       const dataBuffer = await readFile(filePath)
       logger.info('File read successfully, size:', dataBuffer.length)
@@ -46,31 +40,22 @@ export class RawPdfParser implements FileParser {
     try {
       logger.info('Starting to parse buffer, size:', dataBuffer.length)
 
-      // Instead of trying to parse the binary PDF data directly,
-      // we'll extract only the text sections that are readable
-
-      // First convert to string but only for pattern matching, not for display
       const rawContent = dataBuffer.toString('utf-8')
 
-      // Extract basic PDF info
       let version = 'Unknown'
       let pageCount = 0
 
-      // Try to extract PDF version
       const versionMatch = rawContent.match(/%PDF-(\d+\.\d+)/)
       if (versionMatch?.[1]) {
         version = versionMatch[1]
       }
 
-      // Count pages using multiple methods for redundancy
-      // Method 1: Count "/Type /Page" occurrences (most reliable)
       const typePageMatches = rawContent.match(/\/Type\s*\/Page\b/gi)
       if (typePageMatches) {
         pageCount = typePageMatches.length
         logger.info('Found page count using /Type /Page:', pageCount)
       }
 
-      // Method 2: Look for "/Page" dictionary references
       if (pageCount === 0) {
         const pageMatches = rawContent.match(/\/Page\s*\//gi)
         if (pageMatches) {
@@ -79,19 +64,15 @@ export class RawPdfParser implements FileParser {
         }
       }
 
-      // Method 3: Look for "/Pages" object references
       if (pageCount === 0) {
         const pagesObjMatches = rawContent.match(/\/Pages\s+\d+\s+\d+\s+R/gi)
         if (pagesObjMatches && pagesObjMatches.length > 0) {
-          // Extract the object reference
           const pagesObjRef = pagesObjMatches[0].match(/\/Pages\s+(\d+)\s+\d+\s+R/i)
           if (pagesObjRef?.[1]) {
             const objNum = pagesObjRef[1]
-            // Find the referenced object
             const objRegex = new RegExp(`${objNum}\\s+0\\s+obj[\\s\\S]*?endobj`, 'i')
             const objMatch = rawContent.match(objRegex)
             if (objMatch) {
-              // Look for /Count within the Pages object
               const countMatch = objMatch[0].match(/\/Count\s+(\d+)/i)
               if (countMatch?.[1]) {
                 pageCount = Number.parseInt(countMatch[1], 10)
@@ -102,50 +83,40 @@ export class RawPdfParser implements FileParser {
         }
       }
 
-      // Method 4: Count trailer references to get an approximate count
       if (pageCount === 0) {
         const trailerMatches = rawContent.match(/trailer/gi)
         if (trailerMatches) {
-          // This is just a rough estimate, not accurate
           pageCount = Math.max(1, Math.ceil(trailerMatches.length / 2))
           logger.info('Estimated page count using trailer references:', pageCount)
         }
       }
 
-      // Default to at least 1 page if we couldn't find any
       if (pageCount === 0) {
         pageCount = 1
         logger.info('Defaulting to 1 page as no count was found')
       }
 
-      // Extract text content using text markers commonly found in PDFs
       let extractedText = ''
 
-      // Method 1: Extract text between BT (Begin Text) and ET (End Text) markers
       const textMatches = rawContent.match(/BT[\s\S]*?ET/g)
       if (textMatches && textMatches.length > 0) {
         logger.info('Found', textMatches.length, 'text blocks')
 
         extractedText = textMatches
           .map((textBlock) => {
-            // Extract text objects (Tj, TJ) from the text block
             const textObjects = textBlock.match(/(\([^)]*\)|\[[^\]]*\])\s*(Tj|TJ)/g)
             if (textObjects && textObjects.length > 0) {
               return textObjects
                 .map((obj) => {
-                  // Clean up text objects
                   let text = ''
                   if (obj.includes('Tj')) {
-                    // Handle Tj operator (simple string)
                     const match = obj.match(/\(([^)]*)\)\s*Tj/)
                     if (match?.[1]) {
                       text = match[1]
                     }
                   } else if (obj.includes('TJ')) {
-                    // Handle TJ operator (array of strings and positioning)
                     const match = obj.match(/\[(.*)\]\s*TJ/)
                     if (match?.[1]) {
-                      // Extract only the string parts from the array
                       const parts = match[1].match(/\([^)]*\)/g)
                       if (parts) {
                         text = parts.map((p) => p.slice(1, -1)).join(' ')
@@ -153,7 +124,6 @@ export class RawPdfParser implements FileParser {
                     }
                   }
 
-                  // Clean up PDF escape sequences
                   return text
                     .replace(/\\(\d{3})/g, (_, octal) =>
                       String.fromCharCode(Number.parseInt(octal, 8))
@@ -170,50 +140,42 @@ export class RawPdfParser implements FileParser {
           .trim()
       }
 
-      // Try to extract metadata from XML
       let metadataText = ''
       const xmlMatch = rawContent.match(/<x:xmpmeta[\s\S]*?<\/x:xmpmeta>/)
       if (xmlMatch) {
         const xmlContent = xmlMatch[0]
         logger.info('Found XML metadata')
 
-        // Extract document title
         const titleMatch = xmlContent.match(/<dc:title>[\s\S]*?<rdf:li[^>]*>(.*?)<\/rdf:li>/i)
         if (titleMatch?.[1]) {
           const title = titleMatch[1].replace(/<[^>]+>/g, '').trim()
           metadataText += `Document Title: ${title}\n\n`
         }
 
-        // Extract creator/author
         const creatorMatch = xmlContent.match(/<dc:creator>[\s\S]*?<rdf:li[^>]*>(.*?)<\/rdf:li>/i)
         if (creatorMatch?.[1]) {
           const creator = creatorMatch[1].replace(/<[^>]+>/g, '').trim()
           metadataText += `Author: ${creator}\n`
         }
 
-        // Extract creation date
         const dateMatch = xmlContent.match(/<xmp:CreateDate>(.*?)<\/xmp:CreateDate>/i)
         if (dateMatch?.[1]) {
           metadataText += `Created: ${dateMatch[1].trim()}\n`
         }
 
-        // Extract producer
         const producerMatch = xmlContent.match(/<pdf:Producer>(.*?)<\/pdf:Producer>/i)
         if (producerMatch?.[1]) {
           metadataText += `Producer: ${producerMatch[1].trim()}\n`
         }
       }
 
-      // Try to extract actual text content from content streams
       if (!extractedText || extractedText.length < 100 || extractedText.includes('/Type /Page')) {
         logger.info('Trying advanced text extraction from content streams')
 
-        // Find content stream references
         const contentRefs = rawContent.match(/\/Contents\s+\[?\s*(\d+)\s+\d+\s+R\s*\]?/g)
         if (contentRefs && contentRefs.length > 0) {
           logger.info('Found', contentRefs.length, 'content stream references')
 
-          // Extract object numbers from content references
           const objNumbers = contentRefs
             .map((ref) => {
               const match = ref.match(/\/Contents\s+\[?\s*(\d+)\s+\d+\s+R\s*\]?/)
@@ -223,7 +185,6 @@ export class RawPdfParser implements FileParser {
 
           logger.info('Content stream object numbers:', objNumbers)
 
-          // Try to find those objects in the content
           if (objNumbers.length > 0) {
             let textFromStreams = ''
 
@@ -232,12 +193,10 @@ export class RawPdfParser implements FileParser {
               const objMatch = rawContent.match(objRegex)
 
               if (objMatch) {
-                // Look for stream content within the object
                 const streamMatch = objMatch[0].match(/stream\r?\n([\s\S]*?)\r?\nendstream/)
                 if (streamMatch?.[1]) {
                   const streamContent = streamMatch[1]
 
-                  // Look for text operations in the stream (Tj, TJ, etc.)
                   const textFragments = streamContent.match(/\([^)]+\)\s*Tj|\[[^\]]*\]\s*TJ/g)
                   if (textFragments && textFragments.length > 0) {
                     const extractedFragments = textFragments
@@ -290,35 +249,27 @@ export class RawPdfParser implements FileParser {
         }
       }
 
-      // Try to decompress PDF streams
-      // This is especially helpful for PDFs with compressed content
       if (!extractedText || extractedText.length < 100) {
         logger.info('Trying to decompress PDF streams')
 
-        // Find compressed streams (FlateDecode)
         const compressedStreams = rawContent.match(
           /\/Filter\s*\/FlateDecode[\s\S]*?stream[\s\S]*?endstream/g
         )
         if (compressedStreams && compressedStreams.length > 0) {
           logger.info('Found', compressedStreams.length, 'compressed streams')
 
-          // Process each stream
           const decompressedContents = await Promise.all(
             compressedStreams.map(async (stream) => {
               try {
-                // Extract stream content between stream and endstream
                 const streamMatch = stream.match(/stream\r?\n([\s\S]*?)\r?\nendstream/)
                 if (!streamMatch || !streamMatch[1]) return ''
 
                 const compressedData = Buffer.from(streamMatch[1], 'binary')
 
-                // Try different decompression methods
                 try {
-                  // Try inflate (most common)
                   const decompressed = await inflateAsync(compressedData)
                   const content = decompressed.toString('utf-8')
 
-                  // Check if it contains readable text
                   const readable = content.replace(/[^\x20-\x7E\r\n]/g, ' ').trim()
                   if (
                     readable.length > 50 &&
@@ -329,12 +280,10 @@ export class RawPdfParser implements FileParser {
                     return readable
                   }
                 } catch (_inflateErr) {
-                  // Try unzip as fallback
                   try {
                     const decompressed = await unzipAsync(compressedData)
                     const content = decompressed.toString('utf-8')
 
-                    // Check if it contains readable text
                     const readable = content.replace(/[^\x20-\x7E\r\n]/g, ' ').trim()
                     if (
                       readable.length > 50 &&
@@ -345,12 +294,10 @@ export class RawPdfParser implements FileParser {
                       return readable
                     }
                   } catch (_unzipErr) {
-                    // Both methods failed, continue to next stream
                     return ''
                   }
                 }
               } catch (_error) {
-                // Error processing this stream, skip it
                 return ''
               }
 
@@ -358,7 +305,6 @@ export class RawPdfParser implements FileParser {
             })
           )
 
-          // Filter out empty results and combine
           const decompressedText = decompressedContents
             .filter((text) => text && text.length > 0)
             .join('\n\n')
@@ -370,26 +316,19 @@ export class RawPdfParser implements FileParser {
         }
       }
 
-      // Method 2: Look for text stream data
       if (!extractedText || extractedText.length < 50) {
         logger.info('Trying alternative text extraction method with streams')
 
-        // Find text streams
         const streamMatches = rawContent.match(/stream[\s\S]*?endstream/g)
         if (streamMatches && streamMatches.length > 0) {
           logger.info('Found', streamMatches.length, 'streams')
 
-          // Process each stream to look for text content
           const textContent = streamMatches
             .map((stream) => {
-              // Remove 'stream' and 'endstream' markers
               const content = stream.replace(/^stream\r?\n|\r?\nendstream$/g, '')
 
-              // Look for readable ASCII text (more strict heuristic)
-              // Only keep ASCII printable characters
               const readable = content.replace(/[^\x20-\x7E\r\n]/g, ' ').trim()
 
-              // Only keep content that looks like real text (has spaces, periods, etc.)
               if (
                 readable.length > 20 &&
                 readable.includes(' ') &&
@@ -400,7 +339,7 @@ export class RawPdfParser implements FileParser {
               }
               return ''
             })
-            .filter((text) => text.length > 0 && text.split(' ').length > 5) // Must have at least 5 words
+            .filter((text) => text.length > 0 && text.split(' ').length > 5)
             .join('\n\n')
 
           if (textContent.length > 0) {
@@ -409,22 +348,17 @@ export class RawPdfParser implements FileParser {
         }
       }
 
-      // Method 3: Look for object streams
       if (!extractedText || extractedText.length < 50) {
         logger.info('Trying object streams for text')
 
-        // Find object stream content
         const objMatches = rawContent.match(/\d+\s+\d+\s+obj[\s\S]*?endobj/g)
         if (objMatches && objMatches.length > 0) {
           logger.info('Found', objMatches.length, 'objects')
 
-          // Process objects looking for text content
           const textContent = objMatches
             .map((obj) => {
-              // Find readable text in the object - only keep ASCII printable characters
               const readable = obj.replace(/[^\x20-\x7E\r\n]/g, ' ').trim()
 
-              // Only include if it looks like actual text (strict heuristic)
               if (
                 readable.length > 50 &&
                 readable.includes(' ') &&
@@ -445,8 +379,6 @@ export class RawPdfParser implements FileParser {
         }
       }
 
-      // If what we extracted is just PDF structure information rather than readable text,
-      // provide a clearer message
       if (
         extractedText &&
         (extractedText.includes('endobj') ||
@@ -459,53 +391,41 @@ export class RawPdfParser implements FileParser {
         )
         extractedText = metadataText
       } else if (metadataText && !extractedText.includes('Document Title:')) {
-        // Prepend metadata to extracted text if available
         extractedText = metadataText + (extractedText ? `\n\n${extractedText}` : '')
       }
 
-      // Validate that the extracted text looks meaningful
-      // Count how many recognizable words/characters it contains
       const validCharCount = (extractedText || '').replace(/[^\x20-\x7E\r\n]/g, '').length
       const totalCharCount = (extractedText || '').length
       const validRatio = validCharCount / (totalCharCount || 1)
 
-      // Check for common PDF artifacts that indicate binary corruption
       const hasBinaryArtifacts =
         extractedText &&
         (extractedText.includes('\\u') ||
           extractedText.includes('\\x') ||
           extractedText.includes('\0') ||
           /[\x00-\x08\x0B\x0C\x0E-\x1F\x7F-\xFF]{10,}/g.test(extractedText) ||
-          validRatio < 0.7) // Less than 70% valid characters
+          validRatio < 0.7)
 
-      // Check if the content looks like gibberish
       const looksLikeGibberish =
         extractedText &&
-        // Too many special characters
         (extractedText.replace(/[a-zA-Z0-9\s.,:'"()[\]{}]/g, '').length / extractedText.length >
           0.3 ||
-          // Not enough spaces (real text has spaces between words)
           extractedText.split(' ').length < extractedText.length / 20)
 
-      // If no text was extracted, or if it's binary/gibberish,
-      // provide a helpful message instead
       if (!extractedText || extractedText.length < 50 || hasBinaryArtifacts || looksLikeGibberish) {
         logger.info('Could not extract meaningful text, providing fallback message')
         logger.info('Valid character ratio:', validRatio)
         logger.info('Has binary artifacts:', hasBinaryArtifacts)
         logger.info('Looks like gibberish:', looksLikeGibberish)
 
-        // Start with metadata if available
         if (metadataText) {
           extractedText = `${metadataText}\n`
         } else {
           extractedText = ''
         }
 
-        // Add basic PDF info
         extractedText += `This is a PDF document with ${pageCount} page(s) and version ${version}.\n\n`
 
-        // Try to find a title in the PDF structure that we might have missed
         const titleInStructure =
           rawContent.match(/title\s*:\s*([^\n]+)/i) ||
           rawContent.match(/Microsoft Word -\s*([^\n]+)/i)

apps/sim/lib/file-parsers/txt-parser.ts

@@ -8,15 +8,12 @@ const logger = createLogger('TxtParser')
 export class TxtParser implements FileParser {
   async parseFile(filePath: string): Promise<FileParseResult> {
     try {
-      // Validate input
       if (!filePath) {
         throw new Error('No file path provided')
       }
 
-      // Read the file
       const buffer = await readFile(filePath)
 
-      // Use parseBuffer for consistent implementation
       return this.parseBuffer(buffer)
     } catch (error) {
       logger.error('TXT file error:', error)
@@ -28,7 +25,6 @@ export class TxtParser implements FileParser {
     try {
       logger.info('Parsing buffer, size:', buffer.length)
 
-      // Extract content and sanitize for UTF-8 storage
       const rawContent = buffer.toString('utf-8')
       const result = sanitizeTextForUTF8(rawContent)
 

apps/sim/lib/file-parsers/types.ts

@@ -8,4 +8,16 @@ export interface FileParser {
   parseBuffer?(buffer: Buffer): Promise<FileParseResult>
 }
 
-export type SupportedFileType = 'pdf' | 'csv' | 'doc' | 'docx' | 'txt' | 'md' | 'xlsx' | 'xls'
+export type SupportedFileType =
+  | 'pdf'
+  | 'csv'
+  | 'doc'
+  | 'docx'
+  | 'txt'
+  | 'md'
+  | 'xlsx'
+  | 'xls'
+  | 'html'
+  | 'htm'
+  | 'pptx'
+  | 'ppt'

apps/sim/lib/file-parsers/xlsx-parser.ts

@@ -9,19 +9,16 @@ const logger = createLogger('XlsxParser')
 export class XlsxParser implements FileParser {
   async parseFile(filePath: string): Promise<FileParseResult> {
     try {
-      // Validate input
       if (!filePath) {
         throw new Error('No file path provided')
       }
 
-      // Check if file exists
       if (!existsSync(filePath)) {
         throw new Error(`File not found: ${filePath}`)
       }
 
       logger.info(`Parsing XLSX file: ${filePath}`)
 
-      // Read the workbook
       const workbook = XLSX.readFile(filePath)
       return this.processWorkbook(workbook)
     } catch (error) {
@@ -38,7 +35,6 @@ export class XlsxParser implements FileParser {
         throw new Error('Empty buffer provided')
       }
 
-      // Read the workbook from buffer
       const workbook = XLSX.read(buffer, { type: 'buffer' })
       return this.processWorkbook(workbook)
     } catch (error) {
@@ -53,25 +49,20 @@ export class XlsxParser implements FileParser {
     let content = ''
     let totalRows = 0
 
-    // Process each worksheet
     for (const sheetName of sheetNames) {
       const worksheet = workbook.Sheets[sheetName]
 
-      // Convert to array of objects
       const sheetData = XLSX.utils.sheet_to_json(worksheet, { header: 1 })
       sheets[sheetName] = sheetData
       totalRows += sheetData.length
 
-      // Add sheet content to the overall content string (clean sheet name)
       const cleanSheetName = sanitizeTextForUTF8(sheetName)
       content += `Sheet: ${cleanSheetName}\n`
       content += `=${'='.repeat(cleanSheetName.length + 6)}\n\n`
 
       if (sheetData.length > 0) {
-        // Process each row
         sheetData.forEach((row: unknown, rowIndex: number) => {
           if (Array.isArray(row) && row.length > 0) {
-            // Convert row to string, handling undefined/null values and cleaning non-UTF8 characters
             const rowString = row
               .map((cell) => {
                 if (cell === null || cell === undefined) {
@@ -93,7 +84,6 @@ export class XlsxParser implements FileParser {
 
     logger.info(`XLSX parsing completed: ${sheetNames.length} sheets, ${totalRows} total rows`)
 
-    // Final cleanup of the entire content to ensure UTF-8 compatibility
     const cleanContent = sanitizeTextForUTF8(content).trim()
 
     return {

apps/sim/lib/knowledge/consts.ts

@@ -0,0 +1,24 @@
+export const TAG_SLOT_CONFIG = {
+  text: {
+    slots: ['tag1', 'tag2', 'tag3', 'tag4', 'tag5', 'tag6', 'tag7'] as const,
+    maxSlots: 7,
+  },
+} as const
+
+export const SUPPORTED_FIELD_TYPES = Object.keys(TAG_SLOT_CONFIG) as Array<
+  keyof typeof TAG_SLOT_CONFIG
+>
+
+export const TAG_SLOTS = TAG_SLOT_CONFIG.text.slots
+
+export const MAX_TAG_SLOTS = TAG_SLOT_CONFIG.text.maxSlots
+
+export type TagSlot = (typeof TAG_SLOTS)[number]
+
+export function getSlotsForFieldType(fieldType: string): readonly string[] {
+  const config = TAG_SLOT_CONFIG[fieldType as keyof typeof TAG_SLOT_CONFIG]
+  if (!config) {
+    return []
+  }
+  return config.slots
+}

apps/sim/lib/knowledge/documents/service.ts

@@ -1,9 +1,9 @@
 import crypto, { randomUUID } from 'crypto'
 import { tasks } from '@trigger.dev/sdk'
 import { and, asc, desc, eq, inArray, isNull, sql } from 'drizzle-orm'
-import { getSlotsForFieldType, type TAG_SLOT_CONFIG } from '@/lib/constants/knowledge'
 import { generateEmbeddings } from '@/lib/embeddings/utils'
 import { env } from '@/lib/env'
+import { getSlotsForFieldType, type TAG_SLOT_CONFIG } from '@/lib/knowledge/consts'
 import { processDocument } from '@/lib/knowledge/documents/document-processor'
 import { getNextAvailableSlot } from '@/lib/knowledge/tags/service'
 import { createLogger } from '@/lib/logs/console/logger'
@@ -17,8 +17,8 @@ import type { DocumentSortField, SortOrder } from './types'
 const logger = createLogger('DocumentService')
 
 const TIMEOUTS = {
-  OVERALL_PROCESSING: 600000,
-  EMBEDDINGS_API: 180000,
+  OVERALL_PROCESSING: (env.KB_CONFIG_MAX_DURATION || 300) * 1000,
+  EMBEDDINGS_API: (env.KB_CONFIG_MAX_TIMEOUT || 10000) * 18,
 } as const
 
 /**
@@ -38,17 +38,17 @@ function withTimeout<T>(
 }
 
 const PROCESSING_CONFIG = {
-  maxConcurrentDocuments: 4,
-  batchSize: 10,
-  delayBetweenBatches: 200,
-  delayBetweenDocuments: 100,
+  maxConcurrentDocuments: Math.max(1, Math.floor((env.KB_CONFIG_CONCURRENCY_LIMIT || 20) / 5)) || 4,
+  batchSize: Math.max(1, Math.floor((env.KB_CONFIG_BATCH_SIZE || 20) / 2)) || 10,
+  delayBetweenBatches: (env.KB_CONFIG_DELAY_BETWEEN_BATCHES || 100) * 2,
+  delayBetweenDocuments: (env.KB_CONFIG_DELAY_BETWEEN_DOCUMENTS || 50) * 2,
 }
 
 const REDIS_PROCESSING_CONFIG = {
-  maxConcurrentDocuments: 12,
-  batchSize: 20,
-  delayBetweenBatches: 100,
-  delayBetweenDocuments: 50,
+  maxConcurrentDocuments: env.KB_CONFIG_CONCURRENCY_LIMIT || 20,
+  batchSize: env.KB_CONFIG_BATCH_SIZE || 20,
+  delayBetweenBatches: env.KB_CONFIG_DELAY_BETWEEN_BATCHES || 100,
+  delayBetweenDocuments: env.KB_CONFIG_DELAY_BETWEEN_DOCUMENTS || 50,
 }
 
 let documentQueue: DocumentProcessingQueue | null = null
@@ -59,8 +59,8 @@ export function getDocumentQueue(): DocumentProcessingQueue {
     const config = redisClient ? REDIS_PROCESSING_CONFIG : PROCESSING_CONFIG
     documentQueue = new DocumentProcessingQueue({
       maxConcurrent: config.maxConcurrentDocuments,
-      retryDelay: 2000,
-      maxRetries: 5,
+      retryDelay: env.KB_CONFIG_MIN_TIMEOUT || 1000,
+      maxRetries: env.KB_CONFIG_MAX_ATTEMPTS || 3,
     })
   }
   return documentQueue

apps/sim/lib/knowledge/tags/service.ts

@@ -4,7 +4,7 @@ import {
   getSlotsForFieldType,
   SUPPORTED_FIELD_TYPES,
   type TAG_SLOT_CONFIG,
-} from '@/lib/constants/knowledge'
+} from '@/lib/knowledge/consts'
 import type { BulkTagDefinitionsData, DocumentTagDefinition } from '@/lib/knowledge/tags/types'
 import type {
   CreateTagDefinitionData,

apps/sim/lib/permissions/utils.test.ts

@@ -7,6 +7,7 @@ vi.mock('@/db', () => ({
     where: vi.fn(),
     limit: vi.fn(),
     innerJoin: vi.fn(),
+    leftJoin: vi.fn(),
     orderBy: vi.fn(),
   },
 }))
@@ -17,6 +18,7 @@ vi.mock('@/db/schema', () => ({
     userId: 'user_id',
     entityType: 'entity_type',
     entityId: 'entity_id',
+    id: 'permission_id',
   },
   permissionTypeEnum: {
     enumValues: ['admin', 'write', 'read'] as const,
@@ -25,23 +27,18 @@ vi.mock('@/db/schema', () => ({
     id: 'user_id',
     email: 'user_email',
     name: 'user_name',
-    image: 'user_image',
   },
   workspace: {
     id: 'workspace_id',
     name: 'workspace_name',
     ownerId: 'workspace_owner_id',
   },
-  member: {
-    userId: 'member_user_id',
-    organizationId: 'member_organization_id',
-    role: 'member_role',
-  },
 }))
 
 vi.mock('drizzle-orm', () => ({
   and: vi.fn().mockReturnValue('and-condition'),
   eq: vi.fn().mockReturnValue('eq-condition'),
+  or: vi.fn().mockReturnValue('or-condition'),
 }))
 
 import {
@@ -50,8 +47,6 @@ import {
   getUsersWithPermissions,
   hasAdminPermission,
   hasWorkspaceAdminAccess,
-  isOrganizationAdminForWorkspace,
-  isOrganizationOwnerOrAdmin,
 } from '@/lib/permissions/utils'
 import { db } from '@/db'
 
@@ -124,11 +119,64 @@ describe('Permission Utils', () => {
 
       expect(result).toBe('admin')
     })
+
+    it('should return write permission when user only has write access', async () => {
+      const mockResults = [{ permissionType: 'write' as PermissionType }]
+      const chain = createMockChain(mockResults)
+      mockDb.select.mockReturnValue(chain)
+
+      const result = await getUserEntityPermissions('user123', 'workspace', 'workspace456')
+
+      expect(result).toBe('write')
+    })
+
+    it('should prioritize write over read permissions', async () => {
+      const mockResults = [
+        { permissionType: 'read' as PermissionType },
+        { permissionType: 'write' as PermissionType },
+      ]
+      const chain = createMockChain(mockResults)
+      mockDb.select.mockReturnValue(chain)
+
+      const result = await getUserEntityPermissions('user123', 'workspace', 'workspace456')
+
+      expect(result).toBe('write')
+    })
+
+    it('should work with workflow entity type', async () => {
+      const mockResults = [{ permissionType: 'admin' as PermissionType }]
+      const chain = createMockChain(mockResults)
+      mockDb.select.mockReturnValue(chain)
+
+      const result = await getUserEntityPermissions('user123', 'workflow', 'workflow789')
+
+      expect(result).toBe('admin')
+    })
+
+    it('should work with organization entity type', async () => {
+      const mockResults = [{ permissionType: 'read' as PermissionType }]
+      const chain = createMockChain(mockResults)
+      mockDb.select.mockReturnValue(chain)
+
+      const result = await getUserEntityPermissions('user123', 'organization', 'org456')
+
+      expect(result).toBe('read')
+    })
+
+    it('should handle generic entity types', async () => {
+      const mockResults = [{ permissionType: 'write' as PermissionType }]
+      const chain = createMockChain(mockResults)
+      mockDb.select.mockReturnValue(chain)
+
+      const result = await getUserEntityPermissions('user123', 'custom_entity', 'entity123')
+
+      expect(result).toBe('write')
+    })
   })
 
   describe('hasAdminPermission', () => {
     it('should return true when user has admin permission for workspace', async () => {
-      const chain = createMockChain([{ permissionType: 'admin' }])
+      const chain = createMockChain([{ id: 'perm1' }])
       mockDb.select.mockReturnValue(chain)
 
       const result = await hasAdminPermission('admin-user', 'workspace123')
@@ -144,6 +192,42 @@ describe('Permission Utils', () => {
 
       expect(result).toBe(false)
     })
+
+    it('should return false when user has write permission but not admin', async () => {
+      const chain = createMockChain([])
+      mockDb.select.mockReturnValue(chain)
+
+      const result = await hasAdminPermission('write-user', 'workspace123')
+
+      expect(result).toBe(false)
+    })
+
+    it('should return false when user has read permission but not admin', async () => {
+      const chain = createMockChain([])
+      mockDb.select.mockReturnValue(chain)
+
+      const result = await hasAdminPermission('read-user', 'workspace123')
+
+      expect(result).toBe(false)
+    })
+
+    it('should handle non-existent workspace', async () => {
+      const chain = createMockChain([])
+      mockDb.select.mockReturnValue(chain)
+
+      const result = await hasAdminPermission('user123', 'non-existent-workspace')
+
+      expect(result).toBe(false)
+    })
+
+    it('should handle empty user ID', async () => {
+      const chain = createMockChain([])
+      mockDb.select.mockReturnValue(chain)
+
+      const result = await hasAdminPermission('', 'workspace123')
+
+      expect(result).toBe(false)
+    })
   })
 
   describe('getUsersWithPermissions', () => {
@@ -162,7 +246,6 @@ describe('Permission Utils', () => {
           userId: 'user1',
           email: 'alice@example.com',
           name: 'Alice Smith',
-          image: 'https://example.com/alice.jpg',
           permissionType: 'admin' as PermissionType,
         },
       ]
@@ -177,43 +260,66 @@ describe('Permission Utils', () => {
           userId: 'user1',
           email: 'alice@example.com',
           name: 'Alice Smith',
-          image: 'https://example.com/alice.jpg',
           permissionType: 'admin',
         },
       ])
     })
-  })
 
-  describe('isOrganizationAdminForWorkspace', () => {
-    it('should return false when workspace does not exist', async () => {
-      const chain = createMockChain([])
-      mockDb.select.mockReturnValue(chain)
+    it('should return multiple users with different permission levels', async () => {
+      const mockUsersResults = [
+        {
+          userId: 'user1',
+          email: 'admin@example.com',
+          name: 'Admin User',
+          permissionType: 'admin' as PermissionType,
+        },
+        {
+          userId: 'user2',
+          email: 'writer@example.com',
+          name: 'Writer User',
+          permissionType: 'write' as PermissionType,
+        },
+        {
+          userId: 'user3',
+          email: 'reader@example.com',
+          name: 'Reader User',
+          permissionType: 'read' as PermissionType,
+        },
+      ]
 
-      const result = await isOrganizationAdminForWorkspace('user123', 'workspace456')
+      const usersChain = createMockChain(mockUsersResults)
+      mockDb.select.mockReturnValue(usersChain)
 
-      expect(result).toBe(false)
+      const result = await getUsersWithPermissions('workspace456')
+
+      expect(result).toHaveLength(3)
+      expect(result[0].permissionType).toBe('admin')
+      expect(result[1].permissionType).toBe('write')
+      expect(result[2].permissionType).toBe('read')
     })
 
-    it('should return false when user has no organization memberships', async () => {
-      // Mock workspace exists, but user has no org memberships
-      let callCount = 0
-      mockDb.select.mockImplementation(() => {
-        callCount++
-        if (callCount === 1) {
-          return createMockChain([{ ownerId: 'workspace-owner-123' }])
-        }
-        return createMockChain([]) // No memberships
-      })
+    it('should handle users with empty names', async () => {
+      const mockUsersResults = [
+        {
+          userId: 'user1',
+          email: 'test@example.com',
+          name: '',
+          permissionType: 'read' as PermissionType,
+        },
+      ]
 
-      const result = await isOrganizationAdminForWorkspace('user123', 'workspace456')
+      const usersChain = createMockChain(mockUsersResults)
+      mockDb.select.mockReturnValue(usersChain)
 
-      expect(result).toBe(false)
+      const result = await getUsersWithPermissions('workspace123')
+
+      expect(result[0].name).toBe('')
     })
   })
 
   describe('hasWorkspaceAdminAccess', () => {
-    it('should return true when user has direct admin permission', async () => {
-      const chain = createMockChain([{ permissionType: 'admin' }])
+    it('should return true when user owns the workspace', async () => {
+      const chain = createMockChain([{ ownerId: 'user123' }])
       mockDb.select.mockReturnValue(chain)
 
       const result = await hasWorkspaceAdminAccess('user123', 'workspace456')
@@ -221,7 +327,22 @@ describe('Permission Utils', () => {
       expect(result).toBe(true)
     })
 
-    it('should return false when user has neither direct nor organization admin access', async () => {
+    it('should return true when user has direct admin permission', async () => {
+      let callCount = 0
+      mockDb.select.mockImplementation(() => {
+        callCount++
+        if (callCount === 1) {
+          return createMockChain([{ ownerId: 'other-user' }])
+        }
+        return createMockChain([{ id: 'perm1' }])
+      })
+
+      const result = await hasWorkspaceAdminAccess('user123', 'workspace456')
+
+      expect(result).toBe(true)
+    })
+
+    it('should return false when workspace does not exist', async () => {
       const chain = createMockChain([])
       mockDb.select.mockReturnValue(chain)
 
@@ -229,51 +350,137 @@ describe('Permission Utils', () => {
 
       expect(result).toBe(false)
     })
+
+    it('should return false when user has no admin access', async () => {
+      let callCount = 0
+      mockDb.select.mockImplementation(() => {
+        callCount++
+        if (callCount === 1) {
+          return createMockChain([{ ownerId: 'other-user' }])
+        }
+        return createMockChain([])
+      })
+
+      const result = await hasWorkspaceAdminAccess('user123', 'workspace456')
+
+      expect(result).toBe(false)
+    })
+
+    it('should return false when user has write permission but not admin', async () => {
+      let callCount = 0
+      mockDb.select.mockImplementation(() => {
+        callCount++
+        if (callCount === 1) {
+          return createMockChain([{ ownerId: 'other-user' }])
+        }
+        return createMockChain([])
+      })
+
+      const result = await hasWorkspaceAdminAccess('user123', 'workspace456')
+
+      expect(result).toBe(false)
+    })
+
+    it('should return false when user has read permission but not admin', async () => {
+      let callCount = 0
+      mockDb.select.mockImplementation(() => {
+        callCount++
+        if (callCount === 1) {
+          return createMockChain([{ ownerId: 'other-user' }])
+        }
+        return createMockChain([])
+      })
+
+      const result = await hasWorkspaceAdminAccess('user123', 'workspace456')
+
+      expect(result).toBe(false)
+    })
+
+    it('should handle empty workspace ID', async () => {
+      const chain = createMockChain([])
+      mockDb.select.mockReturnValue(chain)
+
+      const result = await hasWorkspaceAdminAccess('user123', '')
+
+      expect(result).toBe(false)
+    })
+
+    it('should handle empty user ID', async () => {
+      const chain = createMockChain([])
+      mockDb.select.mockReturnValue(chain)
+
+      const result = await hasWorkspaceAdminAccess('', 'workspace456')
+
+      expect(result).toBe(false)
+    })
   })
 
-  describe('isOrganizationOwnerOrAdmin', () => {
-    it('should return true when user is owner of organization', async () => {
-      const chain = createMockChain([{ role: 'owner' }])
-      mockDb.select.mockReturnValue(chain)
-
-      const result = await isOrganizationOwnerOrAdmin('user123', 'org456')
-
-      expect(result).toBe(true)
-    })
-
-    it('should return true when user is admin of organization', async () => {
-      const chain = createMockChain([{ role: 'admin' }])
-      mockDb.select.mockReturnValue(chain)
-
-      const result = await isOrganizationOwnerOrAdmin('user123', 'org456')
-
-      expect(result).toBe(true)
-    })
-
-    it('should return false when user is regular member of organization', async () => {
-      const chain = createMockChain([{ role: 'member' }])
-      mockDb.select.mockReturnValue(chain)
-
-      const result = await isOrganizationOwnerOrAdmin('user123', 'org456')
-
-      expect(result).toBe(false)
-    })
-
-    it('should return false when user is not member of organization', async () => {
+  describe('Edge Cases and Security Tests', () => {
+    it('should handle SQL injection attempts in user IDs', async () => {
       const chain = createMockChain([])
       mockDb.select.mockReturnValue(chain)
 
-      const result = await isOrganizationOwnerOrAdmin('user123', 'org456')
+      const result = await getUserEntityPermissions(
+        "'; DROP TABLE users; --",
+        'workspace',
+        'workspace123'
+      )
+
+      expect(result).toBeNull()
+    })
+
+    it('should handle very long entity IDs', async () => {
+      const longEntityId = 'a'.repeat(1000)
+      const chain = createMockChain([])
+      mockDb.select.mockReturnValue(chain)
+
+      const result = await getUserEntityPermissions('user123', 'workspace', longEntityId)
+
+      expect(result).toBeNull()
+    })
+
+    it('should handle unicode characters in entity names', async () => {
+      const chain = createMockChain([{ permissionType: 'read' as PermissionType }])
+      mockDb.select.mockReturnValue(chain)
+
+      const result = await getUserEntityPermissions('user123', '📝workspace', '🏢org-id')
+
+      expect(result).toBe('read')
+    })
+
+    it('should verify permission hierarchy ordering is consistent', () => {
+      const permissionOrder: Record<PermissionType, number> = { admin: 3, write: 2, read: 1 }
+
+      expect(permissionOrder.admin).toBeGreaterThan(permissionOrder.write)
+      expect(permissionOrder.write).toBeGreaterThan(permissionOrder.read)
+    })
+
+    it('should handle workspace ownership checks with null owner IDs', async () => {
+      let callCount = 0
+      mockDb.select.mockImplementation(() => {
+        callCount++
+        if (callCount === 1) {
+          return createMockChain([{ ownerId: null }])
+        }
+        return createMockChain([])
+      })
+
+      const result = await hasWorkspaceAdminAccess('user123', 'workspace456')
 
       expect(result).toBe(false)
     })
 
-    it('should handle errors gracefully', async () => {
+    it('should handle null user ID correctly when owner ID is different', async () => {
+      let callCount = 0
       mockDb.select.mockImplementation(() => {
-        throw new Error('Database error')
+        callCount++
+        if (callCount === 1) {
+          return createMockChain([{ ownerId: 'other-user' }])
+        }
+        return createMockChain([])
       })
 
-      const result = await isOrganizationOwnerOrAdmin('user123', 'org456')
+      const result = await hasWorkspaceAdminAccess(null as any, 'workspace456')
 
       expect(result).toBe(false)
     })
@@ -289,27 +496,121 @@ describe('Permission Utils', () => {
       expect(result).toEqual([])
     })
 
-    it('should return direct admin workspaces', async () => {
-      const mockDirectWorkspaces = [
-        { id: 'ws1', name: 'Workspace 1', ownerId: 'owner1' },
-        { id: 'ws2', name: 'Workspace 2', ownerId: 'owner2' },
+    it('should return owned workspaces', async () => {
+      const mockWorkspaces = [
+        { id: 'ws1', name: 'My Workspace 1', ownerId: 'user123' },
+        { id: 'ws2', name: 'My Workspace 2', ownerId: 'user123' },
       ]
 
       let callCount = 0
       mockDb.select.mockImplementation(() => {
         callCount++
         if (callCount === 1) {
-          return createMockChain(mockDirectWorkspaces) // direct admin workspaces
+          return createMockChain(mockWorkspaces) // Owned workspaces
         }
-        return createMockChain([]) // no organization memberships
+        return createMockChain([]) // No admin workspaces
       })
 
       const result = await getManageableWorkspaces('user123')
 
       expect(result).toEqual([
-        { id: 'ws1', name: 'Workspace 1', ownerId: 'owner1', accessType: 'direct' },
-        { id: 'ws2', name: 'Workspace 2', ownerId: 'owner2', accessType: 'direct' },
+        { id: 'ws1', name: 'My Workspace 1', ownerId: 'user123', accessType: 'owner' },
+        { id: 'ws2', name: 'My Workspace 2', ownerId: 'user123', accessType: 'owner' },
       ])
     })
+
+    it('should return workspaces with direct admin permissions', async () => {
+      const mockAdminWorkspaces = [{ id: 'ws1', name: 'Shared Workspace', ownerId: 'other-user' }]
+
+      let callCount = 0
+      mockDb.select.mockImplementation(() => {
+        callCount++
+        if (callCount === 1) {
+          return createMockChain([]) // No owned workspaces
+        }
+        return createMockChain(mockAdminWorkspaces) // Admin workspaces
+      })
+
+      const result = await getManageableWorkspaces('user123')
+
+      expect(result).toEqual([
+        { id: 'ws1', name: 'Shared Workspace', ownerId: 'other-user', accessType: 'direct' },
+      ])
+    })
+
+    it('should combine owned and admin workspaces without duplicates', async () => {
+      const mockOwnedWorkspaces = [
+        { id: 'ws1', name: 'My Workspace', ownerId: 'user123' },
+        { id: 'ws2', name: 'Another Workspace', ownerId: 'user123' },
+      ]
+      const mockAdminWorkspaces = [
+        { id: 'ws1', name: 'My Workspace', ownerId: 'user123' }, // Duplicate (should be filtered)
+        { id: 'ws3', name: 'Shared Workspace', ownerId: 'other-user' },
+      ]
+
+      let callCount = 0
+      mockDb.select.mockImplementation(() => {
+        callCount++
+        if (callCount === 1) {
+          return createMockChain(mockOwnedWorkspaces) // Owned workspaces
+        }
+        return createMockChain(mockAdminWorkspaces) // Admin workspaces
+      })
+
+      const result = await getManageableWorkspaces('user123')
+
+      expect(result).toHaveLength(3)
+      expect(result).toEqual([
+        { id: 'ws1', name: 'My Workspace', ownerId: 'user123', accessType: 'owner' },
+        { id: 'ws2', name: 'Another Workspace', ownerId: 'user123', accessType: 'owner' },
+        { id: 'ws3', name: 'Shared Workspace', ownerId: 'other-user', accessType: 'direct' },
+      ])
+    })
+
+    it('should handle empty workspace names', async () => {
+      const mockWorkspaces = [{ id: 'ws1', name: '', ownerId: 'user123' }]
+
+      let callCount = 0
+      mockDb.select.mockImplementation(() => {
+        callCount++
+        if (callCount === 1) {
+          return createMockChain(mockWorkspaces)
+        }
+        return createMockChain([])
+      })
+
+      const result = await getManageableWorkspaces('user123')
+
+      expect(result[0].name).toBe('')
+    })
+
+    it('should handle multiple admin permissions for same workspace', async () => {
+      const mockAdminWorkspaces = [
+        { id: 'ws1', name: 'Shared Workspace', ownerId: 'other-user' },
+        { id: 'ws1', name: 'Shared Workspace', ownerId: 'other-user' }, // Duplicate
+      ]
+
+      let callCount = 0
+      mockDb.select.mockImplementation(() => {
+        callCount++
+        if (callCount === 1) {
+          return createMockChain([]) // No owned workspaces
+        }
+        return createMockChain(mockAdminWorkspaces) // Admin workspaces with duplicates
+      })
+
+      const result = await getManageableWorkspaces('user123')
+
+      expect(result).toHaveLength(2) // Should include duplicates from admin permissions
+    })
+
+    it('should handle empty user ID gracefully', async () => {
+      const chain = createMockChain([])
+      mockDb.select.mockReturnValue(chain)
+
+      const result = await getManageableWorkspaces('')
+
+      expect(result).toEqual([])
+    })
   })
 })

apps/sim/lib/permissions/utils.ts

@@ -1,6 +1,6 @@
 import { and, eq } from 'drizzle-orm'
 import { db } from '@/db'
-import { member, permissions, type permissionTypeEnum, user, workspace } from '@/db/schema'
+import { permissions, type permissionTypeEnum, user, workspace } from '@/db/schema'
 
 export type PermissionType = (typeof permissionTypeEnum.enumValues)[number]
 
@@ -32,7 +32,6 @@ export async function getUserEntityPermissions(
     return null
   }
 
-  // If multiple permissions exist (legacy data), return the highest one
   const permissionOrder: Record<PermissionType, number> = { admin: 3, write: 2, read: 1 }
   const highestPermission = result.reduce((highest, current) => {
     return permissionOrder[current.permissionType] > permissionOrder[highest.permissionType]
@@ -46,13 +45,13 @@ export async function getUserEntityPermissions(
 /**
  * Check if a user has admin permission for a specific workspace
  *
- * @param userId - The ID of the user to check permissions for
- * @param workspaceId - The ID of the workspace to check admin permission for
+ * @param userId - The ID of the user to check
+ * @param workspaceId - The ID of the workspace to check
  * @returns Promise<boolean> - True if the user has admin permission for the workspace, false otherwise
  */
 export async function hasAdminPermission(userId: string, workspaceId: string): Promise<boolean> {
   const result = await db
-    .select()
+    .select({ id: permissions.id })
     .from(permissions)
     .where(
       and(
@@ -73,13 +72,19 @@ export async function hasAdminPermission(userId: string, workspaceId: string): P
  * @param workspaceId - The ID of the workspace to retrieve user permissions for.
  * @returns A promise that resolves to an array of user objects, each containing user details and their permission type.
  */
-export async function getUsersWithPermissions(workspaceId: string) {
+export async function getUsersWithPermissions(workspaceId: string): Promise<
+  Array<{
+    userId: string
+    email: string
+    name: string
+    permissionType: PermissionType
+  }>
+> {
   const usersWithPermissions = await db
     .select({
       userId: user.id,
       email: user.email,
       name: user.name,
-      image: user.image,
       permissionType: permissions.permissionType,
     })
     .from(permissions)
@@ -87,141 +92,71 @@ export async function getUsersWithPermissions(workspaceId: string) {
     .where(and(eq(permissions.entityType, 'workspace'), eq(permissions.entityId, workspaceId)))
     .orderBy(user.email)
 
-  // Since each user has only one permission, we can use the results directly
   return usersWithPermissions.map((row) => ({
     userId: row.userId,
     email: row.email,
     name: row.name,
-    image: row.image,
     permissionType: row.permissionType,
   }))
 }
 
 /**
- * Check if a user is an admin or owner of any organization that has access to a workspace
+ * Check if a user has admin access to a specific workspace
  *
  * @param userId - The ID of the user to check
- * @param workspaceId - The ID of the workspace
- * @returns Promise<boolean> - True if the user is an organization admin with access to the workspace
- */
-export async function isOrganizationAdminForWorkspace(
-  userId: string,
-  workspaceId: string
-): Promise<boolean> {
-  try {
-    // Get the workspace owner
-    const workspaceRecord = await db
-      .select({ ownerId: workspace.ownerId })
-      .from(workspace)
-      .where(eq(workspace.id, workspaceId))
-      .limit(1)
-
-    if (workspaceRecord.length === 0) {
-      return false
-    }
-
-    const workspaceOwnerId = workspaceRecord[0].ownerId
-
-    // Check if the user is an admin/owner of any organization that the workspace owner belongs to
-    const orgMemberships = await db
-      .select({
-        organizationId: member.organizationId,
-        role: member.role,
-      })
-      .from(member)
-      .where(
-        and(
-          eq(member.userId, userId),
-          // Only admin and owner roles can manage workspace permissions
-          eq(member.role, 'admin') // We'll also check for 'owner' separately
-        )
-      )
-
-    // Also check for owner role
-    const ownerMemberships = await db
-      .select({
-        organizationId: member.organizationId,
-        role: member.role,
-      })
-      .from(member)
-      .where(and(eq(member.userId, userId), eq(member.role, 'owner')))
-
-    const allOrgMemberships = [...orgMemberships, ...ownerMemberships]
-
-    if (allOrgMemberships.length === 0) {
-      return false
-    }
-
-    // Check if the workspace owner is a member of any of these organizations
-    for (const membership of allOrgMemberships) {
-      const workspaceOwnerInOrg = await db
-        .select()
-        .from(member)
-        .where(
-          and(
-            eq(member.userId, workspaceOwnerId),
-            eq(member.organizationId, membership.organizationId)
-          )
-        )
-        .limit(1)
-
-      if (workspaceOwnerInOrg.length > 0) {
-        return true
-      }
-    }
-
-    return false
-  } catch (error) {
-    console.error('Error checking organization admin status for workspace:', error)
-    return false
-  }
-}
-
-/**
- * Check if a user has admin permissions (either direct workspace admin or organization admin)
- *
- * @param userId - The ID of the user to check permissions for
- * @param workspaceId - The ID of the workspace to check admin permission for
- * @returns Promise<boolean> - True if the user has admin permission for the workspace, false otherwise
+ * @param workspaceId - The ID of the workspace to check
+ * @returns Promise<boolean> - True if the user has admin access to the workspace, false otherwise
  */
 export async function hasWorkspaceAdminAccess(
   userId: string,
   workspaceId: string
 ): Promise<boolean> {
-  // Check direct workspace admin permission
-  const directAdmin = await hasAdminPermission(userId, workspaceId)
-  if (directAdmin) {
+  const workspaceResult = await db
+    .select({ ownerId: workspace.ownerId })
+    .from(workspace)
+    .where(eq(workspace.id, workspaceId))
+    .limit(1)
+
+  if (workspaceResult.length === 0) {
+    return false
+  }
+
+  if (workspaceResult[0].ownerId === userId) {
     return true
   }
 
-  // Check organization admin permission
-  const orgAdmin = await isOrganizationAdminForWorkspace(userId, workspaceId)
-  return orgAdmin
+  return await hasAdminPermission(userId, workspaceId)
 }
 
 /**
- * Get all workspaces that a user can manage (either as direct admin or organization admin)
+ * Get a list of workspaces that the user has access to
  *
- * @param userId - The ID of the user
- * @returns Promise<Array<{id: string, name: string, ownerId: string}>> - Array of workspaces the user can manage
+ * @param userId - The ID of the user to check
+ * @returns Promise<Array<{
+ *   id: string
+ *   name: string
+ *   ownerId: string
+ *   accessType: 'direct' | 'owner'
+ * }>> - A list of workspaces that the user has access to
  */
 export async function getManageableWorkspaces(userId: string): Promise<
   Array<{
     id: string
     name: string
     ownerId: string
-    accessType: 'direct' | 'organization'
+    accessType: 'direct' | 'owner'
   }>
 > {
-  const manageableWorkspaces: Array<{
-    id: string
-    name: string
-    ownerId: string
-    accessType: 'direct' | 'organization'
-  }> = []
+  const ownedWorkspaces = await db
+    .select({
+      id: workspace.id,
+      name: workspace.name,
+      ownerId: workspace.ownerId,
+    })
+    .from(workspace)
+    .where(eq(workspace.ownerId, userId))
 
-  // Get workspaces where user has direct admin permissions
-  const directWorkspaces = await db
+  const adminWorkspaces = await db
     .select({
       id: workspace.id,
       name: workspace.name,
@@ -237,86 +172,13 @@ export async function getManageableWorkspaces(userId: string): Promise<
       )
     )
 
-  directWorkspaces.forEach((ws) => {
-    manageableWorkspaces.push({
-      ...ws,
-      accessType: 'direct',
-    })
-  })
+  const ownedSet = new Set(ownedWorkspaces.map((w) => w.id))
+  const combined = [
+    ...ownedWorkspaces.map((ws) => ({ ...ws, accessType: 'owner' as const })),
+    ...adminWorkspaces
+      .filter((ws) => !ownedSet.has(ws.id))
+      .map((ws) => ({ ...ws, accessType: 'direct' as const })),
+  ]
 
-  // Get workspaces where user has organization admin access
-  // First, get organizations where the user is admin/owner
-  const adminOrgs = await db
-    .select({ organizationId: member.organizationId })
-    .from(member)
-    .where(
-      and(
-        eq(member.userId, userId)
-        // Check for both admin and owner roles
-      )
-    )
-
-  // Get all organization workspaces for these orgs
-  for (const org of adminOrgs) {
-    // Get all members of this organization
-    const orgMembers = await db
-      .select({ userId: member.userId })
-      .from(member)
-      .where(eq(member.organizationId, org.organizationId))
-
-    // Get workspaces owned by org members
-    const orgWorkspaces = await db
-      .select({
-        id: workspace.id,
-        name: workspace.name,
-        ownerId: workspace.ownerId,
-      })
-      .from(workspace)
-      .where(
-        // Find workspaces owned by any org member
-        eq(workspace.ownerId, orgMembers.length > 0 ? orgMembers[0].userId : 'none')
-      )
-
-    // Add these workspaces if not already included
-    orgWorkspaces.forEach((ws) => {
-      if (!manageableWorkspaces.find((existing) => existing.id === ws.id)) {
-        manageableWorkspaces.push({
-          ...ws,
-          accessType: 'organization',
-        })
-      }
-    })
-  }
-
-  return manageableWorkspaces
-}
-
-/**
- * Check if a user is an owner or admin of a specific organization
- *
- * @param userId - The ID of the user to check
- * @param organizationId - The ID of the organization
- * @returns Promise<boolean> - True if the user is an owner or admin of the organization
- */
-export async function isOrganizationOwnerOrAdmin(
-  userId: string,
-  organizationId: string
-): Promise<boolean> {
-  try {
-    const memberRecord = await db
-      .select({ role: member.role })
-      .from(member)
-      .where(and(eq(member.userId, userId), eq(member.organizationId, organizationId)))
-      .limit(1)
-
-    if (memberRecord.length === 0) {
-      return false // User is not a member of the organization
-    }
-
-    const userRole = memberRecord[0].role
-    return ['owner', 'admin'].includes(userRole)
-  } catch (error) {
-    console.error('Error checking organization ownership/admin status:', error)
-    return false
-  }
+  return combined
 }