diff --git a/apps/docs/content/docs/en/tools/github.mdx b/apps/docs/content/docs/en/tools/github.mdx
index ef05e6ae91..a97956d3bb 100644
--- a/apps/docs/content/docs/en/tools/github.mdx
+++ b/apps/docs/content/docs/en/tools/github.mdx
@@ -1535,4 +1535,1433 @@ Delete a GitHub Project V2. This action is permanent and cannot be undone. Requi
 | `number` | number | Deleted project number |
 | `url` | string | Deleted project URL |
 
+### `github_search_code`
+
+Search for code across GitHub repositories. Use qualifiers like repo:owner/name, language:js, path:src, extension:py
+
+#### Input
+
+| Parameter | Type | Required | Description |
+| --------- | ---- | -------- | ----------- |
+| `q` | string | Yes | Search query with optional qualifiers \(repo:, language:, path:, extension:, user:, org:\) |
+| `sort` | string | No | Sort by indexed date \(default: best match\) |
+| `order` | string | No | Sort order: asc or desc \(default: desc\) |
+| `per_page` | number | No | Results per page \(max 100, default: 30\) |
+| `page` | number | No | Page number \(default: 1\) |
+| `apiKey` | string | Yes | GitHub API token |
+
+#### Output
+
+| Parameter | Type | Description |
+| --------- | ---- | ----------- |
+| `total_count` | number | Total matching results |
+| `incomplete_results` | boolean | Whether results are incomplete |
+| `items` | array | Array of code matches from GitHub API |
+|   ↳ `name` | string | Repository name |
+|   ↳ `path` | string | File path |
+|   ↳ `sha` | string | Blob SHA |
+|   ↳ `url` | string | API URL |
+|   ↳ `git_url` | string | Git blob URL |
+|   ↳ `html_url` | string | Profile page URL |
+|   ↳ `score` | number | Search relevance score |
+|   ↳ `repository` | object | Repository containing the code |
+|   ↳ `id` | number | User ID |
+|   ↳ `node_id` | string | GraphQL node ID |
+|   ↳ `name` | string | Repository name |
+|   ↳ `full_name` | string | Full name \(owner/repo\) |
+|   ↳ `private` | boolean | Whether repository is private |
+|   ↳ `html_url` | string | Profile page URL |
+|   ↳ `description` | string | Repository description |
+|   ↳ `fork` | boolean | Whether this is a fork |
+|   ↳ `url` | string | API URL |
+|   ↳ `owner` | object | Repository owner |
+|   ↳ `login` | string | Username |
+|   ↳ `id` | number | User ID |
+|   ↳ `node_id` | string | GraphQL node ID |
+|   ↳ `avatar_url` | string | Avatar image URL |
+|   ↳ `url` | string | API URL |
+|   ↳ `html_url` | string | Profile page URL |
+|   ↳ `type` | string | User or Organization |
+|   ↳ `site_admin` | boolean | GitHub staff indicator |
+|   ↳ `login` | string | Username |
+|   ↳ `avatar_url` | string | Avatar image URL |
+|   ↳ `type` | string | User or Organization |
+|   ↳ `site_admin` | boolean | GitHub staff indicator |
+|   ↳ `id` | number | User ID |
+|   ↳ `node_id` | string | GraphQL node ID |
+|   ↳ `full_name` | string | Full name \(owner/repo\) |
+|   ↳ `private` | boolean | Whether repository is private |
+|   ↳ `description` | string | Repository description |
+|   ↳ `fork` | boolean | Whether this is a fork |
+|   ↳ `owner` | object | Repository owner |
+|   ↳ `login` | string | Username |
+|   ↳ `id` | number | User ID |
+|   ↳ `node_id` | string | GraphQL node ID |
+|   ↳ `avatar_url` | string | Avatar image URL |
+|   ↳ `url` | string | API URL |
+|   ↳ `html_url` | string | Profile page URL |
+|   ↳ `type` | string | User or Organization |
+|   ↳ `site_admin` | boolean | GitHub staff indicator |
+|   ↳ `login` | string | Username |
+|   ↳ `avatar_url` | string | Avatar image URL |
+|   ↳ `type` | string | User or Organization |
+|   ↳ `site_admin` | boolean | GitHub staff indicator |
+|   ↳ `text_matches` | array | Text matches showing context |
+|   ↳ `object_url` | string | Object URL |
+|   ↳ `object_type` | string | Object type |
+|   ↳ `property` | string | Property matched |
+|   ↳ `fragment` | string | Text fragment with match |
+|   ↳ `matches` | array | Match indices |
+|   ↳ `text` | string | Matched text |
+|   ↳ `indices` | array | Start and end indices |
+|   ↳ `text` | string | Matched text |
+|   ↳ `indices` | array | Start and end indices |
+|   ↳ `object_url` | string | Object URL |
+|   ↳ `object_type` | string | Object type |
+|   ↳ `property` | string | Property matched |
+|   ↳ `fragment` | string | Text fragment with match |
+|   ↳ `matches` | array | Match indices |
+|   ↳ `text` | string | Matched text |
+|   ↳ `indices` | array | Start and end indices |
+|   ↳ `text` | string | Matched text |
+|   ↳ `indices` | array | Start and end indices |
+
+### `github_search_commits`
+
+Search for commits across GitHub. Use qualifiers like repo:owner/name, author:user, committer:user, author-date:>2023-01-01
+
+#### Input
+
+| Parameter | Type | Required | Description |
+| --------- | ---- | -------- | ----------- |
+| `q` | string | Yes | Search query with optional qualifiers \(repo:, author:, committer:, author-date:, committer-date:, merge:true/false\) |
+| `sort` | string | No | Sort by: author-date or committer-date \(default: best match\) |
+| `order` | string | No | Sort order: asc or desc \(default: desc\) |
+| `per_page` | number | No | Results per page \(max 100, default: 30\) |
+| `page` | number | No | Page number \(default: 1\) |
+| `apiKey` | string | Yes | GitHub API token |
+
+#### Output
+
+| Parameter | Type | Description |
+| --------- | ---- | ----------- |
+| `total_count` | number | Total matching results |
+| `incomplete_results` | boolean | Whether results are incomplete |
+| `items` | array | Array of commit objects from GitHub API |
+|   ↳ `sha` | string | Parent SHA |
+|   ↳ `node_id` | string | GraphQL node ID |
+|   ↳ `html_url` | string | Parent web URL |
+|   ↳ `url` | string | Parent API URL |
+|   ↳ `comments_url` | string | Comments API URL |
+|   ↳ `score` | number | Search relevance score |
+|   ↳ `commit` | object | Core commit data |
+|   ↳ `url` | string | Tree API URL |
+|   ↳ `message` | string | Commit message |
+|   ↳ `comment_count` | number | Number of comments |
+|   ↳ `author` | object | Git author |
+|   ↳ `name` | string | Author name |
+|   ↳ `email` | string | Author email |
+|   ↳ `date` | string | Author date \(ISO 8601\) |
+|   ↳ `name` | string | Committer name |
+|   ↳ `email` | string | Committer email |
+|   ↳ `date` | string | Commit date \(ISO 8601\) |
+|   ↳ `committer` | object | Git committer |
+|   ↳ `name` | string | Committer name |
+|   ↳ `email` | string | Committer email |
+|   ↳ `date` | string | Commit date \(ISO 8601\) |
+|   ↳ `tree` | object | Tree object |
+|   ↳ `sha` | string | Tree SHA |
+|   ↳ `url` | string | Tree API URL |
+|   ↳ `sha` | string | Tree SHA |
+|   ↳ `message` | string | Commit message |
+|   ↳ `comment_count` | number | Number of comments |
+|   ↳ `author` | object | GitHub user \(author\) |
+|   ↳ `login` | string | Username |
+|   ↳ `id` | number | User ID |
+|   ↳ `node_id` | string | GraphQL node ID |
+|   ↳ `avatar_url` | string | Avatar URL |
+|   ↳ `url` | string | API URL |
+|   ↳ `html_url` | string | Profile URL |
+|   ↳ `type` | string | User or Organization |
+|   ↳ `site_admin` | boolean | GitHub staff indicator |
+|   ↳ `name` | string | Repository name |
+|   ↳ `email` | string | Committer email |
+|   ↳ `date` | string | Commit date \(ISO 8601\) |
+|   ↳ `committer` | object | GitHub user \(committer\) |
+|   ↳ `login` | string | Username |
+|   ↳ `id` | number | User ID |
+|   ↳ `node_id` | string | GraphQL node ID |
+|   ↳ `avatar_url` | string | Avatar URL |
+|   ↳ `url` | string | API URL |
+|   ↳ `html_url` | string | Profile URL |
+|   ↳ `type` | string | User or Organization |
+|   ↳ `site_admin` | boolean | GitHub staff indicator |
+|   ↳ `tree` | object | Tree object |
+|   ↳ `sha` | string | Tree SHA |
+|   ↳ `url` | string | Tree API URL |
+|   ↳ `login` | string | Username |
+|   ↳ `id` | number | User ID |
+|   ↳ `avatar_url` | string | Avatar image URL |
+|   ↳ `type` | string | User or Organization |
+|   ↳ `site_admin` | boolean | GitHub staff indicator |
+|   ↳ `repository` | object | Repository containing the commit |
+|   ↳ `id` | number | User ID |
+|   ↳ `node_id` | string | GraphQL node ID |
+|   ↳ `name` | string | Repository name |
+|   ↳ `full_name` | string | Full name \(owner/repo\) |
+|   ↳ `private` | boolean | Whether repository is private |
+|   ↳ `html_url` | string | Profile page URL |
+|   ↳ `description` | string | Repository description |
+|   ↳ `owner` | object | Repository owner |
+|   ↳ `login` | string | Username |
+|   ↳ `id` | number | User ID |
+|   ↳ `node_id` | string | GraphQL node ID |
+|   ↳ `avatar_url` | string | Avatar image URL |
+|   ↳ `url` | string | API URL |
+|   ↳ `html_url` | string | Profile page URL |
+|   ↳ `type` | string | User or Organization |
+|   ↳ `site_admin` | boolean | GitHub staff indicator |
+|   ↳ `login` | string | Username |
+|   ↳ `avatar_url` | string | Avatar image URL |
+|   ↳ `url` | string | API URL |
+|   ↳ `type` | string | User or Organization |
+|   ↳ `site_admin` | boolean | GitHub staff indicator |
+|   ↳ `full_name` | string | Full name \(owner/repo\) |
+|   ↳ `private` | boolean | Whether repository is private |
+|   ↳ `description` | string | Repository description |
+|   ↳ `owner` | object | Repository owner |
+|   ↳ `login` | string | Username |
+|   ↳ `id` | number | User ID |
+|   ↳ `node_id` | string | GraphQL node ID |
+|   ↳ `avatar_url` | string | Avatar image URL |
+|   ↳ `url` | string | API URL |
+|   ↳ `html_url` | string | Profile page URL |
+|   ↳ `type` | string | User or Organization |
+|   ↳ `site_admin` | boolean | GitHub staff indicator |
+|   ↳ `parents` | array | Parent commits |
+|   ↳ `sha` | string | Parent SHA |
+|   ↳ `url` | string | Parent API URL |
+|   ↳ `html_url` | string | Parent web URL |
+
+### `github_search_issues`
+
+Search for issues and pull requests across GitHub. Use qualifiers like repo:owner/name, is:issue, is:pr, state:open, label:bug, author:user
+
+#### Input
+
+| Parameter | Type | Required | Description |
+| --------- | ---- | -------- | ----------- |
+| `q` | string | Yes | Search query with optional qualifiers \(repo:, is:issue, is:pr, state:, label:, author:, assignee:\) |
+| `sort` | string | No | Sort by: comments, reactions, created, updated, interactions \(default: best match\) |
+| `order` | string | No | Sort order: asc or desc \(default: desc\) |
+| `per_page` | number | No | Results per page \(max 100, default: 30\) |
+| `page` | number | No | Page number \(default: 1\) |
+| `apiKey` | string | Yes | GitHub API token |
+
+#### Output
+
+| Parameter | Type | Description |
+| --------- | ---- | ----------- |
+| `total_count` | number | Total matching results |
+| `incomplete_results` | boolean | Whether results are incomplete |
+| `items` | array | Array of issue/PR objects from GitHub API |
+|   ↳ `id` | number | Milestone ID |
+|   ↳ `node_id` | string | GraphQL node ID |
+|   ↳ `number` | number | Milestone number |
+|   ↳ `title` | string | Milestone title |
+|   ↳ `state` | string | State \(open or closed\) |
+|   ↳ `locked` | boolean | Whether issue is locked |
+|   ↳ `html_url` | string | Web URL |
+|   ↳ `url` | string | API URL |
+|   ↳ `repository_url` | string | Repository API URL |
+|   ↳ `comments_url` | string | Comments API URL |
+|   ↳ `body` | string | Body text |
+|   ↳ `comments` | number | Number of comments |
+|   ↳ `score` | number | Search relevance score |
+|   ↳ `created_at` | string | Creation timestamp |
+|   ↳ `updated_at` | string | Last update timestamp |
+|   ↳ `closed_at` | string | Close timestamp |
+|   ↳ `user` | object | Issue author |
+|   ↳ `login` | string | Username |
+|   ↳ `id` | number | User ID |
+|   ↳ `node_id` | string | GraphQL node ID |
+|   ↳ `avatar_url` | string | Avatar image URL |
+|   ↳ `url` | string | API URL |
+|   ↳ `html_url` | string | Profile page URL |
+|   ↳ `type` | string | User or Organization |
+|   ↳ `site_admin` | boolean | GitHub staff indicator |
+|   ↳ `login` | string | Username |
+|   ↳ `avatar_url` | string | Avatar image URL |
+|   ↳ `type` | string | User or Organization |
+|   ↳ `site_admin` | boolean | GitHub staff indicator |
+|   ↳ `labels` | array | Issue labels |
+|   ↳ `id` | number | Label ID |
+|   ↳ `node_id` | string | GraphQL node ID |
+|   ↳ `url` | string | API URL |
+|   ↳ `name` | string | Label name |
+|   ↳ `description` | string | Label description |
+|   ↳ `color` | string | Hex color code |
+|   ↳ `default` | boolean | Whether this is a default label |
+|   ↳ `name` | string | Label name |
+|   ↳ `description` | string | Milestone description |
+|   ↳ `color` | string | Hex color code |
+|   ↳ `default` | boolean | Whether this is a default label |
+|   ↳ `assignee` | object | Primary assignee |
+|   ↳ `login` | string | Username |
+|   ↳ `id` | number | User ID |
+|   ↳ `node_id` | string | GraphQL node ID |
+|   ↳ `avatar_url` | string | Avatar image URL |
+|   ↳ `url` | string | API URL |
+|   ↳ `html_url` | string | Profile page URL |
+|   ↳ `type` | string | User or Organization |
+|   ↳ `site_admin` | boolean | GitHub staff indicator |
+|   ↳ `assignees` | array | All assignees |
+|   ↳ `login` | string | Username |
+|   ↳ `id` | number | User ID |
+|   ↳ `node_id` | string | GraphQL node ID |
+|   ↳ `avatar_url` | string | Avatar image URL |
+|   ↳ `url` | string | API URL |
+|   ↳ `html_url` | string | Profile page URL |
+|   ↳ `type` | string | User or Organization |
+|   ↳ `site_admin` | boolean | GitHub staff indicator |
+|   ↳ `milestone` | object | Associated milestone |
+|   ↳ `id` | number | Milestone ID |
+|   ↳ `node_id` | string | GraphQL node ID |
+|   ↳ `number` | number | Milestone number |
+|   ↳ `title` | string | Milestone title |
+|   ↳ `description` | string | Milestone description |
+|   ↳ `state` | string | State \(open or closed\) |
+|   ↳ `html_url` | string | Web URL |
+|   ↳ `due_on` | string | Due date |
+|   ↳ `due_on` | string | Due date |
+|   ↳ `pull_request` | object | Pull request details \(if this is a PR\) |
+|   ↳ `url` | string | API URL |
+|   ↳ `html_url` | string | Web URL |
+|   ↳ `diff_url` | string | Diff URL |
+|   ↳ `patch_url` | string | Patch URL |
+|   ↳ `diff_url` | string | Diff URL |
+|   ↳ `patch_url` | string | Patch URL |
+
+### `github_search_repos`
+
+Search for repositories across GitHub. Use qualifiers like language:python, stars:>1000, topic:react, user:owner, org:name
+
+#### Input
+
+| Parameter | Type | Required | Description |
+| --------- | ---- | -------- | ----------- |
+| `q` | string | Yes | Search query with optional qualifiers \(language:, stars:, forks:, topic:, user:, org:, in:name,description,readme\) |
+| `sort` | string | No | Sort by: stars, forks, help-wanted-issues, updated \(default: best match\) |
+| `order` | string | No | Sort order: asc or desc \(default: desc\) |
+| `per_page` | number | No | Results per page \(max 100, default: 30\) |
+| `page` | number | No | Page number \(default: 1\) |
+| `apiKey` | string | Yes | GitHub API token |
+
+#### Output
+
+| Parameter | Type | Description |
+| --------- | ---- | ----------- |
+| `total_count` | number | Total matching results |
+| `incomplete_results` | boolean | Whether results are incomplete |
+| `items` | array | Array of repository objects from GitHub API |
+|   ↳ `id` | number | User ID |
+|   ↳ `node_id` | string | GraphQL node ID |
+|   ↳ `name` | string | License name |
+|   ↳ `full_name` | string | Full name \(owner/repo\) |
+|   ↳ `private` | boolean | Whether repository is private |
+|   ↳ `description` | string | Repository description |
+|   ↳ `html_url` | string | Profile page URL |
+|   ↳ `url` | string | API URL |
+|   ↳ `fork` | boolean | Whether this is a fork |
+|   ↳ `created_at` | string | Creation timestamp |
+|   ↳ `updated_at` | string | Last update timestamp |
+|   ↳ `pushed_at` | string | Last push timestamp |
+|   ↳ `size` | number | Repository size in KB |
+|   ↳ `stargazers_count` | number | Number of stars |
+|   ↳ `watchers_count` | number | Number of watchers |
+|   ↳ `forks_count` | number | Number of forks |
+|   ↳ `open_issues_count` | number | Number of open issues |
+|   ↳ `language` | string | Primary programming language |
+|   ↳ `default_branch` | string | Default branch name |
+|   ↳ `score` | number | Search relevance score |
+|   ↳ `topics` | array | Repository topics |
+|   ↳ `license` | object | License information |
+|   ↳ `key` | string | License key \(e.g., mit\) |
+|   ↳ `name` | string | License name |
+|   ↳ `spdx_id` | string | SPDX identifier |
+|   ↳ `key` | string | License key \(e.g., mit\) |
+|   ↳ `spdx_id` | string | SPDX identifier |
+|   ↳ `owner` | object | Repository owner |
+|   ↳ `login` | string | Username |
+|   ↳ `id` | number | User ID |
+|   ↳ `node_id` | string | GraphQL node ID |
+|   ↳ `avatar_url` | string | Avatar image URL |
+|   ↳ `url` | string | API URL |
+|   ↳ `html_url` | string | Profile page URL |
+|   ↳ `type` | string | User or Organization |
+|   ↳ `site_admin` | boolean | GitHub staff indicator |
+|   ↳ `login` | string | Username |
+|   ↳ `avatar_url` | string | Avatar image URL |
+|   ↳ `type` | string | User or Organization |
+|   ↳ `site_admin` | boolean | GitHub staff indicator |
+
+### `github_search_users`
+
+Search for users and organizations on GitHub. Use qualifiers like type:user, type:org, followers:>1000, repos:>10, location:city
+
+#### Input
+
+| Parameter | Type | Required | Description |
+| --------- | ---- | -------- | ----------- |
+| `q` | string | Yes | Search query with optional qualifiers \(type:user/org, followers:, repos:, location:, language:, created:\) |
+| `sort` | string | No | Sort by: followers, repositories, joined \(default: best match\) |
+| `order` | string | No | Sort order: asc or desc \(default: desc\) |
+| `per_page` | number | No | Results per page \(max 100, default: 30\) |
+| `page` | number | No | Page number \(default: 1\) |
+| `apiKey` | string | Yes | GitHub API token |
+
+#### Output
+
+| Parameter | Type | Description |
+| --------- | ---- | ----------- |
+| `total_count` | number | Total matching results |
+| `incomplete_results` | boolean | Whether results are incomplete |
+| `items` | array | Array of user objects from GitHub API |
+|   ↳ `id` | number | User ID |
+|   ↳ `node_id` | string | GraphQL node ID |
+|   ↳ `login` | string | Username |
+|   ↳ `avatar_url` | string | Avatar image URL |
+|   ↳ `gravatar_id` | string | Gravatar ID |
+|   ↳ `url` | string | API URL |
+|   ↳ `html_url` | string | Profile page URL |
+|   ↳ `followers_url` | string | Followers API URL |
+|   ↳ `following_url` | string | Following API URL |
+|   ↳ `gists_url` | string | Gists API URL |
+|   ↳ `starred_url` | string | Starred API URL |
+|   ↳ `repos_url` | string | Repos API URL |
+|   ↳ `organizations_url` | string | Organizations API URL |
+|   ↳ `type` | string | User or Organization |
+|   ↳ `site_admin` | boolean | GitHub staff indicator |
+|   ↳ `score` | number | Search relevance score |
+
+### `github_list_commits`
+
+List commits in a repository with optional filtering by SHA, path, author, committer, or date range
+
+#### Input
+
+| Parameter | Type | Required | Description |
+| --------- | ---- | -------- | ----------- |
+| `owner` | string | Yes | Repository owner |
+| `repo` | string | Yes | Repository name |
+| `sha` | string | No | SHA or branch to start listing commits from |
+| `path` | string | No | Only commits containing this file path |
+| `author` | string | No | GitHub login or email address to filter by author |
+| `committer` | string | No | GitHub login or email address to filter by committer |
+| `since` | string | No | Only commits after this date \(ISO 8601 format\) |
+| `until` | string | No | Only commits before this date \(ISO 8601 format\) |
+| `per_page` | number | No | Results per page \(max 100, default: 30\) |
+| `page` | number | No | Page number \(default: 1\) |
+| `apiKey` | string | Yes | GitHub API token |
+
+#### Output
+
+| Parameter | Type | Description |
+| --------- | ---- | ----------- |
+| `items` | array | Array of commit objects from GitHub API |
+|   ↳ `sha` | string | Parent SHA |
+|   ↳ `node_id` | string | GraphQL node ID |
+|   ↳ `html_url` | string | Parent web URL |
+|   ↳ `url` | string | Parent API URL |
+|   ↳ `comments_url` | string | Comments API URL |
+|   ↳ `commit` | object | Core commit data |
+|   ↳ `url` | string | Tree API URL |
+|   ↳ `message` | string | Commit message |
+|   ↳ `comment_count` | number | Number of comments |
+|   ↳ `author` | object | Git author |
+|   ↳ `name` | string | Author name |
+|   ↳ `email` | string | Author email |
+|   ↳ `date` | string | Author date \(ISO 8601\) |
+|   ↳ `name` | string | Committer name |
+|   ↳ `email` | string | Committer email |
+|   ↳ `date` | string | Commit date \(ISO 8601\) |
+|   ↳ `committer` | object | Git committer |
+|   ↳ `name` | string | Committer name |
+|   ↳ `email` | string | Committer email |
+|   ↳ `date` | string | Commit date \(ISO 8601\) |
+|   ↳ `tree` | object | Tree object |
+|   ↳ `sha` | string | Tree SHA |
+|   ↳ `url` | string | Tree API URL |
+|   ↳ `sha` | string | Tree SHA |
+|   ↳ `verification` | object | Signature verification |
+|   ↳ `verified` | boolean | Whether signature is verified |
+|   ↳ `reason` | string | Verification reason |
+|   ↳ `signature` | string | GPG signature |
+|   ↳ `payload` | string | Signed payload |
+|   ↳ `verified` | boolean | Whether signature is verified |
+|   ↳ `reason` | string | Verification reason |
+|   ↳ `signature` | string | GPG signature |
+|   ↳ `payload` | string | Signed payload |
+|   ↳ `message` | string | Commit message |
+|   ↳ `comment_count` | number | Number of comments |
+|   ↳ `author` | object | GitHub user \(author\) |
+|   ↳ `login` | string | Username |
+|   ↳ `id` | number | User ID |
+|   ↳ `node_id` | string | GraphQL node ID |
+|   ↳ `avatar_url` | string | Avatar URL |
+|   ↳ `url` | string | API URL |
+|   ↳ `html_url` | string | Profile URL |
+|   ↳ `type` | string | User or Organization |
+|   ↳ `site_admin` | boolean | GitHub staff indicator |
+|   ↳ `name` | string | Committer name |
+|   ↳ `email` | string | Committer email |
+|   ↳ `date` | string | Commit date \(ISO 8601\) |
+|   ↳ `committer` | object | GitHub user \(committer\) |
+|   ↳ `login` | string | Username |
+|   ↳ `id` | number | User ID |
+|   ↳ `node_id` | string | GraphQL node ID |
+|   ↳ `avatar_url` | string | Avatar URL |
+|   ↳ `url` | string | API URL |
+|   ↳ `html_url` | string | Profile URL |
+|   ↳ `type` | string | User or Organization |
+|   ↳ `site_admin` | boolean | GitHub staff indicator |
+|   ↳ `tree` | object | Tree object |
+|   ↳ `sha` | string | Tree SHA |
+|   ↳ `url` | string | Tree API URL |
+|   ↳ `verification` | object | Signature verification |
+|   ↳ `verified` | boolean | Whether signature is verified |
+|   ↳ `reason` | string | Verification reason |
+|   ↳ `signature` | string | GPG signature |
+|   ↳ `payload` | string | Signed payload |
+|   ↳ `verified` | boolean | Whether signature is verified |
+|   ↳ `reason` | string | Verification reason |
+|   ↳ `signature` | string | GPG signature |
+|   ↳ `payload` | string | Signed payload |
+|   ↳ `login` | string | Username |
+|   ↳ `id` | number | User ID |
+|   ↳ `avatar_url` | string | Avatar URL |
+|   ↳ `type` | string | User or Organization |
+|   ↳ `site_admin` | boolean | GitHub staff indicator |
+|   ↳ `parents` | array | Parent commits |
+|   ↳ `sha` | string | Parent SHA |
+|   ↳ `url` | string | Parent API URL |
+|   ↳ `html_url` | string | Parent web URL |
+| `count` | number | Number of commits returned |
+
+### `github_get_commit`
+
+Get detailed information about a specific commit including files changed and stats
+
+#### Input
+
+| Parameter | Type | Required | Description |
+| --------- | ---- | -------- | ----------- |
+| `owner` | string | Yes | Repository owner |
+| `repo` | string | Yes | Repository name |
+| `ref` | string | Yes | Commit SHA, branch name, or tag name |
+| `apiKey` | string | Yes | GitHub API token |
+
+#### Output
+
+| Parameter | Type | Description |
+| --------- | ---- | ----------- |
+| `sha` | string | Commit SHA |
+| `node_id` | string | GraphQL node ID |
+| `html_url` | string | GitHub web URL |
+| `url` | string | API URL |
+| `comments_url` | string | Comments API URL |
+| `commit` | object | Core commit data |
+| ↳ `url` | string | Tree API URL |
+| ↳ `message` | string | Commit message |
+| ↳ `comment_count` | number | Number of comments |
+| ↳ `author` | object | Git author |
+|   ↳ `name` | string | Author name |
+|   ↳ `email` | string | Author email |
+|   ↳ `date` | string | Author date \(ISO 8601\) |
+| ↳ `name` | string | Committer name |
+| ↳ `email` | string | Committer email |
+| ↳ `date` | string | Commit date \(ISO 8601\) |
+| ↳ `committer` | object | Git committer |
+|   ↳ `name` | string | Committer name |
+|   ↳ `email` | string | Committer email |
+|   ↳ `date` | string | Commit date \(ISO 8601\) |
+| ↳ `tree` | object | Tree object |
+|   ↳ `sha` | string | Tree SHA |
+|   ↳ `url` | string | Tree API URL |
+| ↳ `sha` | string | Tree SHA |
+| ↳ `verification` | object | Signature verification |
+|   ↳ `verified` | boolean | Whether signature is verified |
+|   ↳ `reason` | string | Verification reason |
+|   ↳ `signature` | string | GPG signature |
+|   ↳ `payload` | string | Signed payload |
+| ↳ `verified` | boolean | Whether signature is verified |
+| ↳ `reason` | string | Verification reason |
+| ↳ `signature` | string | GPG signature |
+| ↳ `payload` | string | Signed payload |
+| `author` | object | GitHub user \(author\) |
+| ↳ `login` | string | Username |
+| ↳ `id` | number | User ID |
+| ↳ `avatar_url` | string | Avatar URL |
+| ↳ `html_url` | string | Profile URL |
+| ↳ `type` | string | User or Organization |
+| `committer` | object | GitHub user \(committer\) |
+| ↳ `login` | string | Username |
+| ↳ `id` | number | User ID |
+| ↳ `avatar_url` | string | Avatar URL |
+| ↳ `html_url` | string | Profile URL |
+| ↳ `type` | string | User or Organization |
+| `stats` | object | Change statistics |
+| ↳ `additions` | number | Lines added |
+| ↳ `deletions` | number | Lines deleted |
+| ↳ `total` | number | Total changes |
+| `files` | array | Changed files \(diff entries\) |
+|   ↳ `sha` | string | Blob SHA |
+|   ↳ `filename` | string | File path |
+|   ↳ `status` | string | Change status \(added, removed, modified, renamed, copied, changed, unchanged\) |
+|   ↳ `additions` | number | Lines added |
+|   ↳ `deletions` | number | Lines deleted |
+|   ↳ `changes` | number | Total changes |
+|   ↳ `blob_url` | string | Blob URL |
+|   ↳ `raw_url` | string | Raw file URL |
+|   ↳ `contents_url` | string | Contents API URL |
+|   ↳ `patch` | string | Diff patch |
+|   ↳ `previous_filename` | string | Previous filename \(for renames\) |
+| `parents` | array | Parent commits |
+|   ↳ `sha` | string | Parent SHA |
+|   ↳ `url` | string | Parent API URL |
+|   ↳ `html_url` | string | Parent web URL |
+
+### `github_compare_commits`
+
+Compare two commits or branches to see the diff, commits between them, and changed files
+
+#### Input
+
+| Parameter | Type | Required | Description |
+| --------- | ---- | -------- | ----------- |
+| `owner` | string | Yes | Repository owner |
+| `repo` | string | Yes | Repository name |
+| `base` | string | Yes | Base branch/tag/SHA for comparison |
+| `head` | string | Yes | Head branch/tag/SHA for comparison |
+| `per_page` | number | No | Results per page for files \(max 100, default: 30\) |
+| `page` | number | No | Page number for files \(default: 1\) |
+| `apiKey` | string | Yes | GitHub API token |
+
+#### Output
+
+| Parameter | Type | Description |
+| --------- | ---- | ----------- |
+| `url` | string | API URL |
+| `html_url` | string | GitHub web URL |
+| `permalink_url` | string | Permanent link URL |
+| `diff_url` | string | Diff download URL |
+| `patch_url` | string | Patch download URL |
+| `status` | string | Comparison status \(ahead, behind, identical, diverged\) |
+| `ahead_by` | number | Commits head is ahead of base |
+| `behind_by` | number | Commits head is behind base |
+| `total_commits` | number | Total commits in comparison |
+| `base_commit` | object | Base commit object |
+| ↳ `sha` | string | Commit SHA |
+| ↳ `html_url` | string | Web URL |
+| ↳ `commit` | object | Commit data |
+|   ↳ `message` | string | Commit message |
+|   ↳ `author` | object | Git author \(name, email, date\) |
+|   ↳ `committer` | object | Git committer \(name, email, date\) |
+| ↳ `message` | string | Commit message |
+| ↳ `author` | object | GitHub user \(author\) |
+| ↳ `committer` | object | GitHub user \(committer\) |
+| `merge_base_commit` | object | Merge base commit object |
+| ↳ `sha` | string | Commit SHA |
+| ↳ `html_url` | string | Web URL |
+| `commits` | array | Commits between base and head |
+|   ↳ `sha` | string | Commit SHA |
+|   ↳ `html_url` | string | Web URL |
+|   ↳ `commit` | object | Commit data |
+|   ↳ `message` | string | Commit message |
+|   ↳ `author` | object | Git author \(name, email, date\) |
+|   ↳ `committer` | object | Git committer \(name, email, date\) |
+|   ↳ `message` | string | Commit message |
+|   ↳ `author` | object | GitHub user |
+|   ↳ `committer` | object | GitHub user |
+| `files` | array | Changed files \(diff entries\) |
+|   ↳ `sha` | string | Blob SHA |
+|   ↳ `filename` | string | File path |
+|   ↳ `status` | string | Change status \(added, removed, modified, renamed, copied, changed, unchanged\) |
+|   ↳ `additions` | number | Lines added |
+|   ↳ `deletions` | number | Lines deleted |
+|   ↳ `changes` | number | Total changes |
+|   ↳ `blob_url` | string | Blob URL |
+|   ↳ `raw_url` | string | Raw file URL |
+|   ↳ `contents_url` | string | Contents API URL |
+|   ↳ `patch` | string | Diff patch |
+|   ↳ `previous_filename` | string | Previous filename \(for renames\) |
+
+### `github_create_gist`
+
+Create a new gist with one or more files
+
+#### Input
+
+| Parameter | Type | Required | Description |
+| --------- | ---- | -------- | ----------- |
+| `description` | string | No | Description of the gist |
+| `files` | json | Yes | JSON object with filenames as keys and content as values. Example: \{"file.txt": \{"content": "Hello"\}\} |
+| `Example` | string | No | No description |
+| `public` | boolean | No | Whether the gist is public \(default: false\) |
+| `apiKey` | string | Yes | GitHub API token |
+
+#### Output
+
+| Parameter | Type | Description |
+| --------- | ---- | ----------- |
+| `id` | string | Gist ID |
+| `node_id` | string | GraphQL node ID |
+| `url` | string | API URL |
+| `html_url` | string | Web URL |
+| `forks_url` | string | Forks API URL |
+| `commits_url` | string | Commits API URL |
+| `git_pull_url` | string | Git pull URL |
+| `git_push_url` | string | Git push URL |
+| `description` | string | Gist description |
+| `public` | boolean | Whether gist is public |
+| `truncated` | boolean | Whether files are truncated |
+| `comments` | number | Number of comments |
+| `comments_url` | string | Comments API URL |
+| `created_at` | string | Creation timestamp |
+| `updated_at` | string | Last update timestamp |
+| `files` | object | Files in the gist \(object with filenames as keys, each containing filename, type, language, raw_url, size, truncated, content\) |
+| `owner` | object | Gist owner |
+| ↳ `login` | string | Username |
+| ↳ `id` | number | User ID |
+| ↳ `node_id` | string | GraphQL node ID |
+| ↳ `avatar_url` | string | Avatar image URL |
+| ↳ `url` | string | API URL |
+| ↳ `html_url` | string | Profile page URL |
+| ↳ `type` | string | User or Organization |
+| ↳ `site_admin` | boolean | GitHub staff indicator |
+
+### `github_get_gist`
+
+Get a gist by ID including its file contents
+
+#### Input
+
+| Parameter | Type | Required | Description |
+| --------- | ---- | -------- | ----------- |
+| `gist_id` | string | Yes | The gist ID |
+| `apiKey` | string | Yes | GitHub API token |
+
+#### Output
+
+| Parameter | Type | Description |
+| --------- | ---- | ----------- |
+| `id` | string | Gist ID |
+| `node_id` | string | GraphQL node ID |
+| `html_url` | string | GitHub web URL |
+| `url` | string | API URL |
+| `forks_url` | string | Forks API URL |
+| `commits_url` | string | Commits API URL |
+| `git_pull_url` | string | Git clone URL |
+| `git_push_url` | string | Git push URL |
+| `description` | string | Gist description |
+| `public` | boolean | Whether gist is public |
+| `created_at` | string | Creation timestamp |
+| `updated_at` | string | Last update timestamp |
+| `comments` | number | Number of comments |
+| `comments_url` | string | Comments API URL |
+| `truncated` | boolean | Whether content is truncated |
+| `files` | object | Files in the gist \(keyed by filename\) |
+| ↳ `filename` | string | File name |
+| ↳ `type` | string | MIME type |
+| ↳ `language` | string | Programming language |
+| ↳ `raw_url` | string | Raw file URL |
+| ↳ `size` | number | File size in bytes |
+| ↳ `truncated` | boolean | Whether content is truncated |
+| ↳ `content` | string | File content |
+| `owner` | object | Gist owner |
+| ↳ `login` | string | Username |
+| ↳ `id` | number | User ID |
+| ↳ `node_id` | string | GraphQL node ID |
+| ↳ `avatar_url` | string | Avatar image URL |
+| ↳ `url` | string | API URL |
+| ↳ `html_url` | string | Profile page URL |
+| ↳ `type` | string | User or Organization |
+| ↳ `site_admin` | boolean | GitHub staff indicator |
+
+### `github_list_gists`
+
+List gists for a user or the authenticated user
+
+#### Input
+
+| Parameter | Type | Required | Description |
+| --------- | ---- | -------- | ----------- |
+| `username` | string | No | GitHub username \(omit for authenticated user's gists\) |
+| `since` | string | No | Only gists updated after this time \(ISO 8601\) |
+| `per_page` | number | No | Results per page \(max 100, default: 30\) |
+| `page` | number | No | Page number \(default: 1\) |
+| `apiKey` | string | Yes | GitHub API token |
+
+#### Output
+
+| Parameter | Type | Description |
+| --------- | ---- | ----------- |
+| `items` | array | Array of gist objects from GitHub API |
+|   ↳ `id` | number | User ID |
+|   ↳ `node_id` | string | GraphQL node ID |
+|   ↳ `url` | string | API URL |
+|   ↳ `html_url` | string | Profile page URL |
+|   ↳ `forks_url` | string | Forks API URL |
+|   ↳ `commits_url` | string | Commits API URL |
+|   ↳ `git_pull_url` | string | Git pull URL |
+|   ↳ `git_push_url` | string | Git push URL |
+|   ↳ `description` | string | Gist description |
+|   ↳ `public` | boolean | Whether gist is public |
+|   ↳ `truncated` | boolean | Whether files are truncated |
+|   ↳ `comments` | number | Number of comments |
+|   ↳ `comments_url` | string | Comments API URL |
+|   ↳ `created_at` | string | Creation timestamp |
+|   ↳ `updated_at` | string | Last update timestamp |
+|   ↳ `files` | object | Files in the gist \(object with filenames as keys, each containing filename, type, language, raw_url, size\) |
+|   ↳ `owner` | object | Gist owner |
+|   ↳ `login` | string | Username |
+|   ↳ `id` | number | User ID |
+|   ↳ `node_id` | string | GraphQL node ID |
+|   ↳ `avatar_url` | string | Avatar image URL |
+|   ↳ `url` | string | API URL |
+|   ↳ `html_url` | string | Profile page URL |
+|   ↳ `type` | string | User or Organization |
+|   ↳ `site_admin` | boolean | GitHub staff indicator |
+|   ↳ `login` | string | Username |
+|   ↳ `avatar_url` | string | Avatar image URL |
+|   ↳ `type` | string | User or Organization |
+|   ↳ `site_admin` | boolean | GitHub staff indicator |
+| `count` | number | Number of gists returned |
+
+### `github_update_gist`
+
+Update a gist description or files. To delete a file, set its value to null in files object
+
+#### Input
+
+| Parameter | Type | Required | Description |
+| --------- | ---- | -------- | ----------- |
+| `gist_id` | string | Yes | The gist ID to update |
+| `description` | string | No | New description for the gist |
+| `files` | json | No | JSON object with filenames as keys. Set to null to delete, or provide content to update/add |
+| `apiKey` | string | Yes | GitHub API token |
+
+#### Output
+
+| Parameter | Type | Description |
+| --------- | ---- | ----------- |
+| `id` | string | Gist ID |
+| `node_id` | string | GraphQL node ID |
+| `url` | string | API URL |
+| `html_url` | string | Web URL |
+| `forks_url` | string | Forks API URL |
+| `commits_url` | string | Commits API URL |
+| `git_pull_url` | string | Git pull URL |
+| `git_push_url` | string | Git push URL |
+| `description` | string | Gist description |
+| `public` | boolean | Whether gist is public |
+| `truncated` | boolean | Whether files are truncated |
+| `comments` | number | Number of comments |
+| `comments_url` | string | Comments API URL |
+| `created_at` | string | Creation timestamp |
+| `updated_at` | string | Last update timestamp |
+| `files` | object | Files in the gist \(object with filenames as keys, each containing filename, type, language, raw_url, size, truncated, content\) |
+| `owner` | object | Gist owner |
+| ↳ `login` | string | Username |
+| ↳ `id` | number | User ID |
+| ↳ `node_id` | string | GraphQL node ID |
+| ↳ `avatar_url` | string | Avatar image URL |
+| ↳ `url` | string | API URL |
+| ↳ `html_url` | string | Profile page URL |
+| ↳ `type` | string | User or Organization |
+| ↳ `site_admin` | boolean | GitHub staff indicator |
+
+### `github_delete_gist`
+
+Delete a gist by ID
+
+#### Input
+
+| Parameter | Type | Required | Description |
+| --------- | ---- | -------- | ----------- |
+| `gist_id` | string | Yes | The gist ID to delete |
+| `apiKey` | string | Yes | GitHub API token |
+
+#### Output
+
+| Parameter | Type | Description |
+| --------- | ---- | ----------- |
+| `deleted` | boolean | Whether deletion succeeded |
+| `gist_id` | string | The deleted gist ID |
+
+### `github_fork_gist`
+
+Fork a gist to create your own copy
+
+#### Input
+
+| Parameter | Type | Required | Description |
+| --------- | ---- | -------- | ----------- |
+| `gist_id` | string | Yes | The gist ID to fork |
+| `apiKey` | string | Yes | GitHub API token |
+
+#### Output
+
+| Parameter | Type | Description |
+| --------- | ---- | ----------- |
+| `id` | string | New gist ID |
+| `html_url` | string | Web URL |
+| `description` | string | Description |
+| `public` | boolean | Is public |
+| `created_at` | string | Creation date |
+| `owner` | object | Owner info |
+| `files` | object | Files |
+
+### `github_star_gist`
+
+Star a gist
+
+#### Input
+
+| Parameter | Type | Required | Description |
+| --------- | ---- | -------- | ----------- |
+| `gist_id` | string | Yes | The gist ID to star |
+| `apiKey` | string | Yes | GitHub API token |
+
+#### Output
+
+| Parameter | Type | Description |
+| --------- | ---- | ----------- |
+| `starred` | boolean | Whether starring succeeded |
+| `gist_id` | string | The gist ID |
+
+### `github_unstar_gist`
+
+Unstar a gist
+
+#### Input
+
+| Parameter | Type | Required | Description |
+| --------- | ---- | -------- | ----------- |
+| `gist_id` | string | Yes | The gist ID to unstar |
+| `apiKey` | string | Yes | GitHub API token |
+
+#### Output
+
+| Parameter | Type | Description |
+| --------- | ---- | ----------- |
+| `unstarred` | boolean | Whether unstarring succeeded |
+| `gist_id` | string | The gist ID |
+
+### `github_fork_repo`
+
+Fork a repository to your account or an organization
+
+#### Input
+
+| Parameter | Type | Required | Description |
+| --------- | ---- | -------- | ----------- |
+| `owner` | string | Yes | Repository owner to fork from |
+| `repo` | string | Yes | Repository name to fork |
+| `organization` | string | No | Organization to fork into \(omit to fork to your account\) |
+| `name` | string | No | Custom name for the forked repository |
+| `default_branch_only` | boolean | No | Only fork the default branch \(default: false\) |
+| `apiKey` | string | Yes | GitHub API token |
+
+#### Output
+
+| Parameter | Type | Description |
+| --------- | ---- | ----------- |
+| `id` | number | Repository ID |
+| `node_id` | string | GraphQL node ID |
+| `name` | string | Repository name |
+| `full_name` | string | Full name \(owner/repo\) |
+| `private` | boolean | Whether repository is private |
+| `description` | string | Repository description |
+| `html_url` | string | GitHub web URL |
+| `url` | string | API URL |
+| `clone_url` | string | HTTPS clone URL |
+| `ssh_url` | string | SSH clone URL |
+| `git_url` | string | Git protocol URL |
+| `default_branch` | string | Default branch name |
+| `fork` | boolean | Whether this is a fork |
+| `created_at` | string | Creation timestamp |
+| `updated_at` | string | Last update timestamp |
+| `pushed_at` | string | Last push timestamp |
+| `owner` | object | Fork owner |
+| ↳ `login` | string | Username |
+| ↳ `id` | number | User ID |
+| ↳ `node_id` | string | GraphQL node ID |
+| ↳ `avatar_url` | string | Avatar image URL |
+| ↳ `url` | string | API URL |
+| ↳ `html_url` | string | Profile page URL |
+| ↳ `type` | string | User or Organization |
+| ↳ `site_admin` | boolean | GitHub staff indicator |
+| `parent` | object | Parent repository \(source of the fork\) |
+| ↳ `id` | number | User ID |
+| ↳ `full_name` | string | Full name |
+| ↳ `html_url` | string | Web URL |
+| ↳ `description` | string | Description |
+| ↳ `owner` | object | Parent owner |
+|   ↳ `login` | string | Username |
+|   ↳ `id` | number | User ID |
+| ↳ `login` | string | Username |
+| `source` | object | Source repository \(ultimate origin\) |
+| ↳ `id` | number | Repository ID |
+| ↳ `full_name` | string | Full name |
+| ↳ `html_url` | string | Web URL |
+
+### `github_list_forks`
+
+List forks of a repository
+
+#### Input
+
+| Parameter | Type | Required | Description |
+| --------- | ---- | -------- | ----------- |
+| `owner` | string | Yes | Repository owner |
+| `repo` | string | Yes | Repository name |
+| `sort` | string | No | Sort by: newest, oldest, stargazers, watchers \(default: newest\) |
+| `per_page` | number | No | Results per page \(max 100, default: 30\) |
+| `page` | number | No | Page number \(default: 1\) |
+| `apiKey` | string | Yes | GitHub API token |
+
+#### Output
+
+| Parameter | Type | Description |
+| --------- | ---- | ----------- |
+| `items` | array | Array of fork repository objects from GitHub API |
+|   ↳ `id` | number | User ID |
+|   ↳ `node_id` | string | GraphQL node ID |
+|   ↳ `name` | string | Repository name |
+|   ↳ `full_name` | string | Full name \(owner/repo\) |
+|   ↳ `private` | boolean | Whether repository is private |
+|   ↳ `description` | string | Repository description |
+|   ↳ `html_url` | string | Profile page URL |
+|   ↳ `url` | string | API URL |
+|   ↳ `fork` | boolean | Whether this is a fork |
+|   ↳ `created_at` | string | Creation timestamp |
+|   ↳ `updated_at` | string | Last update timestamp |
+|   ↳ `pushed_at` | string | Last push timestamp |
+|   ↳ `size` | number | Repository size in KB |
+|   ↳ `stargazers_count` | number | Number of stars |
+|   ↳ `watchers_count` | number | Number of watchers |
+|   ↳ `forks_count` | number | Number of forks |
+|   ↳ `open_issues_count` | number | Number of open issues |
+|   ↳ `language` | string | Primary programming language |
+|   ↳ `default_branch` | string | Default branch name |
+|   ↳ `visibility` | string | Repository visibility |
+|   ↳ `archived` | boolean | Whether repository is archived |
+|   ↳ `disabled` | boolean | Whether repository is disabled |
+|   ↳ `owner` | object | Fork owner |
+|   ↳ `login` | string | Username |
+|   ↳ `id` | number | User ID |
+|   ↳ `node_id` | string | GraphQL node ID |
+|   ↳ `avatar_url` | string | Avatar image URL |
+|   ↳ `url` | string | API URL |
+|   ↳ `html_url` | string | Profile page URL |
+|   ↳ `type` | string | User or Organization |
+|   ↳ `site_admin` | boolean | GitHub staff indicator |
+|   ↳ `login` | string | Username |
+|   ↳ `avatar_url` | string | Avatar image URL |
+|   ↳ `type` | string | User or Organization |
+|   ↳ `site_admin` | boolean | GitHub staff indicator |
+| `count` | number | Number of forks returned |
+
+### `github_create_milestone`
+
+Create a milestone in a repository
+
+#### Input
+
+| Parameter | Type | Required | Description |
+| --------- | ---- | -------- | ----------- |
+| `owner` | string | Yes | Repository owner |
+| `repo` | string | Yes | Repository name |
+| `title` | string | Yes | Milestone title |
+| `state` | string | No | State: open or closed \(default: open\) |
+| `description` | string | No | Milestone description |
+| `due_on` | string | No | Due date \(ISO 8601 format, e.g., 2024-12-31T23:59:59Z\) |
+| `apiKey` | string | Yes | GitHub API token |
+
+#### Output
+
+| Parameter | Type | Description |
+| --------- | ---- | ----------- |
+| `number` | number | Milestone number |
+| `title` | string | Title |
+| `description` | string | Description |
+| `state` | string | State |
+| `html_url` | string | Web URL |
+| `due_on` | string | Due date |
+| `open_issues` | number | Open issues |
+| `closed_issues` | number | Closed issues |
+| `creator` | object | Creator |
+
+### `github_get_milestone`
+
+Get a specific milestone by number
+
+#### Input
+
+| Parameter | Type | Required | Description |
+| --------- | ---- | -------- | ----------- |
+| `owner` | string | Yes | Repository owner |
+| `repo` | string | Yes | Repository name |
+| `milestone_number` | number | Yes | Milestone number |
+| `apiKey` | string | Yes | GitHub API token |
+
+#### Output
+
+| Parameter | Type | Description |
+| --------- | ---- | ----------- |
+| `id` | number | Milestone ID |
+| `node_id` | string | GraphQL node ID |
+| `number` | number | Milestone number |
+| `title` | string | Milestone title |
+| `description` | string | Milestone description |
+| `state` | string | State \(open or closed\) |
+| `url` | string | API URL |
+| `html_url` | string | GitHub web URL |
+| `labels_url` | string | Labels API URL |
+| `due_on` | string | Due date \(ISO 8601\) |
+| `open_issues` | number | Number of open issues |
+| `closed_issues` | number | Number of closed issues |
+| `created_at` | string | Creation timestamp |
+| `updated_at` | string | Last update timestamp |
+| `closed_at` | string | Close timestamp |
+| `creator` | object | Milestone creator |
+| ↳ `login` | string | Username |
+| ↳ `id` | number | User ID |
+| ↳ `node_id` | string | GraphQL node ID |
+| ↳ `avatar_url` | string | Avatar image URL |
+| ↳ `url` | string | API URL |
+| ↳ `html_url` | string | Profile page URL |
+| ↳ `type` | string | User or Organization |
+| ↳ `site_admin` | boolean | GitHub staff indicator |
+
+### `github_list_milestones`
+
+List milestones in a repository
+
+#### Input
+
+| Parameter | Type | Required | Description |
+| --------- | ---- | -------- | ----------- |
+| `owner` | string | Yes | Repository owner |
+| `repo` | string | Yes | Repository name |
+| `state` | string | No | Filter by state: open, closed, all \(default: open\) |
+| `sort` | string | No | Sort by: due_on or completeness \(default: due_on\) |
+| `direction` | string | No | Sort direction: asc or desc \(default: asc\) |
+| `per_page` | number | No | Results per page \(max 100, default: 30\) |
+| `page` | number | No | Page number \(default: 1\) |
+| `apiKey` | string | Yes | GitHub API token |
+
+#### Output
+
+| Parameter | Type | Description |
+| --------- | ---- | ----------- |
+| `items` | array | Array of milestone objects from GitHub API |
+|   ↳ `id` | number | User ID |
+|   ↳ `node_id` | string | GraphQL node ID |
+|   ↳ `number` | number | Milestone number |
+|   ↳ `title` | string | Milestone title |
+|   ↳ `description` | string | Milestone description |
+|   ↳ `state` | string | State \(open or closed\) |
+|   ↳ `url` | string | API URL |
+|   ↳ `html_url` | string | Profile page URL |
+|   ↳ `labels_url` | string | Labels API URL |
+|   ↳ `due_on` | string | Due date \(ISO 8601\) |
+|   ↳ `open_issues` | number | Number of open issues |
+|   ↳ `closed_issues` | number | Number of closed issues |
+|   ↳ `created_at` | string | Creation timestamp |
+|   ↳ `updated_at` | string | Last update timestamp |
+|   ↳ `closed_at` | string | Close timestamp |
+|   ↳ `creator` | object | Milestone creator |
+|   ↳ `login` | string | Username |
+|   ↳ `id` | number | User ID |
+|   ↳ `node_id` | string | GraphQL node ID |
+|   ↳ `avatar_url` | string | Avatar image URL |
+|   ↳ `url` | string | API URL |
+|   ↳ `html_url` | string | Profile page URL |
+|   ↳ `type` | string | User or Organization |
+|   ↳ `site_admin` | boolean | GitHub staff indicator |
+|   ↳ `login` | string | Username |
+|   ↳ `avatar_url` | string | Avatar image URL |
+|   ↳ `type` | string | User or Organization |
+|   ↳ `site_admin` | boolean | GitHub staff indicator |
+| `count` | number | Number of milestones returned |
+
+### `github_update_milestone`
+
+Update a milestone in a repository
+
+#### Input
+
+| Parameter | Type | Required | Description |
+| --------- | ---- | -------- | ----------- |
+| `owner` | string | Yes | Repository owner |
+| `repo` | string | Yes | Repository name |
+| `milestone_number` | number | Yes | Milestone number to update |
+| `title` | string | No | New milestone title |
+| `state` | string | No | New state: open or closed |
+| `description` | string | No | New description |
+| `due_on` | string | No | New due date \(ISO 8601 format\) |
+| `apiKey` | string | Yes | GitHub API token |
+
+#### Output
+
+| Parameter | Type | Description |
+| --------- | ---- | ----------- |
+| `id` | number | Milestone ID |
+| `node_id` | string | GraphQL node ID |
+| `number` | number | Milestone number |
+| `title` | string | Milestone title |
+| `description` | string | Milestone description |
+| `state` | string | State \(open or closed\) |
+| `url` | string | API URL |
+| `html_url` | string | GitHub web URL |
+| `labels_url` | string | Labels API URL |
+| `due_on` | string | Due date \(ISO 8601\) |
+| `open_issues` | number | Number of open issues |
+| `closed_issues` | number | Number of closed issues |
+| `created_at` | string | Creation timestamp |
+| `updated_at` | string | Last update timestamp |
+| `closed_at` | string | Close timestamp |
+| `creator` | object | Milestone creator |
+| ↳ `login` | string | Username |
+| ↳ `id` | number | User ID |
+| ↳ `node_id` | string | GraphQL node ID |
+| ↳ `avatar_url` | string | Avatar image URL |
+| ↳ `url` | string | API URL |
+| ↳ `html_url` | string | Profile page URL |
+| ↳ `type` | string | User or Organization |
+| ↳ `site_admin` | boolean | GitHub staff indicator |
+
+### `github_delete_milestone`
+
+Delete a milestone from a repository
+
+#### Input
+
+| Parameter | Type | Required | Description |
+| --------- | ---- | -------- | ----------- |
+| `owner` | string | Yes | Repository owner |
+| `repo` | string | Yes | Repository name |
+| `milestone_number` | number | Yes | Milestone number to delete |
+| `apiKey` | string | Yes | GitHub API token |
+
+#### Output
+
+| Parameter | Type | Description |
+| --------- | ---- | ----------- |
+| `deleted` | boolean | Whether deletion succeeded |
+| `milestone_number` | number | The deleted milestone number |
+
+### `github_create_issue_reaction`
+
+Add a reaction to an issue
+
+#### Input
+
+| Parameter | Type | Required | Description |
+| --------- | ---- | -------- | ----------- |
+| `owner` | string | Yes | Repository owner |
+| `repo` | string | Yes | Repository name |
+| `issue_number` | number | Yes | Issue number |
+| `content` | string | Yes | Reaction type: +1 \(thumbs up\), -1 \(thumbs down\), laugh, confused, heart, hooray, rocket, eyes |
+| `apiKey` | string | Yes | GitHub API token |
+
+#### Output
+
+| Parameter | Type | Description |
+| --------- | ---- | ----------- |
+| `id` | number | Reaction ID |
+| `node_id` | string | GraphQL node ID |
+| `content` | string | Reaction type \(+1, -1, laugh, confused, heart, hooray, rocket, eyes\) |
+| `created_at` | string | Creation timestamp |
+| `user` | object | User who reacted |
+| ↳ `login` | string | Username |
+| ↳ `id` | number | User ID |
+| ↳ `node_id` | string | GraphQL node ID |
+| ↳ `avatar_url` | string | Avatar image URL |
+| ↳ `url` | string | API URL |
+| ↳ `html_url` | string | Profile page URL |
+| ↳ `type` | string | User or Organization |
+| ↳ `site_admin` | boolean | GitHub staff indicator |
+
+### `github_delete_issue_reaction`
+
+Remove a reaction from an issue
+
+#### Input
+
+| Parameter | Type | Required | Description |
+| --------- | ---- | -------- | ----------- |
+| `owner` | string | Yes | Repository owner |
+| `repo` | string | Yes | Repository name |
+| `issue_number` | number | Yes | Issue number |
+| `reaction_id` | number | Yes | Reaction ID to delete |
+| `apiKey` | string | Yes | GitHub API token |
+
+#### Output
+
+| Parameter | Type | Description |
+| --------- | ---- | ----------- |
+| `deleted` | boolean | Whether deletion succeeded |
+| `reaction_id` | number | The deleted reaction ID |
+
+### `github_create_comment_reaction`
+
+Add a reaction to an issue comment
+
+#### Input
+
+| Parameter | Type | Required | Description |
+| --------- | ---- | -------- | ----------- |
+| `owner` | string | Yes | Repository owner |
+| `repo` | string | Yes | Repository name |
+| `comment_id` | number | Yes | Comment ID |
+| `content` | string | Yes | Reaction type: +1 \(thumbs up\), -1 \(thumbs down\), laugh, confused, heart, hooray, rocket, eyes |
+| `apiKey` | string | Yes | GitHub API token |
+
+#### Output
+
+| Parameter | Type | Description |
+| --------- | ---- | ----------- |
+| `id` | number | Reaction ID |
+| `node_id` | string | GraphQL node ID |
+| `content` | string | Reaction type \(+1, -1, laugh, confused, heart, hooray, rocket, eyes\) |
+| `created_at` | string | Creation timestamp |
+| `user` | object | User who reacted |
+| ↳ `login` | string | Username |
+| ↳ `id` | number | User ID |
+| ↳ `node_id` | string | GraphQL node ID |
+| ↳ `avatar_url` | string | Avatar image URL |
+| ↳ `url` | string | API URL |
+| ↳ `html_url` | string | Profile page URL |
+| ↳ `type` | string | User or Organization |
+| ↳ `site_admin` | boolean | GitHub staff indicator |
+
+### `github_delete_comment_reaction`
+
+Remove a reaction from an issue comment
+
+#### Input
+
+| Parameter | Type | Required | Description |
+| --------- | ---- | -------- | ----------- |
+| `owner` | string | Yes | Repository owner |
+| `repo` | string | Yes | Repository name |
+| `comment_id` | number | Yes | Comment ID |
+| `reaction_id` | number | Yes | Reaction ID to delete |
+| `apiKey` | string | Yes | GitHub API token |
+
+#### Output
+
+| Parameter | Type | Description |
+| --------- | ---- | ----------- |
+| `deleted` | boolean | Whether deletion succeeded |
+| `reaction_id` | number | The deleted reaction ID |
+
+### `github_star_repo`
+
+Star a repository
+
+#### Input
+
+| Parameter | Type | Required | Description |
+| --------- | ---- | -------- | ----------- |
+| `owner` | string | Yes | Repository owner |
+| `repo` | string | Yes | Repository name |
+| `apiKey` | string | Yes | GitHub API token |
+
+#### Output
+
+| Parameter | Type | Description |
+| --------- | ---- | ----------- |
+| `starred` | boolean | Whether starring succeeded |
+| `owner` | string | Repository owner |
+| `repo` | string | Repository name |
+
+### `github_unstar_repo`
+
+Remove star from a repository
+
+#### Input
+
+| Parameter | Type | Required | Description |
+| --------- | ---- | -------- | ----------- |
+| `owner` | string | Yes | Repository owner |
+| `repo` | string | Yes | Repository name |
+| `apiKey` | string | Yes | GitHub API token |
+
+#### Output
+
+| Parameter | Type | Description |
+| --------- | ---- | ----------- |
+| `unstarred` | boolean | Whether unstarring succeeded |
+| `owner` | string | Repository owner |
+| `repo` | string | Repository name |
+
+### `github_check_star`
+
+Check if you have starred a repository
+
+#### Input
+
+| Parameter | Type | Required | Description |
+| --------- | ---- | -------- | ----------- |
+| `owner` | string | Yes | Repository owner |
+| `repo` | string | Yes | Repository name |
+| `apiKey` | string | Yes | GitHub API token |
+
+#### Output
+
+| Parameter | Type | Description |
+| --------- | ---- | ----------- |
+| `starred` | boolean | Whether you have starred the repo |
+| `owner` | string | Repository owner |
+| `repo` | string | Repository name |
+
+### `github_list_stargazers`
+
+List users who have starred a repository
+
+#### Input
+
+| Parameter | Type | Required | Description |
+| --------- | ---- | -------- | ----------- |
+| `owner` | string | Yes | Repository owner |
+| `repo` | string | Yes | Repository name |
+| `per_page` | number | No | Results per page \(max 100, default: 30\) |
+| `page` | number | No | Page number \(default: 1\) |
+| `apiKey` | string | Yes | GitHub API token |
+
+#### Output
+
+| Parameter | Type | Description |
+| --------- | ---- | ----------- |
+| `items` | array | Array of user objects from GitHub API |
+|   ↳ `login` | string | Username |
+|   ↳ `id` | number | User ID |
+|   ↳ `node_id` | string | GraphQL node ID |
+|   ↳ `avatar_url` | string | Avatar image URL |
+|   ↳ `gravatar_id` | string | Gravatar ID |
+|   ↳ `url` | string | API URL |
+|   ↳ `html_url` | string | Profile page URL |
+|   ↳ `followers_url` | string | Followers API URL |
+|   ↳ `following_url` | string | Following API URL |
+|   ↳ `gists_url` | string | Gists API URL |
+|   ↳ `starred_url` | string | Starred API URL |
+|   ↳ `repos_url` | string | Repos API URL |
+|   ↳ `type` | string | User or Organization |
+|   ↳ `site_admin` | boolean | GitHub staff indicator |
+| `count` | number | Number of stargazers returned |
+
 
diff --git a/apps/docs/content/docs/en/tools/google_calendar.mdx b/apps/docs/content/docs/en/tools/google_calendar.mdx
index 535c32f678..57d5df9673 100644
--- a/apps/docs/content/docs/en/tools/google_calendar.mdx
+++ b/apps/docs/content/docs/en/tools/google_calendar.mdx
@@ -119,6 +119,145 @@ Get a specific event from Google Calendar. Returns API-aligned fields only.
 | `creator` | json | Event creator |
 | `organizer` | json | Event organizer |
 
+### `google_calendar_update`
+
+Update an existing event in Google Calendar. Returns API-aligned fields only.
+
+#### Input
+
+| Parameter | Type | Required | Description |
+| --------- | ---- | -------- | ----------- |
+| `calendarId` | string | No | Calendar ID \(defaults to primary\) |
+| `eventId` | string | Yes | Event ID to update |
+| `summary` | string | No | New event title/summary |
+| `description` | string | No | New event description |
+| `location` | string | No | New event location |
+| `startDateTime` | string | No | New start date and time. MUST include timezone offset \(e.g., 2025-06-03T10:00:00-08:00\) OR provide timeZone parameter |
+| `endDateTime` | string | No | New end date and time. MUST include timezone offset \(e.g., 2025-06-03T11:00:00-08:00\) OR provide timeZone parameter |
+| `timeZone` | string | No | Time zone \(e.g., America/Los_Angeles\). Required if datetime does not include offset. |
+| `attendees` | array | No | Array of attendee email addresses \(replaces existing attendees\) |
+| `sendUpdates` | string | No | How to send updates to attendees: all, externalOnly, or none |
+
+#### Output
+
+| Parameter | Type | Description |
+| --------- | ---- | ----------- |
+| `id` | string | Event ID |
+| `htmlLink` | string | Event link |
+| `status` | string | Event status |
+| `summary` | string | Event title |
+| `description` | string | Event description |
+| `location` | string | Event location |
+| `start` | json | Event start |
+| `end` | json | Event end |
+| `attendees` | json | Event attendees |
+| `creator` | json | Event creator |
+| `organizer` | json | Event organizer |
+
+### `google_calendar_delete`
+
+Delete an event from Google Calendar. Returns API-aligned fields only.
+
+#### Input
+
+| Parameter | Type | Required | Description |
+| --------- | ---- | -------- | ----------- |
+| `calendarId` | string | No | Calendar ID \(defaults to primary\) |
+| `eventId` | string | Yes | Event ID to delete |
+| `sendUpdates` | string | No | How to send updates to attendees: all, externalOnly, or none |
+
+#### Output
+
+| Parameter | Type | Description |
+| --------- | ---- | ----------- |
+| `eventId` | string | Deleted event ID |
+| `deleted` | boolean | Whether deletion was successful |
+
+### `google_calendar_move`
+
+Move an event to a different calendar. Returns API-aligned fields only.
+
+#### Input
+
+| Parameter | Type | Required | Description |
+| --------- | ---- | -------- | ----------- |
+| `calendarId` | string | No | Source calendar ID \(defaults to primary\) |
+| `eventId` | string | Yes | Event ID to move |
+| `destinationCalendarId` | string | Yes | Destination calendar ID |
+| `sendUpdates` | string | No | How to send updates to attendees: all, externalOnly, or none |
+
+#### Output
+
+| Parameter | Type | Description |
+| --------- | ---- | ----------- |
+| `id` | string | Event ID |
+| `htmlLink` | string | Event link |
+| `status` | string | Event status |
+| `summary` | string | Event title |
+| `description` | string | Event description |
+| `location` | string | Event location |
+| `start` | json | Event start |
+| `end` | json | Event end |
+| `attendees` | json | Event attendees |
+| `creator` | json | Event creator |
+| `organizer` | json | Event organizer |
+
+### `google_calendar_instances`
+
+Get instances of a recurring event from Google Calendar. Returns API-aligned fields only.
+
+#### Input
+
+| Parameter | Type | Required | Description |
+| --------- | ---- | -------- | ----------- |
+| `calendarId` | string | No | Calendar ID \(defaults to primary\) |
+| `eventId` | string | Yes | Recurring event ID to get instances of |
+| `timeMin` | string | No | Lower bound for instances \(RFC3339 timestamp, e.g., 2025-06-03T00:00:00Z\) |
+| `timeMax` | string | No | Upper bound for instances \(RFC3339 timestamp, e.g., 2025-06-04T00:00:00Z\) |
+| `maxResults` | number | No | Maximum number of instances to return \(default 250, max 2500\) |
+| `pageToken` | string | No | Token for retrieving subsequent pages of results |
+| `showDeleted` | boolean | No | Include deleted instances |
+
+#### Output
+
+| Parameter | Type | Description |
+| --------- | ---- | ----------- |
+| `nextPageToken` | string | Next page token |
+| `timeZone` | string | Calendar time zone |
+| `instances` | json | List of recurring event instances |
+
+### `google_calendar_list_calendars`
+
+List all calendars in the user
+
+#### Input
+
+| Parameter | Type | Required | Description |
+| --------- | ---- | -------- | ----------- |
+| `minAccessRole` | string | No | Minimum access role for returned calendars: freeBusyReader, reader, writer, or owner |
+| `maxResults` | number | No | Maximum number of calendars to return \(default 100, max 250\) |
+| `pageToken` | string | No | Token for retrieving subsequent pages of results |
+| `showDeleted` | boolean | No | Include deleted calendars |
+| `showHidden` | boolean | No | Include hidden calendars |
+
+#### Output
+
+| Parameter | Type | Description |
+| --------- | ---- | ----------- |
+| `nextPageToken` | string | Next page token |
+| `calendars` | array | List of calendars |
+|   ↳ `id` | string | Calendar ID |
+|   ↳ `summary` | string | Calendar title |
+|   ↳ `description` | string | Calendar description |
+|   ↳ `location` | string | Calendar location |
+|   ↳ `timeZone` | string | Calendar time zone |
+|   ↳ `accessRole` | string | Access role for the calendar |
+|   ↳ `backgroundColor` | string | Calendar background color |
+|   ↳ `foregroundColor` | string | Calendar foreground color |
+|   ↳ `primary` | boolean | Whether this is the primary calendar |
+|   ↳ `hidden` | boolean | Whether the calendar is hidden |
+|   ↳ `selected` | boolean | Whether the calendar is selected |
+
 ### `google_calendar_quick_add`
 
 Create events from natural language text. Returns API-aligned fields only.
diff --git a/apps/docs/content/docs/en/tools/google_drive.mdx b/apps/docs/content/docs/en/tools/google_drive.mdx
index 6dc71fee68..4a56b640e9 100644
--- a/apps/docs/content/docs/en/tools/google_drive.mdx
+++ b/apps/docs/content/docs/en/tools/google_drive.mdx
@@ -1,6 +1,6 @@
 ---
 title: Google Drive
-description: Create, upload, and list files
+description: Manage files, folders, and permissions
 ---
 
 import { BlockInfoCard } from "@/components/ui/block-info-card"
@@ -40,84 +40,123 @@ In Sim, the Google Drive integration enables your agents to interact directly wi
 
 ## Usage Instructions
 
-Integrate Google Drive into the workflow. Can create, upload, and list files.
+Integrate Google Drive into the workflow. Can create, upload, download, copy, move, delete, share files and manage permissions.
 
 
 
 ## Tools
 
-### `google_drive_upload`
+### `google_drive_list`
 
-Upload a file to Google Drive with complete metadata returned
+List files and folders in Google Drive with complete metadata
 
 #### Input
 
 | Parameter | Type | Required | Description |
 | --------- | ---- | -------- | ----------- |
-| `fileName` | string | Yes | The name of the file to upload |
-| `file` | file | No | Binary file to upload \(UserFile object\) |
-| `content` | string | No | Text content to upload \(use this OR file, not both\) |
-| `mimeType` | string | No | The MIME type of the file to upload \(auto-detected from file if not provided\) |
-| `folderSelector` | string | No | Select the folder to upload the file to |
-| `folderId` | string | No | The ID of the folder to upload the file to \(internal use\) |
+| `folderSelector` | string | No | Select the folder to list files from |
+| `folderId` | string | No | The ID of the folder to list files from \(internal use\) |
+| `query` | string | No | Search term to filter files by name \(e.g. "budget" finds files with "budget" in the name\). Do NOT use Google Drive query syntax here - just provide a plain search term. |
+| `pageSize` | number | No | The maximum number of files to return \(default: 100\) |
+| `pageToken` | string | No | The page token to use for pagination |
 
 #### Output
 
 | Parameter | Type | Description |
 | --------- | ---- | ----------- |
-| `file` | object | Complete uploaded file metadata from Google Drive |
+| `files` | array | Array of file metadata objects from Google Drive |
+|   ↳ `id` | string | Google Drive file ID |
+|   ↳ `kind` | string | Resource type identifier |
+|   ↳ `name` | string | File name |
+|   ↳ `mimeType` | string | MIME type |
+|   ↳ `description` | string | File description |
+|   ↳ `originalFilename` | string | Original uploaded filename |
+|   ↳ `fullFileExtension` | string | Full file extension |
+|   ↳ `fileExtension` | string | File extension |
+|   ↳ `owners` | json | List of file owners |
+|   ↳ `permissions` | json | File permissions |
+|   ↳ `permissionIds` | json | Permission IDs |
+|   ↳ `shared` | boolean | Whether file is shared |
+|   ↳ `ownedByMe` | boolean | Whether owned by current user |
+|   ↳ `writersCanShare` | boolean | Whether writers can share |
+|   ↳ `viewersCanCopyContent` | boolean | Whether viewers can copy |
+|   ↳ `copyRequiresWriterPermission` | boolean | Whether copy requires writer permission |
+|   ↳ `sharingUser` | json | User who shared the file |
+|   ↳ `starred` | boolean | Whether file is starred |
+|   ↳ `trashed` | boolean | Whether file is in trash |
+|   ↳ `explicitlyTrashed` | boolean | Whether explicitly trashed |
+|   ↳ `appProperties` | json | App-specific properties |
+|   ↳ `createdTime` | string | File creation time |
+|   ↳ `modifiedTime` | string | Last modification time |
+|   ↳ `modifiedByMeTime` | string | When modified by current user |
+|   ↳ `viewedByMeTime` | string | When last viewed by current user |
+|   ↳ `sharedWithMeTime` | string | When shared with current user |
+|   ↳ `lastModifyingUser` | json | User who last modified the file |
+|   ↳ `viewedByMe` | boolean | Whether viewed by current user |
+|   ↳ `modifiedByMe` | boolean | Whether modified by current user |
+|   ↳ `webViewLink` | string | URL to view in browser |
+|   ↳ `webContentLink` | string | Direct download URL |
+|   ↳ `iconLink` | string | URL to file icon |
+|   ↳ `thumbnailLink` | string | URL to thumbnail |
+|   ↳ `exportLinks` | json | Export format links |
+|   ↳ `size` | string | File size in bytes |
+|   ↳ `quotaBytesUsed` | string | Storage quota used |
+|   ↳ `md5Checksum` | string | MD5 hash |
+|   ↳ `sha1Checksum` | string | SHA-1 hash |
+|   ↳ `sha256Checksum` | string | SHA-256 hash |
+|   ↳ `parents` | json | Parent folder IDs |
+|   ↳ `spaces` | json | Spaces containing file |
+|   ↳ `driveId` | string | Shared drive ID |
+|   ↳ `capabilities` | json | User capabilities on file |
+|   ↳ `version` | string | Version number |
+|   ↳ `headRevisionId` | string | Head revision ID |
+|   ↳ `hasThumbnail` | boolean | Whether has thumbnail |
+|   ↳ `thumbnailVersion` | string | Thumbnail version |
+|   ↳ `imageMediaMetadata` | json | Image-specific metadata |
+|   ↳ `videoMediaMetadata` | json | Video-specific metadata |
+|   ↳ `isAppAuthorized` | boolean | Whether created by requesting app |
+|   ↳ `contentRestrictions` | json | Content restrictions |
+|   ↳ `linkShareMetadata` | json | Link share metadata |
+| `nextPageToken` | string | Token for fetching the next page of results |
+
+### `google_drive_get_file`
+
+Get metadata for a specific file in Google Drive by its ID
+
+#### Input
+
+| Parameter | Type | Required | Description |
+| --------- | ---- | -------- | ----------- |
+| `fileId` | string | Yes | The ID of the file to retrieve |
+
+#### Output
+
+| Parameter | Type | Description |
+| --------- | ---- | ----------- |
+| `file` | json | The file metadata |
 | ↳ `id` | string | Google Drive file ID |
+| ↳ `kind` | string | Resource type identifier |
 | ↳ `name` | string | File name |
 | ↳ `mimeType` | string | MIME type |
-| ↳ `kind` | string | Resource type identifier |
 | ↳ `description` | string | File description |
-| ↳ `originalFilename` | string | Original uploaded filename |
-| ↳ `fullFileExtension` | string | Full file extension |
-| ↳ `fileExtension` | string | File extension |
-| ↳ `owners` | json | List of file owners |
-| ↳ `permissions` | json | File permissions |
-| ↳ `permissionIds` | json | Permission IDs |
-| ↳ `shared` | boolean | Whether file is shared |
-| ↳ `ownedByMe` | boolean | Whether owned by current user |
-| ↳ `writersCanShare` | boolean | Whether writers can share |
-| ↳ `viewersCanCopyContent` | boolean | Whether viewers can copy |
-| ↳ `copyRequiresWriterPermission` | boolean | Whether copy requires writer permission |
-| ↳ `sharingUser` | json | User who shared the file |
+| ↳ `size` | string | File size in bytes |
 | ↳ `starred` | boolean | Whether file is starred |
 | ↳ `trashed` | boolean | Whether file is in trash |
-| ↳ `explicitlyTrashed` | boolean | Whether explicitly trashed |
-| ↳ `appProperties` | json | App-specific properties |
-| ↳ `createdTime` | string | File creation time |
-| ↳ `modifiedTime` | string | Last modification time |
-| ↳ `modifiedByMeTime` | string | When modified by current user |
-| ↳ `viewedByMeTime` | string | When last viewed by current user |
-| ↳ `sharedWithMeTime` | string | When shared with current user |
-| ↳ `lastModifyingUser` | json | User who last modified the file |
-| ↳ `viewedByMe` | boolean | Whether viewed by current user |
-| ↳ `modifiedByMe` | boolean | Whether modified by current user |
 | ↳ `webViewLink` | string | URL to view in browser |
 | ↳ `webContentLink` | string | Direct download URL |
 | ↳ `iconLink` | string | URL to file icon |
 | ↳ `thumbnailLink` | string | URL to thumbnail |
-| ↳ `exportLinks` | json | Export format links |
-| ↳ `size` | string | File size in bytes |
-| ↳ `quotaBytesUsed` | string | Storage quota used |
-| ↳ `md5Checksum` | string | MD5 hash |
-| ↳ `sha1Checksum` | string | SHA-1 hash |
-| ↳ `sha256Checksum` | string | SHA-256 hash |
 | ↳ `parents` | json | Parent folder IDs |
-| ↳ `spaces` | json | Spaces containing file |
-| ↳ `driveId` | string | Shared drive ID |
+| ↳ `owners` | json | List of file owners |
+| ↳ `permissions` | json | File permissions |
+| ↳ `createdTime` | string | File creation time |
+| ↳ `modifiedTime` | string | Last modification time |
+| ↳ `lastModifyingUser` | json | User who last modified the file |
+| ↳ `shared` | boolean | Whether file is shared |
+| ↳ `ownedByMe` | boolean | Whether owned by current user |
 | ↳ `capabilities` | json | User capabilities on file |
+| ↳ `md5Checksum` | string | MD5 hash |
 | ↳ `version` | string | Version number |
-| ↳ `headRevisionId` | string | Head revision ID |
-| ↳ `hasThumbnail` | boolean | Whether has thumbnail |
-| ↳ `thumbnailVersion` | string | Thumbnail version |
-| ↳ `imageMediaMetadata` | json | Image-specific metadata |
-| ↳ `videoMediaMetadata` | json | Video-specific metadata |
-| ↳ `isAppAuthorized` | boolean | Whether created by requesting app |
-| ↳ `contentRestrictions` | json | Content restrictions |
-| ↳ `linkShareMetadata` | json | Link share metadata |
 
 ### `google_drive_create_folder`
 
@@ -137,9 +176,9 @@ Create a new folder in Google Drive with complete metadata returned
 | --------- | ---- | ----------- |
 | `file` | object | Complete created folder metadata from Google Drive |
 | ↳ `id` | string | Google Drive folder ID |
+| ↳ `kind` | string | Resource type identifier |
 | ↳ `name` | string | Folder name |
 | ↳ `mimeType` | string | MIME type \(application/vnd.google-apps.folder\) |
-| ↳ `kind` | string | Resource type identifier |
 | ↳ `description` | string | Folder description |
 | ↳ `owners` | json | List of folder owners |
 | ↳ `permissions` | json | Folder permissions |
@@ -174,6 +213,79 @@ Create a new folder in Google Drive with complete metadata returned
 | ↳ `contentRestrictions` | json | Content restrictions |
 | ↳ `linkShareMetadata` | json | Link share metadata |
 
+### `google_drive_upload`
+
+Upload a file to Google Drive with complete metadata returned
+
+#### Input
+
+| Parameter | Type | Required | Description |
+| --------- | ---- | -------- | ----------- |
+| `fileName` | string | Yes | The name of the file to upload |
+| `file` | file | No | Binary file to upload \(UserFile object\) |
+| `content` | string | No | Text content to upload \(use this OR file, not both\) |
+| `mimeType` | string | No | The MIME type of the file to upload \(auto-detected from file if not provided\) |
+| `folderSelector` | string | No | Select the folder to upload the file to |
+| `folderId` | string | No | The ID of the folder to upload the file to \(internal use\) |
+
+#### Output
+
+| Parameter | Type | Description |
+| --------- | ---- | ----------- |
+| `file` | object | Complete uploaded file metadata from Google Drive |
+| ↳ `id` | string | Google Drive file ID |
+| ↳ `kind` | string | Resource type identifier |
+| ↳ `name` | string | File name |
+| ↳ `mimeType` | string | MIME type |
+| ↳ `description` | string | File description |
+| ↳ `originalFilename` | string | Original uploaded filename |
+| ↳ `fullFileExtension` | string | Full file extension |
+| ↳ `fileExtension` | string | File extension |
+| ↳ `owners` | json | List of file owners |
+| ↳ `permissions` | json | File permissions |
+| ↳ `permissionIds` | json | Permission IDs |
+| ↳ `shared` | boolean | Whether file is shared |
+| ↳ `ownedByMe` | boolean | Whether owned by current user |
+| ↳ `writersCanShare` | boolean | Whether writers can share |
+| ↳ `viewersCanCopyContent` | boolean | Whether viewers can copy |
+| ↳ `copyRequiresWriterPermission` | boolean | Whether copy requires writer permission |
+| ↳ `sharingUser` | json | User who shared the file |
+| ↳ `starred` | boolean | Whether file is starred |
+| ↳ `trashed` | boolean | Whether file is in trash |
+| ↳ `explicitlyTrashed` | boolean | Whether explicitly trashed |
+| ↳ `appProperties` | json | App-specific properties |
+| ↳ `createdTime` | string | File creation time |
+| ↳ `modifiedTime` | string | Last modification time |
+| ↳ `modifiedByMeTime` | string | When modified by current user |
+| ↳ `viewedByMeTime` | string | When last viewed by current user |
+| ↳ `sharedWithMeTime` | string | When shared with current user |
+| ↳ `lastModifyingUser` | json | User who last modified the file |
+| ↳ `viewedByMe` | boolean | Whether viewed by current user |
+| ↳ `modifiedByMe` | boolean | Whether modified by current user |
+| ↳ `webViewLink` | string | URL to view in browser |
+| ↳ `webContentLink` | string | Direct download URL |
+| ↳ `iconLink` | string | URL to file icon |
+| ↳ `thumbnailLink` | string | URL to thumbnail |
+| ↳ `exportLinks` | json | Export format links |
+| ↳ `size` | string | File size in bytes |
+| ↳ `quotaBytesUsed` | string | Storage quota used |
+| ↳ `md5Checksum` | string | MD5 hash |
+| ↳ `sha1Checksum` | string | SHA-1 hash |
+| ↳ `sha256Checksum` | string | SHA-256 hash |
+| ↳ `parents` | json | Parent folder IDs |
+| ↳ `spaces` | json | Spaces containing file |
+| ↳ `driveId` | string | Shared drive ID |
+| ↳ `capabilities` | json | User capabilities on file |
+| ↳ `version` | string | Version number |
+| ↳ `headRevisionId` | string | Head revision ID |
+| ↳ `hasThumbnail` | boolean | Whether has thumbnail |
+| ↳ `thumbnailVersion` | string | Thumbnail version |
+| ↳ `imageMediaMetadata` | json | Image-specific metadata |
+| ↳ `videoMediaMetadata` | json | Video-specific metadata |
+| ↳ `isAppAuthorized` | boolean | Whether created by requesting app |
+| ↳ `contentRestrictions` | json | Content restrictions |
+| ↳ `linkShareMetadata` | json | Link share metadata |
+
 ### `google_drive_download`
 
 Download a file from Google Drive with complete metadata (exports Google Workspace files automatically)
@@ -198,9 +310,9 @@ Download a file from Google Drive with complete metadata (exports Google Workspa
 | ↳ `size` | number | File size in bytes |
 | `metadata` | object | Complete file metadata from Google Drive |
 | ↳ `id` | string | Google Drive file ID |
+| ↳ `kind` | string | Resource type identifier |
 | ↳ `name` | string | File name |
 | ↳ `mimeType` | string | MIME type |
-| ↳ `kind` | string | Resource type identifier |
 | ↳ `description` | string | File description |
 | ↳ `originalFilename` | string | Original uploaded filename |
 | ↳ `fullFileExtension` | string | Full file extension |
@@ -251,77 +363,211 @@ Download a file from Google Drive with complete metadata (exports Google Workspa
 | ↳ `linkShareMetadata` | json | Link share metadata |
 | ↳ `revisions` | json | File revision history \(first 100 revisions only\) |
 
-### `google_drive_list`
+### `google_drive_copy`
 
-List files and folders in Google Drive with complete metadata
+Create a copy of a file in Google Drive
 
 #### Input
 
 | Parameter | Type | Required | Description |
 | --------- | ---- | -------- | ----------- |
-| `folderSelector` | string | No | Select the folder to list files from |
-| `folderId` | string | No | The ID of the folder to list files from \(internal use\) |
-| `query` | string | No | Search term to filter files by name \(e.g. "budget" finds files with "budget" in the name\). Do NOT use Google Drive query syntax here - just provide a plain search term. |
-| `pageSize` | number | No | The maximum number of files to return \(default: 100\) |
-| `pageToken` | string | No | The page token to use for pagination |
+| `fileId` | string | Yes | The ID of the file to copy |
+| `newName` | string | No | Name for the copied file \(defaults to "Copy of \[original name\]"\) |
+| `destinationFolderId` | string | No | ID of the folder to place the copy in \(defaults to same location as original\) |
 
 #### Output
 
 | Parameter | Type | Description |
 | --------- | ---- | ----------- |
-| `files` | array | Array of file metadata objects from Google Drive |
-|   ↳ `id` | string | Google Drive file ID |
-|   ↳ `name` | string | File name |
-|   ↳ `mimeType` | string | MIME type |
-|   ↳ `kind` | string | Resource type identifier |
-|   ↳ `description` | string | File description |
-|   ↳ `originalFilename` | string | Original uploaded filename |
-|   ↳ `fullFileExtension` | string | Full file extension |
-|   ↳ `fileExtension` | string | File extension |
-|   ↳ `owners` | json | List of file owners |
-|   ↳ `permissions` | json | File permissions |
-|   ↳ `permissionIds` | json | Permission IDs |
-|   ↳ `shared` | boolean | Whether file is shared |
-|   ↳ `ownedByMe` | boolean | Whether owned by current user |
-|   ↳ `writersCanShare` | boolean | Whether writers can share |
-|   ↳ `viewersCanCopyContent` | boolean | Whether viewers can copy |
-|   ↳ `copyRequiresWriterPermission` | boolean | Whether copy requires writer permission |
-|   ↳ `sharingUser` | json | User who shared the file |
-|   ↳ `starred` | boolean | Whether file is starred |
-|   ↳ `trashed` | boolean | Whether file is in trash |
-|   ↳ `explicitlyTrashed` | boolean | Whether explicitly trashed |
-|   ↳ `appProperties` | json | App-specific properties |
-|   ↳ `createdTime` | string | File creation time |
-|   ↳ `modifiedTime` | string | Last modification time |
-|   ↳ `modifiedByMeTime` | string | When modified by current user |
-|   ↳ `viewedByMeTime` | string | When last viewed by current user |
-|   ↳ `sharedWithMeTime` | string | When shared with current user |
-|   ↳ `lastModifyingUser` | json | User who last modified the file |
-|   ↳ `viewedByMe` | boolean | Whether viewed by current user |
-|   ↳ `modifiedByMe` | boolean | Whether modified by current user |
-|   ↳ `webViewLink` | string | URL to view in browser |
-|   ↳ `webContentLink` | string | Direct download URL |
-|   ↳ `iconLink` | string | URL to file icon |
-|   ↳ `thumbnailLink` | string | URL to thumbnail |
-|   ↳ `exportLinks` | json | Export format links |
-|   ↳ `size` | string | File size in bytes |
-|   ↳ `quotaBytesUsed` | string | Storage quota used |
-|   ↳ `md5Checksum` | string | MD5 hash |
-|   ↳ `sha1Checksum` | string | SHA-1 hash |
-|   ↳ `sha256Checksum` | string | SHA-256 hash |
-|   ↳ `parents` | json | Parent folder IDs |
-|   ↳ `spaces` | json | Spaces containing file |
-|   ↳ `driveId` | string | Shared drive ID |
-|   ↳ `capabilities` | json | User capabilities on file |
-|   ↳ `version` | string | Version number |
-|   ↳ `headRevisionId` | string | Head revision ID |
-|   ↳ `hasThumbnail` | boolean | Whether has thumbnail |
-|   ↳ `thumbnailVersion` | string | Thumbnail version |
-|   ↳ `imageMediaMetadata` | json | Image-specific metadata |
-|   ↳ `videoMediaMetadata` | json | Video-specific metadata |
-|   ↳ `isAppAuthorized` | boolean | Whether created by requesting app |
-|   ↳ `contentRestrictions` | json | Content restrictions |
-|   ↳ `linkShareMetadata` | json | Link share metadata |
-| `nextPageToken` | string | Token for fetching the next page of results |
+| `file` | json | The copied file metadata |
+| ↳ `id` | string | Google Drive file ID of the copy |
+| ↳ `kind` | string | Resource type identifier |
+| ↳ `name` | string | File name |
+| ↳ `mimeType` | string | MIME type |
+| ↳ `webViewLink` | string | URL to view in browser |
+| ↳ `parents` | json | Parent folder IDs |
+| ↳ `createdTime` | string | File creation time |
+| ↳ `modifiedTime` | string | Last modification time |
+| ↳ `owners` | json | List of file owners |
+| ↳ `size` | string | File size in bytes |
+
+### `google_drive_update`
+
+Update file metadata in Google Drive (rename, move, star, add description)
+
+#### Input
+
+| Parameter | Type | Required | Description |
+| --------- | ---- | -------- | ----------- |
+| `fileId` | string | Yes | The ID of the file to update |
+| `name` | string | No | New name for the file |
+| `description` | string | No | New description for the file |
+| `addParents` | string | No | Comma-separated list of parent folder IDs to add \(moves file to these folders\) |
+| `removeParents` | string | No | Comma-separated list of parent folder IDs to remove |
+| `starred` | boolean | No | Whether to star or unstar the file |
+
+#### Output
+
+| Parameter | Type | Description |
+| --------- | ---- | ----------- |
+| `file` | json | The updated file metadata |
+| ↳ `id` | string | Google Drive file ID |
+| ↳ `kind` | string | Resource type identifier |
+| ↳ `name` | string | File name |
+| ↳ `mimeType` | string | MIME type |
+| ↳ `description` | string | File description |
+| ↳ `starred` | boolean | Whether file is starred |
+| ↳ `webViewLink` | string | URL to view in browser |
+| ↳ `parents` | json | Parent folder IDs |
+| ↳ `modifiedTime` | string | Last modification time |
+
+### `google_drive_trash`
+
+Move a file to the trash in Google Drive (can be restored later)
+
+#### Input
+
+| Parameter | Type | Required | Description |
+| --------- | ---- | -------- | ----------- |
+| `fileId` | string | Yes | The ID of the file to move to trash |
+
+#### Output
+
+| Parameter | Type | Description |
+| --------- | ---- | ----------- |
+| `file` | json | The trashed file metadata |
+| ↳ `id` | string | Google Drive file ID |
+| ↳ `kind` | string | Resource type identifier |
+| ↳ `name` | string | File name |
+| ↳ `mimeType` | string | MIME type |
+| ↳ `trashed` | boolean | Whether file is in trash \(should be true\) |
+| ↳ `trashedTime` | string | When file was trashed |
+| ↳ `webViewLink` | string | URL to view in browser |
+
+### `google_drive_delete`
+
+Permanently delete a file from Google Drive (bypasses trash)
+
+#### Input
+
+| Parameter | Type | Required | Description |
+| --------- | ---- | -------- | ----------- |
+| `fileId` | string | Yes | The ID of the file to permanently delete |
+
+#### Output
+
+| Parameter | Type | Description |
+| --------- | ---- | ----------- |
+| `deleted` | boolean | Whether the file was successfully deleted |
+| `fileId` | string | The ID of the deleted file |
+
+### `google_drive_share`
+
+Share a file with a user, group, domain, or make it public
+
+#### Input
+
+| Parameter | Type | Required | Description |
+| --------- | ---- | -------- | ----------- |
+| `fileId` | string | Yes | The ID of the file to share |
+| `type` | string | Yes | Type of grantee: user, group, domain, or anyone |
+| `role` | string | Yes | Permission role: owner \(transfer ownership\), organizer \(shared drive only\), fileOrganizer \(shared drive only\), writer \(edit\), commenter \(view and comment\), reader \(view only\) |
+| `email` | string | No | Email address of the user or group \(required for type=user or type=group\) |
+| `domain` | string | No | Domain to share with \(required for type=domain\) |
+| `transferOwnership` | boolean | No | Required when role is owner. Transfers ownership to the specified user. |
+| `moveToNewOwnersRoot` | boolean | No | When transferring ownership, move the file to the new owner's My Drive root folder. |
+| `sendNotification` | boolean | No | Whether to send an email notification \(default: true\) |
+| `emailMessage` | string | No | Custom message to include in the notification email |
+
+#### Output
+
+| Parameter | Type | Description |
+| --------- | ---- | ----------- |
+| `permission` | json | The created permission details |
+| ↳ `id` | string | Permission ID |
+| ↳ `type` | string | Grantee type \(user, group, domain, anyone\) |
+| ↳ `role` | string | Permission role |
+| ↳ `emailAddress` | string | Email of the grantee |
+| ↳ `displayName` | string | Display name of the grantee |
+| ↳ `domain` | string | Domain of the grantee |
+| ↳ `expirationTime` | string | Expiration time |
+| ↳ `deleted` | boolean | Whether grantee is deleted |
+
+### `google_drive_unshare`
+
+Remove a permission from a file (revoke access)
+
+#### Input
+
+| Parameter | Type | Required | Description |
+| --------- | ---- | -------- | ----------- |
+| `fileId` | string | Yes | The ID of the file to modify permissions on |
+| `permissionId` | string | Yes | The ID of the permission to remove \(use list_permissions to find this\) |
+
+#### Output
+
+| Parameter | Type | Description |
+| --------- | ---- | ----------- |
+| `removed` | boolean | Whether the permission was successfully removed |
+| `fileId` | string | The ID of the file |
+| `permissionId` | string | The ID of the removed permission |
+
+### `google_drive_list_permissions`
+
+List all permissions (who has access) for a file in Google Drive
+
+#### Input
+
+| Parameter | Type | Required | Description |
+| --------- | ---- | -------- | ----------- |
+| `fileId` | string | Yes | The ID of the file to list permissions for |
+
+#### Output
+
+| Parameter | Type | Description |
+| --------- | ---- | ----------- |
+| `permissions` | array | List of permissions on the file |
+|   ↳ `id` | string | Permission ID \(use to remove permission\) |
+|   ↳ `type` | string | Grantee type \(user, group, domain, anyone\) |
+|   ↳ `role` | string | Permission role \(owner, organizer, fileOrganizer, writer, commenter, reader\) |
+|   ↳ `emailAddress` | string | Email of the grantee |
+|   ↳ `displayName` | string | Display name of the grantee |
+|   ↳ `photoLink` | string | Photo URL of the grantee |
+|   ↳ `domain` | string | Domain of the grantee |
+|   ↳ `expirationTime` | string | When permission expires |
+|   ↳ `deleted` | boolean | Whether grantee account is deleted |
+|   ↳ `allowFileDiscovery` | boolean | Whether file is discoverable by grantee |
+|   ↳ `pendingOwner` | boolean | Whether ownership transfer is pending |
+|   ↳ `permissionDetails` | json | Details about inherited permissions |
+| `nextPageToken` | string | Token for fetching the next page of permissions |
+
+### `google_drive_get_about`
+
+Get information about the user and their Google Drive (storage quota, capabilities)
+
+#### Input
+
+| Parameter | Type | Required | Description |
+| --------- | ---- | -------- | ----------- |
+
+#### Output
+
+| Parameter | Type | Description |
+| --------- | ---- | ----------- |
+| `user` | json | Information about the authenticated user |
+| ↳ `displayName` | string | User display name |
+| ↳ `emailAddress` | string | User email address |
+| ↳ `photoLink` | string | URL to user profile photo |
+| ↳ `permissionId` | string | User permission ID |
+| ↳ `me` | boolean | Whether this is the authenticated user |
+| `storageQuota` | json | Storage quota information in bytes |
+| ↳ `limit` | string | Total storage limit in bytes \(null for unlimited\) |
+| ↳ `usage` | string | Total storage used in bytes |
+| ↳ `usageInDrive` | string | Storage used by Drive files in bytes |
+| ↳ `usageInDriveTrash` | string | Storage used by trashed files in bytes |
+| `canCreateDrives` | boolean | Whether user can create shared drives |
+| `importFormats` | json | Map of MIME types that can be imported and their target formats |
+| `exportFormats` | json | Map of Google Workspace MIME types and their exportable formats |
+| `maxUploadSize` | string | Maximum upload size in bytes |
 
 
diff --git a/apps/docs/content/docs/en/tools/google_forms.mdx b/apps/docs/content/docs/en/tools/google_forms.mdx
index 52ee3053ab..0cbdb357b6 100644
--- a/apps/docs/content/docs/en/tools/google_forms.mdx
+++ b/apps/docs/content/docs/en/tools/google_forms.mdx
@@ -1,6 +1,6 @@
 ---
 title: Google Forms
-description: Read responses from a Google Form
+description: Manage Google Forms and responses
 ---
 
 import { BlockInfoCard } from "@/components/ui/block-info-card"
@@ -29,7 +29,7 @@ In Sim, the Google Forms integration enables your agents to programmatically acc
 
 ## Usage Instructions
 
-Integrate Google Forms into your workflow. Provide a Form ID to list responses, or specify a Response ID to fetch a single response. Requires OAuth.
+Integrate Google Forms into your workflow. Read form structure, get responses, create forms, update content, and manage notification watches.
 
 
 
@@ -37,15 +37,246 @@ Integrate Google Forms into your workflow. Provide a Form ID to list responses,
 
 ### `google_forms_get_responses`
 
+Retrieve a single response or list responses from a Google Form
+
+#### Input
+
+| Parameter | Type | Required | Description |
+| --------- | ---- | -------- | ----------- |
+| `formId` | string | Yes | The ID of the Google Form |
+| `responseId` | string | No | If provided, returns this specific response |
+| `pageSize` | number | No | Maximum number of responses to return \(service may return fewer\). Defaults to 5000. |
+
+#### Output
+
+| Parameter | Type | Description |
+| --------- | ---- | ----------- |
+| `responses` | array | Array of form responses \(when no responseId provided\) |
+|   ↳ `responseId` | string | Unique response ID |
+|   ↳ `createTime` | string | When the response was created |
+|   ↳ `lastSubmittedTime` | string | When the response was last submitted |
+|   ↳ `answers` | json | Map of question IDs to answer values |
+| `response` | object | Single form response \(when responseId is provided\) |
+| ↳ `responseId` | string | Unique response ID |
+| ↳ `createTime` | string | When the response was created |
+| ↳ `lastSubmittedTime` | string | When the response was last submitted |
+| ↳ `answers` | json | Map of question IDs to answer values |
+| `raw` | json | Raw API response data |
+
+### `google_forms_get_form`
+
+Retrieve a form structure including its items, settings, and metadata
+
+#### Input
+
+| Parameter | Type | Required | Description |
+| --------- | ---- | -------- | ----------- |
+| `formId` | string | Yes | The ID of the Google Form to retrieve |
+
+#### Output
+
+| Parameter | Type | Description |
+| --------- | ---- | ----------- |
+| `formId` | string | The form ID |
+| `title` | string | The form title visible to responders |
+| `description` | string | The form description |
+| `documentTitle` | string | The document title visible in Drive |
+| `responderUri` | string | The URI to share with responders |
+| `linkedSheetId` | string | The ID of the linked Google Sheet |
+| `revisionId` | string | The revision ID of the form |
+| `items` | array | The form items \(questions, sections, etc.\) |
+|   ↳ `itemId` | string | Item ID |
+|   ↳ `title` | string | Item title |
+|   ↳ `description` | string | Item description |
+| `settings` | json | Form settings |
+| `publishSettings` | json | Form publish settings |
+
+### `google_forms_create_form`
+
+Create a new Google Form with a title
+
+#### Input
+
+| Parameter | Type | Required | Description |
+| --------- | ---- | -------- | ----------- |
+| `title` | string | Yes | The title of the form visible to responders |
+| `documentTitle` | string | No | The document title visible in Drive \(defaults to form title\) |
+| `unpublished` | boolean | No | If true, create an unpublished form that does not accept responses |
+
+#### Output
+
+| Parameter | Type | Description |
+| --------- | ---- | ----------- |
+| `formId` | string | The ID of the created form |
+| `title` | string | The form title |
+| `documentTitle` | string | The document title in Drive |
+| `responderUri` | string | The URI to share with responders |
+| `revisionId` | string | The revision ID of the form |
+
+### `google_forms_batch_update`
+
+Apply multiple updates to a form (add items, update info, change settings, etc.)
+
+#### Input
+
+| Parameter | Type | Required | Description |
+| --------- | ---- | -------- | ----------- |
+| `formId` | string | Yes | The ID of the Google Form to update |
+| `requests` | json | Yes | Array of update requests \(updateFormInfo, updateSettings, createItem, updateItem, moveItem, deleteItem\) |
+| `includeFormInResponse` | boolean | No | Whether to return the updated form in the response |
+
+#### Output
+
+| Parameter | Type | Description |
+| --------- | ---- | ----------- |
+| `replies` | array | The replies from each update request |
+| `writeControl` | object | Write control information with revision IDs |
+| ↳ `requiredRevisionId` | string | Required revision ID for conflict detection |
+| ↳ `targetRevisionId` | string | Target revision ID |
+| `form` | object | The updated form \(if includeFormInResponse was true\) |
+| ↳ `formId` | string | The form ID |
+| ↳ `info` | object | Form info containing title and description |
+|   ↳ `title` | string | The form title visible to responders |
+|   ↳ `description` | string | The form description |
+|   ↳ `documentTitle` | string | The document title visible in Drive |
+| ↳ `title` | string | Item title |
+| ↳ `description` | string | Item description |
+| ↳ `documentTitle` | string | The document title visible in Drive |
+| ↳ `settings` | object | Form settings |
+|   ↳ `quizSettings` | object | Quiz settings |
+|   ↳ `isQuiz` | boolean | Whether the form is a quiz |
+|   ↳ `isQuiz` | boolean | Whether the form is a quiz |
+|   ↳ `emailCollectionType` | string | Email collection type |
+| ↳ `quizSettings` | object | Quiz settings |
+|   ↳ `isQuiz` | boolean | Whether the form is a quiz |
+| ↳ `isQuiz` | boolean | Whether the form is a quiz |
+| ↳ `emailCollectionType` | string | Email collection type |
+| ↳ `itemId` | string | Item ID |
+| ↳ `questionItem` | json | Question item configuration |
+| ↳ `questionGroupItem` | json | Question group configuration |
+| ↳ `pageBreakItem` | json | Page break configuration |
+| ↳ `textItem` | json | Text item configuration |
+| ↳ `imageItem` | json | Image item configuration |
+| ↳ `videoItem` | json | Video item configuration |
+| ↳ `revisionId` | string | The revision ID of the form |
+| ↳ `responderUri` | string | The URI to share with responders |
+| ↳ `linkedSheetId` | string | The ID of the linked Google Sheet |
+| ↳ `publishSettings` | object | Form publish settings |
+|   ↳ `publishState` | object | Current publish state |
+|   ↳ `isPublished` | boolean | Whether the form is published |
+|   ↳ `isAcceptingResponses` | boolean | Whether the form is accepting responses |
+|   ↳ `isPublished` | boolean | Whether the form is published |
+|   ↳ `isAcceptingResponses` | boolean | Whether the form is accepting responses |
+| ↳ `publishState` | object | Current publish state |
+|   ↳ `isPublished` | boolean | Whether the form is published |
+|   ↳ `isAcceptingResponses` | boolean | Whether the form is accepting responses |
+| ↳ `isPublished` | boolean | Whether the form is published |
+| ↳ `isAcceptingResponses` | boolean | Whether the form is accepting responses |
+
+### `google_forms_set_publish_settings`
+
+Update the publish settings of a form (publish/unpublish, accept responses)
+
+#### Input
+
+| Parameter | Type | Required | Description |
+| --------- | ---- | -------- | ----------- |
+| `formId` | string | Yes | The ID of the Google Form |
+| `isPublished` | boolean | Yes | Whether the form is published and visible to others |
+| `isAcceptingResponses` | boolean | No | Whether the form accepts responses \(forced to false if isPublished is false\) |
+
+#### Output
+
+| Parameter | Type | Description |
+| --------- | ---- | ----------- |
+| `formId` | string | The form ID |
+| `publishSettings` | json | The updated publish settings |
+| ↳ `publishState` | object | The publish state |
+|   ↳ `isPublished` | boolean | Whether the form is published |
+|   ↳ `isAcceptingResponses` | boolean | Whether the form accepts responses |
+| ↳ `isPublished` | boolean | Whether the form is published |
+| ↳ `isAcceptingResponses` | boolean | Whether the form accepts responses |
+
+### `google_forms_create_watch`
+
+Create a notification watch for form changes (schema changes or new responses)
+
+#### Input
+
+| Parameter | Type | Required | Description |
+| --------- | ---- | -------- | ----------- |
+| `formId` | string | Yes | The ID of the Google Form to watch |
+| `eventType` | string | Yes | Event type to watch: SCHEMA \(form changes\) or RESPONSES \(new submissions\) |
+| `topicName` | string | Yes | The Cloud Pub/Sub topic name \(format: projects/\{project\}/topics/\{topic\}\) |
+| `watchId` | string | No | Custom watch ID \(4-63 chars, lowercase letters, numbers, hyphens\) |
+
+#### Output
+
+| Parameter | Type | Description |
+| --------- | ---- | ----------- |
+| `id` | string | The watch ID |
+| `eventType` | string | The event type being watched |
+| `topicName` | string | The Cloud Pub/Sub topic |
+| `createTime` | string | When the watch was created |
+| `expireTime` | string | When the watch expires \(7 days after creation\) |
+| `state` | string | The watch state \(ACTIVE, SUSPENDED\) |
+
+### `google_forms_list_watches`
+
+List all notification watches for a form
+
+#### Input
+
+| Parameter | Type | Required | Description |
+| --------- | ---- | -------- | ----------- |
+| `formId` | string | Yes | The ID of the Google Form |
+
+#### Output
+
+| Parameter | Type | Description |
+| --------- | ---- | ----------- |
+| `watches` | array | List of watches for the form |
+|   ↳ `id` | string | Watch ID |
+|   ↳ `eventType` | string | Event type \(SCHEMA or RESPONSES\) |
+|   ↳ `createTime` | string | When the watch was created |
+|   ↳ `expireTime` | string | When the watch expires |
+|   ↳ `state` | string | Watch state |
+
+### `google_forms_delete_watch`
+
+Delete a notification watch from a form
+
+#### Input
+
+| Parameter | Type | Required | Description |
+| --------- | ---- | -------- | ----------- |
+| `formId` | string | Yes | The ID of the Google Form |
+| `watchId` | string | Yes | The ID of the watch to delete |
+
+#### Output
+
+| Parameter | Type | Description |
+| --------- | ---- | ----------- |
+| `deleted` | boolean | Whether the watch was successfully deleted |
+
+### `google_forms_renew_watch`
+
+Renew a notification watch for another 7 days
+
 #### Input
 
 | Parameter | Type | Required | Description |
 | --------- | ---- | -------- | ----------- |
+| `formId` | string | Yes | The ID of the Google Form |
+| `watchId` | string | Yes | The ID of the watch to renew |
 
 #### Output
 
 | Parameter | Type | Description |
 | --------- | ---- | ----------- |
-| `data` | json | Response or list of responses |
+| `id` | string | The watch ID |
+| `eventType` | string | The event type being watched |
+| `expireTime` | string | The new expiration time |
+| `state` | string | The watch state |
 
 
diff --git a/apps/docs/content/docs/en/tools/google_groups.mdx b/apps/docs/content/docs/en/tools/google_groups.mdx
index 793bc90134..f967ebf270 100644
--- a/apps/docs/content/docs/en/tools/google_groups.mdx
+++ b/apps/docs/content/docs/en/tools/google_groups.mdx
@@ -215,4 +215,191 @@ Check if a user is a member of a Google Group
 | --------- | ---- | ----------- |
 | `isMember` | boolean | Whether the user is a member of the group |
 
+### `google_groups_list_aliases`
+
+List all email aliases for a Google Group
+
+#### Input
+
+| Parameter | Type | Required | Description |
+| --------- | ---- | -------- | ----------- |
+| `groupKey` | string | Yes | Group email address or unique group ID |
+
+#### Output
+
+| Parameter | Type | Description |
+| --------- | ---- | ----------- |
+| `aliases` | array | List of email aliases for the group |
+|   ↳ `id` | string | Unique group identifier |
+|   ↳ `primaryEmail` | string | Group |
+|   ↳ `alias` | string | Alias email address |
+|   ↳ `kind` | string | API resource type |
+|   ↳ `etag` | string | Resource version identifier |
+
+### `google_groups_add_alias`
+
+Add an email alias to a Google Group
+
+#### Input
+
+| Parameter | Type | Required | Description |
+| --------- | ---- | -------- | ----------- |
+| `groupKey` | string | Yes | Group email address or unique group ID |
+| `alias` | string | Yes | The email alias to add to the group |
+
+#### Output
+
+| Parameter | Type | Description |
+| --------- | ---- | ----------- |
+| `id` | string | Unique group identifier |
+| `primaryEmail` | string | Group |
+| `alias` | string | The alias that was added |
+| `kind` | string | API resource type |
+| `etag` | string | Resource version identifier |
+
+### `google_groups_remove_alias`
+
+Remove an email alias from a Google Group
+
+#### Input
+
+| Parameter | Type | Required | Description |
+| --------- | ---- | -------- | ----------- |
+| `groupKey` | string | Yes | Group email address or unique group ID |
+| `alias` | string | Yes | The email alias to remove from the group |
+
+#### Output
+
+| Parameter | Type | Description |
+| --------- | ---- | ----------- |
+| `deleted` | boolean | Whether the alias was successfully deleted |
+
+### `google_groups_get_settings`
+
+Get the settings for a Google Group including access permissions, moderation, and posting options
+
+#### Input
+
+| Parameter | Type | Required | Description |
+| --------- | ---- | -------- | ----------- |
+| `groupEmail` | string | Yes | The email address of the group |
+
+#### Output
+
+| Parameter | Type | Description |
+| --------- | ---- | ----------- |
+| `email` | string | The group |
+| `name` | string | The group name \(max 75 characters\) |
+| `description` | string | The group description \(max 4096 characters\) |
+| `whoCanJoin` | string | Who can join the group \(ANYONE_CAN_JOIN, ALL_IN_DOMAIN_CAN_JOIN, INVITED_CAN_JOIN, CAN_REQUEST_TO_JOIN\) |
+| `whoCanViewMembership` | string | Who can view group membership |
+| `whoCanViewGroup` | string | Who can view group messages |
+| `whoCanPostMessage` | string | Who can post messages to the group |
+| `allowExternalMembers` | string | Whether external users can be members |
+| `allowWebPosting` | string | Whether web posting is allowed |
+| `primaryLanguage` | string | The group |
+| `isArchived` | string | Whether messages are archived |
+| `archiveOnly` | string | Whether the group is archive-only \(inactive\) |
+| `messageModerationLevel` | string | Message moderation level |
+| `spamModerationLevel` | string | Spam handling level \(ALLOW, MODERATE, SILENTLY_MODERATE, REJECT\) |
+| `replyTo` | string | Default reply destination |
+| `customReplyTo` | string | Custom email for replies |
+| `includeCustomFooter` | string | Whether to include custom footer |
+| `customFooterText` | string | Custom footer text \(max 1000 characters\) |
+| `sendMessageDenyNotification` | string | Whether to send rejection notifications |
+| `defaultMessageDenyNotificationText` | string | Default rejection message text |
+| `membersCanPostAsTheGroup` | string | Whether members can post as the group |
+| `includeInGlobalAddressList` | string | Whether included in Global Address List |
+| `whoCanLeaveGroup` | string | Who can leave the group |
+| `whoCanContactOwner` | string | Who can contact the group owner |
+| `favoriteRepliesOnTop` | string | Whether favorite replies appear at top |
+| `whoCanApproveMembers` | string | Who can approve new members |
+| `whoCanBanUsers` | string | Who can ban users |
+| `whoCanModerateMembers` | string | Who can manage members |
+| `whoCanModerateContent` | string | Who can moderate content |
+| `whoCanAssistContent` | string | Who can assist with content metadata |
+| `enableCollaborativeInbox` | string | Whether collaborative inbox is enabled |
+| `whoCanDiscoverGroup` | string | Who can discover the group |
+| `defaultSender` | string | Default sender identity \(DEFAULT_SELF or GROUP\) |
+
+### `google_groups_update_settings`
+
+Update the settings for a Google Group including access permissions, moderation, and posting options
+
+#### Input
+
+| Parameter | Type | Required | Description |
+| --------- | ---- | -------- | ----------- |
+| `groupEmail` | string | Yes | The email address of the group |
+| `name` | string | No | The group name \(max 75 characters\) |
+| `description` | string | No | The group description \(max 4096 characters\) |
+| `whoCanJoin` | string | No | Who can join: ANYONE_CAN_JOIN, ALL_IN_DOMAIN_CAN_JOIN, INVITED_CAN_JOIN, CAN_REQUEST_TO_JOIN |
+| `whoCanViewMembership` | string | No | Who can view membership: ALL_IN_DOMAIN_CAN_VIEW, ALL_MEMBERS_CAN_VIEW, ALL_MANAGERS_CAN_VIEW |
+| `whoCanViewGroup` | string | No | Who can view group messages: ANYONE_CAN_VIEW, ALL_IN_DOMAIN_CAN_VIEW, ALL_MEMBERS_CAN_VIEW, ALL_MANAGERS_CAN_VIEW |
+| `whoCanPostMessage` | string | No | Who can post: NONE_CAN_POST, ALL_MANAGERS_CAN_POST, ALL_MEMBERS_CAN_POST, ALL_OWNERS_CAN_POST, ALL_IN_DOMAIN_CAN_POST, ANYONE_CAN_POST |
+| `allowExternalMembers` | string | No | Whether external users can be members: true or false |
+| `allowWebPosting` | string | No | Whether web posting is allowed: true or false |
+| `primaryLanguage` | string | No | The group's primary language \(e.g., en\) |
+| `isArchived` | string | No | Whether messages are archived: true or false |
+| `archiveOnly` | string | No | Whether the group is archive-only \(inactive\): true or false |
+| `messageModerationLevel` | string | No | Message moderation: MODERATE_ALL_MESSAGES, MODERATE_NON_MEMBERS, MODERATE_NEW_MEMBERS, MODERATE_NONE |
+| `spamModerationLevel` | string | No | Spam handling: ALLOW, MODERATE, SILENTLY_MODERATE, REJECT |
+| `replyTo` | string | No | Default reply: REPLY_TO_CUSTOM, REPLY_TO_SENDER, REPLY_TO_LIST, REPLY_TO_OWNER, REPLY_TO_IGNORE, REPLY_TO_MANAGERS |
+| `customReplyTo` | string | No | Custom email for replies \(when replyTo is REPLY_TO_CUSTOM\) |
+| `includeCustomFooter` | string | No | Whether to include custom footer: true or false |
+| `customFooterText` | string | No | Custom footer text \(max 1000 characters\) |
+| `sendMessageDenyNotification` | string | No | Whether to send rejection notifications: true or false |
+| `defaultMessageDenyNotificationText` | string | No | Default rejection message text |
+| `membersCanPostAsTheGroup` | string | No | Whether members can post as the group: true or false |
+| `includeInGlobalAddressList` | string | No | Whether included in Global Address List: true or false |
+| `whoCanLeaveGroup` | string | No | Who can leave: ALL_MANAGERS_CAN_LEAVE, ALL_MEMBERS_CAN_LEAVE, NONE_CAN_LEAVE |
+| `whoCanContactOwner` | string | No | Who can contact owner: ALL_IN_DOMAIN_CAN_CONTACT, ALL_MANAGERS_CAN_CONTACT, ALL_MEMBERS_CAN_CONTACT, ANYONE_CAN_CONTACT |
+| `favoriteRepliesOnTop` | string | No | Whether favorite replies appear at top: true or false |
+| `whoCanApproveMembers` | string | No | Who can approve members: ALL_OWNERS_CAN_APPROVE, ALL_MANAGERS_CAN_APPROVE, ALL_MEMBERS_CAN_APPROVE, NONE_CAN_APPROVE |
+| `whoCanBanUsers` | string | No | Who can ban users: OWNERS_ONLY, OWNERS_AND_MANAGERS, NONE |
+| `whoCanModerateMembers` | string | No | Who can manage members: OWNERS_ONLY, OWNERS_AND_MANAGERS, ALL_MEMBERS, NONE |
+| `whoCanModerateContent` | string | No | Who can moderate content: OWNERS_ONLY, OWNERS_AND_MANAGERS, ALL_MEMBERS, NONE |
+| `whoCanAssistContent` | string | No | Who can assist with content metadata: OWNERS_ONLY, OWNERS_AND_MANAGERS, ALL_MEMBERS, NONE |
+| `enableCollaborativeInbox` | string | No | Whether collaborative inbox is enabled: true or false |
+| `whoCanDiscoverGroup` | string | No | Who can discover: ANYONE_CAN_DISCOVER, ALL_IN_DOMAIN_CAN_DISCOVER, ALL_MEMBERS_CAN_DISCOVER |
+| `defaultSender` | string | No | Default sender: DEFAULT_SELF or GROUP |
+
+#### Output
+
+| Parameter | Type | Description |
+| --------- | ---- | ----------- |
+| `email` | string | The group |
+| `name` | string | The group name |
+| `description` | string | The group description |
+| `whoCanJoin` | string | Who can join the group |
+| `whoCanViewMembership` | string | Who can view group membership |
+| `whoCanViewGroup` | string | Who can view group messages |
+| `whoCanPostMessage` | string | Who can post messages to the group |
+| `allowExternalMembers` | string | Whether external users can be members |
+| `allowWebPosting` | string | Whether web posting is allowed |
+| `primaryLanguage` | string | The group |
+| `isArchived` | string | Whether messages are archived |
+| `archiveOnly` | string | Whether the group is archive-only |
+| `messageModerationLevel` | string | Message moderation level |
+| `spamModerationLevel` | string | Spam handling level |
+| `replyTo` | string | Default reply destination |
+| `customReplyTo` | string | Custom email for replies |
+| `includeCustomFooter` | string | Whether to include custom footer |
+| `customFooterText` | string | Custom footer text |
+| `sendMessageDenyNotification` | string | Whether to send rejection notifications |
+| `defaultMessageDenyNotificationText` | string | Default rejection message text |
+| `membersCanPostAsTheGroup` | string | Whether members can post as the group |
+| `includeInGlobalAddressList` | string | Whether included in Global Address List |
+| `whoCanLeaveGroup` | string | Who can leave the group |
+| `whoCanContactOwner` | string | Who can contact the group owner |
+| `favoriteRepliesOnTop` | string | Whether favorite replies appear at top |
+| `whoCanApproveMembers` | string | Who can approve new members |
+| `whoCanBanUsers` | string | Who can ban users |
+| `whoCanModerateMembers` | string | Who can manage members |
+| `whoCanModerateContent` | string | Who can moderate content |
+| `whoCanAssistContent` | string | Who can assist with content metadata |
+| `enableCollaborativeInbox` | string | Whether collaborative inbox is enabled |
+| `whoCanDiscoverGroup` | string | Who can discover the group |
+| `defaultSender` | string | Default sender identity |
+
 
diff --git a/apps/docs/content/docs/en/tools/google_sheets.mdx b/apps/docs/content/docs/en/tools/google_sheets.mdx
index b48647ce85..73ae75fa09 100644
--- a/apps/docs/content/docs/en/tools/google_sheets.mdx
+++ b/apps/docs/content/docs/en/tools/google_sheets.mdx
@@ -28,7 +28,7 @@ In Sim, the Google Sheets integration empowers your agents to automate reading f
 
 ## Usage Instructions
 
-Integrate Google Sheets into the workflow with explicit sheet selection. Can read, write, append, and update data in specific sheets.
+Integrate Google Sheets into the workflow with explicit sheet selection. Can read, write, append, update, clear data, create spreadsheets, get spreadsheet info, and copy sheets.
 
 
 
@@ -42,9 +42,8 @@ Read data from a specific sheet in a Google Sheets spreadsheet
 
 | Parameter | Type | Required | Description |
 | --------- | ---- | -------- | ----------- |
-| `spreadsheetId` | string | Yes | The ID of the spreadsheet |
-| `sheetName` | string | Yes | The name of the sheet/tab to read from |
-| `cellRange` | string | No | The cell range to read \(e.g. "A1:D10"\). Defaults to "A1:Z1000" if not specified. |
+| `spreadsheetId` | string | Yes | The ID of the spreadsheet \(found in the URL: docs.google.com/spreadsheets/d/\{SPREADSHEET_ID\}/edit\). |
+| `range` | string | No | The A1 notation range to read \(e.g. "Sheet1!A1:D10", "A1:B5"\). Defaults to first sheet A1:Z1000 if not specified. |
 
 #### Output
 
@@ -66,8 +65,7 @@ Write data to a specific sheet in a Google Sheets spreadsheet
 | Parameter | Type | Required | Description |
 | --------- | ---- | -------- | ----------- |
 | `spreadsheetId` | string | Yes | The ID of the spreadsheet |
-| `sheetName` | string | Yes | The name of the sheet/tab to write to |
-| `cellRange` | string | No | The cell range to write to \(e.g. "A1:D10", "A1"\). Defaults to "A1" if not specified. |
+| `range` | string | No | The A1 notation range to write to \(e.g. "Sheet1!A1:D10", "A1:B5"\) |
 | `values` | array | Yes | The data to write as a 2D array \(e.g. \[\["Name", "Age"\], \["Alice", 30\], \["Bob", 25\]\]\) or array of objects. |
 | `valueInputOption` | string | No | The format of the data to write |
 | `includeValuesInResponse` | boolean | No | Whether to include the written values in the response |
@@ -93,8 +91,7 @@ Update data in a specific sheet in a Google Sheets spreadsheet
 | Parameter | Type | Required | Description |
 | --------- | ---- | -------- | ----------- |
 | `spreadsheetId` | string | Yes | The ID of the spreadsheet to update |
-| `sheetName` | string | Yes | The name of the sheet/tab to update |
-| `cellRange` | string | No | The cell range to update \(e.g. "A1:D10", "A1"\). Defaults to "A1" if not specified. |
+| `range` | string | No | The A1 notation range to update \(e.g. "Sheet1!A1:D10", "A1:B5"\) |
 | `values` | array | Yes | The data to update as a 2D array \(e.g. \[\["Name", "Age"\], \["Alice", 30\]\]\) or array of objects. |
 | `valueInputOption` | string | No | The format of the data to update |
 | `includeValuesInResponse` | boolean | No | Whether to include the updated values in the response |
@@ -120,7 +117,7 @@ Append data to the end of a specific sheet in a Google Sheets spreadsheet
 | Parameter | Type | Required | Description |
 | --------- | ---- | -------- | ----------- |
 | `spreadsheetId` | string | Yes | The ID of the spreadsheet to append to |
-| `sheetName` | string | Yes | The name of the sheet/tab to append to |
+| `range` | string | No | The A1 notation range to append after \(e.g. "Sheet1", "Sheet1!A:D"\) |
 | `values` | array | Yes | The data to append as a 2D array \(e.g. \[\["Alice", 30\], \["Bob", 25\]\]\) or array of objects. |
 | `valueInputOption` | string | No | The format of the data to append |
 | `insertDataOption` | string | No | How to insert the data \(OVERWRITE or INSERT_ROWS\) |
@@ -139,4 +136,180 @@ Append data to the end of a specific sheet in a Google Sheets spreadsheet
 | ↳ `spreadsheetId` | string | Google Sheets spreadsheet ID |
 | ↳ `spreadsheetUrl` | string | Spreadsheet URL |
 
+### `google_sheets_clear`
+
+Clear values from a specific range in a Google Sheets spreadsheet
+
+#### Input
+
+| Parameter | Type | Required | Description |
+| --------- | ---- | -------- | ----------- |
+| `spreadsheetId` | string | Yes | The ID of the spreadsheet |
+| `sheetName` | string | Yes | The name of the sheet/tab to clear |
+| `cellRange` | string | No | The cell range to clear \(e.g. "A1:D10"\). Clears entire sheet if not specified. |
+
+#### Output
+
+| Parameter | Type | Description |
+| --------- | ---- | ----------- |
+| `clearedRange` | string | The range that was cleared |
+| `sheetName` | string | Name of the sheet that was cleared |
+| `metadata` | json | Spreadsheet metadata including ID and URL |
+| ↳ `spreadsheetId` | string | Google Sheets spreadsheet ID |
+| ↳ `spreadsheetUrl` | string | Spreadsheet URL |
+
+### `google_sheets_get_spreadsheet`
+
+Get metadata about a Google Sheets spreadsheet including title and sheet list
+
+#### Input
+
+| Parameter | Type | Required | Description |
+| --------- | ---- | -------- | ----------- |
+| `spreadsheetId` | string | Yes | The ID of the spreadsheet |
+| `includeGridData` | boolean | No | Whether to include grid data \(cell values\). Defaults to false. |
+
+#### Output
+
+| Parameter | Type | Description |
+| --------- | ---- | ----------- |
+| `spreadsheetId` | string | The spreadsheet ID |
+| `title` | string | The title of the spreadsheet |
+| `locale` | string | The locale of the spreadsheet |
+| `timeZone` | string | The time zone of the spreadsheet |
+| `spreadsheetUrl` | string | URL to the spreadsheet |
+| `sheets` | array | List of sheets in the spreadsheet |
+|   ↳ `sheetId` | number | The sheet ID |
+|   ↳ `title` | string | The sheet title/name |
+|   ↳ `index` | number | The sheet index \(position\) |
+|   ↳ `rowCount` | number | Number of rows in the sheet |
+|   ↳ `columnCount` | number | Number of columns in the sheet |
+|   ↳ `hidden` | boolean | Whether the sheet is hidden |
+
+### `google_sheets_create_spreadsheet`
+
+Create a new Google Sheets spreadsheet
+
+#### Input
+
+| Parameter | Type | Required | Description |
+| --------- | ---- | -------- | ----------- |
+| `title` | string | Yes | The title of the new spreadsheet |
+| `sheetTitles` | json | No | Array of sheet names to create \(e.g., \["Sheet1", "Data", "Summary"\]\). Defaults to a single "Sheet1". |
+| `locale` | string | No | The locale of the spreadsheet \(e.g., "en_US"\) |
+| `timeZone` | string | No | The time zone of the spreadsheet \(e.g., "America/New_York"\) |
+
+#### Output
+
+| Parameter | Type | Description |
+| --------- | ---- | ----------- |
+| `spreadsheetId` | string | The ID of the created spreadsheet |
+| `title` | string | The title of the created spreadsheet |
+| `spreadsheetUrl` | string | URL to the created spreadsheet |
+| `sheets` | array | List of sheets created in the spreadsheet |
+|   ↳ `sheetId` | number | The sheet ID |
+|   ↳ `title` | string | The sheet title/name |
+|   ↳ `index` | number | The sheet index \(position\) |
+
+### `google_sheets_batch_get`
+
+Read multiple ranges from a Google Sheets spreadsheet in a single request
+
+#### Input
+
+| Parameter | Type | Required | Description |
+| --------- | ---- | -------- | ----------- |
+| `spreadsheetId` | string | Yes | The ID of the spreadsheet |
+| `ranges` | json | Yes | Array of ranges to read \(e.g., \["Sheet1!A1:D10", "Sheet2!A1:B5"\]\). Each range should include sheet name. |
+| `majorDimension` | string | No | The major dimension of values: "ROWS" \(default\) or "COLUMNS" |
+| `valueRenderOption` | string | No | How values should be rendered: "FORMATTED_VALUE" \(default\), "UNFORMATTED_VALUE", or "FORMULA" |
+
+#### Output
+
+| Parameter | Type | Description |
+| --------- | ---- | ----------- |
+| `spreadsheetId` | string | The spreadsheet ID |
+| `valueRanges` | array | Array of value ranges read from the spreadsheet |
+|   ↳ `range` | string | The range that was read |
+|   ↳ `majorDimension` | string | Major dimension \(ROWS or COLUMNS\) |
+|   ↳ `values` | array | The cell values as a 2D array |
+| `metadata` | json | Spreadsheet metadata including ID and URL |
+| ↳ `spreadsheetId` | string | Google Sheets spreadsheet ID |
+| ↳ `spreadsheetUrl` | string | Spreadsheet URL |
+
+### `google_sheets_batch_update`
+
+Update multiple ranges in a Google Sheets spreadsheet in a single request
+
+#### Input
+
+| Parameter | Type | Required | Description |
+| --------- | ---- | -------- | ----------- |
+| `spreadsheetId` | string | Yes | The ID of the spreadsheet |
+| `data` | json | Yes | Array of value ranges to update. Each item should have "range" \(e.g., "Sheet1!A1:D10"\) and "values" \(2D array\). |
+| `valueInputOption` | string | No | How input data should be interpreted: "RAW" or "USER_ENTERED" \(default\). USER_ENTERED parses formulas. |
+
+#### Output
+
+| Parameter | Type | Description |
+| --------- | ---- | ----------- |
+| `spreadsheetId` | string | The spreadsheet ID |
+| `totalUpdatedRows` | number | Total number of rows updated |
+| `totalUpdatedColumns` | number | Total number of columns updated |
+| `totalUpdatedCells` | number | Total number of cells updated |
+| `totalUpdatedSheets` | number | Total number of sheets updated |
+| `responses` | array | Array of update responses for each range |
+|   ↳ `spreadsheetId` | string | The spreadsheet ID |
+|   ↳ `updatedRange` | string | The range that was updated |
+|   ↳ `updatedRows` | number | Number of rows updated in this range |
+|   ↳ `updatedColumns` | number | Number of columns updated in this range |
+|   ↳ `updatedCells` | number | Number of cells updated in this range |
+| `metadata` | json | Spreadsheet metadata including ID and URL |
+| ↳ `spreadsheetId` | string | Google Sheets spreadsheet ID |
+| ↳ `spreadsheetUrl` | string | Spreadsheet URL |
+
+### `google_sheets_batch_clear`
+
+Clear multiple ranges in a Google Sheets spreadsheet in a single request
+
+#### Input
+
+| Parameter | Type | Required | Description |
+| --------- | ---- | -------- | ----------- |
+| `spreadsheetId` | string | Yes | The ID of the spreadsheet |
+| `ranges` | json | Yes | Array of ranges to clear \(e.g., \["Sheet1!A1:D10", "Sheet2!A1:B5"\]\). Each range should include sheet name. |
+
+#### Output
+
+| Parameter | Type | Description |
+| --------- | ---- | ----------- |
+| `spreadsheetId` | string | The spreadsheet ID |
+| `clearedRanges` | array | Array of ranges that were cleared |
+| `metadata` | json | Spreadsheet metadata including ID and URL |
+| ↳ `spreadsheetId` | string | Google Sheets spreadsheet ID |
+| ↳ `spreadsheetUrl` | string | Spreadsheet URL |
+
+### `google_sheets_copy_sheet`
+
+Copy a sheet from one spreadsheet to another
+
+#### Input
+
+| Parameter | Type | Required | Description |
+| --------- | ---- | -------- | ----------- |
+| `sourceSpreadsheetId` | string | Yes | The ID of the source spreadsheet |
+| `sheetId` | number | Yes | The ID of the sheet to copy \(numeric ID, not the sheet name\). Use Get Spreadsheet to find sheet IDs. |
+| `destinationSpreadsheetId` | string | Yes | The ID of the destination spreadsheet where the sheet will be copied |
+
+#### Output
+
+| Parameter | Type | Description |
+| --------- | ---- | ----------- |
+| `sheetId` | number | The ID of the newly created sheet in the destination |
+| `title` | string | The title of the copied sheet |
+| `index` | number | The index \(position\) of the copied sheet |
+| `sheetType` | string | The type of the sheet \(GRID, CHART, etc.\) |
+| `destinationSpreadsheetId` | string | The ID of the destination spreadsheet |
+| `destinationSpreadsheetUrl` | string | URL to the destination spreadsheet |
+
 
diff --git a/apps/docs/content/docs/en/tools/google_slides.mdx b/apps/docs/content/docs/en/tools/google_slides.mdx
index b8a290b01b..3d826a257c 100644
--- a/apps/docs/content/docs/en/tools/google_slides.mdx
+++ b/apps/docs/content/docs/en/tools/google_slides.mdx
@@ -30,7 +30,7 @@ In Sim, the Google Slides integration enables your agents to interact directly w
 
 ## Usage Instructions
 
-Integrate Google Slides into the workflow. Can read, write, create presentations, replace text, add slides, add images, and get thumbnails.
+Integrate Google Slides into the workflow. Can read, write, create presentations, replace text, add slides, add images, get thumbnails, get page details, delete objects, duplicate objects, reorder slides, create tables, create shapes, and insert text.
 
 
 
@@ -177,4 +177,177 @@ Generate a thumbnail image of a specific slide in a Google Slides presentation
 | `height` | number | Height of the thumbnail in pixels |
 | `metadata` | json | Operation metadata including presentation ID and page object ID |
 
+### `google_slides_get_page`
+
+Get detailed information about a specific slide/page in a Google Slides presentation
+
+#### Input
+
+| Parameter | Type | Required | Description |
+| --------- | ---- | -------- | ----------- |
+| `presentationId` | string | Yes | The ID of the presentation |
+| `pageObjectId` | string | Yes | The object ID of the slide/page to retrieve |
+
+#### Output
+
+| Parameter | Type | Description |
+| --------- | ---- | ----------- |
+| `objectId` | string | The object ID of the page |
+| `pageType` | string | The type of page \(SLIDE, MASTER, LAYOUT, NOTES, NOTES_MASTER\) |
+| `pageElements` | array | Array of page elements \(shapes, images, tables, etc.\) on this page |
+| `slideProperties` | object | Properties specific to slides \(layout, master, notes\) |
+| ↳ `layoutObjectId` | string | Object ID of the layout this slide is based on |
+| ↳ `masterObjectId` | string | Object ID of the master this slide is based on |
+| ↳ `notesPage` | json | The notes page associated with the slide |
+| `metadata` | object | Operation metadata including presentation ID and URL |
+| ↳ `presentationId` | string | The presentation ID |
+| ↳ `url` | string | URL to the presentation |
+
+### `google_slides_delete_object`
+
+Delete a page element (shape, image, table, etc.) or an entire slide from a Google Slides presentation
+
+#### Input
+
+| Parameter | Type | Required | Description |
+| --------- | ---- | -------- | ----------- |
+| `presentationId` | string | Yes | The ID of the presentation |
+| `objectId` | string | Yes | The object ID of the element or slide to delete |
+
+#### Output
+
+| Parameter | Type | Description |
+| --------- | ---- | ----------- |
+| `deleted` | boolean | Whether the object was successfully deleted |
+| `objectId` | string | The object ID that was deleted |
+| `metadata` | object | Operation metadata including presentation ID and URL |
+| ↳ `presentationId` | string | The presentation ID |
+| ↳ `url` | string | URL to the presentation |
+
+### `google_slides_duplicate_object`
+
+Duplicate an object (slide, shape, image, table, etc.) in a Google Slides presentation
+
+#### Input
+
+| Parameter | Type | Required | Description |
+| --------- | ---- | -------- | ----------- |
+| `presentationId` | string | Yes | The ID of the presentation |
+| `objectId` | string | Yes | The object ID of the element or slide to duplicate |
+| `objectIds` | string | No | Optional JSON object mapping source object IDs \(within the slide being duplicated\) to new object IDs for the duplicates. Format: \{"sourceId1":"newId1","sourceId2":"newId2"\} |
+| `Format` | string | No | No description |
+
+#### Output
+
+| Parameter | Type | Description |
+| --------- | ---- | ----------- |
+| `duplicatedObjectId` | string | The object ID of the newly created duplicate |
+| `metadata` | object | Operation metadata including presentation ID and source object ID |
+| ↳ `presentationId` | string | The presentation ID |
+| ↳ `sourceObjectId` | string | The original object ID that was duplicated |
+| ↳ `url` | string | URL to the presentation |
+
+### `google_slides_update_slides_position`
+
+Move one or more slides to a new position in a Google Slides presentation
+
+#### Input
+
+| Parameter | Type | Required | Description |
+| --------- | ---- | -------- | ----------- |
+| `presentationId` | string | Yes | The ID of the presentation |
+| `slideObjectIds` | string | Yes | Comma-separated list of slide object IDs to move. The slides will maintain their relative order. |
+| `insertionIndex` | number | Yes | The zero-based index where the slides should be moved. All slides with indices greater than or equal to this will be shifted right. |
+
+#### Output
+
+| Parameter | Type | Description |
+| --------- | ---- | ----------- |
+| `moved` | boolean | Whether the slides were successfully moved |
+| `slideObjectIds` | array | The slide object IDs that were moved |
+| `insertionIndex` | number | The index where the slides were moved to |
+| `metadata` | object | Operation metadata including presentation ID and URL |
+| ↳ `presentationId` | string | The presentation ID |
+| ↳ `url` | string | URL to the presentation |
+
+### `google_slides_create_table`
+
+Create a new table on a slide in a Google Slides presentation
+
+#### Input
+
+| Parameter | Type | Required | Description |
+| --------- | ---- | -------- | ----------- |
+| `presentationId` | string | Yes | The ID of the presentation |
+| `pageObjectId` | string | Yes | The object ID of the slide/page to add the table to |
+| `rows` | number | Yes | Number of rows in the table \(minimum 1\) |
+| `columns` | number | Yes | Number of columns in the table \(minimum 1\) |
+| `width` | number | No | Width of the table in points \(default: 400\) |
+| `height` | number | No | Height of the table in points \(default: 200\) |
+| `positionX` | number | No | X position from the left edge in points \(default: 100\) |
+| `positionY` | number | No | Y position from the top edge in points \(default: 100\) |
+
+#### Output
+
+| Parameter | Type | Description |
+| --------- | ---- | ----------- |
+| `tableId` | string | The object ID of the newly created table |
+| `rows` | number | Number of rows in the table |
+| `columns` | number | Number of columns in the table |
+| `metadata` | object | Operation metadata including presentation ID and page object ID |
+| ↳ `presentationId` | string | The presentation ID |
+| ↳ `pageObjectId` | string | The page object ID where the table was created |
+| ↳ `url` | string | URL to the presentation |
+
+### `google_slides_create_shape`
+
+Create a shape (rectangle, ellipse, text box, arrow, etc.) on a slide in a Google Slides presentation
+
+#### Input
+
+| Parameter | Type | Required | Description |
+| --------- | ---- | -------- | ----------- |
+| `presentationId` | string | Yes | The ID of the presentation |
+| `pageObjectId` | string | Yes | The object ID of the slide/page to add the shape to |
+| `shapeType` | string | Yes | The type of shape to create. Common types: TEXT_BOX, RECTANGLE, ROUND_RECTANGLE, ELLIPSE, TRIANGLE, DIAMOND, STAR_5, ARROW_EAST, HEART, CLOUD |
+| `width` | number | No | Width of the shape in points \(default: 200\) |
+| `height` | number | No | Height of the shape in points \(default: 100\) |
+| `positionX` | number | No | X position from the left edge in points \(default: 100\) |
+| `positionY` | number | No | Y position from the top edge in points \(default: 100\) |
+
+#### Output
+
+| Parameter | Type | Description |
+| --------- | ---- | ----------- |
+| `shapeId` | string | The object ID of the newly created shape |
+| `shapeType` | string | The type of shape that was created |
+| `metadata` | object | Operation metadata including presentation ID and page object ID |
+| ↳ `presentationId` | string | The presentation ID |
+| ↳ `pageObjectId` | string | The page object ID where the shape was created |
+| ↳ `url` | string | URL to the presentation |
+
+### `google_slides_insert_text`
+
+Insert text into a shape or table cell in a Google Slides presentation. Use this to add text to text boxes, shapes, or table cells.
+
+#### Input
+
+| Parameter | Type | Required | Description |
+| --------- | ---- | -------- | ----------- |
+| `presentationId` | string | Yes | The ID of the presentation |
+| `objectId` | string | Yes | The object ID of the shape or table cell to insert text into. For table cells, use the cell object ID. |
+| `text` | string | Yes | The text to insert |
+| `insertionIndex` | number | No | The zero-based index at which to insert the text. If not specified, text is inserted at the beginning \(index 0\). |
+
+#### Output
+
+| Parameter | Type | Description |
+| --------- | ---- | ----------- |
+| `inserted` | boolean | Whether the text was successfully inserted |
+| `objectId` | string | The object ID where text was inserted |
+| `text` | string | The text that was inserted |
+| `metadata` | object | Operation metadata including presentation ID and URL |
+| ↳ `presentationId` | string | The presentation ID |
+| ↳ `url` | string | URL to the presentation |
+
 
diff --git a/apps/docs/content/docs/en/tools/knowledge.mdx b/apps/docs/content/docs/en/tools/knowledge.mdx
index 21405f8150..44f5db36a7 100644
--- a/apps/docs/content/docs/en/tools/knowledge.mdx
+++ b/apps/docs/content/docs/en/tools/knowledge.mdx
@@ -51,6 +51,7 @@ Search for similar content in a knowledge base using vector similarity
 | `properties` | string | No | No description |
 | `tagName` | string | No | No description |
 | `tagValue` | string | No | No description |
+| `tagFilters` | string | No | No description |
 
 #### Output
 
@@ -108,19 +109,8 @@ Create a new document in a knowledge base
 | `knowledgeBaseId` | string | Yes | ID of the knowledge base containing the document |
 | `name` | string | Yes | Name of the document |
 | `content` | string | Yes | Content of the document |
-| `tag1` | string | No | Tag 1 value for the document |
-| `tag2` | string | No | Tag 2 value for the document |
-| `tag3` | string | No | Tag 3 value for the document |
-| `tag4` | string | No | Tag 4 value for the document |
-| `tag5` | string | No | Tag 5 value for the document |
-| `tag6` | string | No | Tag 6 value for the document |
-| `tag7` | string | No | Tag 7 value for the document |
-| `documentTagsData` | array | No | Structured tag data with names, types, and values |
-| `items` | object | No | No description |
-| `properties` | string | No | No description |
-| `tagName` | string | No | No description |
-| `tagValue` | string | No | No description |
-| `tagType` | string | No | No description |
+| `documentTags` | object | No | Document tags |
+| `documentTags` | string | No | No description |
 
 #### Output
 
diff --git a/apps/docs/content/docs/en/tools/microsoft_excel.mdx b/apps/docs/content/docs/en/tools/microsoft_excel.mdx
index d981eabc9e..65a8eaa5dc 100644
--- a/apps/docs/content/docs/en/tools/microsoft_excel.mdx
+++ b/apps/docs/content/docs/en/tools/microsoft_excel.mdx
@@ -45,8 +45,7 @@ Read data from a specific sheet in a Microsoft Excel spreadsheet
 | Parameter | Type | Required | Description |
 | --------- | ---- | -------- | ----------- |
 | `spreadsheetId` | string | Yes | The ID of the spreadsheet to read from |
-| `sheetName` | string | Yes | The name of the sheet/tab to read from |
-| `cellRange` | string | No | The cell range to read \(e.g., "A1:D10"\). If not specified, reads the entire used range. |
+| `range` | string | No | The range of cells to read from. Accepts "SheetName!A1:B2" for explicit ranges or just "SheetName" to read the used range of that sheet. If omitted, reads the used range of the first sheet. |
 
 #### Output
 
@@ -68,9 +67,8 @@ Write data to a specific sheet in a Microsoft Excel spreadsheet
 | Parameter | Type | Required | Description |
 | --------- | ---- | -------- | ----------- |
 | `spreadsheetId` | string | Yes | The ID of the spreadsheet to write to |
-| `sheetName` | string | Yes | The name of the sheet/tab to write to |
-| `cellRange` | string | No | The cell range to write to \(e.g., "A1:D10", "A1"\). Defaults to "A1" if not specified. |
-| `values` | array | Yes | The data to write as a 2D array \(e.g. \[\["Name", "Age"\], \["Alice", 30\], \["Bob", 25\]\]\) or array of objects. |
+| `range` | string | No | The range of cells to write to |
+| `values` | array | Yes | The data to write to the spreadsheet |
 | `valueInputOption` | string | No | The format of the data to write |
 | `includeValuesInResponse` | boolean | No | Whether to include the written values in the response |
 
diff --git a/apps/docs/content/docs/en/tools/slack.mdx b/apps/docs/content/docs/en/tools/slack.mdx
index 4462adba61..6ae9192b8e 100644
--- a/apps/docs/content/docs/en/tools/slack.mdx
+++ b/apps/docs/content/docs/en/tools/slack.mdx
@@ -84,9 +84,10 @@ Send messages to Slack channels or direct messages. Supports Slack mrkdwn format
 | Parameter | Type | Required | Description |
 | --------- | ---- | -------- | ----------- |
 | `authMethod` | string | No | Authentication method: oauth or bot_token |
+| `destinationType` | string | No | Destination type: channel or dm |
 | `botToken` | string | No | Bot token for Custom Bot |
 | `channel` | string | No | Target Slack channel \(e.g., #general\) |
-| `userId` | string | No | Target Slack user ID for direct messages \(e.g., U1234567890\) |
+| `dmUserId` | string | No | Target Slack user for direct messages |
 | `text` | string | Yes | Message text to send \(supports Slack mrkdwn formatting\) |
 | `thread_ts` | string | No | Thread timestamp to reply to \(creates thread reply\) |
 | `files` | file[] | No | Files to attach to the message |
@@ -132,9 +133,10 @@ Read the latest messages from Slack channels. Retrieve conversation history with
 | Parameter | Type | Required | Description |
 | --------- | ---- | -------- | ----------- |
 | `authMethod` | string | No | Authentication method: oauth or bot_token |
+| `destinationType` | string | No | Destination type: channel or dm |
 | `botToken` | string | No | Bot token for Custom Bot |
 | `channel` | string | No | Slack channel to read messages from \(e.g., #general\) |
-| `userId` | string | No | User ID for DM conversation \(e.g., U1234567890\) |
+| `dmUserId` | string | No | Target Slack user for DM conversation |
 | `limit` | number | No | Number of messages to retrieve \(default: 10, max: 15\) |
 | `oldest` | string | No | Start of time range \(timestamp\) |
 | `latest` | string | No | End of time range \(timestamp\) |
diff --git a/apps/sim/app/api/knowledge/[id]/tag-definitions/route.ts b/apps/sim/app/api/knowledge/[id]/tag-definitions/route.ts
index 09f1fc7873..ba52994c88 100644
--- a/apps/sim/app/api/knowledge/[id]/tag-definitions/route.ts
+++ b/apps/sim/app/api/knowledge/[id]/tag-definitions/route.ts
@@ -2,7 +2,7 @@ import { randomUUID } from 'crypto'
 import { createLogger } from '@sim/logger'
 import { type NextRequest, NextResponse } from 'next/server'
 import { z } from 'zod'
-import { getSession } from '@/lib/auth'
+import { checkHybridAuth } from '@/lib/auth/hybrid'
 import { SUPPORTED_FIELD_TYPES } from '@/lib/knowledge/constants'
 import { createTagDefinition, getTagDefinitions } from '@/lib/knowledge/tags/service'
 import { checkKnowledgeBaseAccess } from '@/app/api/knowledge/utils'
@@ -19,19 +19,32 @@ export async function GET(req: NextRequest, { params }: { params: Promise<{ id:
   try {
     logger.info(`[${requestId}] Getting tag definitions for knowledge base ${knowledgeBaseId}`)
 
-    const session = await getSession()
-    if (!session?.user?.id) {
-      return NextResponse.json({ error: 'Unauthorized' }, { status: 401 })
+    const auth = await checkHybridAuth(req, { requireWorkflowId: false })
+    if (!auth.success) {
+      return NextResponse.json({ error: auth.error || 'Unauthorized' }, { status: 401 })
     }
 
-    const accessCheck = await checkKnowledgeBaseAccess(knowledgeBaseId, session.user.id)
-    if (!accessCheck.hasAccess) {
-      return NextResponse.json({ error: 'Forbidden' }, { status: 403 })
+    // Only allow session and internal JWT auth (not API key)
+    if (auth.authType === 'api_key') {
+      return NextResponse.json(
+        { error: 'API key auth not supported for this endpoint' },
+        { status: 401 }
+      )
+    }
+
+    // For session auth, verify KB access. Internal JWT is trusted.
+    if (auth.authType === 'session' && auth.userId) {
+      const accessCheck = await checkKnowledgeBaseAccess(knowledgeBaseId, auth.userId)
+      if (!accessCheck.hasAccess) {
+        return NextResponse.json({ error: 'Forbidden' }, { status: 403 })
+      }
     }
 
     const tagDefinitions = await getTagDefinitions(knowledgeBaseId)
 
-    logger.info(`[${requestId}] Retrieved ${tagDefinitions.length} tag definitions`)
+    logger.info(
+      `[${requestId}] Retrieved ${tagDefinitions.length} tag definitions (${auth.authType})`
+    )
 
     return NextResponse.json({
       success: true,
@@ -51,14 +64,25 @@ export async function POST(req: NextRequest, { params }: { params: Promise<{ id:
   try {
     logger.info(`[${requestId}] Creating tag definition for knowledge base ${knowledgeBaseId}`)
 
-    const session = await getSession()
-    if (!session?.user?.id) {
-      return NextResponse.json({ error: 'Unauthorized' }, { status: 401 })
+    const auth = await checkHybridAuth(req, { requireWorkflowId: false })
+    if (!auth.success) {
+      return NextResponse.json({ error: auth.error || 'Unauthorized' }, { status: 401 })
     }
 
-    const accessCheck = await checkKnowledgeBaseAccess(knowledgeBaseId, session.user.id)
-    if (!accessCheck.hasAccess) {
-      return NextResponse.json({ error: 'Forbidden' }, { status: 403 })
+    // Only allow session and internal JWT auth (not API key)
+    if (auth.authType === 'api_key') {
+      return NextResponse.json(
+        { error: 'API key auth not supported for this endpoint' },
+        { status: 401 }
+      )
+    }
+
+    // For session auth, verify KB access. Internal JWT is trusted.
+    if (auth.authType === 'session' && auth.userId) {
+      const accessCheck = await checkKnowledgeBaseAccess(knowledgeBaseId, auth.userId)
+      if (!accessCheck.hasAccess) {
+        return NextResponse.json({ error: 'Forbidden' }, { status: 403 })
+      }
     }
 
     const body = await req.json()
diff --git a/apps/sim/app/chat/components/message/components/markdown-renderer.tsx b/apps/sim/app/chat/components/message/components/markdown-renderer.tsx
index ba69814cfc..8aa66579d5 100644
--- a/apps/sim/app/chat/components/message/components/markdown-renderer.tsx
+++ b/apps/sim/app/chat/components/message/components/markdown-renderer.tsx
@@ -1,4 +1,4 @@
-import React, { type HTMLAttributes, type ReactNode } from 'react'
+import React, { type HTMLAttributes, memo, type ReactNode, useMemo } from 'react'
 import ReactMarkdown from 'react-markdown'
 import remarkGfm from 'remark-gfm'
 import { Tooltip } from '@/components/emcn'
@@ -23,24 +23,16 @@ export function LinkWithPreview({ href, children }: { href: string; children: Re
   )
 }
 
-export default function MarkdownRenderer({
-  content,
-  customLinkComponent,
-}: {
-  content: string
-  customLinkComponent?: typeof LinkWithPreview
-}) {
-  const LinkComponent = customLinkComponent || LinkWithPreview
+const REMARK_PLUGINS = [remarkGfm]
 
-  const customComponents = {
-    // Paragraph
+function createCustomComponents(LinkComponent: typeof LinkWithPreview) {
+  return {
     p: ({ children }: React.HTMLAttributes<HTMLParagraphElement>) => (
       <p className='mb-1 font-sans text-base text-gray-800 leading-relaxed last:mb-0 dark:text-gray-200'>
         {children}
       </p>
     ),
 
-    // Headings
     h1: ({ children }: React.HTMLAttributes<HTMLHeadingElement>) => (
       <h1 className='mt-10 mb-5 font-sans font-semibold text-2xl text-gray-900 dark:text-gray-100'>
         {children}
@@ -62,7 +54,6 @@ export default function MarkdownRenderer({
       </h4>
     ),
 
-    // Lists
     ul: ({ children }: React.HTMLAttributes<HTMLUListElement>) => (
       <ul
         className='mt-1 mb-1 space-y-1 pl-6 font-sans text-gray-800 dark:text-gray-200'
@@ -89,7 +80,6 @@ export default function MarkdownRenderer({
       </li>
     ),
 
-    // Code blocks
     pre: ({ children }: HTMLAttributes<HTMLPreElement>) => {
       let codeProps: HTMLAttributes<HTMLElement> = {}
       let codeContent: ReactNode = children
@@ -120,7 +110,6 @@ export default function MarkdownRenderer({
       )
     },
 
-    // Inline code
     code: ({
       inline,
       className,
@@ -144,24 +133,20 @@ export default function MarkdownRenderer({
       )
     },
 
-    // Blockquotes
     blockquote: ({ children }: React.HTMLAttributes<HTMLQuoteElement>) => (
       <blockquote className='my-4 border-gray-300 border-l-4 py-1 pl-4 font-sans text-gray-700 italic dark:border-gray-600 dark:text-gray-300'>
         {children}
       </blockquote>
     ),
 
-    // Horizontal rule
     hr: () => <hr className='my-8 border-gray-500/[.07] border-t dark:border-gray-400/[.07]' />,
 
-    // Links
     a: ({ href, children, ...props }: React.AnchorHTMLAttributes<HTMLAnchorElement>) => (
       <LinkComponent href={href || '#'} {...props}>
         {children}
       </LinkComponent>
     ),
 
-    // Tables
     table: ({ children }: React.TableHTMLAttributes<HTMLTableElement>) => (
       <div className='my-4 w-full overflow-x-auto'>
         <table className='min-w-full table-auto border border-gray-300 font-sans text-sm dark:border-gray-700'>
@@ -193,7 +178,6 @@ export default function MarkdownRenderer({
       </td>
     ),
 
-    // Images
     img: ({ src, alt, ...props }: React.ImgHTMLAttributes<HTMLImageElement>) => (
       <img
         src={src}
@@ -203,15 +187,33 @@ export default function MarkdownRenderer({
       />
     ),
   }
+}
+
+const DEFAULT_COMPONENTS = createCustomComponents(LinkWithPreview)
+
+const MarkdownRenderer = memo(function MarkdownRenderer({
+  content,
+  customLinkComponent,
+}: {
+  content: string
+  customLinkComponent?: typeof LinkWithPreview
+}) {
+  const components = useMemo(() => {
+    if (!customLinkComponent) {
+      return DEFAULT_COMPONENTS
+    }
+    return createCustomComponents(customLinkComponent)
+  }, [customLinkComponent])
 
-  // Pre-process content to fix common issues
   const processedContent = content.trim()
 
   return (
     <div className='space-y-4 break-words font-sans text-[#0D0D0D] text-base leading-relaxed dark:text-gray-100'>
-      <ReactMarkdown remarkPlugins={[remarkGfm]} components={customComponents}>
+      <ReactMarkdown remarkPlugins={REMARK_PLUGINS} components={components}>
         {processedContent}
       </ReactMarkdown>
     </div>
   )
-}
+})
+
+export default MarkdownRenderer
diff --git a/apps/sim/app/layout.tsx b/apps/sim/app/layout.tsx
index 166b260af8..6ab3aae353 100644
--- a/apps/sim/app/layout.tsx
+++ b/apps/sim/app/layout.tsx
@@ -7,7 +7,7 @@ import { generateBrandedMetadata, generateStructuredData } from '@/lib/branding/
 import { PostHogProvider } from '@/app/_shell/providers/posthog-provider'
 import '@/app/_styles/globals.css'
 import { OneDollarStats } from '@/components/analytics/onedollarstats'
-import { isReactGrabEnabled } from '@/lib/core/config/feature-flags'
+import { isReactGrabEnabled, isReactScanEnabled } from '@/lib/core/config/feature-flags'
 import { HydrationErrorHandler } from '@/app/_shell/hydration-error-handler'
 import { QueryProvider } from '@/app/_shell/providers/query-provider'
 import { SessionProvider } from '@/app/_shell/providers/session-provider'
@@ -35,6 +35,13 @@ export default function RootLayout({ children }: { children: React.ReactNode })
   return (
     <html lang='en' suppressHydrationWarning>
       <head>
+        {isReactScanEnabled && (
+          <Script
+            src='https://unpkg.com/react-scan/dist/auto.global.js'
+            crossOrigin='anonymous'
+            strategy='beforeInteractive'
+          />
+        )}
         {isReactGrabEnabled && (
           <Script
             src='https://unpkg.com/react-grab/dist/index.global.js'
diff --git a/apps/sim/app/workspace/[workspaceId]/providers/workspace-permissions-provider.tsx b/apps/sim/app/workspace/[workspaceId]/providers/workspace-permissions-provider.tsx
index 73e39bf641..607d177888 100644
--- a/apps/sim/app/workspace/[workspaceId]/providers/workspace-permissions-provider.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/providers/workspace-permissions-provider.tsx
@@ -4,13 +4,13 @@ import type React from 'react'
 import { createContext, useContext, useEffect, useMemo, useState } from 'react'
 import { createLogger } from '@sim/logger'
 import { useParams } from 'next/navigation'
-import { useCollaborativeWorkflow } from '@/hooks/use-collaborative-workflow'
 import { useUserPermissions, type WorkspaceUserPermissions } from '@/hooks/use-user-permissions'
 import {
   useWorkspacePermissions,
   type WorkspacePermissions,
 } from '@/hooks/use-workspace-permissions'
 import { useNotificationStore } from '@/stores/notifications'
+import { useOperationQueueStore } from '@/stores/operation-queue/store'
 
 const logger = createLogger('WorkspacePermissionsProvider')
 
@@ -64,8 +64,8 @@ export function WorkspacePermissionsProvider({ children }: WorkspacePermissionsP
   // Track whether we've already surfaced an offline notification to avoid duplicates
   const [hasShownOfflineNotification, setHasShownOfflineNotification] = useState(false)
 
-  // Get operation error state from collaborative workflow
-  const { hasOperationError } = useCollaborativeWorkflow()
+  // Get operation error state directly from the store (avoid full useCollaborativeWorkflow subscription)
+  const hasOperationError = useOperationQueueStore((state) => state.hasOperationError)
 
   const addNotification = useNotificationStore((state) => state.addNotification)
 
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/action-bar/action-bar.tsx b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/action-bar/action-bar.tsx
index c2f7ee340a..835cf02184 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/action-bar/action-bar.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/action-bar/action-bar.tsx
@@ -48,17 +48,17 @@ export const ActionBar = memo(
       collaborativeBatchToggleBlockEnabled,
       collaborativeBatchToggleBlockHandles,
     } = useCollaborativeWorkflow()
-    const { activeWorkflowId } = useWorkflowRegistry()
-    const blocks = useWorkflowStore((state) => state.blocks)
-    const subBlockStore = useSubBlockStore()
+    const { activeWorkflowId, setPendingSelection } = useWorkflowRegistry()
 
     const handleDuplicateBlock = useCallback(() => {
+      const blocks = useWorkflowStore.getState().blocks
       const sourceBlock = blocks[blockId]
       if (!sourceBlock) return
 
       const newId = crypto.randomUUID()
       const newName = getUniqueBlockName(sourceBlock.name, blocks)
-      const subBlockValues = subBlockStore.workflowValues[activeWorkflowId || '']?.[blockId] || {}
+      const subBlockValues =
+        useSubBlockStore.getState().workflowValues[activeWorkflowId || '']?.[blockId] || {}
 
       const { block, subBlockValues: filteredValues } = prepareDuplicateBlockState({
         sourceBlock,
@@ -68,18 +68,10 @@ export const ActionBar = memo(
         subBlockValues,
       })
 
+      setPendingSelection([newId])
       collaborativeBatchAddBlocks([block], [], {}, {}, { [newId]: filteredValues })
-    }, [
-      blockId,
-      blocks,
-      activeWorkflowId,
-      subBlockStore.workflowValues,
-      collaborativeBatchAddBlocks,
-    ])
+    }, [blockId, activeWorkflowId, collaborativeBatchAddBlocks, setPendingSelection])
 
-    /**
-     * Optimized single store subscription for all block data
-     */
     const { isEnabled, horizontalHandles, parentId, parentType } = useWorkflowStore(
       useCallback(
         (state) => {
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/note-block/note-block.tsx b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/note-block/note-block.tsx
index 2cfa568165..25242087c4 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/note-block/note-block.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/note-block/note-block.tsx
@@ -3,13 +3,11 @@ import ReactMarkdown from 'react-markdown'
 import type { NodeProps } from 'reactflow'
 import remarkGfm from 'remark-gfm'
 import { cn } from '@/lib/core/utils/cn'
+import { BLOCK_DIMENSIONS } from '@/lib/workflows/blocks/block-dimensions'
 import { useUserPermissionsContext } from '@/app/workspace/[workspaceId]/providers/workspace-permissions-provider'
 import { ActionBar } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/action-bar/action-bar'
 import { useBlockVisual } from '@/app/workspace/[workspaceId]/w/[workflowId]/hooks'
-import {
-  BLOCK_DIMENSIONS,
-  useBlockDimensions,
-} from '@/app/workspace/[workspaceId]/w/[workflowId]/hooks/use-block-dimensions'
+import { useBlockDimensions } from '@/app/workspace/[workspaceId]/w/[workflowId]/hooks/use-block-dimensions'
 import { useSubBlockStore } from '@/stores/workflows/subblock/store'
 import type { WorkflowBlockProps } from '../workflow-block/types'
 
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/copilot-message/components/markdown-renderer.tsx b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/copilot-message/components/markdown-renderer.tsx
index dc3299c50f..2f134d03ba 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/copilot-message/components/markdown-renderer.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/copilot-message/components/markdown-renderer.tsx
@@ -6,6 +6,8 @@ import ReactMarkdown from 'react-markdown'
 import remarkGfm from 'remark-gfm'
 import { Code, Tooltip } from '@/components/emcn'
 
+const REMARK_PLUGINS = [remarkGfm]
+
 /**
  * Recursively extracts text content from React elements
  * @param element - React node to extract text from
@@ -149,14 +151,12 @@ interface CopilotMarkdownRendererProps {
  * Tighter spacing compared to traditional prose for better chat UX
  */
 const markdownComponents = {
-  // Paragraphs - tight spacing, no margin on last
   p: ({ children }: React.HTMLAttributes<HTMLParagraphElement>) => (
     <p className='mb-1.5 font-base font-season text-[var(--text-primary)] text-sm leading-[1.4] last:mb-0 dark:font-[470]'>
       {children}
     </p>
   ),
 
-  // Headings - minimal margins for chat context
   h1: ({ children }: React.HTMLAttributes<HTMLHeadingElement>) => (
     <h1 className='mt-2 mb-1 font-season font-semibold text-[var(--text-primary)] text-base first:mt-0'>
       {children}
@@ -178,7 +178,6 @@ const markdownComponents = {
     </h4>
   ),
 
-  // Lists - compact spacing
   ul: ({ children }: React.HTMLAttributes<HTMLUListElement>) => (
     <ul
       className='my-1 space-y-0.5 pl-5 font-base font-season text-[var(--text-primary)] dark:font-[470]'
@@ -204,7 +203,6 @@ const markdownComponents = {
     </li>
   ),
 
-  // Code blocks - handled by CodeBlock component
   pre: ({ children }: React.HTMLAttributes<HTMLPreElement>) => {
     let codeContent: React.ReactNode = children
     let language = 'code'
@@ -243,7 +241,6 @@ const markdownComponents = {
     return <CodeBlock code={actualCodeText} language={language} />
   },
 
-  // Inline code
   code: ({
     className,
     children,
@@ -257,7 +254,6 @@ const markdownComponents = {
     </code>
   ),
 
-  // Text formatting
   strong: ({ children }: React.HTMLAttributes<HTMLElement>) => (
     <strong className='font-semibold text-[var(--text-primary)]'>{children}</strong>
   ),
@@ -271,22 +267,18 @@ const markdownComponents = {
     <i className='text-[var(--text-primary)] italic'>{children}</i>
   ),
 
-  // Blockquote - compact
   blockquote: ({ children }: React.HTMLAttributes<HTMLQuoteElement>) => (
     <blockquote className='my-1.5 border-[var(--border-1)] border-l-2 py-0.5 pl-3 font-season text-[var(--text-secondary)] text-sm italic'>
       {children}
     </blockquote>
   ),
 
-  // Horizontal rule
   hr: () => <hr className='my-3 border-[var(--divider)] border-t' />,
 
-  // Links
   a: ({ href, children }: React.AnchorHTMLAttributes<HTMLAnchorElement>) => (
     <LinkWithPreview href={href || '#'}>{children}</LinkWithPreview>
   ),
 
-  // Tables - compact
   table: ({ children }: React.TableHTMLAttributes<HTMLTableElement>) => (
     <div className='my-2 max-w-full overflow-x-auto'>
       <table className='min-w-full table-auto border border-[var(--border-1)] font-season text-xs'>
@@ -314,7 +306,6 @@ const markdownComponents = {
     </td>
   ),
 
-  // Images
   img: ({ src, alt, ...props }: React.ImgHTMLAttributes<HTMLImageElement>) => (
     <img src={src} alt={alt || 'Image'} className='my-2 h-auto max-w-full rounded-md' {...props} />
   ),
@@ -330,7 +321,7 @@ const markdownComponents = {
 function CopilotMarkdownRenderer({ content }: CopilotMarkdownRendererProps) {
   return (
     <div className='max-w-full break-words font-base font-season text-[var(--text-primary)] text-sm leading-[1.4] dark:font-[470] [&_*]:max-w-full [&_a]:break-all [&_code:not(pre_code)]:break-words [&_li]:break-words [&_p]:break-words'>
-      <ReactMarkdown remarkPlugins={[remarkGfm]} components={markdownComponents}>
+      <ReactMarkdown remarkPlugins={REMARK_PLUGINS} components={markdownComponents}>
         {content}
       </ReactMarkdown>
     </div>
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/copilot-message/hooks/index.ts b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/copilot-message/hooks/index.ts
index 979353aaba..2c501a1c9a 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/copilot-message/hooks/index.ts
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/copilot-message/hooks/index.ts
@@ -1,4 +1,2 @@
 export { useCheckpointManagement } from './use-checkpoint-management'
 export { useMessageEditing } from './use-message-editing'
-export { useMessageFeedback } from './use-message-feedback'
-export { useSuccessTimers } from './use-success-timers'
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/copilot-message/hooks/use-message-feedback.ts b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/copilot-message/hooks/use-message-feedback.ts
deleted file mode 100644
index 5494eb7115..0000000000
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/copilot-message/hooks/use-message-feedback.ts
+++ /dev/null
@@ -1,138 +0,0 @@
-'use client'
-
-import { useCallback } from 'react'
-import { createLogger } from '@sim/logger'
-import type { CopilotMessage } from '@/stores/panel'
-import { useCopilotStore } from '@/stores/panel'
-
-const logger = createLogger('useMessageFeedback')
-
-const WORKFLOW_TOOL_NAMES = ['edit_workflow']
-
-interface UseMessageFeedbackProps {
-  setShowUpvoteSuccess: (show: boolean) => void
-  setShowDownvoteSuccess: (show: boolean) => void
-}
-
-/**
- * Custom hook to handle message feedback (upvote/downvote)
- *
- * @param message - The copilot message
- * @param messages - Array of all messages in the chat
- * @param props - Success state setters from useSuccessTimers
- * @returns Feedback management utilities
- */
-export function useMessageFeedback(
-  message: CopilotMessage,
-  messages: CopilotMessage[],
-  props: UseMessageFeedbackProps
-) {
-  const { setShowUpvoteSuccess, setShowDownvoteSuccess } = props
-  const { currentChat } = useCopilotStore()
-
-  /**
-   * Gets the full assistant response content from message
-   */
-  const getFullAssistantContent = useCallback((message: CopilotMessage) => {
-    if (message.content?.trim()) {
-      return message.content
-    }
-
-    if (message.contentBlocks && message.contentBlocks.length > 0) {
-      return message.contentBlocks
-        .filter((block) => block.type === 'text')
-        .map((block) => block.content)
-        .join('')
-    }
-
-    return message.content || ''
-  }, [])
-
-  /**
-   * Finds the last user query before this assistant message
-   */
-  const getLastUserQuery = useCallback(() => {
-    const messageIndex = messages.findIndex((msg) => msg.id === message.id)
-    if (messageIndex === -1) return null
-
-    for (let i = messageIndex - 1; i >= 0; i--) {
-      if (messages[i].role === 'user') {
-        return messages[i].content
-      }
-    }
-    return null
-  }, [messages, message.id])
-
-  /**
-   * Submits feedback to the API
-   */
-  const submitFeedback = useCallback(
-    async (isPositive: boolean) => {
-      if (!currentChat?.id) {
-        logger.error('No current chat ID available for feedback submission')
-        return
-      }
-
-      const userQuery = getLastUserQuery()
-      if (!userQuery) {
-        logger.error('No user query found for feedback submission')
-        return
-      }
-
-      const agentResponse = getFullAssistantContent(message)
-      if (!agentResponse.trim()) {
-        logger.error('No agent response content available for feedback submission')
-        return
-      }
-
-      try {
-        const requestBody = {
-          chatId: currentChat.id,
-          userQuery,
-          agentResponse,
-          isPositiveFeedback: isPositive,
-        }
-
-        const response = await fetch('/api/copilot/feedback', {
-          method: 'POST',
-          headers: {
-            'Content-Type': 'application/json',
-          },
-          body: JSON.stringify(requestBody),
-        })
-
-        if (!response.ok) {
-          throw new Error(`Failed to submit feedback: ${response.statusText}`)
-        }
-
-        await response.json()
-      } catch (error) {
-        logger.error('Error submitting feedback:', error)
-      }
-    },
-    [currentChat, getLastUserQuery, getFullAssistantContent, message]
-  )
-
-  /**
-   * Handles upvote action
-   */
-  const handleUpvote = useCallback(async () => {
-    setShowDownvoteSuccess(false)
-    setShowUpvoteSuccess(true)
-    await submitFeedback(true)
-  }, [submitFeedback])
-
-  /**
-   * Handles downvote action
-   */
-  const handleDownvote = useCallback(async () => {
-    setShowUpvoteSuccess(false)
-    setShowDownvoteSuccess(true)
-    await submitFeedback(false)
-  }, [submitFeedback])
-
-  return {
-    handleUpvote,
-    handleDownvote,
-  }
-}
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/copilot-message/hooks/use-success-timers.ts b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/copilot-message/hooks/use-success-timers.ts
deleted file mode 100644
index ceecf4842b..0000000000
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/copilot-message/hooks/use-success-timers.ts
+++ /dev/null
@@ -1,77 +0,0 @@
-'use client'
-
-import { useCallback, useEffect, useState } from 'react'
-
-/**
- * Duration to show success indicators (in milliseconds)
- */
-const SUCCESS_DISPLAY_DURATION = 2000
-
-/**
- * Custom hook to manage auto-hiding success states
- * Automatically hides success indicators after a set duration
- *
- * @returns Success state management utilities
- */
-export function useSuccessTimers() {
-  const [showCopySuccess, setShowCopySuccess] = useState(false)
-  const [showUpvoteSuccess, setShowUpvoteSuccess] = useState(false)
-  const [showDownvoteSuccess, setShowDownvoteSuccess] = useState(false)
-
-  /**
-   * Auto-hide copy success indicator after duration
-   */
-  useEffect(() => {
-    if (showCopySuccess) {
-      const timer = setTimeout(() => {
-        setShowCopySuccess(false)
-      }, SUCCESS_DISPLAY_DURATION)
-      return () => clearTimeout(timer)
-    }
-  }, [showCopySuccess])
-
-  /**
-   * Auto-hide upvote success indicator after duration
-   */
-  useEffect(() => {
-    if (showUpvoteSuccess) {
-      const timer = setTimeout(() => {
-        setShowUpvoteSuccess(false)
-      }, SUCCESS_DISPLAY_DURATION)
-      return () => clearTimeout(timer)
-    }
-  }, [showUpvoteSuccess])
-
-  /**
-   * Auto-hide downvote success indicator after duration
-   */
-  useEffect(() => {
-    if (showDownvoteSuccess) {
-      const timer = setTimeout(() => {
-        setShowDownvoteSuccess(false)
-      }, SUCCESS_DISPLAY_DURATION)
-      return () => clearTimeout(timer)
-    }
-  }, [showDownvoteSuccess])
-
-  /**
-   * Handles copy to clipboard action
-   * @param content - Content to copy to clipboard
-   */
-  const handleCopy = useCallback((content: string) => {
-    navigator.clipboard.writeText(content)
-    setShowCopySuccess(true)
-  }, [])
-
-  return {
-    // State
-    showCopySuccess,
-    showUpvoteSuccess,
-    showDownvoteSuccess,
-
-    // Operations
-    handleCopy,
-    setShowUpvoteSuccess,
-    setShowDownvoteSuccess,
-  }
-}
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/tool-call/tool-call.tsx b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/tool-call/tool-call.tsx
index 7987d20435..bba129df70 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/tool-call/tool-call.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/tool-call/tool-call.tsx
@@ -1,6 +1,6 @@
 'use client'
 
-import { useEffect, useMemo, useRef, useState } from 'react'
+import { memo, useEffect, useMemo, useRef, useState } from 'react'
 import clsx from 'clsx'
 import { ChevronUp, LayoutList } from 'lucide-react'
 import Editor from 'react-simple-code-editor'
@@ -530,7 +530,7 @@ function splitActionVerb(text: string): [string | null, string] {
  * For special tool calls, uses a gradient color. For normal tools, highlights action verbs
  * in a lighter color with the rest in default gray.
  */
-function ShimmerOverlayText({
+const ShimmerOverlayText = memo(function ShimmerOverlayText({
   text,
   active = false,
   className,
@@ -622,256 +622,7 @@ function ShimmerOverlayText({
       `}</style>
     </span>
   )
-}
-
-/**
- * SubAgentToolCall renders a nested tool call from a subagent in a muted/thinking style.
- */
-function SubAgentToolCall({ toolCall: toolCallProp }: { toolCall: CopilotToolCall }) {
-  // Get live toolCall from store to ensure we have the latest state and params
-  const liveToolCall = useCopilotStore((s) =>
-    toolCallProp.id ? s.toolCallsById[toolCallProp.id] : undefined
-  )
-  const toolCall = liveToolCall || toolCallProp
-
-  const displayName = getDisplayNameForSubAgent(toolCall)
-
-  const isLoading =
-    toolCall.state === ClientToolCallState.generating ||
-    toolCall.state === ClientToolCallState.pending ||
-    toolCall.state === ClientToolCallState.executing
-
-  const showButtons = shouldShowRunSkipButtons(toolCall)
-  const isSpecial = isSpecialToolCall(toolCall)
-
-  // Get params for table rendering
-  const params =
-    (toolCall as any).parameters || (toolCall as any).input || (toolCall as any).params || {}
-
-  // Render table for tools that support it
-  const renderSubAgentTable = () => {
-    if (toolCall.name === 'set_environment_variables') {
-      const variables = params.variables || params.env_vars || {}
-      const entries = Array.isArray(variables)
-        ? variables.map((v: any, i: number) => [v.name || `var_${i}`, v.value || ''])
-        : Object.entries(variables).map(([key, val]) => {
-            if (typeof val === 'object' && val !== null && 'value' in (val as any)) {
-              return [key, (val as any).value]
-            }
-            return [key, val]
-          })
-      if (entries.length === 0) return null
-      return (
-        <div className='mt-1.5 w-full overflow-hidden rounded-[4px] border border-[var(--border-1)] bg-[var(--surface-1)]'>
-          <table className='w-full table-fixed bg-transparent'>
-            <thead className='bg-transparent'>
-              <tr className='border-[var(--border-1)] border-b bg-transparent'>
-                <th className='w-[36%] border-[var(--border-1)] border-r bg-transparent px-[10px] py-[5px] text-left font-medium text-[12px] text-[var(--text-tertiary)]'>
-                  Variable
-                </th>
-                <th className='w-[64%] bg-transparent px-[10px] py-[5px] text-left font-medium text-[12px] text-[var(--text-tertiary)]'>
-                  Value
-                </th>
-              </tr>
-            </thead>
-            <tbody className='bg-transparent'>
-              {entries.map((entry) => {
-                const [key, value] = entry as [string, any]
-                return (
-                  <tr key={key} className='border-[var(--border-1)] border-t bg-transparent'>
-                    <td className='w-[36%] border-[var(--border-1)] border-r bg-transparent px-[10px] py-[6px]'>
-                      <span className='truncate font-medium text-[var(--text-primary)] text-xs'>
-                        {key}
-                      </span>
-                    </td>
-                    <td className='w-[64%] bg-transparent px-[10px] py-[6px]'>
-                      <span className='font-mono text-[var(--text-muted)] text-xs'>
-                        {String(value)}
-                      </span>
-                    </td>
-                  </tr>
-                )
-              })}
-            </tbody>
-          </table>
-        </div>
-      )
-    }
-
-    if (toolCall.name === 'set_global_workflow_variables') {
-      const ops = Array.isArray(params.operations) ? (params.operations as any[]) : []
-      if (ops.length === 0) return null
-      return (
-        <div className='mt-1.5 w-full overflow-hidden rounded-[4px] border border-[var(--border-1)] bg-[var(--surface-1)]'>
-          <div className='grid grid-cols-3 gap-0 border-[var(--border-1)] border-b bg-[var(--surface-4)] py-1.5'>
-            <div className='self-start px-2 font-medium font-season text-[10px] text-[var(--text-secondary)] uppercase tracking-wide'>
-              Name
-            </div>
-            <div className='self-start px-2 font-medium font-season text-[10px] text-[var(--text-secondary)] uppercase tracking-wide'>
-              Type
-            </div>
-            <div className='self-start px-2 font-medium font-season text-[10px] text-[var(--text-secondary)] uppercase tracking-wide'>
-              Value
-            </div>
-          </div>
-          <div className='divide-y divide-[var(--border-1)]'>
-            {ops.map((op, idx) => (
-              <div key={idx} className='grid grid-cols-3 gap-0 py-1.5'>
-                <div className='min-w-0 self-start px-2'>
-                  <span className='font-season text-[var(--text-primary)] text-xs'>
-                    {String(op.name || '')}
-                  </span>
-                </div>
-                <div className='self-start px-2'>
-                  <span className='rounded border border-[var(--border-1)] px-1 py-0.5 font-[470] font-season text-[10px] text-[var(--text-primary)]'>
-                    {String(op.type || '')}
-                  </span>
-                </div>
-                <div className='min-w-0 self-start px-2'>
-                  <span className='font-[470] font-mono text-[var(--text-muted)] text-xs'>
-                    {op.value !== undefined ? String(op.value) : '—'}
-                  </span>
-                </div>
-              </div>
-            ))}
-          </div>
-        </div>
-      )
-    }
-
-    if (toolCall.name === 'run_workflow') {
-      let inputs = params.input || params.inputs || params.workflow_input
-      if (typeof inputs === 'string') {
-        try {
-          inputs = JSON.parse(inputs)
-        } catch {
-          inputs = {}
-        }
-      }
-      if (params.workflow_input && typeof params.workflow_input === 'object') {
-        inputs = params.workflow_input
-      }
-      if (!inputs || typeof inputs !== 'object') {
-        const { workflowId, workflow_input, ...rest } = params
-        inputs = rest
-      }
-      const safeInputs = inputs && typeof inputs === 'object' ? inputs : {}
-      const inputEntries = Object.entries(safeInputs)
-      if (inputEntries.length === 0) return null
-
-      /**
-       * Format a value for display - handles objects, arrays, and primitives
-       */
-      const formatValue = (value: unknown): string => {
-        if (value === null || value === undefined) return '-'
-        if (typeof value === 'string') return value || '-'
-        if (typeof value === 'number' || typeof value === 'boolean') return String(value)
-        try {
-          return JSON.stringify(value, null, 2)
-        } catch {
-          return String(value)
-        }
-      }
-
-      /**
-       * Check if a value is a complex type (object or array)
-       */
-      const isComplex = (value: unknown): boolean => {
-        return typeof value === 'object' && value !== null
-      }
-
-      return (
-        <div className='mt-1.5 w-full overflow-hidden rounded-md border border-[var(--border-1)] bg-[var(--surface-1)]'>
-          {/* Header */}
-          <div className='flex items-center gap-[8px] border-[var(--border-1)] border-b bg-[var(--surface-2)] p-[8px]'>
-            <span className='font-medium text-[12px] text-[var(--text-primary)]'>Input</span>
-            <span className='flex-shrink-0 font-medium text-[12px] text-[var(--text-tertiary)]'>
-              {inputEntries.length}
-            </span>
-          </div>
-          {/* Input entries */}
-          <div className='flex flex-col'>
-            {inputEntries.map(([key, value], index) => {
-              const formattedValue = formatValue(value)
-              const needsCodeViewer = isComplex(value)
-
-              return (
-                <div
-                  key={key}
-                  className={clsx(
-                    'flex flex-col gap-1 px-[10px] py-[6px]',
-                    index > 0 && 'border-[var(--border-1)] border-t'
-                  )}
-                >
-                  {/* Input key */}
-                  <span className='font-medium text-[11px] text-[var(--text-primary)]'>{key}</span>
-                  {/* Value display */}
-                  {needsCodeViewer ? (
-                    <Code.Viewer
-                      code={formattedValue}
-                      language='json'
-                      showGutter={false}
-                      className='max-h-[80px] min-h-0'
-                    />
-                  ) : (
-                    <span className='font-mono text-[11px] text-[var(--text-muted)] leading-[1.3]'>
-                      {formattedValue}
-                    </span>
-                  )}
-                </div>
-              )
-            })}
-          </div>
-        </div>
-      )
-    }
-
-    return null
-  }
-
-  // For edit_workflow, only show the WorkflowEditSummary component (replaces text display)
-  const isEditWorkflow = toolCall.name === 'edit_workflow'
-  const hasOperations = Array.isArray(params.operations) && params.operations.length > 0
-
-  return (
-    <div className='py-0.5'>
-      {/* Hide text display for edit_workflow when we have operations to show in summary */}
-      {!(isEditWorkflow && hasOperations) && (
-        <ShimmerOverlayText
-          text={displayName}
-          active={isLoading && !showButtons}
-          isSpecial={isSpecial}
-          className='font-[470] font-season text-[12px] text-[var(--text-tertiary)]'
-        />
-      )}
-      {renderSubAgentTable()}
-      {/* WorkflowEditSummary is rendered outside SubAgentContent for edit subagent */}
-      {showButtons && <RunSkipButtons toolCall={toolCall} />}
-    </div>
-  )
-}
-
-/**
- * Get display name for subagent tool calls
- */
-function getDisplayNameForSubAgent(toolCall: CopilotToolCall): string {
-  const fromStore = toolCall.display?.text
-  if (fromStore) return fromStore
-
-  const stateVerb = getStateVerb(toolCall.state)
-  const formattedName = formatToolName(toolCall.name)
-  return `${stateVerb} ${formattedName}`
-}
-
-/**
- * Max height for subagent content before internal scrolling kicks in
- */
-const SUBAGENT_MAX_HEIGHT = 200
-
-/**
- * Interval for auto-scroll during streaming (ms)
- */
-const SUBAGENT_SCROLL_INTERVAL = 100
+})
 
 /**
  * Get the outer collapse header label for completed subagent tools.
@@ -882,236 +633,6 @@ function getSubagentCompletionLabel(toolName: string): string {
   return labels?.completed ?? 'Thought'
 }
 
-/**
- * Get display labels for subagent tools.
- * Uses the tool's UI config.
- */
-function getSubagentLabels(toolName: string, isStreaming: boolean): string {
-  const labels = getSubagentLabelsFromConfig(toolName, isStreaming)
-  if (labels) {
-    return isStreaming ? labels.streaming : labels.completed
-  }
-  return isStreaming ? 'Processing' : 'Processed'
-}
-
-/**
- * SubAgentContent renders the streamed content and tool calls from a subagent
- * with thinking-style styling (same as ThinkingBlock).
- * Auto-collapses when streaming ends and has internal scrolling for long content.
- */
-function SubAgentContent({
-  blocks,
-  isStreaming = false,
-  toolName = 'debug',
-}: {
-  blocks?: SubAgentContentBlock[]
-  isStreaming?: boolean
-  toolName?: string
-}) {
-  const [isExpanded, setIsExpanded] = useState(false)
-  const [userHasScrolledAway, setUserHasScrolledAway] = useState(false)
-  const userCollapsedRef = useRef<boolean>(false)
-  const scrollContainerRef = useRef<HTMLDivElement>(null)
-  const lastScrollTopRef = useRef(0)
-  const programmaticScrollRef = useRef(false)
-
-  // Check if there are any tool calls (which means thinking should close)
-  const hasToolCalls = useMemo(() => {
-    if (!blocks) return false
-    return blocks.some((b) => b.type === 'subagent_tool_call' && b.toolCall)
-  }, [blocks])
-
-  // Auto-expand when streaming with content, auto-collapse when done or when tool call comes in
-  useEffect(() => {
-    if (!isStreaming || hasToolCalls) {
-      setIsExpanded(false)
-      userCollapsedRef.current = false
-      setUserHasScrolledAway(false)
-      return
-    }
-
-    if (!userCollapsedRef.current && blocks && blocks.length > 0) {
-      setIsExpanded(true)
-    }
-  }, [isStreaming, blocks, hasToolCalls])
-
-  // Handle scroll events to detect user scrolling away
-  useEffect(() => {
-    const container = scrollContainerRef.current
-    if (!container || !isExpanded) return
-
-    const handleScroll = () => {
-      if (programmaticScrollRef.current) return
-
-      const { scrollTop, scrollHeight, clientHeight } = container
-      const distanceFromBottom = scrollHeight - scrollTop - clientHeight
-      const isNearBottom = distanceFromBottom <= 20
-
-      const delta = scrollTop - lastScrollTopRef.current
-      const movedUp = delta < -2
-
-      if (movedUp && !isNearBottom) {
-        setUserHasScrolledAway(true)
-      }
-
-      // Re-stick if user scrolls back to bottom
-      if (userHasScrolledAway && isNearBottom) {
-        setUserHasScrolledAway(false)
-      }
-
-      lastScrollTopRef.current = scrollTop
-    }
-
-    container.addEventListener('scroll', handleScroll, { passive: true })
-    lastScrollTopRef.current = container.scrollTop
-
-    return () => container.removeEventListener('scroll', handleScroll)
-  }, [isExpanded, userHasScrolledAway])
-
-  // Smart auto-scroll: only scroll if user hasn't scrolled away
-  useEffect(() => {
-    if (!isStreaming || !isExpanded || userHasScrolledAway) return
-
-    const intervalId = window.setInterval(() => {
-      const container = scrollContainerRef.current
-      if (!container) return
-
-      const { scrollTop, scrollHeight, clientHeight } = container
-      const distanceFromBottom = scrollHeight - scrollTop - clientHeight
-      const isNearBottom = distanceFromBottom <= 50
-
-      if (isNearBottom) {
-        programmaticScrollRef.current = true
-        container.scrollTo({
-          top: container.scrollHeight,
-          behavior: 'smooth',
-        })
-        window.setTimeout(() => {
-          programmaticScrollRef.current = false
-        }, 150)
-      }
-    }, SUBAGENT_SCROLL_INTERVAL)
-
-    return () => window.clearInterval(intervalId)
-  }, [isStreaming, isExpanded, userHasScrolledAway])
-
-  if (!blocks || blocks.length === 0) return null
-
-  const hasContent = blocks.length > 0
-  // Show "done" label when streaming ends OR when tool calls are present
-  const isThinkingDone = !isStreaming || hasToolCalls
-  const label = getSubagentLabels(toolName, !isThinkingDone)
-
-  return (
-    <div>
-      {/* Define shimmer keyframes */}
-      {!isThinkingDone && (
-        <style>{`
-          @keyframes thinking-shimmer {
-            0% { background-position: 150% 0; }
-            50% { background-position: 0% 0; }
-            100% { background-position: -150% 0; }
-          }
-        `}</style>
-      )}
-      <button
-        onClick={() => {
-          setIsExpanded((v) => {
-            const next = !v
-            if (!next && isStreaming) userCollapsedRef.current = true
-            return next
-          })
-        }}
-        className='group inline-flex items-center gap-1 text-left font-[470] font-season text-[var(--text-secondary)] text-sm transition-colors hover:text-[var(--text-primary)]'
-        type='button'
-        disabled={!hasContent}
-      >
-        <span className='relative inline-block'>
-          <span className='text-[var(--text-tertiary)]'>{label}</span>
-          {!isThinkingDone && (
-            <span
-              aria-hidden='true'
-              className='pointer-events-none absolute inset-0 select-none overflow-hidden'
-            >
-              <span
-                className='block text-transparent'
-                style={{
-                  backgroundImage:
-                    'linear-gradient(90deg, rgba(255,255,255,0) 0%, rgba(255,255,255,0.85) 50%, rgba(255,255,255,0) 100%)',
-                  backgroundSize: '200% 100%',
-                  backgroundRepeat: 'no-repeat',
-                  WebkitBackgroundClip: 'text',
-                  backgroundClip: 'text',
-                  animation: 'thinking-shimmer 1.4s ease-in-out infinite',
-                  mixBlendMode: 'screen',
-                }}
-              >
-                {label}
-              </span>
-            </span>
-          )}
-        </span>
-        {hasContent && (
-          <ChevronUp
-            className={clsx(
-              'h-3 w-3 transition-all group-hover:opacity-100',
-              isExpanded ? 'rotate-180 opacity-100' : 'rotate-90 opacity-0'
-            )}
-            aria-hidden='true'
-          />
-        )}
-      </button>
-
-      <div
-        ref={scrollContainerRef}
-        className={clsx(
-          'overflow-y-auto transition-all duration-150 ease-out',
-          isExpanded ? 'mt-1.5 max-h-[200px] opacity-100' : 'max-h-0 opacity-0'
-        )}
-      >
-        {blocks.map((block, index) => {
-          if (block.type === 'subagent_text' && block.content) {
-            const isLastBlock = index === blocks.length - 1
-            // Strip special tags from display (they're rendered separately)
-            const parsed = parseSpecialTags(block.content)
-            const displayContent = parsed.cleanContent
-            if (!displayContent) return null
-            return (
-              <pre
-                key={`subagent-text-${index}`}
-                className='whitespace-pre-wrap font-[470] font-season text-[12px] text-[var(--text-tertiary)] leading-[1.15rem]'
-              >
-                {displayContent}
-                {!isThinkingDone && isLastBlock && (
-                  <span className='ml-1 inline-block h-2 w-1 animate-pulse bg-[var(--text-tertiary)]' />
-                )}
-              </pre>
-            )
-          }
-
-          // All tool calls are rendered at top level, skip here
-          return null
-        })}
-      </div>
-
-      {/* Render PlanSteps for plan subagent when content contains <plan> tag */}
-      {toolName === 'plan' &&
-        (() => {
-          // Combine all text content from blocks
-          const allText = blocks
-            .filter((b) => b.type === 'subagent_text' && b.content)
-            .map((b) => b.content)
-            .join('')
-          const parsed = parseSpecialTags(allText)
-          if (parsed.plan && Object.keys(parsed.plan).length > 0) {
-            return <PlanSteps steps={parsed.plan} streaming={!isThinkingDone} />
-          }
-          return null
-        })()}
-    </div>
-  )
-}
-
 /**
  * SubAgentThinkingContent renders subagent blocks as simple thinking text (ThinkingBlock).
  * Used for inline rendering within regular tool calls that have subagent content.
@@ -1123,7 +644,6 @@ function SubAgentThinkingContent({
   blocks: SubAgentContentBlock[]
   isStreaming?: boolean
 }) {
-  // Combine all text content from blocks
   let allRawText = ''
   let cleanText = ''
   for (const block of blocks) {
@@ -1134,12 +654,10 @@ function SubAgentThinkingContent({
     }
   }
 
-  // Parse plan from all text
   const allParsed = parseSpecialTags(allRawText)
 
   if (!cleanText.trim() && !allParsed.plan) return null
 
-  // Check if special tags are present
   const hasSpecialTags = !!(allParsed.plan && Object.keys(allParsed.plan).length > 0)
 
   return (
@@ -1172,7 +690,7 @@ const COLLAPSIBLE_SUBAGENTS = new Set(['plan', 'debug', 'research'])
  * - When done (not streaming): Most subagents stay expanded, only specific ones collapse
  * - Exception: plan, debug, research, info subagents collapse into a header
  */
-function SubagentContentRenderer({
+const SubagentContentRenderer = memo(function SubagentContentRenderer({
   toolCall,
   shouldCollapse,
 }: {
@@ -1182,36 +700,26 @@ function SubagentContentRenderer({
   const [isExpanded, setIsExpanded] = useState(true)
   const [duration, setDuration] = useState(0)
   const startTimeRef = useRef<number>(Date.now())
+  const wasStreamingRef = useRef(false)
 
   const isStreaming = !!toolCall.subAgentStreaming
 
-  // Reset start time when streaming begins
   useEffect(() => {
-    if (isStreaming) {
+    if (isStreaming && !wasStreamingRef.current) {
       startTimeRef.current = Date.now()
-      setDuration(0)
-    }
-  }, [isStreaming])
-
-  // Update duration timer during streaming
-  useEffect(() => {
-    if (!isStreaming) return
-
-    const interval = setInterval(() => {
+      wasStreamingRef.current = true
+    } else if (!isStreaming && wasStreamingRef.current) {
       setDuration(Date.now() - startTimeRef.current)
-    }, 100)
-
-    return () => clearInterval(interval)
+      wasStreamingRef.current = false
+    }
   }, [isStreaming])
 
-  // Auto-collapse when streaming ends (only for collapsible subagents)
   useEffect(() => {
     if (!isStreaming && shouldCollapse) {
       setIsExpanded(false)
     }
   }, [isStreaming, shouldCollapse])
 
-  // Build segments: each segment is either text content or a tool call
   const segments: Array<
     { type: 'text'; content: string } | { type: 'tool'; block: SubAgentContentBlock }
   > = []
@@ -1235,7 +743,6 @@ function SubagentContentRenderer({
     segments.push({ type: 'text', content: currentText })
   }
 
-  // Parse plan and options
   const allParsed = parseSpecialTags(allRawText)
   const hasSpecialTags = !!(
     (allParsed.plan && Object.keys(allParsed.plan).length > 0) ||
@@ -1247,15 +754,11 @@ function SubagentContentRenderer({
     return `${seconds}s`
   }
 
-  // Outer header uses subagent-specific label
   const outerLabel = getSubagentCompletionLabel(toolCall.name)
   const durationText = `${outerLabel} for ${formatDuration(duration)}`
 
-  // Check if we have a plan to render outside the collapsible
   const hasPlan = allParsed.plan && Object.keys(allParsed.plan).length > 0
 
-  // Render the collapsible content (thinking blocks + tool calls, NOT plan)
-  // Inner thinking text always uses "Thought" label
   const renderCollapsibleContent = () => (
     <>
       {segments.map((segment, index) => {
@@ -1275,7 +778,6 @@ function SubagentContentRenderer({
           )
         }
         if (segment.type === 'tool' && segment.block.toolCall) {
-          // For edit subagent's edit_workflow tool: only show the diff summary, skip the tool call header
           if (toolCall.name === 'edit' && segment.block.toolCall.name === 'edit_workflow') {
             return (
               <div key={`tool-${segment.block.toolCall.id || index}`}>
@@ -1294,7 +796,6 @@ function SubagentContentRenderer({
     </>
   )
 
-  // During streaming OR for non-collapsible subagents: show content at top level
   if (isStreaming || !shouldCollapse) {
     return (
       <div className='w-full space-y-1.5'>
@@ -1304,8 +805,6 @@ function SubagentContentRenderer({
     )
   }
 
-  // Completed collapsible subagent (plan, debug, research, info): show collapsible header
-  // Plan artifact stays outside the collapsible
   return (
     <div className='w-full'>
       <button
@@ -1336,7 +835,7 @@ function SubagentContentRenderer({
       {hasPlan && <PlanSteps steps={allParsed.plan!} />}
     </div>
   )
-}
+})
 
 /**
  * Determines if a tool call is "special" and should display with gradient styling.
@@ -1351,15 +850,15 @@ function isSpecialToolCall(toolCall: CopilotToolCall): boolean {
  * Displays: workflow name with stats (+N green, N orange, -N red)
  * Expands inline on click to show individual blocks with their icons.
  */
-function WorkflowEditSummary({ toolCall }: { toolCall: CopilotToolCall }) {
-  // Get block data from current workflow state
+const WorkflowEditSummary = memo(function WorkflowEditSummary({
+  toolCall,
+}: {
+  toolCall: CopilotToolCall
+}) {
   const blocks = useWorkflowStore((s) => s.blocks)
 
-  // Cache block info on first render (before diff is applied) so we can show
-  // deleted blocks properly even after they're removed from the workflow
   const cachedBlockInfoRef = useRef<Record<string, { name: string; type: string }>>({})
 
-  // Update cache with current block info (only add, never remove)
   useEffect(() => {
     for (const [blockId, block] of Object.entries(blocks)) {
       if (!cachedBlockInfoRef.current[blockId]) {
@@ -1371,22 +870,18 @@ function WorkflowEditSummary({ toolCall }: { toolCall: CopilotToolCall }) {
     }
   }, [blocks])
 
-  // Show for edit_workflow regardless of state
   if (toolCall.name !== 'edit_workflow') {
     return null
   }
 
-  // Extract operations from tool call params
   const params =
     (toolCall as any).parameters || (toolCall as any).input || (toolCall as any).params || {}
   let operations = Array.isArray(params.operations) ? params.operations : []
 
-  // Fallback: check if operations are at top level of toolCall
   if (operations.length === 0 && Array.isArray((toolCall as any).operations)) {
     operations = (toolCall as any).operations
   }
 
-  // Group operations by type with block info
   interface SubBlockPreview {
     id: string
     title: string
@@ -1412,25 +907,20 @@ function WorkflowEditSummary({ toolCall }: { toolCall: CopilotToolCall }) {
     const blockId = op.block_id
     if (!blockId) continue
 
-    // Get block info from current workflow state, cached state, or operation params
     const currentBlock = blocks[blockId]
     const cachedBlock = cachedBlockInfoRef.current[blockId]
     let blockName = currentBlock?.name || cachedBlock?.name || ''
     let blockType = currentBlock?.type || cachedBlock?.type || ''
 
-    // For add operations, get info from params (type is stored as params.type)
     if (op.operation_type === 'add' && op.params) {
       blockName = blockName || op.params.name || ''
       blockType = blockType || op.params.type || ''
     }
 
-    // For edit operations, also check params.type if block not in current state
     if (op.operation_type === 'edit' && op.params && !blockType) {
       blockType = op.params.type || ''
     }
 
-    // Skip edge-only edit operations (like how we don't highlight blocks on canvas for edge changes)
-    // An edit is edge-only if params only contains 'connections' and nothing else meaningful
     if (op.operation_type === 'edit' && op.params) {
       const paramKeys = Object.keys(op.params)
       const isEdgeOnlyEdit = paramKeys.length === 1 && paramKeys[0] === 'connections'
@@ -1439,9 +929,7 @@ function WorkflowEditSummary({ toolCall }: { toolCall: CopilotToolCall }) {
       }
     }
 
-    // For delete operations, check if block info was provided in operation
     if (op.operation_type === 'delete') {
-      // Some delete operations may include block_name and block_type
       blockName = blockName || op.block_name || ''
       blockType = blockType || op.block_type || ''
     }
@@ -1453,16 +941,12 @@ function WorkflowEditSummary({ toolCall }: { toolCall: CopilotToolCall }) {
 
     const change: BlockChange = { blockId, blockName, blockType }
 
-    // Extract subblock info from operation params, ordered by block config
     if (op.params?.inputs && typeof op.params.inputs === 'object') {
       const inputs = op.params.inputs as Record<string, unknown>
       const blockConfig = getBlock(blockType)
 
-      // Build subBlocks array
       const subBlocks: SubBlockPreview[] = []
 
-      // Special handling for condition blocks - parse conditions JSON and render as separate rows
-      // This matches how the canvas renders condition blocks with "if", "else if", "else" rows
       if (blockType === 'condition' && 'conditions' in inputs) {
         const conditionsValue = inputs.conditions
         const raw = typeof conditionsValue === 'string' ? conditionsValue : undefined
@@ -1484,35 +968,26 @@ function WorkflowEditSummary({ toolCall }: { toolCall: CopilotToolCall }) {
             }
           }
         } catch {
-          // Fallback: show default if/else
           subBlocks.push({ id: 'if', title: 'if', value: '', isPassword: false })
           subBlocks.push({ id: 'else', title: 'else', value: '', isPassword: false })
         }
       } else {
-        // Filter visible subblocks from config (same logic as canvas preview)
         const visibleSubBlocks =
           blockConfig?.subBlocks?.filter((sb) => {
-            // Skip hidden subblocks
             if (sb.hidden) return false
             if (sb.hideFromPreview) return false
-            // Skip advanced mode subblocks (not visible by default)
             if (sb.mode === 'advanced') return false
-            // Skip trigger mode subblocks
             if (sb.mode === 'trigger') return false
             return true
           }) ?? []
 
-        // Track seen ids to dedupe (same pattern as canvas preview using id as key)
         const seenIds = new Set<string>()
 
-        // Add subblocks that are visible in config, in config order (first config per id wins)
         for (const subBlockConfig of visibleSubBlocks) {
-          // Skip if we've already added this id (handles configs with same id but different conditions)
           if (seenIds.has(subBlockConfig.id)) continue
 
           if (subBlockConfig.id in inputs) {
             const value = inputs[subBlockConfig.id]
-            // Skip empty values and connections
             if (value === null || value === undefined || value === '') continue
             seenIds.add(subBlockConfig.id)
             subBlocks.push({
@@ -1553,12 +1028,10 @@ function WorkflowEditSummary({ toolCall }: { toolCall: CopilotToolCall }) {
     return null
   }
 
-  // Get block config by type (for icon and bgColor)
   const getBlockConfig = (blockType: string) => {
     return getBlock(blockType)
   }
 
-  // Render a single block item with action icon and details
   const renderBlockItem = (change: BlockChange, type: 'add' | 'edit' | 'delete') => {
     const blockConfig = getBlockConfig(change.blockType)
     const Icon = blockConfig?.icon
@@ -1631,23 +1104,20 @@ function WorkflowEditSummary({ toolCall }: { toolCall: CopilotToolCall }) {
       {deletedBlocks.map((change) => renderBlockItem(change, 'delete'))}
     </div>
   )
-}
+})
 
 /**
  * Checks if a tool is an integration tool (server-side executed, not a client tool)
  */
 function isIntegrationTool(toolName: string): boolean {
-  // Any tool NOT in CLASS_TOOL_METADATA is an integration tool (server-side execution)
   return !CLASS_TOOL_METADATA[toolName]
 }
 
 function shouldShowRunSkipButtons(toolCall: CopilotToolCall): boolean {
-  // First check UI config for interrupt
   if (hasInterruptFromConfig(toolCall.name) && toolCall.state === 'pending') {
     return true
   }
 
-  // Then check instance-level interrupt
   const instance = getClientTool(toolCall.id)
   let hasInterrupt = !!instance?.getInterruptDisplays?.()
   if (!hasInterrupt) {
@@ -1662,12 +1132,10 @@ function shouldShowRunSkipButtons(toolCall: CopilotToolCall): boolean {
     } catch {}
   }
 
-  // Show buttons for client tools with interrupts
   if (hasInterrupt && toolCall.state === 'pending') {
     return true
   }
 
-  // Always show buttons for integration tools in pending state (they need user confirmation)
   const mode = useCopilotStore.getState().mode
   if (mode === 'build' && isIntegrationTool(toolCall.name) && toolCall.state === 'pending') {
     return true
@@ -1684,19 +1152,14 @@ async function handleRun(
 ) {
   const instance = getClientTool(toolCall.id)
 
-  // Handle integration tools (server-side execution)
   if (!instance && isIntegrationTool(toolCall.name)) {
-    // Set executing state immediately for UI feedback
     setToolCallState(toolCall, 'executing')
     onStateChange?.('executing')
     try {
       await useCopilotStore.getState().executeIntegrationTool(toolCall.id)
-      // Note: executeIntegrationTool handles success/error state updates internally
     } catch (e) {
-      // If executeIntegrationTool throws, ensure we update state to error
       setToolCallState(toolCall, 'error', { error: e instanceof Error ? e.message : String(e) })
       onStateChange?.('error')
-      // Notify backend about the error so agent doesn't hang
       try {
         await fetch('/api/copilot/tools/mark-complete', {
           method: 'POST',
@@ -1710,7 +1173,6 @@ async function handleRun(
           }),
         })
       } catch {
-        // Last resort: log error if we can't notify backend
         console.error('[handleRun] Failed to notify backend of tool error:', toolCall.id)
       }
     }
@@ -1735,13 +1197,10 @@ async function handleRun(
 async function handleSkip(toolCall: CopilotToolCall, setToolCallState: any, onStateChange?: any) {
   const instance = getClientTool(toolCall.id)
 
-  // Handle integration tools (skip by marking as rejected and notifying backend)
   if (!instance && isIntegrationTool(toolCall.name)) {
     setToolCallState(toolCall, 'rejected')
     onStateChange?.('rejected')
 
-    // Notify backend that tool was skipped - this is CRITICAL for the agent to continue
-    // Retry up to 3 times if the notification fails
     let notified = false
     for (let attempt = 0; attempt < 3 && !notified; attempt++) {
       try {
@@ -1760,7 +1219,6 @@ async function handleSkip(toolCall: CopilotToolCall, setToolCallState: any, onSt
           notified = true
         }
       } catch (e) {
-        // Wait briefly before retry
         if (attempt < 2) {
           await new Promise((resolve) => setTimeout(resolve, 500))
         }
@@ -1783,7 +1241,6 @@ async function handleSkip(toolCall: CopilotToolCall, setToolCallState: any, onSt
 }
 
 function getDisplayName(toolCall: CopilotToolCall): string {
-  // Prefer display resolved in the copilot store (SSOT)
   const fromStore = (toolCall as any).display?.text
   if (fromStore) return fromStore
   try {
@@ -1792,8 +1249,6 @@ function getDisplayName(toolCall: CopilotToolCall): string {
     if (byState?.text) return byState.text
   } catch {}
 
-  // For integration tools, format the tool name nicely
-  // e.g., "google_calendar_list_events" -> "Running Google Calendar List Events"
   const stateVerb = getStateVerb(toolCall.state)
   const formattedName = formatToolName(toolCall.name)
   return `${stateVerb} ${formattedName}`
@@ -2308,11 +1763,9 @@ export function ToolCall({ toolCall: toolCallProp, toolCallId, onStateChange }:
     }
 
     if (toolCall.name === 'run_workflow') {
-      // Get inputs - could be in multiple locations
       let inputs = editedParams.input || editedParams.inputs || editedParams.workflow_input
       let isNestedInWorkflowInput = false
 
-      // If input is a JSON string, parse it
       if (typeof inputs === 'string') {
         try {
           inputs = JSON.parse(inputs)
@@ -2321,13 +1774,11 @@ export function ToolCall({ toolCall: toolCallProp, toolCallId, onStateChange }:
         }
       }
 
-      // Check if workflow_input exists and contains the actual inputs
       if (editedParams.workflow_input && typeof editedParams.workflow_input === 'object') {
         inputs = editedParams.workflow_input
         isNestedInWorkflowInput = true
       }
 
-      // If no inputs object found, treat base editedParams as inputs (excluding system fields)
       if (!inputs || typeof inputs !== 'object') {
         const { workflowId, workflow_input, ...rest } = editedParams
         inputs = rest
@@ -2336,7 +1787,6 @@ export function ToolCall({ toolCall: toolCallProp, toolCallId, onStateChange }:
       const safeInputs = inputs && typeof inputs === 'object' ? inputs : {}
       const inputEntries = Object.entries(safeInputs)
 
-      // Don't show the section if there are no inputs
       if (inputEntries.length === 0) {
         return null
       }
@@ -2348,7 +1798,6 @@ export function ToolCall({ toolCall: toolCallProp, toolCallId, onStateChange }:
         if (value === null || value === undefined) return ''
         if (typeof value === 'string') return value
         if (typeof value === 'number' || typeof value === 'boolean') return String(value)
-        // For objects and arrays, use JSON.stringify with formatting
         try {
           return JSON.stringify(value, null, 2)
         } catch {
@@ -2360,11 +1809,9 @@ export function ToolCall({ toolCall: toolCallProp, toolCallId, onStateChange }:
        * Parse a string value back to its original type if possible
        */
       const parseInputValue = (value: string, originalValue: unknown): unknown => {
-        // If original was a primitive, keep as string
         if (typeof originalValue !== 'object' || originalValue === null) {
           return value
         }
-        // Try to parse as JSON for objects/arrays
         try {
           return JSON.parse(value)
         } catch {
@@ -2473,7 +1920,6 @@ export function ToolCall({ toolCall: toolCallProp, toolCallId, onStateChange }:
     return null
   }
 
-  // Special handling for tools with alwaysExpanded config (e.g., set_environment_variables)
   const isAlwaysExpanded = toolUIConfig?.alwaysExpanded
   if (
     (isAlwaysExpanded || toolCall.name === 'set_environment_variables') &&
@@ -2531,7 +1977,6 @@ export function ToolCall({ toolCall: toolCallProp, toolCallId, onStateChange }:
     )
   }
 
-  // Special rendering for tools with 'code' customRenderer (e.g., function_execute)
   if (toolUIConfig?.customRenderer === 'code' || toolCall.name === 'function_execute') {
     const code = params.code || ''
     const isFunctionExecuteClickable = isAutoAllowed
@@ -2593,7 +2038,6 @@ export function ToolCall({ toolCall: toolCallProp, toolCallId, onStateChange }:
     )
   }
 
-  // Determine if tool name should be clickable (expandable tools or auto-allowed integration tools)
   const isToolNameClickable = isExpandableTool || isAutoAllowed
 
   const handleToolNameClick = () => {
@@ -2604,7 +2048,6 @@ export function ToolCall({ toolCall: toolCallProp, toolCallId, onStateChange }:
     }
   }
 
-  // For edit_workflow, hide text display when we have operations (WorkflowEditSummary replaces it)
   const isEditWorkflow = toolCall.name === 'edit_workflow'
   const hasOperations = Array.isArray(params.operations) && params.operations.length > 0
   const hideTextForEditWorkflow = isEditWorkflow && hasOperations
@@ -2649,13 +2092,11 @@ export function ToolCall({ toolCall: toolCallProp, toolCallId, onStateChange }:
             onClick={async () => {
               try {
                 const instance = getClientTool(toolCall.id)
-                // Transition to background state locally so UI updates immediately
                 instance?.setState?.((ClientToolCallState as any).background)
                 await instance?.markToolComplete?.(
                   200,
                   'The user has chosen to move the workflow execution to the background. Check back with them later to know when the workflow execution is complete'
                 )
-                // Optionally force a re-render; store should sync state from server
                 forceUpdate({})
                 onStateChange?.('background')
               } catch {}
@@ -2672,21 +2113,16 @@ export function ToolCall({ toolCall: toolCallProp, toolCallId, onStateChange }:
             onClick={async () => {
               try {
                 const instance = getClientTool(toolCall.id)
-                // Get elapsed seconds before waking
                 const elapsedSeconds = instance?.getElapsedSeconds?.() || 0
-                // Transition to background state locally so UI updates immediately
-                // Pass elapsed seconds in the result so dynamic text can use it
                 instance?.setState?.((ClientToolCallState as any).background, {
                   result: { _elapsedSeconds: elapsedSeconds },
                 })
-                // Update the tool call params in the store to include elapsed time for display
                 const { updateToolCallParams } = useCopilotStore.getState()
                 updateToolCallParams?.(toolCall.id, { _elapsedSeconds: Math.round(elapsedSeconds) })
                 await instance?.markToolComplete?.(
                   200,
                   `User woke you up after ${Math.round(elapsedSeconds)} seconds`
                 )
-                // Optionally force a re-render; store should sync state from server
                 forceUpdate({})
                 onStateChange?.('background')
               } catch {}
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/user-input/hooks/use-mention-data.ts b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/user-input/hooks/use-mention-data.ts
index cea9a5ce34..15f5007b6b 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/user-input/hooks/use-mention-data.ts
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/user-input/hooks/use-mention-data.ts
@@ -151,7 +151,7 @@ export function useMentionData(props: UseMentionDataProps): MentionDataReturn {
     useShallow(useCallback((state) => Object.keys(state.blocks), []))
   )
 
-  const registryWorkflows = useWorkflowRegistry((state) => state.workflows)
+  const registryWorkflows = useWorkflowRegistry(useShallow((state) => state.workflows))
   const hydrationPhase = useWorkflowRegistry((state) => state.hydration.phase)
   const isLoadingWorkflows =
     hydrationPhase === 'idle' ||
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/user-input/hooks/use-mention-tokens.ts b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/user-input/hooks/use-mention-tokens.ts
index cfc448d1aa..fc82f845db 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/user-input/hooks/use-mention-tokens.ts
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/user-input/hooks/use-mention-tokens.ts
@@ -1,4 +1,4 @@
-import { useCallback } from 'react'
+import { useCallback, useMemo } from 'react'
 import type { useMentionMenu } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/user-input/hooks/use-mention-menu'
 import type { ChatContext } from '@/stores/panel'
 
@@ -39,11 +39,11 @@ export function useMentionTokens({
   setSelectedContexts,
 }: UseMentionTokensProps) {
   /**
-   * Computes all mention ranges in the message (both @mentions and /commands)
-   *
-   * @returns Array of mention ranges sorted by start position
+   * Memoized mention ranges - computed once when message or selectedContexts change.
+   * This prevents expensive O(n×m) string searches from running on every keystroke
+   * when other callbacks access the ranges.
    */
-  const computeMentionRanges = useCallback((): MentionRange[] => {
+  const memoizedMentionRanges = useMemo((): MentionRange[] => {
     const ranges: MentionRange[] = []
     if (!message || selectedContexts.length === 0) return ranges
 
@@ -93,35 +93,45 @@ export function useMentionTokens({
 
   /**
    * Finds a mention range containing the given position
+   */
+  const computeMentionRanges = useCallback(
+    (): MentionRange[] => memoizedMentionRanges,
+    [memoizedMentionRanges]
+  )
+
+  /**
+   * Finds a mention range containing the given position.
+   * Uses memoized ranges directly for better performance.
    *
    * @param pos - Position to check
    * @returns Mention range if found, undefined otherwise
    */
   const findRangeContaining = useCallback(
     (pos: number): MentionRange | undefined => {
-      const ranges = computeMentionRanges()
-      return ranges.find((r) => pos > r.start && pos < r.end)
+      return memoizedMentionRanges.find((r) => pos > r.start && pos < r.end)
     },
-    [computeMentionRanges]
+    [memoizedMentionRanges]
   )
 
   /**
-   * Removes contexts for mention tokens that overlap with a text selection
+   * Removes contexts for mention tokens that overlap with a text selection.
+   * Uses memoized ranges directly for better performance.
    *
    * @param selStart - Selection start position
    * @param selEnd - Selection end position
    */
   const removeContextsInSelection = useCallback(
     (selStart: number, selEnd: number) => {
-      const ranges = computeMentionRanges()
-      const overlappingRanges = ranges.filter((r) => !(selEnd <= r.start || selStart >= r.end))
+      const overlappingRanges = memoizedMentionRanges.filter(
+        (r) => !(selEnd <= r.start || selStart >= r.end)
+      )
 
       if (overlappingRanges.length > 0) {
         const labelsToRemove = new Set(overlappingRanges.map((r) => r.label))
         setSelectedContexts((prev) => prev.filter((c) => !c.label || !labelsToRemove.has(c.label)))
       }
     },
-    [computeMentionRanges, setSelectedContexts]
+    [memoizedMentionRanges, setSelectedContexts]
   )
 
   /**
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/user-input/user-input.tsx b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/user-input/user-input.tsx
index 11a8574aef..3636c6b29b 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/user-input/user-input.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/copilot/components/user-input/user-input.tsx
@@ -655,6 +655,13 @@ const UserInput = forwardRef<UserInputRef, UserInputProps>(
       [insertTriggerAndOpenMenu]
     )
 
+    const handleModelSelect = useCallback(
+      (model: string) => {
+        setSelectedModel(model as any)
+      },
+      [setSelectedModel]
+    )
+
     const canSubmit = message.trim().length > 0 && !disabled && !isLoading
     const showAbortButton = isLoading && onAbort
 
@@ -863,7 +870,7 @@ const UserInput = forwardRef<UserInputRef, UserInputProps>(
               <ModelSelector
                 selectedModel={selectedModel}
                 isNearTop={isNearTop}
-                onModelSelect={(model: string) => setSelectedModel(model as any)}
+                onModelSelect={handleModelSelect}
               />
             </div>
 
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/deploy/components/deploy-modal/components/a2a/a2a.tsx b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/deploy/components/deploy-modal/components/a2a/a2a.tsx
index 204e6c5259..b4829b903e 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/deploy/components/deploy-modal/components/a2a/a2a.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/deploy/components/deploy-modal/components/a2a/a2a.tsx
@@ -11,8 +11,6 @@ import {
   ButtonGroupItem,
   Checkbox,
   Code,
-  Combobox,
-  type ComboboxOption,
   Input,
   Label,
   TagInput,
@@ -271,14 +269,6 @@ export function A2aDeploy({
     onNeedsRepublishChange?.(!!needsRepublish)
   }, [needsRepublish, onNeedsRepublishChange])
 
-  const authSchemeOptions: ComboboxOption[] = useMemo(
-    () => [
-      { label: 'API Key', value: 'apiKey' },
-      { label: 'None (Public)', value: 'none' },
-    ],
-    []
-  )
-
   const canSave = name.trim().length > 0 && description.trim().length > 0
   useEffect(() => {
     onCanSaveChange?.(canSave)
@@ -758,17 +748,18 @@ console.log(data);`
         />
       </div>
 
-      {/* Authentication */}
+      {/* Access */}
       <div>
         <Label className='mb-[6.5px] block pl-[2px] font-medium text-[13px] text-[var(--text-primary)]'>
-          Authentication
+          Access
         </Label>
-        <Combobox
-          options={authSchemeOptions}
+        <ButtonGroup
           value={authScheme}
-          onChange={(v) => setAuthScheme(v as AuthScheme)}
-          placeholder='Select authentication...'
-        />
+          onValueChange={(value) => setAuthScheme(value as AuthScheme)}
+        >
+          <ButtonGroupItem value='apiKey'>API Key</ButtonGroupItem>
+          <ButtonGroupItem value='none'>Public</ButtonGroupItem>
+        </ButtonGroup>
         <p className='mt-[6.5px] text-[11px] text-[var(--text-secondary)]'>
           {authScheme === 'none'
             ? 'Anyone can call this agent without authentication'
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/deploy/components/deploy-modal/components/chat/chat.tsx b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/deploy/components/deploy-modal/components/chat/chat.tsx
index 8b56c5ab43..3776f322f0 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/deploy/components/deploy-modal/components/chat/chat.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/deploy/components/deploy-modal/components/chat/chat.tsx
@@ -409,7 +409,11 @@ export function ChatDeploy({
           <ModalHeader>Delete Chat</ModalHeader>
           <ModalBody>
             <p className='text-[12px] text-[var(--text-secondary)]'>
-              Are you sure you want to delete this chat?{' '}
+              Are you sure you want to delete{' '}
+              <span className='font-medium text-[var(--text-primary)]'>
+                {existingChat?.title || 'this chat'}
+              </span>
+              ?{' '}
               <span className='text-[var(--text-error)]'>
                 This will remove the chat at "{getEmailDomain()}/chat/{existingChat?.identifier}"
                 and make it unavailable to all users.
@@ -424,7 +428,7 @@ export function ChatDeploy({
             >
               Cancel
             </Button>
-            <Button variant='default' onClick={handleDelete} disabled={isDeleting}>
+            <Button variant='destructive' onClick={handleDelete} disabled={isDeleting}>
               {isDeleting ? 'Deleting...' : 'Delete'}
             </Button>
           </ModalFooter>
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/deploy/components/deploy-modal/components/template/template.tsx b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/deploy/components/deploy-modal/components/template/template.tsx
index cd8d8755a3..6ff75f6f61 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/deploy/components/deploy-modal/components/template/template.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/deploy/components/deploy-modal/components/template/template.tsx
@@ -375,8 +375,11 @@ export function TemplateDeploy({
           <ModalHeader>Delete Template</ModalHeader>
           <ModalBody>
             <p className='text-[12px] text-[var(--text-secondary)]'>
-              Are you sure you want to delete this template?{' '}
-              <span className='text-[var(--text-error)]'>This action cannot be undone.</span>
+              Are you sure you want to delete{' '}
+              <span className='font-medium text-[var(--text-primary)]'>
+                {existingTemplate?.name || formData.name || 'this template'}
+              </span>
+              ? <span className='text-[var(--text-error)]'>This action cannot be undone.</span>
             </p>
           </ModalBody>
           <ModalFooter>
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/deploy/components/deploy-modal/deploy-modal.tsx b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/deploy/components/deploy-modal/deploy-modal.tsx
index 3db8509ec3..d03cc72106 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/deploy/components/deploy-modal/deploy-modal.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/deploy/components/deploy-modal/deploy-modal.tsx
@@ -846,7 +846,11 @@ export function DeployModal({
           <ModalHeader>Delete A2A Agent</ModalHeader>
           <ModalBody>
             <p className='text-[12px] text-[var(--text-secondary)]'>
-              Are you sure you want to delete this agent?{' '}
+              Are you sure you want to delete{' '}
+              <span className='font-medium text-[var(--text-primary)]'>
+                {existingA2aAgent?.name || 'this agent'}
+              </span>
+              ?{' '}
               <span className='text-[var(--text-error)]'>
                 This will permanently remove the agent configuration.
               </span>
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/code/code.tsx b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/code/code.tsx
index f778c9c4aa..fab801432b 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/code/code.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/code/code.tsx
@@ -1,5 +1,5 @@
 import type { ReactElement } from 'react'
-import { useEffect, useImperativeHandle, useMemo, useRef, useState } from 'react'
+import { memo, useCallback, useEffect, useImperativeHandle, useMemo, useRef, useState } from 'react'
 import { Check, Copy, Wand2 } from 'lucide-react'
 import { useParams } from 'next/navigation'
 import 'prismjs/components/prism-python'
@@ -170,7 +170,7 @@ interface CodeProps {
   hideInternalWand?: boolean
 }
 
-export function Code({
+export const Code = memo(function Code({
   blockId,
   subBlockId,
   placeholder = 'Write JavaScript...',
@@ -206,6 +206,8 @@ export function Code({
   const handleGeneratedContentRef = useRef<(generatedCode: string) => void>(() => {})
   const handleStreamChunkRef = useRef<(chunk: string) => void>(() => {})
   const hasEditedSinceFocusRef = useRef(false)
+  const codeRef = useRef(code)
+  codeRef.current = code
 
   const accessiblePrefixes = useAccessibleReferencePrefixes(blockId)
   const emitTagSelection = useTagSelection(blockId, subBlockId)
@@ -307,25 +309,18 @@ export function Code({
         ? getDefaultValueString()
         : storeValue
 
-  const lastValidationStatus = useRef<boolean>(true)
-
   useEffect(() => {
     if (!onValidationChange) return
 
-    const nextStatus = shouldValidateJson ? isValidJson : true
-    if (lastValidationStatus.current === nextStatus) {
-      return
-    }
-
-    lastValidationStatus.current = nextStatus
+    const isValid = !shouldValidateJson || isValidJson
 
-    if (!shouldValidateJson) {
-      onValidationChange(nextStatus)
+    if (isValid) {
+      onValidationChange(true)
       return
     }
 
     const timeoutId = setTimeout(() => {
-      onValidationChange(nextStatus)
+      onValidationChange(false)
     }, 150)
 
     return () => clearTimeout(timeoutId)
@@ -337,7 +332,7 @@ export function Code({
     }
 
     handleStreamChunkRef.current = (chunk: string) => {
-      setCode((prev) => prev + chunk)
+      setCode((prev: string) => prev + chunk)
     }
 
     handleGeneratedContentRef.current = (generatedCode: string) => {
@@ -434,12 +429,12 @@ export function Code({
       `
       document.body.appendChild(tempContainer)
 
-      lines.forEach((line) => {
+      lines.forEach((line: string) => {
         const lineDiv = document.createElement('div')
 
         if (line.includes('<') && line.includes('>')) {
           const parts = line.split(/(<[^>]+>)/g)
-          parts.forEach((part) => {
+          parts.forEach((part: string) => {
             const span = document.createElement('span')
             span.textContent = part
             lineDiv.appendChild(span)
@@ -472,7 +467,6 @@ export function Code({
     }
   }, [code])
 
-  // Event Handlers
   /**
    * Handles drag-and-drop events for inserting reference tags into the code editor.
    * @param e - The drag event
@@ -500,7 +494,6 @@ export function Code({
           textarea.selectionStart = newCursorPosition
           textarea.selectionEnd = newCursorPosition
 
-          // Show tag dropdown after cursor is positioned
           setShowTags(true)
           if (data.connectionData?.sourceBlockId) {
             setActiveSourceBlockId(data.connectionData.sourceBlockId)
@@ -559,44 +552,45 @@ export function Code({
     }
   }
 
-  // Helper Functions
   /**
    * Determines whether a `<...>` segment should be highlighted as a reference.
    * @param part - The code segment to check
    * @returns True if the segment should be highlighted as a reference
    */
-  const shouldHighlightReference = (part: string): boolean => {
-    if (!part.startsWith('<') || !part.endsWith('>')) {
-      return false
-    }
+  const shouldHighlightReference = useCallback(
+    (part: string): boolean => {
+      if (!part.startsWith('<') || !part.endsWith('>')) {
+        return false
+      }
 
-    if (!isLikelyReferenceSegment(part)) {
-      return false
-    }
+      if (!isLikelyReferenceSegment(part)) {
+        return false
+      }
 
-    const split = splitReferenceSegment(part)
-    if (!split) {
-      return false
-    }
+      const split = splitReferenceSegment(part)
+      if (!split) {
+        return false
+      }
 
-    const reference = split.reference
+      const reference = split.reference
 
-    if (!accessiblePrefixes) {
-      return true
-    }
+      if (!accessiblePrefixes) {
+        return true
+      }
 
-    const inner = reference.slice(1, -1)
-    const [prefix] = inner.split('.')
-    const normalizedPrefix = normalizeName(prefix)
+      const inner = reference.slice(1, -1)
+      const [prefix] = inner.split('.')
+      const normalizedPrefix = normalizeName(prefix)
 
-    if (SYSTEM_REFERENCE_PREFIXES.has(normalizedPrefix)) {
-      return true
-    }
+      if (SYSTEM_REFERENCE_PREFIXES.has(normalizedPrefix)) {
+        return true
+      }
 
-    return accessiblePrefixes.has(normalizedPrefix)
-  }
+      return accessiblePrefixes.has(normalizedPrefix)
+    },
+    [accessiblePrefixes]
+  )
 
-  // Expose wand control handlers to parent via ref
   useImperativeHandle(
     wandControlRef,
     () => ({
@@ -609,6 +603,62 @@ export function Code({
     [generateCodeStream, isPromptVisible, isAiStreaming]
   )
 
+  const highlightCode = useMemo(
+    () => createHighlightFunction(effectiveLanguage, shouldHighlightReference),
+    [effectiveLanguage, shouldHighlightReference]
+  )
+
+  const handleValueChange = useCallback(
+    (newCode: string) => {
+      if (!isAiStreaming && !isPreview && !disabled && !readOnly) {
+        hasEditedSinceFocusRef.current = true
+        setCode(newCode)
+        setStoreValue(newCode)
+
+        const textarea = editorRef.current?.querySelector('textarea')
+        if (textarea) {
+          const pos = textarea.selectionStart
+          setCursorPosition(pos)
+
+          const tagTrigger = checkTagTrigger(newCode, pos)
+          setShowTags(tagTrigger.show)
+          if (!tagTrigger.show) {
+            setActiveSourceBlockId(null)
+          }
+
+          const envVarTrigger = checkEnvVarTrigger(newCode, pos)
+          setShowEnvVars(envVarTrigger.show)
+          setSearchTerm(envVarTrigger.show ? envVarTrigger.searchTerm : '')
+        }
+      }
+    },
+    [isAiStreaming, isPreview, disabled, readOnly, setStoreValue]
+  )
+
+  const handleKeyDown = useCallback(
+    (e: React.KeyboardEvent<HTMLDivElement | HTMLTextAreaElement>) => {
+      if (e.key === 'Escape') {
+        setShowTags(false)
+        setShowEnvVars(false)
+      }
+      if (isAiStreaming) {
+        e.preventDefault()
+      }
+      if (e.key === 'z' && (e.metaKey || e.ctrlKey) && !hasEditedSinceFocusRef.current) {
+        e.preventDefault()
+      }
+    },
+    [isAiStreaming]
+  )
+
+  const handleEditorFocus = useCallback(() => {
+    hasEditedSinceFocusRef.current = false
+    if (!isPreview && !disabled && !readOnly && codeRef.current.trim() === '') {
+      setShowTags(true)
+      setCursorPosition(0)
+    }
+  }, [isPreview, disabled, readOnly])
+
   /**
    * Renders the line numbers, aligned with wrapped visual lines and highlighting the active line.
    * @returns Array of React elements representing the line numbers
@@ -617,7 +667,7 @@ export function Code({
     const numbers: ReactElement[] = []
     let lineNumber = 1
 
-    visualLineHeights.forEach((height) => {
+    visualLineHeights.forEach((height: number) => {
       const isActive = lineNumber === activeLineNumber
       numbers.push(
         <div
@@ -724,50 +774,10 @@ export function Code({
 
           <Editor
             value={code}
-            onValueChange={(newCode) => {
-              if (!isAiStreaming && !isPreview && !disabled && !readOnly) {
-                hasEditedSinceFocusRef.current = true
-                setCode(newCode)
-                setStoreValue(newCode)
-
-                const textarea = editorRef.current?.querySelector('textarea')
-                if (textarea) {
-                  const pos = textarea.selectionStart
-                  setCursorPosition(pos)
-
-                  const tagTrigger = checkTagTrigger(newCode, pos)
-                  setShowTags(tagTrigger.show)
-                  if (!tagTrigger.show) {
-                    setActiveSourceBlockId(null)
-                  }
-
-                  const envVarTrigger = checkEnvVarTrigger(newCode, pos)
-                  setShowEnvVars(envVarTrigger.show)
-                  setSearchTerm(envVarTrigger.show ? envVarTrigger.searchTerm : '')
-                }
-              }
-            }}
-            onKeyDown={(e) => {
-              if (e.key === 'Escape') {
-                setShowTags(false)
-                setShowEnvVars(false)
-              }
-              if (isAiStreaming) {
-                e.preventDefault()
-              }
-              if (e.key === 'z' && (e.metaKey || e.ctrlKey) && !hasEditedSinceFocusRef.current) {
-                e.preventDefault()
-              }
-            }}
-            onFocus={() => {
-              hasEditedSinceFocusRef.current = false
-              // Show tag dropdown on focus when code is empty
-              if (!isPreview && !disabled && !readOnly && code.trim() === '') {
-                setShowTags(true)
-                setCursorPosition(0)
-              }
-            }}
-            highlight={createHighlightFunction(effectiveLanguage, shouldHighlightReference)}
+            onValueChange={handleValueChange}
+            onKeyDown={handleKeyDown}
+            onFocus={handleEditorFocus}
+            highlight={highlightCode}
             {...getCodeEditorProps({ isStreaming: isAiStreaming, isPreview, disabled })}
           />
 
@@ -810,4 +820,4 @@ export function Code({
       </CodeEditor.Container>
     </>
   )
-}
+})
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/combobox/combobox.tsx b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/combobox/combobox.tsx
index 9eaab8c3a6..c86e934231 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/combobox/combobox.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/combobox/combobox.tsx
@@ -1,4 +1,5 @@
-import { useCallback, useEffect, useMemo, useRef, useState } from 'react'
+import { memo, useCallback, useEffect, useMemo, useRef, useState } from 'react'
+import { isEqual } from 'lodash'
 import { useReactFlow } from 'reactflow'
 import { Combobox, type ComboboxOption } from '@/components/emcn/components'
 import { cn } from '@/lib/core/utils/cn'
@@ -71,7 +72,7 @@ interface ComboBoxProps {
   dependsOn?: SubBlockConfig['dependsOn']
 }
 
-export function ComboBox({
+export const ComboBox = memo(function ComboBox({
   options,
   defaultValue,
   blockId,
@@ -112,7 +113,8 @@ export function ComboBox({
         )
       },
       [dependsOnFields, activeWorkflowId, blockId, canonicalIndex, canonicalModeOverrides]
-    )
+    ),
+    isEqual
   )
 
   // State management
@@ -281,34 +283,17 @@ export function ComboBox({
     setStoreInitialized(true)
   }, [])
 
-  // Check if current value is valid (exists in allowed options)
-  const isValueValid = useMemo(() => {
-    if (value === null || value === undefined) return false
-    return evaluatedOptions.some((opt) => getOptionValue(opt) === value)
-  }, [value, evaluatedOptions, getOptionValue])
-
   // Set default value once store is initialized and permissions are loaded
-  // Also reset if current value becomes invalid (e.g., provider was blocked)
   useEffect(() => {
     if (isPermissionLoading) return
     if (!storeInitialized) return
     if (defaultOptionValue === undefined) return
 
-    const needsDefault = value === null || value === undefined
-    const needsReset = subBlockId === 'model' && value && !isValueValid
-
-    if (needsDefault || needsReset) {
+    // Only set default when no value exists (initial block add)
+    if (value === null || value === undefined) {
       setStoreValue(defaultOptionValue)
     }
-  }, [
-    storeInitialized,
-    value,
-    defaultOptionValue,
-    setStoreValue,
-    isPermissionLoading,
-    subBlockId,
-    isValueValid,
-  ])
+  }, [storeInitialized, value, defaultOptionValue, setStoreValue, isPermissionLoading])
 
   // Clear fetched options and hydrated option when dependencies change
   useEffect(() => {
@@ -437,6 +422,18 @@ export function ComboBox({
     [reactFlowInstance]
   )
 
+  /**
+   * Handles combobox open state changes to trigger option fetching
+   */
+  const handleOpenChange = useCallback(
+    (open: boolean) => {
+      if (open) {
+        void fetchOptionsIfNeeded()
+      }
+    },
+    [fetchOptionsIfNeeded]
+  )
+
   /**
    * Gets the icon for the currently selected option
    */
@@ -466,6 +463,75 @@ export function ComboBox({
     )
   }, [inputValue, accessiblePrefixes, selectedOption, selectedOptionIcon])
 
+  const ctrlOnChangeRef = useRef<
+    ((e: React.ChangeEvent<HTMLTextAreaElement | HTMLInputElement>) => void) | null
+  >(null)
+  const onDropRef = useRef<
+    ((e: React.DragEvent<HTMLTextAreaElement | HTMLInputElement>) => void) | null
+  >(null)
+  const onDragOverRef = useRef<
+    ((e: React.DragEvent<HTMLTextAreaElement | HTMLInputElement>) => void) | null
+  >(null)
+  const inputRefFromController = useRef<HTMLInputElement | null>(null)
+
+  const comboboxOnChange = useCallback(
+    (newValue: string) => {
+      const matchedComboboxOption = comboboxOptions.find((option) => option.value === newValue)
+      if (matchedComboboxOption) {
+        setInputValue(matchedComboboxOption.label)
+      } else {
+        setInputValue(newValue)
+      }
+
+      // Use controller's handler so env vars, tags, and DnD still work
+      const syntheticEvent = {
+        target: { value: newValue, selectionStart: newValue.length },
+      } as React.ChangeEvent<HTMLInputElement>
+      ctrlOnChangeRef.current?.(syntheticEvent)
+    },
+    [comboboxOptions, setInputValue]
+  )
+
+  const comboboxInputProps = useMemo(
+    () => ({
+      onDrop: ((e: React.DragEvent<HTMLInputElement>) => {
+        onDropRef.current?.(e)
+      }) as (e: React.DragEvent<HTMLInputElement>) => void,
+      onDragOver: ((e: React.DragEvent<HTMLInputElement>) => {
+        onDragOverRef.current?.(e)
+      }) as (e: React.DragEvent<HTMLInputElement>) => void,
+      onWheel: handleWheel,
+      autoComplete: 'off' as const,
+    }),
+    [handleWheel]
+  )
+
+  // Stable onChange for SubBlockInputController
+  const controllerOnChange = useCallback(
+    (newValue: string) => {
+      if (isPreview) {
+        return
+      }
+
+      const matchedOption = evaluatedOptions.find((option) => {
+        if (typeof option === 'string') {
+          return option === newValue
+        }
+        return option.id === newValue
+      })
+
+      // If a matching option is found, store its ID; otherwise store the raw value
+      // (allows expressions like <block.output> to be entered directly)
+      const nextValue = matchedOption
+        ? typeof matchedOption === 'string'
+          ? matchedOption
+          : matchedOption.id
+        : newValue
+      setStoreValue(nextValue)
+    },
+    [isPreview, evaluatedOptions, setStoreValue]
+  )
+
   return (
     <div className='relative w-full'>
       <SubBlockInputController
@@ -473,76 +539,43 @@ export function ComboBox({
         subBlockId={subBlockId}
         config={config}
         value={propValue}
-        onChange={(newValue) => {
-          if (isPreview) {
-            return
-          }
-
-          const matchedOption = evaluatedOptions.find((option) => {
-            if (typeof option === 'string') {
-              return option === newValue
-            }
-            return option.id === newValue
-          })
-
-          // If a matching option is found, store its ID; otherwise store the raw value
-          // (allows expressions like <block.output> to be entered directly)
-          const nextValue = matchedOption
-            ? typeof matchedOption === 'string'
-              ? matchedOption
-              : matchedOption.id
-            : newValue
-          setStoreValue(nextValue)
-        }}
+        onChange={controllerOnChange}
         isPreview={isPreview}
         disabled={disabled}
         previewValue={previewValue}
       >
-        {({ ref, onChange: ctrlOnChange, onDrop, onDragOver }) => (
-          <Combobox
-            options={comboboxOptions}
-            value={inputValue}
-            selectedValue={value ?? ''}
-            onChange={(newValue) => {
-              const matchedComboboxOption = comboboxOptions.find(
-                (option) => option.value === newValue
-              )
-              if (matchedComboboxOption) {
-                setInputValue(matchedComboboxOption.label)
-              } else {
-                setInputValue(newValue)
-              }
-
-              // Use controller's handler so env vars, tags, and DnD still work
-              const syntheticEvent = {
-                target: { value: newValue, selectionStart: newValue.length },
-              } as React.ChangeEvent<HTMLInputElement>
-              ctrlOnChange(syntheticEvent)
-            }}
-            placeholder={placeholder}
-            disabled={disabled}
-            editable
-            overlayContent={overlayContent}
-            inputRef={ref as React.RefObject<HTMLInputElement>}
-            filterOptions
-            searchable={config.searchable}
-            className={cn('allow-scroll overflow-x-auto', selectedOptionIcon && 'pl-[28px]')}
-            inputProps={{
-              onDrop: onDrop as (e: React.DragEvent<HTMLInputElement>) => void,
-              onDragOver: onDragOver as (e: React.DragEvent<HTMLInputElement>) => void,
-              onWheel: handleWheel,
-              autoComplete: 'off',
-            }}
-            isLoading={isLoadingOptions}
-            error={fetchError}
-            onOpenChange={(open) => {
-              if (open) {
-                void fetchOptionsIfNeeded()
-              }
-            }}
-          />
-        )}
+        {({ ref, onChange: ctrlOnChange, onDrop, onDragOver }) => {
+          // Update refs with latest handlers from render prop
+          ctrlOnChangeRef.current = ctrlOnChange
+          onDropRef.current = onDrop
+          onDragOverRef.current = onDragOver
+          // Store the input ref for passing to Combobox
+          if (ref.current) {
+            inputRefFromController.current = ref.current as HTMLInputElement
+          }
+
+          return (
+            <Combobox
+              options={comboboxOptions}
+              value={inputValue}
+              selectedValue={value ?? ''}
+              onChange={comboboxOnChange}
+              placeholder={placeholder}
+              disabled={disabled}
+              editable
+              overlayContent={overlayContent}
+              inputRef={ref as React.RefObject<HTMLInputElement>}
+              filterOptions
+              searchable={config.searchable}
+              className={cn('allow-scroll overflow-x-auto', selectedOptionIcon && 'pl-[28px]')}
+              inputProps={comboboxInputProps}
+              isLoading={isLoadingOptions}
+              error={fetchError}
+              onOpenChange={handleOpenChange}
+            />
+          )
+        }}
       </SubBlockInputController>
     </div>
   )
-}
+})
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/credential-selector/components/oauth-required-modal.tsx b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/credential-selector/components/oauth-required-modal.tsx
index dd0ad1dad7..b6e7aa4cbb 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/credential-selector/components/oauth-required-modal.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/credential-selector/components/oauth-required-modal.tsx
@@ -41,6 +41,7 @@ const SCOPE_DESCRIPTIONS: Record<string, string> = {
   'https://www.googleapis.com/auth/calendar': 'View and manage calendar',
   'https://www.googleapis.com/auth/userinfo.email': 'View email address',
   'https://www.googleapis.com/auth/userinfo.profile': 'View basic profile info',
+  'https://www.googleapis.com/auth/forms.body': 'View and manage Google Forms',
   'https://www.googleapis.com/auth/forms.responses.readonly': 'View responses to Google Forms',
   'https://www.googleapis.com/auth/ediscovery': 'Access Google Vault for eDiscovery',
   'https://www.googleapis.com/auth/devstorage.read_only': 'Read files from Google Cloud Storage',
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/document-selector/document-selector.tsx b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/document-selector/document-selector.tsx
index 938b45029e..012c78338f 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/document-selector/document-selector.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/document-selector/document-selector.tsx
@@ -15,6 +15,7 @@ interface DocumentSelectorProps {
   onDocumentSelect?: (documentId: string) => void
   isPreview?: boolean
   previewValue?: string | null
+  previewContextValues?: Record<string, unknown>
 }
 
 export function DocumentSelector({
@@ -24,9 +25,15 @@ export function DocumentSelector({
   onDocumentSelect,
   isPreview = false,
   previewValue,
+  previewContextValues,
 }: DocumentSelectorProps) {
-  const { finalDisabled } = useDependsOnGate(blockId, subBlock, { disabled, isPreview })
-  const [knowledgeBaseIdValue] = useSubBlockValue(blockId, 'knowledgeBaseId')
+  const { finalDisabled } = useDependsOnGate(blockId, subBlock, {
+    disabled,
+    isPreview,
+    previewContextValues,
+  })
+  const [knowledgeBaseIdFromStore] = useSubBlockValue(blockId, 'knowledgeBaseId')
+  const knowledgeBaseIdValue = previewContextValues?.knowledgeBaseId ?? knowledgeBaseIdFromStore
   const normalizedKnowledgeBaseId =
     typeof knowledgeBaseIdValue === 'string' && knowledgeBaseIdValue.trim().length > 0
       ? knowledgeBaseIdValue
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/document-tag-entry/document-tag-entry.tsx b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/document-tag-entry/document-tag-entry.tsx
index fcdee23504..ae05f4ad58 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/document-tag-entry/document-tag-entry.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/document-tag-entry/document-tag-entry.tsx
@@ -37,6 +37,7 @@ interface DocumentTagEntryProps {
   disabled?: boolean
   isPreview?: boolean
   previewValue?: any
+  previewContextValues?: Record<string, unknown>
 }
 
 /**
@@ -56,6 +57,7 @@ export function DocumentTagEntry({
   disabled = false,
   isPreview = false,
   previewValue,
+  previewContextValues,
 }: DocumentTagEntryProps) {
   const [storeValue, setStoreValue] = useSubBlockValue<string>(blockId, subBlock.id)
   const accessiblePrefixes = useAccessibleReferencePrefixes(blockId)
@@ -74,8 +76,12 @@ export function DocumentTagEntry({
     disabled,
   })
 
-  const [knowledgeBaseIdValue] = useSubBlockValue(blockId, 'knowledgeBaseId')
-  const knowledgeBaseId = knowledgeBaseIdValue || null
+  const [knowledgeBaseIdFromStore] = useSubBlockValue(blockId, 'knowledgeBaseId')
+  const knowledgeBaseIdValue = previewContextValues?.knowledgeBaseId ?? knowledgeBaseIdFromStore
+  const knowledgeBaseId =
+    typeof knowledgeBaseIdValue === 'string' && knowledgeBaseIdValue.trim().length > 0
+      ? knowledgeBaseIdValue
+      : null
 
   const { tagDefinitions, isLoading } = useKnowledgeBaseTagDefinitions(knowledgeBaseId)
   const emitTagSelection = useTagSelection(blockId, subBlock.id)
@@ -131,11 +137,16 @@ export function DocumentTagEntry({
   }
 
   /**
-   * Removes a tag by ID (prevents removing the last tag)
+   * Removes a tag by ID, or resets it if it's the last one
    */
   const removeTag = (id: string) => {
-    if (isReadOnly || tags.length === 1) return
-    updateTags(tags.filter((t) => t.id !== id))
+    if (isReadOnly) return
+    if (tags.length === 1) {
+      // Reset the last tag instead of removing it
+      updateTags([createDefaultTag()])
+    } else {
+      updateTags(tags.filter((t) => t.id !== id))
+    }
   }
 
   /**
@@ -222,6 +233,7 @@ export function DocumentTagEntry({
 
   /**
    * Renders the tag header with name, badge, and action buttons
+   * Shows tag name only when collapsed (as summary), generic label when expanded
    */
   const renderTagHeader = (tag: DocumentTag, index: number) => (
     <div
@@ -230,9 +242,11 @@ export function DocumentTagEntry({
     >
       <div className='flex min-w-0 flex-1 items-center gap-[8px]'>
         <span className='block truncate font-medium text-[14px] text-[var(--text-tertiary)]'>
-          {tag.tagName || `Tag ${index + 1}`}
+          {tag.collapsed ? tag.tagName || `Tag ${index + 1}` : `Tag ${index + 1}`}
         </span>
-        {tag.tagName && <Badge size='sm'>{FIELD_TYPE_LABELS[tag.fieldType] || 'Text'}</Badge>}
+        {tag.collapsed && tag.tagName && (
+          <Badge size='sm'>{FIELD_TYPE_LABELS[tag.fieldType] || 'Text'}</Badge>
+        )}
       </div>
       <div className='flex items-center gap-[8px] pl-[8px]' onClick={(e) => e.stopPropagation()}>
         <Button
@@ -247,7 +261,7 @@ export function DocumentTagEntry({
         <Button
           variant='ghost'
           onClick={() => removeTag(tag.id)}
-          disabled={isReadOnly || tags.length === 1}
+          disabled={isReadOnly}
           className='h-auto p-0 text-[var(--text-error)] hover:text-[var(--text-error)]'
         >
           <Trash className='h-[14px] w-[14px]' />
@@ -341,7 +355,7 @@ export function DocumentTagEntry({
 
     const tagOptions: ComboboxOption[] = selectableTags.map((t) => ({
       value: t.displayName,
-      label: `${t.displayName} (${FIELD_TYPE_LABELS[t.fieldType] || 'Text'})`,
+      label: t.displayName,
     }))
 
     return (
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/dropdown/dropdown.tsx b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/dropdown/dropdown.tsx
index 3dd1aca9a9..51aa596a5b 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/dropdown/dropdown.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/dropdown/dropdown.tsx
@@ -1,4 +1,5 @@
-import { useCallback, useEffect, useMemo, useRef, useState } from 'react'
+import { memo, useCallback, useEffect, useMemo, useRef, useState } from 'react'
+import { isEqual } from 'lodash'
 import { Badge } from '@/components/emcn'
 import { Combobox, type ComboboxOption } from '@/components/emcn/components'
 import { buildCanonicalIndex, resolveDependencyValue } from '@/lib/workflows/subblocks/visibility'
@@ -68,7 +69,7 @@ interface DropdownProps {
  * - Special handling for dataMode subblock to convert between JSON and structured formats
  * - Integrates with the workflow state management system
  */
-export function Dropdown({
+export const Dropdown = memo(function Dropdown({
   options,
   defaultValue,
   blockId,
@@ -110,7 +111,8 @@ export function Dropdown({
         )
       },
       [dependsOnFields, activeWorkflowId, blockId, canonicalIndex, canonicalModeOverrides]
-    )
+    ),
+    isEqual
   )
 
   const [storeInitialized, setStoreInitialized] = useState(false)
@@ -161,6 +163,18 @@ export function Dropdown({
     }
   }, [fetchOptions, blockId, subBlockId, isPreview, disabled])
 
+  /**
+   * Handles combobox open state changes to trigger option fetching
+   */
+  const handleOpenChange = useCallback(
+    (open: boolean) => {
+      if (open) {
+        void fetchOptionsIfNeeded()
+      }
+    },
+    [fetchOptionsIfNeeded]
+  )
+
   const evaluatedOptions = useMemo(() => {
     return typeof options === 'function' ? options() : options
   }, [options])
@@ -471,11 +485,7 @@ export function Dropdown({
       placeholder={placeholder}
       disabled={disabled}
       editable={false}
-      onOpenChange={(open) => {
-        if (open) {
-          void fetchOptionsIfNeeded()
-        }
-      }}
+      onOpenChange={handleOpenChange}
       overlayContent={multiSelectOverlay}
       multiSelect={multiSelect}
       isLoading={isLoadingOptions}
@@ -484,4 +494,4 @@ export function Dropdown({
       searchPlaceholder='Search...'
     />
   )
-}
+})
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/knowledge-tag-filters/knowledge-tag-filters.tsx b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/knowledge-tag-filters/knowledge-tag-filters.tsx
index fb6a4fd3e3..4366a0a34a 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/knowledge-tag-filters/knowledge-tag-filters.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/knowledge-tag-filters/knowledge-tag-filters.tsx
@@ -40,6 +40,7 @@ interface KnowledgeTagFiltersProps {
   disabled?: boolean
   isPreview?: boolean
   previewValue?: string | null
+  previewContextValues?: Record<string, unknown>
 }
 
 /**
@@ -60,14 +61,19 @@ export function KnowledgeTagFilters({
   disabled = false,
   isPreview = false,
   previewValue,
+  previewContextValues,
 }: KnowledgeTagFiltersProps) {
   const [storeValue, setStoreValue] = useSubBlockValue<string | null>(blockId, subBlock.id)
   const emitTagSelection = useTagSelection(blockId, subBlock.id)
   const valueInputRefs = useRef<Record<string, HTMLInputElement>>({})
   const overlayRefs = useRef<Record<string, HTMLDivElement>>({})
 
-  const [knowledgeBaseIdValue] = useSubBlockValue(blockId, 'knowledgeBaseId')
-  const knowledgeBaseId = knowledgeBaseIdValue || null
+  const [knowledgeBaseIdFromStore] = useSubBlockValue(blockId, 'knowledgeBaseId')
+  const knowledgeBaseIdValue = previewContextValues?.knowledgeBaseId ?? knowledgeBaseIdFromStore
+  const knowledgeBaseId =
+    typeof knowledgeBaseIdValue === 'string' && knowledgeBaseIdValue.trim().length > 0
+      ? knowledgeBaseIdValue
+      : null
 
   const { tagDefinitions, isLoading } = useKnowledgeBaseTagDefinitions(knowledgeBaseId)
   const accessiblePrefixes = useAccessibleReferencePrefixes(blockId)
@@ -123,11 +129,16 @@ export function KnowledgeTagFilters({
   }
 
   /**
-   * Removes a filter by ID (prevents removing the last filter)
+   * Removes a filter by ID, or resets it if it's the last one
    */
   const removeFilter = (id: string) => {
-    if (isReadOnly || filters.length === 1) return
-    updateFilters(filters.filter((f) => f.id !== id))
+    if (isReadOnly) return
+    if (filters.length === 1) {
+      // Reset the last filter instead of removing it
+      updateFilters([createDefaultFilter()])
+    } else {
+      updateFilters(filters.filter((f) => f.id !== id))
+    }
   }
 
   /**
@@ -215,6 +226,7 @@ export function KnowledgeTagFilters({
 
   /**
    * Renders the filter header with name, badge, and action buttons
+   * Shows tag name only when collapsed (as summary), generic label when expanded
    */
   const renderFilterHeader = (filter: TagFilter, index: number) => (
     <div
@@ -223,9 +235,11 @@ export function KnowledgeTagFilters({
     >
       <div className='flex min-w-0 flex-1 items-center gap-[8px]'>
         <span className='block truncate font-medium text-[14px] text-[var(--text-tertiary)]'>
-          {filter.tagName || `Filter ${index + 1}`}
+          {filter.collapsed ? filter.tagName || `Filter ${index + 1}` : `Filter ${index + 1}`}
         </span>
-        {filter.tagName && <Badge size='sm'>{FIELD_TYPE_LABELS[filter.fieldType] || 'Text'}</Badge>}
+        {filter.collapsed && filter.tagName && (
+          <Badge size='sm'>{FIELD_TYPE_LABELS[filter.fieldType] || 'Text'}</Badge>
+        )}
       </div>
       <div className='flex items-center gap-[8px] pl-[8px]' onClick={(e) => e.stopPropagation()}>
         <Button variant='ghost' onClick={addFilter} disabled={isReadOnly} className='h-auto p-0'>
@@ -235,7 +249,7 @@ export function KnowledgeTagFilters({
         <Button
           variant='ghost'
           onClick={() => removeFilter(filter.id)}
-          disabled={isReadOnly || filters.length === 1}
+          disabled={isReadOnly}
           className='h-auto p-0 text-[var(--text-error)] hover:text-[var(--text-error)]'
         >
           <Trash className='h-[14px] w-[14px]' />
@@ -324,7 +338,7 @@ export function KnowledgeTagFilters({
   const renderFilterContent = (filter: TagFilter) => {
     const tagOptions: ComboboxOption[] = tagDefinitions.map((tag) => ({
       value: tag.displayName,
-      label: `${tag.displayName} (${FIELD_TYPE_LABELS[tag.fieldType] || 'Text'})`,
+      label: tag.displayName,
     }))
 
     const operators = getOperatorsForFieldType(filter.fieldType)
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/messages-input/messages-input.tsx b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/messages-input/messages-input.tsx
index 50943acfcd..6ada0e47cb 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/messages-input/messages-input.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/messages-input/messages-input.tsx
@@ -1,4 +1,5 @@
 import { useCallback, useEffect, useImperativeHandle, useMemo, useRef, useState } from 'react'
+import { isEqual } from 'lodash'
 import { ChevronDown, ChevronsUpDown, ChevronUp, Plus } from 'lucide-react'
 import { Button, Popover, PopoverContent, PopoverItem, PopoverTrigger } from '@/components/emcn'
 import { Trash } from '@/components/emcn/icons/trash'
@@ -225,14 +226,18 @@ export function MessagesInput({
     [wandHook]
   )
 
-  /**
-   * Initialize local state from stored or preview value
-   */
+  const localMessagesRef = useRef(localMessages)
+  localMessagesRef.current = localMessages
+
   useEffect(() => {
     if (isPreview && previewValue && Array.isArray(previewValue)) {
-      setLocalMessages(previewValue)
+      if (!isEqual(localMessagesRef.current, previewValue)) {
+        setLocalMessages(previewValue)
+      }
     } else if (messages && Array.isArray(messages) && messages.length > 0) {
-      setLocalMessages(messages)
+      if (!isEqual(localMessagesRef.current, messages)) {
+        setLocalMessages(messages)
+      }
     }
   }, [isPreview, previewValue, messages])
 
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/short-input/short-input.tsx b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/short-input/short-input.tsx
index a2c8bedfb2..60e74716f7 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/short-input/short-input.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/short-input/short-input.tsx
@@ -1,4 +1,4 @@
-import { useCallback, useEffect, useImperativeHandle, useMemo, useRef, useState } from 'react'
+import { memo, useCallback, useEffect, useImperativeHandle, useMemo, useRef, useState } from 'react'
 import { Check, Copy, Wand2 } from 'lucide-react'
 import { useReactFlow } from 'reactflow'
 import { Input } from '@/components/emcn'
@@ -62,7 +62,7 @@ interface ShortInputProps {
  * - Copy to clipboard functionality
  * - Integrates with ReactFlow for zoom control
  */
-export function ShortInput({
+export const ShortInput = memo(function ShortInput({
   blockId,
   subBlockId,
   placeholder,
@@ -445,4 +445,4 @@ export function ShortInput({
       </div>
     </>
   )
-}
+})
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/starter/input-format.tsx b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/starter/input-format.tsx
index 40463cf89d..3799c9c5e5 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/starter/input-format.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/starter/input-format.tsx
@@ -1,4 +1,4 @@
-import { useRef } from 'react'
+import { useCallback, useRef } from 'react'
 import { Plus } from 'lucide-react'
 import { Trash } from '@/components/emcn/icons/trash'
 import 'prismjs/components/prism-json'
@@ -81,6 +81,8 @@ const createDefaultField = (): Field => ({
  */
 const validateFieldName = (name: string): string => name.replace(/[\x00-\x1F"\\]/g, '').trim()
 
+const jsonHighlight = (code: string): string => highlight(code, languages.json, 'json')
+
 export function FieldFormat({
   blockId,
   subBlockId,
@@ -138,17 +140,50 @@ export function FieldFormat({
     setStoreValue(fields.filter((field) => field.id !== id))
   }
 
-  /**
-   * Updates a specific field property
-   */
-  const updateField = (id: string, field: keyof Field, value: any) => {
-    if (isReadOnly) return
+  const storeValueRef = useRef(storeValue)
+  storeValueRef.current = storeValue
 
-    const updatedValue =
-      field === 'name' && typeof value === 'string' ? validateFieldName(value) : value
+  const isReadOnlyRef = useRef(isReadOnly)
+  isReadOnlyRef.current = isReadOnly
 
-    setStoreValue(fields.map((f) => (f.id === id ? { ...f, [field]: updatedValue } : f)))
-  }
+  const setStoreValueRef = useRef(setStoreValue)
+  setStoreValueRef.current = setStoreValue
+
+  const updateField = useCallback(
+    (id: string, fieldKey: keyof Field, fieldValue: Field[keyof Field]) => {
+      if (isReadOnlyRef.current) return
+
+      const updatedValue =
+        fieldKey === 'name' && typeof fieldValue === 'string'
+          ? validateFieldName(fieldValue)
+          : fieldValue
+
+      const currentStoreValue = storeValueRef.current
+      const currentFields: Field[] =
+        Array.isArray(currentStoreValue) && currentStoreValue.length > 0
+          ? currentStoreValue
+          : [createDefaultField()]
+
+      setStoreValueRef.current(
+        currentFields.map((f) => (f.id === id ? { ...f, [fieldKey]: updatedValue } : f))
+      )
+    },
+    []
+  )
+
+  const editorValueChangeHandlersRef = useRef<Record<string, (newValue: string) => void>>({})
+
+  const getEditorValueChangeHandler = useCallback(
+    (fieldId: string): ((newValue: string) => void) => {
+      if (!editorValueChangeHandlersRef.current[fieldId]) {
+        editorValueChangeHandlersRef.current[fieldId] = (newValue: string) => {
+          updateField(fieldId, 'value', newValue)
+        }
+      }
+      return editorValueChangeHandlersRef.current[fieldId]
+    },
+    [updateField]
+  )
 
   /**
    * Toggles the collapsed state of a field
@@ -222,15 +257,14 @@ export function FieldFormat({
           placeholder={placeholder}
           disabled={isReadOnly}
           autoComplete='off'
-          className={cn('allow-scroll w-full overflow-auto', inputClassName)}
-          style={{ overflowX: 'auto' }}
+          className={cn('allow-scroll w-full overflow-x-auto overflow-y-hidden', inputClassName)}
         />
         <div
           ref={(el) => {
             if (el) nameOverlayRefs.current[field.id] = el
           }}
           className='pointer-events-none absolute inset-0 flex items-center overflow-x-auto bg-transparent px-[8px] py-[6px] font-medium font-sans text-sm'
-          style={{ overflowX: 'auto' }}
+          style={{ scrollbarWidth: 'none' }}
         >
           <div
             className='w-full whitespace-pre'
@@ -359,12 +393,8 @@ export function FieldFormat({
             </Code.Placeholder>
             <Editor
               value={fieldValue}
-              onValueChange={(newValue) => {
-                if (!isReadOnly) {
-                  updateField(field.id, 'value', newValue)
-                }
-              }}
-              highlight={(code) => highlight(code, languages.json, 'json')}
+              onValueChange={getEditorValueChangeHandler(field.id)}
+              highlight={jsonHighlight}
               disabled={isReadOnly}
               {...getCodeEditorProps({ disabled: isReadOnly })}
             />
@@ -398,12 +428,8 @@ export function FieldFormat({
             </Code.Placeholder>
             <Editor
               value={fieldValue}
-              onValueChange={(newValue) => {
-                if (!isReadOnly) {
-                  updateField(field.id, 'value', newValue)
-                }
-              }}
-              highlight={(code) => highlight(code, languages.json, 'json')}
+              onValueChange={getEditorValueChangeHandler(field.id)}
+              highlight={jsonHighlight}
               disabled={isReadOnly}
               {...getCodeEditorProps({ disabled: isReadOnly })}
             />
@@ -439,12 +465,8 @@ export function FieldFormat({
             </Code.Placeholder>
             <Editor
               value={fieldValue}
-              onValueChange={(newValue) => {
-                if (!isReadOnly) {
-                  updateField(field.id, 'value', newValue)
-                }
-              }}
-              highlight={(code) => highlight(code, languages.json, 'json')}
+              onValueChange={getEditorValueChangeHandler(field.id)}
+              highlight={jsonHighlight}
               disabled={isReadOnly}
               {...getCodeEditorProps({ disabled: isReadOnly })}
             />
@@ -476,15 +498,14 @@ export function FieldFormat({
           placeholder={valuePlaceholder}
           disabled={isReadOnly}
           autoComplete='off'
-          className={cn('allow-scroll w-full overflow-auto', inputClassName)}
-          style={{ overflowX: 'auto' }}
+          className={cn('allow-scroll w-full overflow-x-auto overflow-y-hidden', inputClassName)}
         />
         <div
           ref={(el) => {
             if (el) overlayRefs.current[field.id] = el
           }}
           className='pointer-events-none absolute inset-0 flex items-center overflow-x-auto bg-transparent px-[8px] py-[6px] font-medium font-sans text-sm'
-          style={{ overflowX: 'auto' }}
+          style={{ scrollbarWidth: 'none' }}
         >
           <div
             className='w-full whitespace-pre'
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/tag-dropdown/components/keyboard-navigation-handler.tsx b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/tag-dropdown/components/keyboard-navigation-handler.tsx
index db454dc432..ba34435672 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/tag-dropdown/components/keyboard-navigation-handler.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/tag-dropdown/components/keyboard-navigation-handler.tsx
@@ -1,6 +1,7 @@
 import { useEffect, useMemo } from 'react'
 import { usePopoverContext } from '@/components/emcn'
-import type { BlockTagGroup, NestedBlockTagGroup } from '../types'
+import { useNestedNavigation } from '../tag-dropdown'
+import type { BlockTagGroup, NestedBlockTagGroup, NestedTag } from '../types'
 
 /**
  * Keyboard navigation handler component that uses popover context
@@ -15,6 +16,90 @@ interface KeyboardNavigationHandlerProps {
   handleTagSelect: (tag: string, group?: BlockTagGroup) => void
 }
 
+/**
+ * Recursively finds a folder in nested tags by its ID
+ */
+const findFolderInNested = (
+  nestedTags: NestedTag[],
+  blockId: string,
+  targetFolderId: string
+): NestedTag | null => {
+  for (const nestedTag of nestedTags) {
+    const folderId = `${blockId}-${nestedTag.key}`
+    if (folderId === targetFolderId) {
+      return nestedTag
+    }
+    if (nestedTag.nestedChildren) {
+      const found = findFolderInNested(nestedTag.nestedChildren, blockId, targetFolderId)
+      if (found) return found
+    }
+  }
+  return null
+}
+
+/**
+ * Recursively finds folder info for a tag that can be expanded.
+ * Returns both the folder metadata and the NestedTag object for navigation.
+ */
+const findFolderInfoForTag = (
+  nestedTags: NestedTag[],
+  targetTag: string,
+  group: NestedBlockTagGroup
+): {
+  id: string
+  title: string
+  parentTag: string
+  group: NestedBlockTagGroup
+  nestedTag: NestedTag
+} | null => {
+  for (const nestedTag of nestedTags) {
+    if (
+      nestedTag.parentTag === targetTag &&
+      (nestedTag.children?.length || nestedTag.nestedChildren?.length)
+    ) {
+      return {
+        id: `${group.blockId}-${nestedTag.key}`,
+        title: nestedTag.display,
+        parentTag: nestedTag.parentTag,
+        group,
+        nestedTag,
+      }
+    }
+    if (nestedTag.nestedChildren) {
+      const found = findFolderInfoForTag(nestedTag.nestedChildren, targetTag, group)
+      if (found) return found
+    }
+  }
+  return null
+}
+
+/**
+ * Recursively checks if a tag is a child of any folder.
+ * This includes both leaf children and nested folder parent tags.
+ */
+const isChildOfAnyFolder = (nestedTags: NestedTag[], tag: string): boolean => {
+  for (const nestedTag of nestedTags) {
+    if (nestedTag.children) {
+      for (const child of nestedTag.children) {
+        if (child.fullTag === tag) {
+          return true
+        }
+      }
+    }
+    if (nestedTag.nestedChildren) {
+      for (const nestedChild of nestedTag.nestedChildren) {
+        if (nestedChild.parentTag === tag) {
+          return true
+        }
+      }
+      if (isChildOfAnyFolder(nestedTag.nestedChildren, tag)) {
+        return true
+      }
+    }
+  }
+  return false
+}
+
 export const KeyboardNavigationHandler: React.FC<KeyboardNavigationHandlerProps> = ({
   visible,
   selectedIndex,
@@ -23,55 +108,66 @@ export const KeyboardNavigationHandler: React.FC<KeyboardNavigationHandlerProps>
   nestedBlockTagGroups,
   handleTagSelect,
 }) => {
-  const { openFolder, closeFolder, isInFolder, currentFolder } = usePopoverContext()
+  const { openFolder, closeFolder, isInFolder, currentFolder, setKeyboardNav } = usePopoverContext()
+  const nestedNav = useNestedNavigation()
 
   const visibleIndices = useMemo(() => {
     const indices: number[] = []
+    const nestedPath = nestedNav?.nestedPath ?? []
 
     if (isInFolder && currentFolder) {
-      for (const group of nestedBlockTagGroups) {
-        for (const nestedTag of group.nestedTags) {
-          const folderId = `${group.blockId}-${nestedTag.key}`
-          if (folderId === currentFolder && nestedTag.children) {
-            // First, add the parent tag itself (so it's navigable as the first item)
-            if (nestedTag.parentTag) {
-              const parentIdx = flatTagList.findIndex((item) => item.tag === nestedTag.parentTag)
-              if (parentIdx >= 0) {
-                indices.push(parentIdx)
-              }
+      let currentNestedTag: NestedTag | null = null
+
+      if (nestedPath.length > 0) {
+        currentNestedTag = nestedPath[nestedPath.length - 1]
+      } else {
+        for (const group of nestedBlockTagGroups) {
+          const folder = findFolderInNested(group.nestedTags, group.blockId, currentFolder)
+          if (folder) {
+            currentNestedTag = folder
+            break
+          }
+        }
+      }
+
+      if (currentNestedTag) {
+        if (currentNestedTag.parentTag) {
+          const parentIdx = flatTagList.findIndex(
+            (item) => item.tag === currentNestedTag!.parentTag
+          )
+          if (parentIdx >= 0) {
+            indices.push(parentIdx)
+          }
+        }
+        if (currentNestedTag.children) {
+          for (const child of currentNestedTag.children) {
+            const idx = flatTagList.findIndex((item) => item.tag === child.fullTag)
+            if (idx >= 0) {
+              indices.push(idx)
             }
-            // Then add all children
-            for (const child of nestedTag.children) {
-              const idx = flatTagList.findIndex((item) => item.tag === child.fullTag)
+          }
+        }
+        if (currentNestedTag.nestedChildren) {
+          for (const nestedChild of currentNestedTag.nestedChildren) {
+            if (nestedChild.parentTag) {
+              const idx = flatTagList.findIndex((item) => item.tag === nestedChild.parentTag)
               if (idx >= 0) {
                 indices.push(idx)
               }
             }
-            break
           }
         }
       }
     } else {
-      // We're at root level, show all non-child items
-      // (variables and parent tags, but not their children)
       for (let i = 0; i < flatTagList.length; i++) {
         const tag = flatTagList[i].tag
 
-        // Check if this is a child of a parent folder
         let isChild = false
         for (const group of nestedBlockTagGroups) {
-          for (const nestedTag of group.nestedTags) {
-            if (nestedTag.children) {
-              for (const child of nestedTag.children) {
-                if (child.fullTag === tag) {
-                  isChild = true
-                  break
-                }
-              }
-            }
-            if (isChild) break
+          if (isChildOfAnyFolder(group.nestedTags, tag)) {
+            isChild = true
+            break
           }
-          if (isChild) break
         }
 
         if (!isChild) {
@@ -81,16 +177,16 @@ export const KeyboardNavigationHandler: React.FC<KeyboardNavigationHandlerProps>
     }
 
     return indices
-  }, [isInFolder, currentFolder, flatTagList, nestedBlockTagGroups])
+  }, [isInFolder, currentFolder, flatTagList, nestedBlockTagGroups, nestedNav])
+
+  const nestedPathLength = nestedNav?.nestedPath.length ?? 0
 
-  // Auto-select first visible item when entering/exiting folders
   useEffect(() => {
     if (!visible || visibleIndices.length === 0) return
 
-    if (!visibleIndices.includes(selectedIndex)) {
-      setSelectedIndex(visibleIndices[0])
-    }
-  }, [visible, isInFolder, currentFolder, visibleIndices, selectedIndex, setSelectedIndex])
+    setSelectedIndex(visibleIndices[0])
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [visible, isInFolder, currentFolder, nestedPathLength])
 
   useEffect(() => {
     if (!visible || !flatTagList.length) return
@@ -117,89 +213,98 @@ export const KeyboardNavigationHandler: React.FC<KeyboardNavigationHandlerProps>
         id: string
         title: string
         parentTag: string
-        group: BlockTagGroup
+        group: NestedBlockTagGroup
+        nestedTag: NestedTag
       } | null = null
 
       if (selected) {
         for (const group of nestedBlockTagGroups) {
-          for (const nestedTag of group.nestedTags) {
-            if (
-              nestedTag.parentTag === selected.tag &&
-              nestedTag.children &&
-              nestedTag.children.length > 0
-            ) {
-              currentFolderInfo = {
-                id: `${selected.group?.blockId}-${nestedTag.key}`,
-                title: nestedTag.display,
-                parentTag: nestedTag.parentTag,
-                group,
-              }
-              break
-            }
+          const folderInfo = findFolderInfoForTag(group.nestedTags, selected.tag, group)
+          if (folderInfo) {
+            currentFolderInfo = folderInfo
+            break
           }
-          if (currentFolderInfo) break
         }
       }
 
+      const scrollIntoView = () => {
+        setTimeout(() => {
+          const selectedItem = document.querySelector<HTMLElement>(
+            '[data-radix-popper-content-wrapper] [aria-selected="true"]'
+          )
+          if (selectedItem) {
+            selectedItem.scrollIntoView({ behavior: 'auto', block: 'nearest' })
+          }
+        }, 0)
+      }
+
       switch (e.key) {
         case 'ArrowDown':
           e.preventDefault()
           e.stopPropagation()
+          setKeyboardNav(true)
           if (visibleIndices.length > 0) {
             const currentVisibleIndex = visibleIndices.indexOf(selectedIndex)
+            let newIndex: number
             if (currentVisibleIndex === -1) {
-              setSelectedIndex(visibleIndices[0])
+              newIndex = visibleIndices[0]
             } else if (currentVisibleIndex < visibleIndices.length - 1) {
-              setSelectedIndex(visibleIndices[currentVisibleIndex + 1])
+              newIndex = visibleIndices[currentVisibleIndex + 1]
+            } else {
+              newIndex = visibleIndices[0]
             }
+            setSelectedIndex(newIndex)
+            scrollIntoView()
           }
           break
         case 'ArrowUp':
           e.preventDefault()
           e.stopPropagation()
+          setKeyboardNav(true)
           if (visibleIndices.length > 0) {
             const currentVisibleIndex = visibleIndices.indexOf(selectedIndex)
+            let newIndex: number
             if (currentVisibleIndex === -1) {
-              setSelectedIndex(visibleIndices[0])
+              newIndex = visibleIndices[visibleIndices.length - 1]
             } else if (currentVisibleIndex > 0) {
-              setSelectedIndex(visibleIndices[currentVisibleIndex - 1])
+              newIndex = visibleIndices[currentVisibleIndex - 1]
+            } else {
+              newIndex = visibleIndices[visibleIndices.length - 1]
             }
+            setSelectedIndex(newIndex)
+            scrollIntoView()
           }
           break
         case 'Enter':
           e.preventDefault()
           e.stopPropagation()
           if (selected && selectedIndex >= 0 && selectedIndex < flatTagList.length) {
-            if (currentFolderInfo && !isInFolder) {
-              // It's a folder, open it
+            handleTagSelect(selected.tag, selected.group)
+          }
+          break
+        case 'ArrowRight':
+          if (currentFolderInfo) {
+            e.preventDefault()
+            e.stopPropagation()
+            if (isInFolder && nestedNav) {
+              nestedNav.navigateIn(currentFolderInfo.nestedTag, currentFolderInfo.group)
+            } else {
               openFolderWithSelection(
                 currentFolderInfo.id,
                 currentFolderInfo.title,
                 currentFolderInfo.parentTag,
                 currentFolderInfo.group
               )
-            } else {
-              // Not a folder, select it
-              handleTagSelect(selected.tag, selected.group)
             }
           }
           break
-        case 'ArrowRight':
-          if (currentFolderInfo && !isInFolder) {
-            e.preventDefault()
-            e.stopPropagation()
-            openFolderWithSelection(
-              currentFolderInfo.id,
-              currentFolderInfo.title,
-              currentFolderInfo.parentTag,
-              currentFolderInfo.group
-            )
-          }
-          break
         case 'ArrowLeft':
           if (isInFolder) {
             e.preventDefault()
             e.stopPropagation()
+            if (nestedNav?.navigateBack()) {
+              return
+            }
             closeFolder()
             let firstRootIndex = 0
             for (let i = 0; i < flatTagList.length; i++) {
@@ -239,6 +344,8 @@ export const KeyboardNavigationHandler: React.FC<KeyboardNavigationHandlerProps>
     isInFolder,
     setSelectedIndex,
     handleTagSelect,
+    nestedNav,
+    setKeyboardNav,
   ])
 
   return null
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/tag-dropdown/tag-dropdown.tsx b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/tag-dropdown/tag-dropdown.tsx
index 4ff7205535..d5fde31199 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/tag-dropdown/tag-dropdown.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/tag-dropdown/tag-dropdown.tsx
@@ -1,12 +1,9 @@
-import type React from 'react'
-import { useCallback, useEffect, useMemo, useRef, useState } from 'react'
-import { createLogger } from '@sim/logger'
+import React, { useCallback, useEffect, useMemo, useRef, useState } from 'react'
 import { RepeatIcon, SplitIcon } from 'lucide-react'
 import { useShallow } from 'zustand/react/shallow'
 import {
   Popover,
   PopoverAnchor,
-  PopoverBackButton,
   PopoverContent,
   PopoverDivider,
   PopoverFolder,
@@ -33,6 +30,7 @@ import type {
   BlockTagGroup,
   NestedBlockTagGroup,
   NestedTag,
+  NestedTagChild,
 } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/tag-dropdown/types'
 import { useAccessibleReferencePrefixes } from '@/app/workspace/[workspaceId]/w/[workflowId]/hooks/use-accessible-reference-prefixes'
 import { getBlock } from '@/blocks'
@@ -45,7 +43,30 @@ import { normalizeName } from '@/stores/workflows/utils'
 import { useWorkflowStore } from '@/stores/workflows/workflow/store'
 import type { BlockState } from '@/stores/workflows/workflow/types'
 
-const logger = createLogger('TagDropdown')
+/**
+ * Context for sharing nested navigation state between components.
+ * This enables unlimited nesting depth with a single back button.
+ */
+interface NestedNavigationContextValue {
+  /** Stack of nested tags representing current navigation depth */
+  nestedPath: NestedTag[]
+  /** Navigate into a nested folder */
+  navigateIn: (tag: NestedTag, group: NestedBlockTagGroup) => void
+  /** Navigate back one level, returns true if navigation happened, false if at root */
+  navigateBack: () => boolean
+  /** Register the base folder when it opens */
+  registerFolder: (
+    folderId: string,
+    folderTitle: string,
+    baseTag: NestedTag,
+    group: NestedBlockTagGroup
+  ) => void
+}
+
+const NestedNavigationContext = React.createContext<NestedNavigationContextValue | null>(null)
+
+/** Hook to access nested navigation state from child components */
+export const useNestedNavigation = () => React.useContext(NestedNavigationContext)
 
 /**
  * Props for the TagDropdown component
@@ -299,6 +320,101 @@ const getCaretViewportPosition = (
  * @param color - Background color for the icon container
  * @returns A styled icon element
  */
+/**
+ * Tree node for building nested tag hierarchy
+ */
+interface TagTreeNode {
+  key: string
+  fullTag?: string
+  children: Map<string, TagTreeNode>
+}
+
+/**
+ * Builds a recursive tree structure from flat tag paths.
+ * Converts tags like `blockname.form.info.title` into a nested tree.
+ *
+ * @param tags - Array of dot-separated tag paths
+ * @param blockName - The normalized block name (first segment of tags)
+ * @returns Array of NestedTag with recursive nestedChildren
+ */
+const buildNestedTagTree = (tags: string[], blockName: string): NestedTag[] => {
+  const root: TagTreeNode = { key: 'root', children: new Map() }
+
+  for (const tag of tags) {
+    const parts = tag.split('.')
+    if (parts.length < 2) continue
+
+    const pathParts = parts.slice(1)
+    let current = root
+
+    for (let i = 0; i < pathParts.length; i++) {
+      const part = pathParts[i]
+      if (!current.children.has(part)) {
+        current.children.set(part, {
+          key: part,
+          children: new Map(),
+        })
+      }
+      const node = current.children.get(part)!
+
+      if (i === pathParts.length - 1) {
+        node.fullTag = tag
+      }
+      current = node
+    }
+  }
+
+  const convertToNestedTags = (
+    node: TagTreeNode,
+    parentPath: string,
+    blockPrefix: string
+  ): NestedTag[] => {
+    const result: NestedTag[] = []
+
+    for (const [key, child] of node.children) {
+      const currentPath = parentPath ? `${parentPath}.${key}` : key
+      const parentTag = `${blockPrefix}.${currentPath}`
+
+      if (child.children.size === 0) {
+        result.push({
+          key: currentPath,
+          display: key,
+          fullTag: child.fullTag || parentTag,
+        })
+      } else {
+        const nestedChildren = convertToNestedTags(child, currentPath, blockPrefix)
+
+        const leafChildren: NestedTagChild[] = []
+        const folders: NestedTag[] = []
+
+        for (const nestedChild of nestedChildren) {
+          if (nestedChild.nestedChildren || nestedChild.children) {
+            folders.push(nestedChild)
+          } else {
+            leafChildren.push({
+              key: nestedChild.key,
+              display: nestedChild.display,
+              fullTag: nestedChild.fullTag!,
+            })
+          }
+        }
+
+        result.push({
+          key: currentPath,
+          display: key,
+          parentTag,
+          children: leafChildren.length > 0 ? leafChildren : undefined,
+          nestedChildren: folders.length > 0 ? folders : undefined,
+        })
+      }
+    }
+
+    return result
+  }
+
+  return convertToNestedTags(root, '', blockName)
+}
+
 const TagIcon: React.FC<{
   icon: string | React.ComponentType<{ className?: string }>
   color: string
@@ -319,62 +435,516 @@ const TagIcon: React.FC<{
 )
 
 /**
- * Wrapper for PopoverBackButton that handles parent tag navigation.
- *
- * @remarks
- * Extends the base PopoverBackButton to support selecting the parent tag
- * when navigating back from a nested folder view.
- *
- * @param selectedIndex - Currently selected item index
- * @param setSelectedIndex - Callback to update selection
- * @param flatTagList - Flat list of all available tags
- * @param nestedBlockTagGroups - Groups of nested block tags
- * @param itemRefs - Refs to item DOM elements for scrolling
- * @returns The back button component with parent tag support
+ * Props for the recursive NestedTagRenderer component
  */
-const TagDropdownBackButton: React.FC<{
+interface NestedTagRendererProps {
+  nestedTag: NestedTag
+  group: NestedBlockTagGroup
+  flatTagList: Array<{ tag: string; group?: BlockTagGroup }>
   selectedIndex: number
   setSelectedIndex: (index: number) => void
-  flatTagList: Array<{ tag: string; group?: BlockTagGroup }>
-  nestedBlockTagGroups: NestedBlockTagGroup[]
-  itemRefs: React.MutableRefObject<Map<number, HTMLElement>>
-}> = ({ selectedIndex, setSelectedIndex, flatTagList, nestedBlockTagGroups, itemRefs }) => {
-  const { currentFolder } = usePopoverContext()
+  handleTagSelect: (tag: string, blockGroup?: BlockTagGroup) => void
+  itemRefs: React.RefObject<Map<number, HTMLElement>>
+  blocks: Record<string, BlockState>
+  getMergedSubBlocks: (blockId: string) => Record<string, any>
+}
+
+/**
+ * Props for FolderContents with nested navigation state
+ */
+interface FolderContentsProps extends NestedTagRendererProps {
+  /** Current nested path stack for navigation within this folder */
+  nestedPath: NestedTag[]
+  /** Callback to navigate into a subfolder */
+  onNavigateIn: (nestedTag: NestedTag) => void
+}
 
-  // Find parent tag info for current folder
-  const parentTagInfo = useMemo(() => {
-    if (!currentFolder) return null
+/**
+ * Renders the contents of a folder (leaf children + nested subfolder triggers).
+ * The parent tag is rendered as the first item in the list for selection.
+ */
+const FolderContentsInner: React.FC<FolderContentsProps> = ({
+  group,
+  flatTagList,
+  selectedIndex,
+  setSelectedIndex,
+  handleTagSelect,
+  itemRefs,
+  blocks,
+  getMergedSubBlocks,
+  nestedPath,
+  nestedTag,
+  onNavigateIn,
+}) => {
+  const { isKeyboardNav, setKeyboardNav } = usePopoverContext()
+  const currentNestedTag = nestedPath.length > 0 ? nestedPath[nestedPath.length - 1] : nestedTag
 
-    for (const group of nestedBlockTagGroups) {
-      for (const nestedTag of group.nestedTags) {
-        const folderId = `${group.blockId}-${nestedTag.key}`
-        if (folderId === currentFolder && nestedTag.parentTag) {
-          const parentIdx = flatTagList.findIndex((item) => item.tag === nestedTag.parentTag)
-          return parentIdx >= 0 ? { index: parentIdx } : null
+  const parentTagIndex = currentNestedTag.parentTag
+    ? flatTagList.findIndex((item) => item.tag === currentNestedTag.parentTag)
+    : -1
+
+  return (
+    <>
+      {/* Render parent tag as the first selectable item */}
+      {currentNestedTag.parentTag && (
+        <PopoverItem
+          active={parentTagIndex === selectedIndex && parentTagIndex >= 0}
+          onMouseEnter={() => {
+            // Skip selection update during keyboard navigation to prevent scroll-triggered selection changes
+            if (isKeyboardNav) return
+            setKeyboardNav(false)
+            if (parentTagIndex >= 0) setSelectedIndex(parentTagIndex)
+          }}
+          onMouseDown={(e) => {
+            e.preventDefault()
+            e.stopPropagation()
+            handleTagSelect(currentNestedTag.parentTag!, group)
+          }}
+          ref={(el) => {
+            if (el && parentTagIndex >= 0) {
+              itemRefs.current?.set(parentTagIndex, el)
+            }
+          }}
+        >
+          <span className='flex-1 truncate font-medium'>{currentNestedTag.display}</span>
+        </PopoverItem>
+      )}
+
+      {/* Render leaf children as PopoverItems */}
+      {currentNestedTag.children?.map((child) => {
+        const childGlobalIndex = flatTagList.findIndex((item) => item.tag === child.fullTag)
+
+        const tagParts = child.fullTag.split('.')
+        const outputPath = tagParts.slice(1).join('.')
+
+        let childType = ''
+        const block = Object.values(blocks).find((b) => b.id === group.blockId)
+        if (block) {
+          const blockConfig = getBlock(block.type)
+          const mergedSubBlocks = getMergedSubBlocks(group.blockId)
+
+          childType = getOutputTypeForPath(
+            block,
+            blockConfig || null,
+            group.blockId,
+            outputPath,
+            mergedSubBlocks
+          )
         }
+
+        return (
+          <PopoverItem
+            key={child.key}
+            active={childGlobalIndex === selectedIndex && childGlobalIndex >= 0}
+            onMouseEnter={() => {
+              if (isKeyboardNav) return
+              setKeyboardNav(false)
+              if (childGlobalIndex >= 0) setSelectedIndex(childGlobalIndex)
+            }}
+            onMouseDown={(e) => {
+              e.preventDefault()
+              e.stopPropagation()
+              handleTagSelect(child.fullTag, group)
+            }}
+            ref={(el) => {
+              if (el && childGlobalIndex >= 0) {
+                itemRefs.current?.set(childGlobalIndex, el)
+              }
+            }}
+          >
+            <span className='flex-1 truncate'>{child.display}</span>
+            {childType && childType !== 'any' && (
+              <span className='ml-auto text-[10px] text-[var(--text-muted-inverse)]'>
+                {childType}
+              </span>
+            )}
+          </PopoverItem>
+        )
+      })}
+
+      {/* Render nested children as clickable folder items */}
+      {currentNestedTag.nestedChildren?.map((nestedChild) => {
+        const parentGlobalIndex = nestedChild.parentTag
+          ? flatTagList.findIndex((item) => item.tag === nestedChild.parentTag)
+          : -1
+
+        return (
+          <PopoverItem
+            key={`${group.blockId}-${nestedChild.key}`}
+            active={parentGlobalIndex === selectedIndex && parentGlobalIndex >= 0}
+            onMouseEnter={() => {
+              if (isKeyboardNav) return
+              setKeyboardNav(false)
+              if (parentGlobalIndex >= 0) setSelectedIndex(parentGlobalIndex)
+            }}
+            onMouseDown={(e) => {
+              e.preventDefault()
+              e.stopPropagation()
+              // Navigate into the subfolder on click
+              onNavigateIn(nestedChild)
+            }}
+            ref={(el) => {
+              if (el && parentGlobalIndex >= 0) {
+                itemRefs.current?.set(parentGlobalIndex, el)
+              }
+            }}
+          >
+            <span className='flex-1 truncate'>{nestedChild.display}</span>
+            <span className='ml-auto text-[10px] text-[var(--text-muted-inverse)]'>{'>'}</span>
+          </PopoverItem>
+        )
+      })}
+    </>
+  )
+}
+
+/**
+ * Wrapper component that uses shared nested navigation state from context.
+ * Handles registration of the base folder and navigation callbacks.
+ */
+const FolderContents: React.FC<NestedTagRendererProps> = (props) => {
+  const nestedNav = useNestedNavigation()
+  const { currentFolder } = usePopoverContext()
+
+  const nestedPath = nestedNav?.nestedPath ?? []
+
+  useEffect(() => {
+    if (nestedNav && currentFolder) {
+      const folderId = `${props.group.blockId}-${props.nestedTag.key}`
+      if (currentFolder === folderId) {
+        nestedNav.registerFolder(folderId, props.nestedTag.display, props.nestedTag, props.group)
       }
     }
-    return null
-  }, [currentFolder, nestedBlockTagGroups, flatTagList])
+  }, [currentFolder, nestedNav, props.group, props.nestedTag])
+
+  const handleNavigateIn = useCallback(
+    (nestedTag: NestedTag) => {
+      nestedNav?.navigateIn(nestedTag, props.group)
+    },
+    [nestedNav, props.group]
+  )
+
+  return <FolderContentsInner {...props} nestedPath={nestedPath} onNavigateIn={handleNavigateIn} />
+}
+
+/**
+ * Recursively renders nested tags with PopoverFolder components.
+ * Handles arbitrary depth of nesting for deeply nested object structures.
+ */
+const NestedTagRenderer: React.FC<NestedTagRendererProps> = ({
+  nestedTag,
+  group,
+  flatTagList,
+  selectedIndex,
+  setSelectedIndex,
+  handleTagSelect,
+  itemRefs,
+  blocks,
+  getMergedSubBlocks,
+}) => {
+  const { isKeyboardNav, setKeyboardNav } = usePopoverContext()
+  const hasChildren = nestedTag.children && nestedTag.children.length > 0
+  const hasNestedChildren = nestedTag.nestedChildren && nestedTag.nestedChildren.length > 0
+
+  if (hasChildren || hasNestedChildren) {
+    const folderId = `${group.blockId}-${nestedTag.key}`
+
+    const parentGlobalIndex = nestedTag.parentTag
+      ? flatTagList.findIndex((item) => item.tag === nestedTag.parentTag)
+      : -1
+
+    return (
+      <PopoverFolder
+        key={folderId}
+        id={folderId}
+        title={nestedTag.display}
+        active={parentGlobalIndex === selectedIndex && parentGlobalIndex >= 0}
+        onSelect={() => {
+          if (nestedTag.parentTag) {
+            handleTagSelect(nestedTag.parentTag, group)
+          }
+        }}
+        onMouseEnter={() => {
+          if (isKeyboardNav) return
+          setKeyboardNav(false)
+          if (parentGlobalIndex >= 0) {
+            setSelectedIndex(parentGlobalIndex)
+          }
+        }}
+        ref={(el) => {
+          if (el && parentGlobalIndex >= 0) {
+            itemRefs.current?.set(parentGlobalIndex, el)
+          }
+        }}
+      >
+        <FolderContents
+          nestedTag={nestedTag}
+          group={group}
+          flatTagList={flatTagList}
+          selectedIndex={selectedIndex}
+          setSelectedIndex={setSelectedIndex}
+          handleTagSelect={handleTagSelect}
+          itemRefs={itemRefs}
+          blocks={blocks}
+          getMergedSubBlocks={getMergedSubBlocks}
+        />
+      </PopoverFolder>
+    )
+  }
 
-  if (!parentTagInfo) {
-    return <PopoverBackButton />
+  // Leaf tag - render as a simple PopoverItem
+  const globalIndex = nestedTag.fullTag
+    ? flatTagList.findIndex((item) => item.tag === nestedTag.fullTag)
+    : -1
+
+  let tagDescription = ''
+
+  // Handle loop/parallel contextual tags with special types
+  if (
+    (group.blockType === 'loop' || group.blockType === 'parallel') &&
+    !nestedTag.key.includes('.')
+  ) {
+    if (nestedTag.key === 'index') {
+      tagDescription = 'number'
+    } else if (nestedTag.key === 'currentItem') {
+      tagDescription = 'any'
+    } else if (nestedTag.key === 'items') {
+      tagDescription = 'array'
+    }
+  } else if (nestedTag.fullTag) {
+    const tagParts = nestedTag.fullTag.split('.')
+    const outputPath = tagParts.slice(1).join('.')
+
+    const block = Object.values(blocks).find((b) => b.id === group.blockId)
+    if (block) {
+      const blockConfig = getBlock(block.type)
+      const mergedSubBlocks = getMergedSubBlocks(group.blockId)
+
+      tagDescription = getOutputTypeForPath(
+        block,
+        blockConfig || null,
+        group.blockId,
+        outputPath,
+        mergedSubBlocks
+      )
+    }
   }
 
-  const isActive = parentTagInfo.index === selectedIndex
+  return (
+    <PopoverItem
+      key={`${group.blockId}-${nestedTag.key}`}
+      rootOnly
+      active={globalIndex === selectedIndex && globalIndex >= 0}
+      onMouseEnter={() => {
+        if (isKeyboardNav) return
+        setKeyboardNav(false)
+        if (globalIndex >= 0) setSelectedIndex(globalIndex)
+      }}
+      onMouseDown={(e) => {
+        e.preventDefault()
+        e.stopPropagation()
+        if (nestedTag.fullTag) {
+          handleTagSelect(nestedTag.fullTag, group)
+        }
+      }}
+      ref={(el) => {
+        if (el && globalIndex >= 0) {
+          itemRefs.current?.set(globalIndex, el)
+        }
+      }}
+    >
+      <span className='flex-1 truncate'>{nestedTag.display}</span>
+      {tagDescription && tagDescription !== 'any' && (
+        <span className='ml-auto text-[10px] text-[var(--text-muted-inverse)]'>
+          {tagDescription}
+        </span>
+      )}
+    </PopoverItem>
+  )
+}
+
+/**
+ * Hook to get mouse enter handler that respects keyboard navigation mode.
+ * Returns a handler that only updates selection if not in keyboard mode.
+ */
+const useKeyboardAwareMouseEnter = (
+  setSelectedIndex: (index: number) => void
+): ((index: number) => void) => {
+  const { isKeyboardNav, setKeyboardNav } = usePopoverContext()
+
+  return useCallback(
+    (index: number) => {
+      if (isKeyboardNav) return
+      setKeyboardNav(false)
+      if (index >= 0) setSelectedIndex(index)
+    },
+    [isKeyboardNav, setKeyboardNav, setSelectedIndex]
+  )
+}
+
+/**
+ * Wrapper for variable tag items that has access to popover context
+ */
+const VariableTagItem: React.FC<{
+  tag: string
+  globalIndex: number
+  selectedIndex: number
+  setSelectedIndex: (index: number) => void
+  handleTagSelect: (tag: string) => void
+  itemRefs: React.RefObject<Map<number, HTMLElement>>
+  variableInfo: { type: string; id: string } | null
+}> = ({
+  tag,
+  globalIndex,
+  selectedIndex,
+  setSelectedIndex,
+  handleTagSelect,
+  itemRefs,
+  variableInfo,
+}) => {
+  const handleMouseEnter = useKeyboardAwareMouseEnter(setSelectedIndex)
 
   return (
-    <PopoverBackButton
-      folderTitleRef={(el) => {
-        if (el) {
-          itemRefs.current.set(parentTagInfo.index, el)
+    <PopoverItem
+      key={tag}
+      rootOnly
+      active={globalIndex === selectedIndex && globalIndex >= 0}
+      onMouseEnter={() => handleMouseEnter(globalIndex)}
+      onMouseDown={(e) => {
+        e.preventDefault()
+        e.stopPropagation()
+        handleTagSelect(tag)
+      }}
+      ref={(el) => {
+        if (el && globalIndex >= 0) {
+          itemRefs.current?.set(globalIndex, el)
         }
       }}
-      folderTitleActive={isActive}
-      onFolderTitleMouseEnter={() => {
-        setSelectedIndex(parentTagInfo.index)
+    >
+      <span className='flex-1 truncate'>
+        {tag.startsWith(TAG_PREFIXES.VARIABLE) ? tag.substring(TAG_PREFIXES.VARIABLE.length) : tag}
+      </span>
+      {variableInfo && (
+        <span className='ml-auto text-[10px] text-[var(--text-muted-inverse)]'>
+          {variableInfo.type}
+        </span>
+      )}
+    </PopoverItem>
+  )
+}
+
+/**
+ * Wrapper for block root tag items that has access to popover context
+ */
+const BlockRootTagItem: React.FC<{
+  rootTag: string
+  rootTagGlobalIndex: number
+  selectedIndex: number
+  setSelectedIndex: (index: number) => void
+  handleTagSelect: (tag: string, group?: BlockTagGroup) => void
+  itemRefs: React.RefObject<Map<number, HTMLElement>>
+  group: BlockTagGroup
+  tagIcon: string | React.ComponentType<{ className?: string }>
+  blockColor: string
+  blockName: string
+}> = ({
+  rootTag,
+  rootTagGlobalIndex,
+  selectedIndex,
+  setSelectedIndex,
+  handleTagSelect,
+  itemRefs,
+  group,
+  tagIcon,
+  blockColor,
+  blockName,
+}) => {
+  const handleMouseEnter = useKeyboardAwareMouseEnter(setSelectedIndex)
+
+  return (
+    <PopoverItem
+      rootOnly
+      active={rootTagGlobalIndex === selectedIndex && rootTagGlobalIndex >= 0}
+      onMouseEnter={() => handleMouseEnter(rootTagGlobalIndex)}
+      onMouseDown={(e) => {
+        e.preventDefault()
+        e.stopPropagation()
+        handleTagSelect(rootTag, group)
       }}
-    />
+      ref={(el) => {
+        if (el && rootTagGlobalIndex >= 0) {
+          itemRefs.current?.set(rootTagGlobalIndex, el)
+        }
+      }}
+    >
+      <TagIcon icon={tagIcon} color={blockColor} />
+      <span className='flex-1 truncate font-medium'>{blockName}</span>
+    </PopoverItem>
+  )
+}
+
+/**
+ * Helper component to capture popover context for nested navigation
+ */
+const PopoverContextCapture: React.FC<{
+  contextRef: React.RefObject<{
+    openFolder: (id: string, title: string, onLoad?: () => void, onSelect?: () => void) => void
+  } | null>
+}> = ({ contextRef }) => {
+  const { openFolder } = usePopoverContext()
+  useEffect(() => {
+    if (contextRef && 'current' in contextRef) {
+      ;(contextRef as { current: typeof contextRef.current }).current = { openFolder }
+    }
+  }, [openFolder, contextRef])
+  return null
+}
+
+/**
+ * Back button that handles nested navigation.
+ * When in nested folders, goes back one level at a time.
+ * At the root folder level, closes the folder.
+ */
+const TagDropdownBackButton: React.FC = () => {
+  const { isInFolder, closeFolder, colorScheme, size } = usePopoverContext()
+  const nestedNav = useNestedNavigation()
+
+  if (!isInFolder) return null
+
+  const handleBackClick = (e: React.MouseEvent) => {
+    e.stopPropagation()
+    // Try to navigate back in nested path first
+    if (nestedNav?.navigateBack()) {
+      // Successfully navigated back one level
+      return
+    }
+    // At root folder level, close the folder
+    closeFolder()
+  }
+
+  // Just render the back button - the parent tag is rendered as the first item in FolderContentsInner
+  return (
+    <div
+      className={cn(
+        'flex min-w-0 cursor-pointer items-center gap-[8px] rounded-[6px] px-[6px] font-base',
+        size === 'sm' ? 'h-[22px] text-[11px]' : 'h-[26px] text-[13px]',
+        colorScheme === 'inverted'
+          ? 'text-white hover:bg-[#363636] hover:text-white dark:text-[var(--text-primary)] dark:hover:bg-[var(--surface-5)]'
+          : 'text-[var(--text-primary)] hover:bg-[var(--border-1)]'
+      )}
+      role='button'
+      onClick={handleBackClick}
+    >
+      <svg
+        className={size === 'sm' ? 'h-3 w-3' : 'h-3.5 w-3.5'}
+        fill='none'
+        viewBox='0 0 24 24'
+        stroke='currentColor'
+      >
+        <path strokeLinecap='round' strokeLinejoin='round' strokeWidth={2} d='M15 19l-7-7 7-7' />
+      </svg>
+      <span>Back</span>
+    </div>
   )
 }
 
@@ -415,6 +985,16 @@ export const TagDropdown: React.FC<TagDropdownProps> = ({
   const [selectedIndex, setSelectedIndex] = useState(0)
   const itemRefs = useRef<Map<number, HTMLElement>>(new Map())
 
+  const [nestedPath, setNestedPath] = useState<NestedTag[]>([])
+  const baseFolderRef = useRef<{
+    id: string
+    title: string
+    baseTag: NestedTag
+    group: NestedBlockTagGroup
+  } | null>(null)
+  const handleTagSelectRef = useRef<((tag: string, group?: BlockTagGroup) => void) | null>(null)
+  const scrollAreaRef = useRef<HTMLDivElement>(null)
+
   const { blocks, edges, loops, parallels } = useWorkflowStore(
     useShallow((state) => ({
       blocks: state.blocks,
@@ -620,7 +1200,6 @@ export const TagDropdown: React.FC<TagDropdownProps> = ({
 
           if (dynamicOutputs.length > 0) {
             const allTags = dynamicOutputs.map((path) => `${normalizedBlockName}.${path}`)
-            // For self-reference, only show url and resumeEndpoint (not response format fields)
             blockTags = isSelfReference
               ? allTags.filter((tag) => tag.endsWith('.url') || tag.endsWith('.resumeEndpoint'))
               : allTags
@@ -635,7 +1214,7 @@ export const TagDropdown: React.FC<TagDropdownProps> = ({
           const operationValue =
             mergedSubBlocks?.operation?.value ?? getSubBlockValue(activeSourceBlockId, 'operation')
           const toolOutputPaths = operationValue
-            ? getToolOutputPaths(blockConfig, operationValue)
+            ? getToolOutputPaths(blockConfig, operationValue, mergedSubBlocks)
             : []
 
           if (toolOutputPaths.length > 0) {
@@ -967,7 +1546,7 @@ export const TagDropdown: React.FC<TagDropdownProps> = ({
           const operationValue =
             mergedSubBlocks?.operation?.value ?? getSubBlockValue(accessibleBlockId, 'operation')
           const toolOutputPaths = operationValue
-            ? getToolOutputPaths(blockConfig, operationValue)
+            ? getToolOutputPaths(blockConfig, operationValue, mergedSubBlocks)
             : []
 
           if (toolOutputPaths.length > 0) {
@@ -978,6 +1557,7 @@ export const TagDropdown: React.FC<TagDropdownProps> = ({
               mergedSubBlocks,
               accessibleBlock.triggerMode
             )
+
             blockTags = outputPaths.map((path) => `${normalizedBlockName}.${path}`)
           }
         }
@@ -1070,72 +1650,41 @@ export const TagDropdown: React.FC<TagDropdownProps> = ({
 
   const nestedBlockTagGroups: NestedBlockTagGroup[] = useMemo(() => {
     return filteredBlockTagGroups.map((group: BlockTagGroup) => {
-      const nestedTags: NestedTag[] = []
-      const groupedTags: Record<
-        string,
-        Array<{ key: string; display: string; fullTag: string }>
-      > = {}
-      const directTags: Array<{ key: string; display: string; fullTag: string }> = []
+      const normalizedBlockName = normalizeName(group.blockName)
+
+      // Handle loop/parallel contextual tags (index, currentItem, items)
+      const directTags: NestedTag[] = []
+      const tagsForTree: string[] = []
 
       group.tags.forEach((tag: string) => {
         const tagParts = tag.split('.')
-        if (tagParts.length >= 3) {
-          const parent = tagParts[1]
-          const child = tagParts.slice(2).join('.')
 
-          if (!groupedTags[parent]) {
-            groupedTags[parent] = []
-          }
-          groupedTags[parent].push({
-            key: `${parent}.${child}`,
-            display: child,
+        // Loop/parallel contextual tags without block prefix
+        if (
+          (group.blockType === 'loop' || group.blockType === 'parallel') &&
+          tagParts.length === 1
+        ) {
+          directTags.push({
+            key: tag,
+            display: tag,
             fullTag: tag,
           })
-        } else {
-          const path = tagParts.slice(1).join('.')
-          if (
-            (group.blockType === 'loop' || group.blockType === 'parallel') &&
-            tagParts.length === 1
-          ) {
-            directTags.push({
-              key: tag,
-              display: tag,
-              fullTag: tag,
-            })
-          } else {
-            directTags.push({
-              key: path || group.blockName,
-              display: path || group.blockName,
-              fullTag: tag,
-            })
-          }
-        }
-      })
-
-      directTags.forEach((directTag) => {
-        nestedTags.push(directTag)
-      })
-
-      Object.entries(groupedTags).forEach(([parent, children]) => {
-        const firstChildTag = children[0]?.fullTag
-        if (firstChildTag) {
-          const tagParts = firstChildTag.split('.')
-          const parentTag = `${tagParts[0]}.${parent}`
-          nestedTags.push({
-            key: parent,
-            display: parent,
-            parentTag: parentTag,
-            children: children,
+        } else if (tagParts.length === 2) {
+          // Direct property like blockname.property
+          directTags.push({
+            key: tagParts[1],
+            display: tagParts[1],
+            fullTag: tag,
           })
         } else {
-          nestedTags.push({
-            key: parent,
-            display: parent,
-            children: children,
-          })
+          // Nested property - add to tree builder
+          tagsForTree.push(tag)
         }
       })
 
+      // Build recursive tree from nested tags
+      const nestedTags = [...directTags, ...buildNestedTagTree(tagsForTree, normalizedBlockName)]
+
       return {
         ...group,
         nestedTags,
@@ -1150,6 +1699,32 @@ export const TagDropdown: React.FC<TagDropdownProps> = ({
       list.push({ tag })
     })
 
+    const flattenNestedTag = (nestedTag: NestedTag, group: BlockTagGroup, rootTag: string) => {
+      if (nestedTag.fullTag === rootTag) {
+        return
+      }
+
+      if (nestedTag.parentTag) {
+        list.push({ tag: nestedTag.parentTag, group })
+      }
+
+      if (nestedTag.fullTag && !nestedTag.children && !nestedTag.nestedChildren) {
+        list.push({ tag: nestedTag.fullTag, group })
+      }
+
+      if (nestedTag.children) {
+        nestedTag.children.forEach((child) => {
+          list.push({ tag: child.fullTag, group })
+        })
+      }
+
+      if (nestedTag.nestedChildren) {
+        nestedTag.nestedChildren.forEach((nestedChild) => {
+          flattenNestedTag(nestedChild, group, rootTag)
+        })
+      }
+    }
+
     nestedBlockTagGroups.forEach((group) => {
       const normalizedBlockName = normalizeName(group.blockName)
       const rootTagFromTags = group.tags.find((tag) => tag === normalizedBlockName)
@@ -1158,21 +1733,7 @@ export const TagDropdown: React.FC<TagDropdownProps> = ({
       list.push({ tag: rootTag, group })
 
       group.nestedTags.forEach((nestedTag) => {
-        if (nestedTag.fullTag === rootTag) {
-          return
-        }
-
-        if (nestedTag.parentTag) {
-          list.push({ tag: nestedTag.parentTag, group })
-        }
-        if (nestedTag.fullTag) {
-          list.push({ tag: nestedTag.fullTag, group })
-        }
-        if (nestedTag.children) {
-          nestedTag.children.forEach((child) => {
-            list.push({ tag: child.fullTag, group })
-          })
-        }
+        flattenNestedTag(nestedTag, group, rootTag)
       })
     })
 
@@ -1185,7 +1746,7 @@ export const TagDropdown: React.FC<TagDropdownProps> = ({
     const element = itemRefs.current.get(selectedIndex)
     if (element) {
       element.scrollIntoView({
-        behavior: 'smooth',
+        behavior: 'auto',
         block: 'nearest',
       })
     }
@@ -1281,6 +1842,90 @@ export const TagDropdown: React.FC<TagDropdownProps> = ({
     [inputValue, cursorPosition, workflowVariables, onSelect, onClose, getMergedSubBlocks]
   )
 
+  handleTagSelectRef.current = handleTagSelect
+
+  const popoverContextRef = useRef<{
+    openFolder: (id: string, title: string, onLoad?: () => void, onSelect?: () => void) => void
+  } | null>(null)
+
+  const nestedNavigationValue = useMemo<NestedNavigationContextValue>(
+    () => ({
+      nestedPath,
+      navigateIn: (tag: NestedTag, group: NestedBlockTagGroup) => {
+        const baseFolder = baseFolderRef.current
+        if (!baseFolder || !popoverContextRef.current) return
+
+        setNestedPath((prev) => [...prev, tag])
+
+        if (scrollAreaRef.current) {
+          scrollAreaRef.current.scrollTop = 0
+        }
+
+        const selectionCallback = () => {
+          if (tag.parentTag && handleTagSelectRef.current) {
+            handleTagSelectRef.current(tag.parentTag, group)
+          }
+        }
+        popoverContextRef.current.openFolder(
+          baseFolder.id,
+          tag.display,
+          undefined,
+          selectionCallback
+        )
+      },
+      navigateBack: () => {
+        const baseFolder = baseFolderRef.current
+        if (!baseFolder || !popoverContextRef.current) return false
+        if (nestedPath.length === 0) return false
+
+        const newPath = nestedPath.slice(0, -1)
+        setNestedPath(newPath)
+
+        if (newPath.length === 0) {
+          const selectionCallback = () => {
+            if (baseFolder.baseTag.parentTag && handleTagSelectRef.current) {
+              handleTagSelectRef.current(baseFolder.baseTag.parentTag, baseFolder.group)
+            }
+          }
+          popoverContextRef.current.openFolder(
+            baseFolder.id,
+            baseFolder.title,
+            undefined,
+            selectionCallback
+          )
+        } else {
+          const parentTag = newPath[newPath.length - 1]
+          const selectionCallback = () => {
+            if (parentTag.parentTag && handleTagSelectRef.current) {
+              handleTagSelectRef.current(parentTag.parentTag, baseFolder.group)
+            }
+          }
+          popoverContextRef.current.openFolder(
+            baseFolder.id,
+            parentTag.display,
+            undefined,
+            selectionCallback
+          )
+        }
+        return true
+      },
+      registerFolder: (folderId, folderTitle, baseTag, group) => {
+        baseFolderRef.current = { id: folderId, title: folderTitle, baseTag, group }
+        if (scrollAreaRef.current) {
+          scrollAreaRef.current.scrollTop = 0
+        }
+      },
+    }),
+    [nestedPath]
+  )
+
+  useEffect(() => {
+    if (!visible) {
+      setNestedPath([])
+      baseFolderRef.current = null
+    }
+  }, [visible])
+
   useEffect(() => setSelectedIndex(0), [searchTerm])
 
   useEffect(() => {
@@ -1322,316 +1967,145 @@ export const TagDropdown: React.FC<TagDropdownProps> = ({
   }
 
   return (
-    <Popover open={visible} onOpenChange={(open) => !open && onClose?.()} colorScheme='inverted'>
-      <PopoverAnchor asChild>
-        <div
-          className={cn('pointer-events-none', className)}
-          style={{
-            ...style,
-            position: inputElement ? 'fixed' : 'absolute',
-            top: inputElement ? `${caretViewport.top}px` : style?.top,
-            left: inputElement ? `${caretViewport.left}px` : style?.left,
-            width: '1px',
-            height: '1px',
-          }}
-        />
-      </PopoverAnchor>
-      <KeyboardNavigationHandler
-        visible={visible}
-        selectedIndex={selectedIndex}
-        setSelectedIndex={setSelectedIndex}
-        flatTagList={flatTagList}
-        nestedBlockTagGroups={nestedBlockTagGroups}
-        handleTagSelect={handleTagSelect}
-      />
-      <PopoverContent
-        maxHeight={240}
-        className='min-w-[280px]'
-        side={side}
-        align='start'
-        collisionPadding={6}
-        onOpenAutoFocus={(e) => e.preventDefault()}
-        onCloseAutoFocus={(e) => e.preventDefault()}
-      >
-        <TagDropdownBackButton
+    <NestedNavigationContext.Provider value={nestedNavigationValue}>
+      <Popover open={visible} onOpenChange={(open) => !open && onClose?.()} colorScheme='inverted'>
+        <PopoverContextCapture contextRef={popoverContextRef} />
+        <PopoverAnchor asChild>
+          <div
+            className={cn('pointer-events-none', className)}
+            style={{
+              ...style,
+              position: inputElement ? 'fixed' : 'absolute',
+              top: inputElement ? `${caretViewport.top}px` : style?.top,
+              left: inputElement ? `${caretViewport.left}px` : style?.left,
+              width: '1px',
+              height: '1px',
+            }}
+          />
+        </PopoverAnchor>
+        <KeyboardNavigationHandler
+          visible={visible}
           selectedIndex={selectedIndex}
           setSelectedIndex={setSelectedIndex}
           flatTagList={flatTagList}
           nestedBlockTagGroups={nestedBlockTagGroups}
-          itemRefs={itemRefs}
+          handleTagSelect={handleTagSelect}
         />
-        <PopoverScrollArea>
-          {flatTagList.length === 0 ? (
-            <div className='px-[6px] py-[8px] text-[12px] text-[var(--white)]/60'>
-              No matching tags found
-            </div>
-          ) : (
-            <>
-              {variableTags.length > 0 && (
-                <>
-                  <PopoverSection rootOnly>
-                    <div className='flex items-center gap-[6px]'>
-                      <TagIcon icon='V' color={BLOCK_COLORS.VARIABLE} />
-                      Variables
-                    </div>
-                  </PopoverSection>
-                  {variableTags.map((tag: string) => {
-                    const variableInfo = variableInfoMap?.[tag] || null
-                    const globalIndex = flatTagList.findIndex((item) => item.tag === tag)
-
-                    return (
-                      <PopoverItem
-                        key={tag}
-                        rootOnly
-                        active={globalIndex === selectedIndex && globalIndex >= 0}
-                        onMouseEnter={() => {
-                          if (globalIndex >= 0) setSelectedIndex(globalIndex)
-                        }}
-                        onMouseDown={(e) => {
-                          e.preventDefault()
-                          e.stopPropagation()
-                          handleTagSelect(tag)
-                        }}
-                        ref={(el) => {
-                          if (el && globalIndex >= 0) {
-                            itemRefs.current.set(globalIndex, el)
-                          }
-                        }}
-                      >
-                        <span className='flex-1 truncate'>
-                          {tag.startsWith(TAG_PREFIXES.VARIABLE)
-                            ? tag.substring(TAG_PREFIXES.VARIABLE.length)
-                            : tag}
-                        </span>
-                        {variableInfo && (
-                          <span className='ml-auto text-[10px] text-[var(--text-muted-inverse)]'>
-                            {variableInfo.type}
-                          </span>
-                        )}
-                      </PopoverItem>
-                    )
-                  })}
-                  {nestedBlockTagGroups.length > 0 && <PopoverDivider rootOnly />}
-                </>
-              )}
-
-              {nestedBlockTagGroups.map((group: NestedBlockTagGroup, groupIndex: number) => {
-                const blockConfig = getBlock(group.blockType)
-                let blockColor = blockConfig?.bgColor || BLOCK_COLORS.DEFAULT
-
-                if (group.blockType === 'loop') {
-                  blockColor = BLOCK_COLORS.LOOP
-                } else if (group.blockType === 'parallel') {
-                  blockColor = BLOCK_COLORS.PARALLEL
-                }
-
-                let tagIcon: string | React.ComponentType<{ className?: string }> = group.blockName
-                  .charAt(0)
-                  .toUpperCase()
-                if (blockConfig?.icon) {
-                  tagIcon = blockConfig.icon
-                } else if (group.blockType === 'loop') {
-                  tagIcon = RepeatIcon
-                } else if (group.blockType === 'parallel') {
-                  tagIcon = SplitIcon
-                }
-
-                const normalizedBlockName = normalizeName(group.blockName)
-                const rootTagFromTags = group.tags.find((tag) => tag === normalizedBlockName)
-                const rootTag = rootTagFromTags || normalizedBlockName
-
-                const rootTagGlobalIndex = flatTagList.findIndex((item) => item.tag === rootTag)
-
-                return (
-                  <div key={group.blockId}>
-                    <PopoverItem
-                      rootOnly
-                      active={rootTagGlobalIndex === selectedIndex && rootTagGlobalIndex >= 0}
-                      onMouseEnter={() => {
-                        if (rootTagGlobalIndex >= 0) setSelectedIndex(rootTagGlobalIndex)
-                      }}
-                      onMouseDown={(e) => {
-                        e.preventDefault()
-                        e.stopPropagation()
-                        handleTagSelect(rootTag, group)
-                      }}
-                      ref={(el) => {
-                        if (el && rootTagGlobalIndex >= 0) {
-                          itemRefs.current.set(rootTagGlobalIndex, el)
-                        }
-                      }}
-                    >
-                      <TagIcon icon={tagIcon} color={blockColor} />
-                      <span className='flex-1 truncate font-medium'>{group.blockName}</span>
-                    </PopoverItem>
-                    {group.nestedTags.map((nestedTag) => {
-                      if (nestedTag.fullTag === rootTag) {
-                        return null
-                      }
-
-                      const hasChildren = nestedTag.children && nestedTag.children.length > 0
-
-                      if (hasChildren) {
-                        const folderId = `${group.blockId}-${nestedTag.key}`
-
-                        const parentGlobalIndex = nestedTag.parentTag
-                          ? flatTagList.findIndex((item) => item.tag === nestedTag.parentTag)
-                          : -1
-
-                        return (
-                          <PopoverFolder
-                            key={folderId}
-                            id={folderId}
-                            title={nestedTag.display}
-                            active={parentGlobalIndex === selectedIndex && parentGlobalIndex >= 0}
-                            onSelect={() => {
-                              if (nestedTag.parentTag) {
-                                handleTagSelect(nestedTag.parentTag, group)
-                              }
-                            }}
-                            onMouseEnter={() => {
-                              if (parentGlobalIndex >= 0) {
-                                setSelectedIndex(parentGlobalIndex)
-                              }
-                            }}
-                            ref={(el) => {
-                              if (el && parentGlobalIndex >= 0) {
-                                itemRefs.current.set(parentGlobalIndex, el)
-                              }
-                            }}
-                          >
-                            {nestedTag.children!.map((child) => {
-                              const childGlobalIndex = flatTagList.findIndex(
-                                (item) => item.tag === child.fullTag
-                              )
-
-                              const tagParts = child.fullTag.split('.')
-                              const outputPath = tagParts.slice(1).join('.')
-
-                              let childType = ''
-                              const block = Object.values(blocks).find(
-                                (b) => b.id === group.blockId
-                              )
-                              if (block) {
-                                const blockConfig = getBlock(block.type)
-                                const mergedSubBlocks = getMergedSubBlocks(group.blockId)
-
-                                childType = getOutputTypeForPath(
-                                  block,
-                                  blockConfig || null,
-                                  group.blockId,
-                                  outputPath,
-                                  mergedSubBlocks
-                                )
-                              }
-
-                              return (
-                                <PopoverItem
-                                  key={child.key}
-                                  active={
-                                    childGlobalIndex === selectedIndex && childGlobalIndex >= 0
-                                  }
-                                  onMouseEnter={() => {
-                                    if (childGlobalIndex >= 0) setSelectedIndex(childGlobalIndex)
-                                  }}
-                                  onMouseDown={(e) => {
-                                    e.preventDefault()
-                                    e.stopPropagation()
-                                    handleTagSelect(child.fullTag, group)
-                                  }}
-                                  ref={(el) => {
-                                    if (el && childGlobalIndex >= 0) {
-                                      itemRefs.current.set(childGlobalIndex, el)
-                                    }
-                                  }}
-                                >
-                                  <span className='flex-1 truncate'>{child.display}</span>
-                                  {childType && childType !== 'any' && (
-                                    <span className='ml-auto text-[10px] text-[var(--text-muted-inverse)]'>
-                                      {childType}
-                                    </span>
-                                  )}
-                                </PopoverItem>
-                              )
-                            })}
-                          </PopoverFolder>
-                        )
-                      }
-
-                      const globalIndex = nestedTag.fullTag
-                        ? flatTagList.findIndex((item) => item.tag === nestedTag.fullTag)
-                        : -1
-
-                      let tagDescription = ''
-
-                      if (
-                        (group.blockType === 'loop' || group.blockType === 'parallel') &&
-                        !nestedTag.key.includes('.')
-                      ) {
-                        if (nestedTag.key === 'index') {
-                          tagDescription = 'number'
-                        } else if (nestedTag.key === 'currentItem') {
-                          tagDescription = 'any'
-                        } else if (nestedTag.key === 'items') {
-                          tagDescription = 'array'
-                        }
-                      } else if (nestedTag.fullTag) {
-                        const tagParts = nestedTag.fullTag.split('.')
-                        const outputPath = tagParts.slice(1).join('.')
-
-                        const block = Object.values(blocks).find((b) => b.id === group.blockId)
-                        if (block) {
-                          const blockConfig = getBlock(block.type)
-                          const mergedSubBlocks = getMergedSubBlocks(group.blockId)
-
-                          tagDescription = getOutputTypeForPath(
-                            block,
-                            blockConfig || null,
-                            group.blockId,
-                            outputPath,
-                            mergedSubBlocks
-                          )
-                        }
-                      }
+        <PopoverContent
+          maxHeight={240}
+          className='min-w-[280px]'
+          side={side}
+          align='start'
+          collisionPadding={6}
+          onOpenAutoFocus={(e) => e.preventDefault()}
+          onCloseAutoFocus={(e) => e.preventDefault()}
+        >
+          <TagDropdownBackButton />
+          <PopoverScrollArea ref={scrollAreaRef}>
+            {flatTagList.length === 0 ? (
+              <div className='px-[6px] py-[8px] text-[12px] text-[var(--white)]/60'>
+                No matching tags found
+              </div>
+            ) : (
+              <>
+                {variableTags.length > 0 && (
+                  <>
+                    <PopoverSection rootOnly>
+                      <div className='flex items-center gap-[6px]'>
+                        <TagIcon icon='V' color={BLOCK_COLORS.VARIABLE} />
+                        Variables
+                      </div>
+                    </PopoverSection>
+                    {variableTags.map((tag: string) => {
+                      const variableInfo = variableInfoMap?.[tag] || null
+                      const globalIndex = flatTagList.findIndex((item) => item.tag === tag)
 
                       return (
-                        <PopoverItem
-                          key={`${group.blockId}-${nestedTag.key}`}
-                          rootOnly
-                          active={globalIndex === selectedIndex && globalIndex >= 0}
-                          onMouseEnter={() => {
-                            if (globalIndex >= 0) setSelectedIndex(globalIndex)
-                          }}
-                          onMouseDown={(e) => {
-                            e.preventDefault()
-                            e.stopPropagation()
-                            if (nestedTag.fullTag) {
-                              handleTagSelect(nestedTag.fullTag, group)
-                            }
-                          }}
-                          ref={(el) => {
-                            if (el && globalIndex >= 0) {
-                              itemRefs.current.set(globalIndex, el)
-                            }
-                          }}
-                        >
-                          <span className='flex-1 truncate'>{nestedTag.display}</span>
-                          {tagDescription && tagDescription !== 'any' && (
-                            <span className='ml-auto text-[10px] text-[var(--text-muted-inverse)]'>
-                              {tagDescription}
-                            </span>
-                          )}
-                        </PopoverItem>
+                        <VariableTagItem
+                          key={tag}
+                          tag={tag}
+                          globalIndex={globalIndex}
+                          selectedIndex={selectedIndex}
+                          setSelectedIndex={setSelectedIndex}
+                          handleTagSelect={handleTagSelect}
+                          itemRefs={itemRefs}
+                          variableInfo={variableInfo}
+                        />
                       )
                     })}
-                    {groupIndex < nestedBlockTagGroups.length - 1 && <PopoverDivider rootOnly />}
-                  </div>
-                )
-              })}
-            </>
-          )}
-        </PopoverScrollArea>
-      </PopoverContent>
-    </Popover>
+                    {nestedBlockTagGroups.length > 0 && <PopoverDivider rootOnly />}
+                  </>
+                )}
+
+                {nestedBlockTagGroups.map((group: NestedBlockTagGroup, groupIndex: number) => {
+                  const blockConfig = getBlock(group.blockType)
+                  let blockColor = blockConfig?.bgColor || BLOCK_COLORS.DEFAULT
+
+                  if (group.blockType === 'loop') {
+                    blockColor = BLOCK_COLORS.LOOP
+                  } else if (group.blockType === 'parallel') {
+                    blockColor = BLOCK_COLORS.PARALLEL
+                  }
+
+                  let tagIcon: string | React.ComponentType<{ className?: string }> =
+                    group.blockName.charAt(0).toUpperCase()
+                  if (blockConfig?.icon) {
+                    tagIcon = blockConfig.icon
+                  } else if (group.blockType === 'loop') {
+                    tagIcon = RepeatIcon
+                  } else if (group.blockType === 'parallel') {
+                    tagIcon = SplitIcon
+                  }
+
+                  const normalizedBlockName = normalizeName(group.blockName)
+                  const rootTagFromTags = group.tags.find((tag) => tag === normalizedBlockName)
+                  const rootTag = rootTagFromTags || normalizedBlockName
+
+                  const rootTagGlobalIndex = flatTagList.findIndex((item) => item.tag === rootTag)
+
+                  return (
+                    <div key={group.blockId}>
+                      <BlockRootTagItem
+                        rootTag={rootTag}
+                        rootTagGlobalIndex={rootTagGlobalIndex}
+                        selectedIndex={selectedIndex}
+                        setSelectedIndex={setSelectedIndex}
+                        handleTagSelect={handleTagSelect}
+                        itemRefs={itemRefs}
+                        group={group}
+                        tagIcon={tagIcon}
+                        blockColor={blockColor}
+                        blockName={group.blockName}
+                      />
+                      {group.nestedTags.map((nestedTag) => {
+                        if (nestedTag.fullTag === rootTag) {
+                          return null
+                        }
+
+                        return (
+                          <NestedTagRenderer
+                            key={`${group.blockId}-${nestedTag.key}`}
+                            nestedTag={nestedTag}
+                            group={group}
+                            flatTagList={flatTagList}
+                            selectedIndex={selectedIndex}
+                            setSelectedIndex={setSelectedIndex}
+                            handleTagSelect={handleTagSelect}
+                            itemRefs={itemRefs}
+                            blocks={blocks}
+                            getMergedSubBlocks={getMergedSubBlocks}
+                          />
+                        )
+                      })}
+                      {groupIndex < nestedBlockTagGroups.length - 1 && <PopoverDivider rootOnly />}
+                    </div>
+                  )
+                })}
+              </>
+            )}
+          </PopoverScrollArea>
+        </PopoverContent>
+      </Popover>
+    </NestedNavigationContext.Provider>
   )
 }
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/tag-dropdown/types.ts b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/tag-dropdown/types.ts
index 64f256babd..d17fc28745 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/tag-dropdown/types.ts
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/tag-dropdown/types.ts
@@ -10,14 +10,27 @@ export interface BlockTagGroup {
 }
 
 /**
- * Nested tag structure for hierarchical display
+ * Child tag within a nested structure
+ */
+export interface NestedTagChild {
+  key: string
+  display: string
+  fullTag: string
+}
+
+/**
+ * Nested tag structure for hierarchical display.
+ * Supports recursive nesting for deeply nested object structures.
  */
 export interface NestedTag {
   key: string
   display: string
   fullTag?: string
-  parentTag?: string // Tag for the parent object when it has children
-  children?: Array<{ key: string; display: string; fullTag: string }>
+  parentTag?: string
+  /** Leaf children (no further nesting) */
+  children?: NestedTagChild[]
+  /** Recursively nested folders */
+  nestedChildren?: NestedTag[]
 }
 
 /**
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/tool-input/tool-input.tsx b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/tool-input/tool-input.tsx
index 6afbe1484c..6a95cf1ef1 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/tool-input/tool-input.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/tool-input/tool-input.tsx
@@ -1,5 +1,5 @@
 import type React from 'react'
-import { useCallback, useEffect, useMemo, useRef, useState } from 'react'
+import { memo, useCallback, useEffect, useMemo, useRef, useState } from 'react'
 import { createLogger } from '@sim/logger'
 import { Loader2, WrenchIcon, XIcon } from 'lucide-react'
 import { useParams } from 'next/navigation'
@@ -35,6 +35,7 @@ import {
   Code,
   FileSelectorInput,
   FileUpload,
+  FolderSelectorInput,
   LongInput,
   ProjectSelectorInput,
   SheetSelectorInput,
@@ -45,7 +46,9 @@ import {
   TimeInput,
 } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components'
 import { DocumentSelector } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/document-selector/document-selector'
+import { DocumentTagEntry } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/document-tag-entry/document-tag-entry'
 import { KnowledgeBaseSelector } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/knowledge-base-selector/knowledge-base-selector'
+import { KnowledgeTagFilters } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/knowledge-tag-filters/knowledge-tag-filters'
 import {
   type CustomTool,
   CustomToolModal,
@@ -75,6 +78,13 @@ import {
   isPasswordParameter,
   type ToolParameterConfig,
 } from '@/tools/params'
+import {
+  buildCanonicalIndex,
+  buildPreviewContextValues,
+  type CanonicalIndex,
+  evaluateSubBlockCondition,
+  type SubBlockCondition,
+} from '@/tools/params-resolver'
 
 const logger = createLogger('ToolInput')
 
@@ -304,6 +314,42 @@ function SheetSelectorSyncWrapper({
   )
 }
 
+function FolderSelectorSyncWrapper({
+  blockId,
+  paramId,
+  value,
+  onChange,
+  uiComponent,
+  disabled,
+  previewContextValues,
+}: {
+  blockId: string
+  paramId: string
+  value: string
+  onChange: (value: string) => void
+  uiComponent: any
+  disabled: boolean
+  previewContextValues?: Record<string, any>
+}) {
+  return (
+    <GenericSyncWrapper blockId={blockId} paramId={paramId} value={value} onChange={onChange}>
+      <FolderSelectorInput
+        blockId={blockId}
+        subBlock={{
+          id: paramId,
+          type: 'folder-selector' as const,
+          title: paramId,
+          serviceId: uiComponent.serviceId,
+          requiredScopes: uiComponent.requiredScopes || [],
+          placeholder: uiComponent.placeholder,
+          dependsOn: uiComponent.dependsOn,
+        }}
+        disabled={disabled}
+      />
+    </GenericSyncWrapper>
+  )
+}
+
 function KnowledgeBaseSelectorSyncWrapper({
   blockId,
   paramId,
@@ -342,6 +388,7 @@ function DocumentSelectorSyncWrapper({
   onChange,
   uiComponent,
   disabled,
+  previewContextValues,
 }: {
   blockId: string
   paramId: string
@@ -349,6 +396,7 @@ function DocumentSelectorSyncWrapper({
   onChange: (value: string) => void
   uiComponent: any
   disabled: boolean
+  previewContextValues?: Record<string, any>
 }) {
   return (
     <GenericSyncWrapper blockId={blockId} paramId={paramId} value={value} onChange={onChange}>
@@ -361,6 +409,67 @@ function DocumentSelectorSyncWrapper({
           dependsOn: ['knowledgeBaseId'],
         }}
         disabled={disabled}
+        previewContextValues={previewContextValues}
+      />
+    </GenericSyncWrapper>
+  )
+}
+
+function DocumentTagEntrySyncWrapper({
+  blockId,
+  paramId,
+  value,
+  onChange,
+  disabled,
+  previewContextValues,
+}: {
+  blockId: string
+  paramId: string
+  value: string
+  onChange: (value: string) => void
+  disabled: boolean
+  previewContextValues?: Record<string, any>
+}) {
+  return (
+    <GenericSyncWrapper blockId={blockId} paramId={paramId} value={value} onChange={onChange}>
+      <DocumentTagEntry
+        blockId={blockId}
+        subBlock={{
+          id: paramId,
+          type: 'document-tag-entry',
+        }}
+        disabled={disabled}
+        previewContextValues={previewContextValues}
+      />
+    </GenericSyncWrapper>
+  )
+}
+
+function KnowledgeTagFiltersSyncWrapper({
+  blockId,
+  paramId,
+  value,
+  onChange,
+  disabled,
+  previewContextValues,
+}: {
+  blockId: string
+  paramId: string
+  value: string
+  onChange: (value: string) => void
+  disabled: boolean
+  previewContextValues?: Record<string, any>
+}) {
+  return (
+    <GenericSyncWrapper blockId={blockId} paramId={paramId} value={value} onChange={onChange}>
+      <KnowledgeTagFilters
+        blockId={blockId}
+        subBlock={{
+          id: paramId,
+          type: 'knowledge-tag-filters',
+        }}
+        disabled={disabled}
+        previewContextValues={previewContextValues}
       />
     </GenericSyncWrapper>
   )
@@ -497,11 +606,15 @@ function CheckboxListSyncWrapper({
 }
 
 function ComboboxSyncWrapper({
+  blockId,
+  paramId,
   value,
   onChange,
   uiComponent,
   disabled,
 }: {
+  blockId: string
+  paramId: string
   value: string
   onChange: (value: string) => void
   uiComponent: any
@@ -512,13 +625,15 @@ function ComboboxSyncWrapper({
   )
 
   return (
-    <Combobox
-      options={options}
-      value={value}
-      onChange={onChange}
-      placeholder={uiComponent.placeholder || 'Select option'}
-      disabled={disabled}
-    />
+    <GenericSyncWrapper blockId={blockId} paramId={paramId} value={value} onChange={onChange}>
+      <Combobox
+        options={options}
+        value={value}
+        onChange={onChange}
+        placeholder={uiComponent.placeholder || 'Select option'}
+        disabled={disabled}
+      />
+    </GenericSyncWrapper>
   )
 }
 
@@ -597,6 +712,8 @@ function SlackSelectorSyncWrapper({
 }
 
 function WorkflowSelectorSyncWrapper({
+  blockId,
+  paramId,
   value,
   onChange,
   uiComponent,
@@ -604,6 +721,8 @@ function WorkflowSelectorSyncWrapper({
   workspaceId,
   currentWorkflowId,
 }: {
+  blockId: string
+  paramId: string
   value: string
   onChange: (value: string) => void
   uiComponent: any
@@ -623,15 +742,17 @@ function WorkflowSelectorSyncWrapper({
   }))
 
   return (
-    <Combobox
-      options={options}
-      value={value}
-      onChange={onChange}
-      placeholder={uiComponent.placeholder || 'Select workflow'}
-      disabled={disabled || isLoading}
-      searchable
-      searchPlaceholder='Search workflows...'
-    />
+    <GenericSyncWrapper blockId={blockId} paramId={paramId} value={value} onChange={onChange}>
+      <Combobox
+        options={options}
+        value={value}
+        onChange={onChange}
+        placeholder={uiComponent.placeholder || 'Select workflow'}
+        disabled={disabled || isLoading}
+        searchable
+        searchPlaceholder='Search workflows...'
+      />
+    </GenericSyncWrapper>
   )
 }
 
@@ -877,7 +998,7 @@ function createToolIcon(bgColor: string, IconComponent: any) {
  * - Allows drag-and-drop reordering of selected tools
  * - Supports tool usage control (auto/force/none) for compatible LLM providers
  */
-export function ToolInput({
+export const ToolInput = memo(function ToolInput({
   blockId,
   subBlockId,
   isPreview = false,
@@ -1792,57 +1913,13 @@ export function ToolInput({
     return toolParams?.toolConfig?.oauth
   }
 
-  /**
-   * Evaluates parameter conditions to determine if a parameter should be visible.
-   *
-   * @remarks
-   * Supports field value matching with arrays, negation via `not`, and
-   * compound conditions via `and`. Used for conditional parameter visibility.
-   *
-   * @param param - The parameter configuration with optional condition
-   * @param tool - The current tool instance with its parameter values
-   * @returns `true` if the parameter should be shown based on its condition
-   */
   const evaluateParameterCondition = (param: any, tool: StoredTool): boolean => {
     if (!('uiComponent' in param) || !param.uiComponent?.condition) return true
-
-    const condition = param.uiComponent.condition
-    const currentValues: Record<string, any> = {
-      operation: tool.operation,
-      ...tool.params,
-    }
-
-    const fieldValue = currentValues[condition.field]
-    let result = false
-
-    if (Array.isArray(condition.value)) {
-      result = condition.value.includes(fieldValue)
-    } else {
-      result = fieldValue === condition.value
-    }
-
-    if (condition.not) {
-      result = !result
-    }
-
-    if (condition.and) {
-      const andFieldValue = currentValues[condition.and.field]
-      let andResult = false
-
-      if (Array.isArray(condition.and.value)) {
-        andResult = condition.and.value.includes(andFieldValue)
-      } else {
-        andResult = andFieldValue === condition.and.value
-      }
-
-      if (condition.and.not) {
-        andResult = !andResult
-      }
-
-      result = result && andResult
-    }
-
-    return result
+    const currentValues: Record<string, any> = { operation: tool.operation, ...tool.params }
+    return evaluateSubBlockCondition(
+      param.uiComponent.condition as SubBlockCondition,
+      currentValues
+    )
   }
 
   /**
@@ -1961,7 +2038,7 @@ export function ToolInput({
             onChange={onChange}
             uiComponent={uiComponent}
             disabled={disabled}
-            previewContextValues={currentToolParams as any}
+            previewContextValues={currentToolParams}
             selectorType='channel-selector'
           />
         )
@@ -1975,7 +2052,7 @@ export function ToolInput({
             onChange={onChange}
             uiComponent={uiComponent}
             disabled={disabled}
-            previewContextValues={currentToolParams as any}
+            previewContextValues={currentToolParams}
             selectorType='user-selector'
           />
         )
@@ -1995,7 +2072,7 @@ export function ToolInput({
             }}
             onProjectSelect={onChange}
             disabled={disabled}
-            previewContextValues={currentToolParams as any}
+            previewContextValues={currentToolParams}
           />
         )
 
@@ -2020,7 +2097,7 @@ export function ToolInput({
             onChange={onChange}
             uiComponent={uiComponent}
             disabled={disabled}
-            previewContextValues={currentToolParams as any}
+            previewContextValues={currentToolParams}
           />
         )
 
@@ -2033,7 +2110,20 @@ export function ToolInput({
             onChange={onChange}
             uiComponent={uiComponent}
             disabled={disabled}
-            previewContextValues={currentToolParams as any}
+            previewContextValues={currentToolParams}
+          />
+        )
+
+      case 'folder-selector':
+        return (
+          <FolderSelectorSyncWrapper
+            blockId={blockId}
+            paramId={param.id}
+            value={value}
+            onChange={onChange}
+            uiComponent={uiComponent}
+            disabled={disabled}
+            previewContextValues={currentToolParams}
           />
         )
 
@@ -2052,6 +2142,8 @@ export function ToolInput({
       case 'combobox':
         return (
           <ComboboxSyncWrapper
+            blockId={blockId}
+            paramId={param.id}
             value={value}
             onChange={onChange}
             uiComponent={uiComponent}
@@ -2110,6 +2202,8 @@ export function ToolInput({
       case 'workflow-selector':
         return (
           <WorkflowSelectorSyncWrapper
+            blockId={blockId}
+            paramId={param.id}
             value={value}
             onChange={onChange}
             uiComponent={uiComponent}
@@ -2167,6 +2261,31 @@ export function ToolInput({
             onChange={onChange}
             uiComponent={uiComponent}
             disabled={disabled}
+            previewContextValues={currentToolParams}
+          />
+        )
+
+      case 'document-tag-entry':
+        return (
+          <DocumentTagEntrySyncWrapper
+            blockId={blockId}
+            paramId={param.id}
+            value={value}
+            onChange={onChange}
+            disabled={disabled}
+            previewContextValues={currentToolParams}
+          />
+        )
+
+      case 'knowledge-tag-filters':
+        return (
+          <KnowledgeTagFiltersSyncWrapper
+            blockId={blockId}
+            paramId={param.id}
+            value={value}
+            onChange={onChange}
+            disabled={disabled}
+            previewContextValues={currentToolParams}
           />
         )
 
@@ -2225,9 +2344,27 @@ export function ToolInput({
           // Get tool parameters using the new utility with block type for UI components
           const toolParams =
             !isCustomTool && !isMcpTool && currentToolId
-              ? getToolParametersConfig(currentToolId, tool.type)
+              ? getToolParametersConfig(currentToolId, tool.type, {
+                  operation: tool.operation,
+                  ...tool.params,
+                })
               : null
 
+          // Build canonical index for proper dependency resolution
+          const toolCanonicalIndex: CanonicalIndex | null = toolBlock?.subBlocks
+            ? buildCanonicalIndex(toolBlock.subBlocks)
+            : null
+
+          // Build preview context with canonical resolution
+          const toolContextValues = toolCanonicalIndex
+            ? buildPreviewContextValues(tool.params || {}, {
+                blockType: tool.type,
+                subBlocks: toolBlock!.subBlocks,
+                canonicalIndex: toolCanonicalIndex,
+                values: { operation: tool.operation, ...tool.params },
+              })
+            : tool.params || {}
+
           // For custom tools, resolve from reference (new format) or use inline (legacy)
           const resolvedCustomTool = isCustomTool
             ? resolveCustomToolFromReference(tool, customTools)
@@ -2590,7 +2727,7 @@ export function ToolInput({
                             {param.required && param.visibility === 'user-only' && (
                               <span className='ml-1'>*</span>
                             )}
-                            {(!param.required || param.visibility !== 'user-only') && (
+                            {param.visibility === 'user-or-llm' && (
                               <span className='ml-[6px] text-[12px] text-[var(--text-tertiary)]'>
                                 (optional)
                               </span>
@@ -2603,7 +2740,7 @@ export function ToolInput({
                                 tool.params?.[param.id] || '',
                                 (value) => handleParamChange(toolIndex, param.id, value),
                                 toolIndex,
-                                tool.params || {}
+                                toolContextValues as Record<string, string>
                               )
                             ) : (
                               <ShortInput
@@ -2682,4 +2819,4 @@ export function ToolInput({
       />
     </div>
   )
-}
+})
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/hooks/use-depends-on-gate.ts b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/hooks/use-depends-on-gate.ts
index e333338f93..cc5a906098 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/hooks/use-depends-on-gate.ts
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/hooks/use-depends-on-gate.ts
@@ -1,6 +1,7 @@
 'use client'
 
-import { useMemo } from 'react'
+import { useCallback, useMemo } from 'react'
+import { isEqual } from 'lodash'
 import {
   buildCanonicalIndex,
   isNonEmptyValue,
@@ -97,47 +98,60 @@ export function useDependsOnGate(
     return rawValue
   }
 
-  // Get values for all dependency fields (both all and any)
-  const dependencyValuesMap = useSubBlockStore((state) => {
-    if (allDependsOnFields.length === 0) return {} as Record<string, unknown>
+  const dependencySelector = useCallback(
+    (state: ReturnType<typeof useSubBlockStore.getState>) => {
+      if (allDependsOnFields.length === 0) return {} as Record<string, unknown>
+
+      // If previewContextValues are provided (e.g., tool parameters), use those first
+      if (previewContextValues) {
+        const map: Record<string, unknown> = {}
+        for (const key of allDependsOnFields) {
+          const resolvedValue = resolveDependencyValue(
+            key,
+            previewContextValues,
+            canonicalIndex,
+            canonicalModeOverrides
+          )
+          map[key] = normalizeDependencyValue(resolvedValue)
+        }
+        return map
+      }
+
+      if (!activeWorkflowId) {
+        const map: Record<string, unknown> = {}
+        for (const key of allDependsOnFields) {
+          map[key] = null
+        }
+        return map
+      }
 
-    // If previewContextValues are provided (e.g., tool parameters), use those first
-    if (previewContextValues) {
+      const workflowValues = state.workflowValues[activeWorkflowId] || {}
+      const blockValues = (workflowValues as any)[blockId] || {}
       const map: Record<string, unknown> = {}
       for (const key of allDependsOnFields) {
         const resolvedValue = resolveDependencyValue(
           key,
-          previewContextValues,
+          blockValues,
           canonicalIndex,
           canonicalModeOverrides
         )
         map[key] = normalizeDependencyValue(resolvedValue)
       }
       return map
-    }
-
-    if (!activeWorkflowId) {
-      const map: Record<string, unknown> = {}
-      for (const key of allDependsOnFields) {
-        map[key] = null
-      }
-      return map
-    }
+    },
+    [
+      allDependsOnFields,
+      previewContextValues,
+      activeWorkflowId,
+      blockId,
+      canonicalIndex,
+      canonicalModeOverrides,
+    ]
+  )
 
-    const workflowValues = state.workflowValues[activeWorkflowId] || {}
-    const blockValues = (workflowValues as any)[blockId] || {}
-    const map: Record<string, unknown> = {}
-    for (const key of allDependsOnFields) {
-      const resolvedValue = resolveDependencyValue(
-        key,
-        blockValues,
-        canonicalIndex,
-        canonicalModeOverrides
-      )
-      map[key] = normalizeDependencyValue(resolvedValue)
-    }
-    return map
-  })
+  // Get values for all dependency fields (both all and any)
+  // Use isEqual to prevent re-renders when dependency values haven't actually changed
+  const dependencyValuesMap = useSubBlockStore(dependencySelector, isEqual)
 
   const depsSatisfied = useMemo(() => {
     // Check all fields (AND logic) - all must be satisfied
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/hooks/use-sub-block-value.ts b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/hooks/use-sub-block-value.ts
index 3acc8a5534..b757d4f09a 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/hooks/use-sub-block-value.ts
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/hooks/use-sub-block-value.ts
@@ -1,6 +1,7 @@
 import { useCallback, useEffect, useRef } from 'react'
 import { createLogger } from '@sim/logger'
 import { isEqual } from 'lodash'
+import { useShallow } from 'zustand/react/shallow'
 import { useCollaborativeWorkflow } from '@/hooks/use-collaborative-workflow'
 import { getProviderFromModel } from '@/providers/utils'
 import { useWorkflowDiffStore } from '@/stores/workflow-diff/store'
@@ -51,16 +52,12 @@ export function useSubBlockValue<T = any>(
     )
   )
 
-  // Keep a ref to the latest value to prevent unnecessary re-renders
   const valueRef = useRef<T | null>(null)
 
-  // Streaming refs
   const lastEmittedValueRef = useRef<T | null>(null)
   const streamingValueRef = useRef<T | null>(null)
   const wasStreamingRef = useRef<boolean>(false)
 
-  // Get value from subblock store, keyed by active workflow id
-  // Optimized: use shallow equality comparison to prevent re-renders when other fields change
   const storeValue = useSubBlockStore(
     useCallback(
       (state) => {
@@ -70,11 +67,17 @@ export function useSubBlockValue<T = any>(
       },
       [activeWorkflowId, blockId, subBlockId]
     ),
-    (a, b) => isEqual(a, b) // Use deep equality to prevent re-renders for same values
+    (a, b) => isEqual(a, b)
   )
 
   // Check if we're in diff mode and get diff value if available
-  const { isShowingDiff, hasActiveDiff, baselineWorkflow } = useWorkflowDiffStore()
+  const { isShowingDiff, hasActiveDiff, baselineWorkflow } = useWorkflowDiffStore(
+    useShallow((state) => ({
+      isShowingDiff: state.isShowingDiff,
+      hasActiveDiff: state.hasActiveDiff,
+      baselineWorkflow: state.baselineWorkflow,
+    }))
+  )
   const isBaselineView = hasActiveDiff && !isShowingDiff
   const snapshotSubBlock =
     isBaselineView && baselineWorkflow
@@ -101,7 +104,7 @@ export function useSubBlockValue<T = any>(
   // Compute the modelValue based on block type
   const modelValue = isProviderBasedBlock ? (modelSubBlockValue as string) : null
 
-  // Emit the value to socket/DB
+  // Emit the value to socket/DB and update local store
   const emitValue = useCallback(
     (value: T) => {
       collaborativeSetSubblockValue(blockId, subBlockId, value)
@@ -155,20 +158,6 @@ export function useSubBlockValue<T = any>(
           return
         }
 
-        // Update local store immediately for UI responsiveness (non-streaming)
-        useSubBlockStore.setState((state) => ({
-          workflowValues: {
-            ...state.workflowValues,
-            [currentActiveWorkflowId]: {
-              ...state.workflowValues[currentActiveWorkflowId],
-              [blockId]: {
-                ...state.workflowValues[currentActiveWorkflowId]?.[blockId],
-                [subBlockId]: newValue,
-              },
-            },
-          },
-        }))
-
         // Handle model changes for provider-based blocks - clear API key when provider changes (non-streaming)
         if (
           subBlockId === 'model' &&
@@ -206,6 +195,8 @@ export function useSubBlockValue<T = any>(
       isStreaming,
       emitValue,
       isBaselineView,
+      collaborativeSetSubblockValue,
+      isProviderBasedBlock,
     ]
   )
 
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/sub-block.tsx b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/sub-block.tsx
index 9379ed8c20..2ea7cb5572 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/sub-block.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/sub-block.tsx
@@ -1,4 +1,5 @@
 import { type JSX, type MouseEvent, memo, useRef, useState } from 'react'
+import { isEqual } from 'lodash'
 import { AlertTriangle, ArrowLeftRight, ArrowUp } from 'lucide-react'
 import { Button, Input, Label, Tooltip } from '@/components/emcn/components'
 import { cn } from '@/lib/core/utils/cn'
@@ -168,6 +169,8 @@ const getPreviewValue = (
  * @param isValidJson - Whether the JSON content is valid (for code blocks)
  * @param subBlockValues - Current values of all subblocks for evaluating conditional requirements
  * @param wandState - Optional state and handlers for the AI wand feature
+ * @param canonicalToggle - Optional canonical toggle metadata and handlers
+ * @param canonicalToggleIsDisabled - Whether the canonical toggle is disabled
  * @returns The label JSX element, or `null` for switch types or when no title is defined
  */
 const renderLabel = (
@@ -192,7 +195,8 @@ const renderLabel = (
     mode: 'basic' | 'advanced'
     disabled?: boolean
     onToggle?: () => void
-  }
+  },
+  canonicalToggleIsDisabled?: boolean
 ): JSX.Element | null => {
   if (config.type === 'switch') return null
   if (!config.title) return null
@@ -200,28 +204,28 @@ const renderLabel = (
   const required = isFieldRequired(config, subBlockValues)
   const showWand = wandState?.isWandEnabled && !wandState.isPreview && !wandState.disabled
   const showCanonicalToggle = !!canonicalToggle && !wandState?.isPreview
-  const canonicalToggleDisabled = wandState?.disabled || canonicalToggle?.disabled
+  const canonicalToggleDisabledResolved = canonicalToggleIsDisabled ?? canonicalToggle?.disabled
 
   return (
     <div className='flex items-center justify-between gap-[6px] pl-[2px]'>
       <Label className='flex items-center gap-[6px] whitespace-nowrap'>
         {config.title}
         {required && <span className='ml-0.5'>*</span>}
-        {config.type === 'code' && config.language === 'json' && (
-          <Tooltip.Root>
-            <Tooltip.Trigger asChild>
-              <AlertTriangle
-                className={cn(
-                  'h-4 w-4 cursor-pointer text-destructive',
-                  !isValidJson ? 'opacity-100' : 'opacity-0'
-                )}
-              />
-            </Tooltip.Trigger>
-            <Tooltip.Content side='top'>
-              <p>Invalid JSON</p>
-            </Tooltip.Content>
-          </Tooltip.Root>
-        )}
+        {config.type === 'code' &&
+          config.language === 'json' &&
+          !isValidJson &&
+          !wandState?.isStreaming && (
+            <Tooltip.Root>
+              <Tooltip.Trigger asChild>
+                <span className='inline-flex'>
+                  <AlertTriangle className='h-3 w-3 flex-shrink-0 cursor-pointer text-destructive' />
+                </span>
+              </Tooltip.Trigger>
+              <Tooltip.Content side='top'>
+                <p>Invalid JSON</p>
+              </Tooltip.Content>
+            </Tooltip.Root>
+          )}
       </Label>
       <div className='flex items-center gap-[6px]'>
         {showWand && (
@@ -239,9 +243,11 @@ const renderLabel = (
                 <Input
                   ref={wandState.searchInputRef}
                   value={wandState.isStreaming ? 'Generating...' : wandState.searchQuery}
-                  onChange={(e) => wandState.onSearchChange(e.target.value)}
+                  onChange={(e: React.ChangeEvent<HTMLInputElement>) =>
+                    wandState.onSearchChange(e.target.value)
+                  }
                   onBlur={wandState.onSearchBlur}
-                  onKeyDown={(e) => {
+                  onKeyDown={(e: React.KeyboardEvent<HTMLInputElement>) => {
                     if (
                       e.key === 'Enter' &&
                       wandState.searchQuery.trim() &&
@@ -262,11 +268,11 @@ const renderLabel = (
                 <Button
                   variant='tertiary'
                   disabled={!wandState.searchQuery.trim() || wandState.isStreaming}
-                  onMouseDown={(e) => {
+                  onMouseDown={(e: React.MouseEvent) => {
                     e.preventDefault()
                     e.stopPropagation()
                   }}
-                  onClick={(e) => {
+                  onClick={(e: React.MouseEvent) => {
                     e.stopPropagation()
                     wandState.onSearchSubmit()
                   }}
@@ -283,7 +289,7 @@ const renderLabel = (
             type='button'
             className='flex h-[12px] w-[12px] flex-shrink-0 items-center justify-center bg-transparent p-0 disabled:cursor-not-allowed disabled:opacity-50'
             onClick={canonicalToggle?.onToggle}
-            disabled={canonicalToggleDisabled}
+            disabled={canonicalToggleDisabledResolved}
             aria-label={canonicalToggle?.mode === 'advanced' ? 'Use selector' : 'Enter manual ID'}
           >
             <ArrowLeftRight
@@ -302,22 +308,27 @@ const renderLabel = (
 }
 
 /**
- * Compares props to prevent unnecessary re-renders.
- *
- * @remarks
- * Used with React.memo to optimize performance by skipping re-renders
- * when props haven't meaningfully changed.
+ * Compares props for memo equality check.
  *
  * @param prevProps - Previous component props
  * @param nextProps - Next component props
  * @returns `true` if props are equal and re-render should be skipped
  */
 const arePropsEqual = (prevProps: SubBlockProps, nextProps: SubBlockProps): boolean => {
+  const subBlockId = prevProps.config.id
+  const prevValue = prevProps.subBlockValues?.[subBlockId]?.value
+  const nextValue = nextProps.subBlockValues?.[subBlockId]?.value
+
+  const valueEqual = prevValue === nextValue || isEqual(prevValue, nextValue)
+
+  const configEqual =
+    prevProps.config.id === nextProps.config.id && prevProps.config.type === nextProps.config.type
+
   return (
     prevProps.blockId === nextProps.blockId &&
-    prevProps.config === nextProps.config &&
+    configEqual &&
     prevProps.isPreview === nextProps.isPreview &&
-    prevProps.subBlockValues === nextProps.subBlockValues &&
+    valueEqual &&
     prevProps.disabled === nextProps.disabled &&
     prevProps.fieldDiffStatus === nextProps.fieldDiffStatus &&
     prevProps.allowExpandInPreview === nextProps.allowExpandInPreview &&
@@ -941,7 +952,8 @@ function SubBlockComponent({
           onSearchCancel: handleSearchCancel,
           searchInputRef,
         },
-        canonicalToggle
+        canonicalToggle,
+        Boolean(canonicalToggle?.disabled || disabled || isPreview)
       )}
       {renderInput()}
     </div>
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/editor.tsx b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/editor.tsx
index 3516855889..d9fa9a2062 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/editor.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/editor.tsx
@@ -1,12 +1,14 @@
 'use client'
 
 import { useCallback, useEffect, useMemo, useRef, useState } from 'react'
+import { isEqual } from 'lodash'
 import { BookOpen, Check, ChevronDown, ChevronUp, Pencil } from 'lucide-react'
+import { useShallow } from 'zustand/react/shallow'
 import { Button, Tooltip } from '@/components/emcn'
 import {
   buildCanonicalIndex,
+  evaluateSubBlockCondition,
   hasAdvancedValues,
-  hasStandaloneAdvancedFields,
   isCanonicalPair,
   resolveCanonicalMode,
 } from '@/lib/workflows/subblocks/visibility'
@@ -33,6 +35,9 @@ import { usePanelEditorStore } from '@/stores/panel'
 import { useWorkflowRegistry } from '@/stores/workflows/registry/store'
 import { useSubBlockStore } from '@/stores/workflows/subblock/store'
 
+/** Stable empty object to avoid creating new references */
+const EMPTY_SUBBLOCK_VALUES = {} as Record<string, any>
+
 /**
  * Icon component for rendering block icons.
  *
@@ -58,7 +63,15 @@ export function Editor() {
     toggleConnectionsCollapsed,
     shouldFocusRename,
     setShouldFocusRename,
-  } = usePanelEditorStore()
+  } = usePanelEditorStore(
+    useShallow((state) => ({
+      currentBlockId: state.currentBlockId,
+      connectionsHeight: state.connectionsHeight,
+      toggleConnectionsCollapsed: state.toggleConnectionsCollapsed,
+      shouldFocusRename: state.shouldFocusRename,
+      setShouldFocusRename: state.setShouldFocusRename,
+    }))
+  )
   const currentWorkflow = useCurrentWorkflow()
   const currentBlock = currentBlockId ? currentWorkflow.getBlockById(currentBlockId) : null
   const blockConfig = currentBlock ? getBlock(currentBlock.type) : null
@@ -86,15 +99,15 @@ export function Editor() {
     currentWorkflow.isSnapshotView
   )
 
-  // Subscribe to block's subblock values
   const blockSubBlockValues = useSubBlockStore(
     useCallback(
       (state) => {
-        if (!activeWorkflowId || !currentBlockId) return {}
-        return state.workflowValues[activeWorkflowId]?.[currentBlockId] || {}
+        if (!activeWorkflowId || !currentBlockId) return EMPTY_SUBBLOCK_VALUES
+        return state.workflowValues[activeWorkflowId]?.[currentBlockId] ?? EMPTY_SUBBLOCK_VALUES
       },
       [activeWorkflowId, currentBlockId]
-    )
+    ),
+    isEqual
   )
 
   const subBlocksForCanonical = useMemo(() => {
@@ -118,10 +131,24 @@ export function Editor() {
   )
   const displayAdvancedOptions = advancedMode || advancedValuesPresent
 
-  const hasAdvancedOnlyFields = useMemo(
-    () => hasStandaloneAdvancedFields(subBlocksForCanonical, canonicalIndex),
-    [subBlocksForCanonical, canonicalIndex]
-  )
+  const hasAdvancedOnlyFields = useMemo(() => {
+    for (const subBlock of subBlocksForCanonical) {
+      // Must be standalone advanced (mode: 'advanced' without canonicalParamId)
+      if (subBlock.mode !== 'advanced') continue
+      if (canonicalIndex.canonicalIdBySubBlockId[subBlock.id]) continue
+
+      // Check condition - skip if condition not met for current values
+      if (
+        subBlock.condition &&
+        !evaluateSubBlockCondition(subBlock.condition, blockSubBlockValues)
+      ) {
+        continue
+      }
+
+      return true
+    }
+    return false
+  }, [subBlocksForCanonical, canonicalIndex.canonicalIdBySubBlockId, blockSubBlockValues])
 
   // Get subblock layout using custom hook
   const { subBlocks, stateToUse: subBlockState } = useEditorSubblockLayout(
@@ -467,7 +494,9 @@ export function Editor() {
                         onClick={handleToggleAdvancedMode}
                         className='flex items-center gap-[6px] whitespace-nowrap font-medium text-[13px] text-[var(--text-secondary)] hover:text-[var(--text-primary)]'
                       >
-                        {displayAdvancedOptions ? 'Hide advanced fields' : 'Show advanced fields'}
+                        {displayAdvancedOptions
+                          ? 'Hide additional fields'
+                          : 'Show additional fields'}
                         <ChevronDown
                           className={`h-[14px] w-[14px] transition-transform duration-200 ${displayAdvancedOptions ? 'rotate-180' : ''}`}
                         />
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/hooks/use-block-connections.ts b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/hooks/use-block-connections.ts
index 5f1d854ebe..a61ee158ac 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/hooks/use-block-connections.ts
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/hooks/use-block-connections.ts
@@ -43,13 +43,12 @@ export function useBlockConnections(blockId: string) {
   )
 
   const workflowId = useWorkflowRegistry((state) => state.activeWorkflowId)
-  const workflowSubBlockValues = useSubBlockStore((state) =>
-    workflowId ? (state.workflowValues[workflowId] ?? {}) : {}
-  )
 
-  // Helper function to merge block subBlocks with live values from subblock store
   const getMergedSubBlocks = (sourceBlockId: string): Record<string, any> => {
     const base = blocks[sourceBlockId]?.subBlocks || {}
+    const workflowSubBlockValues = workflowId
+      ? (useSubBlockStore.getState().workflowValues[workflowId] ?? {})
+      : {}
     const live = workflowSubBlockValues?.[sourceBlockId] || {}
     const merged: Record<string, any> = { ...base }
     for (const [subId, liveVal] of Object.entries(live)) {
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/hooks/use-connections-resize.ts b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/hooks/use-connections-resize.ts
index ea9185f30f..957b0fd506 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/hooks/use-connections-resize.ts
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/hooks/use-connections-resize.ts
@@ -1,4 +1,5 @@
 import { useCallback, useEffect, useRef, useState } from 'react'
+import { useShallow } from 'zustand/react/shallow'
 import { usePanelEditorStore } from '@/stores/panel'
 
 /**
@@ -27,7 +28,12 @@ interface UseConnectionsResizeProps {
  * @returns Object containing resize handler
  */
 export function useConnectionsResize({ subBlocksRef }: UseConnectionsResizeProps) {
-  const { connectionsHeight, setConnectionsHeight } = usePanelEditorStore()
+  const { connectionsHeight, setConnectionsHeight } = usePanelEditorStore(
+    useShallow((state) => ({
+      connectionsHeight: state.connectionsHeight,
+      setConnectionsHeight: state.setConnectionsHeight,
+    }))
+  )
 
   const [isResizing, setIsResizing] = useState(false)
   const startYRef = useRef<number>(0)
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/hooks/use-editor-block-properties.ts b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/hooks/use-editor-block-properties.ts
index 27539b331f..64f38b213a 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/hooks/use-editor-block-properties.ts
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/hooks/use-editor-block-properties.ts
@@ -1,4 +1,5 @@
-import { useCallback, useMemo } from 'react'
+import { useCallback } from 'react'
+import { shallow } from 'zustand/shallow'
 import { useWorkflowDiffStore } from '@/stores/workflow-diff'
 import { useWorkflowStore } from '@/stores/workflows/workflow/store'
 
@@ -11,27 +12,36 @@ import { useWorkflowStore } from '@/stores/workflows/workflow/store'
  * @returns Block display properties (advanced mode, trigger mode)
  */
 export function useEditorBlockProperties(blockId: string | null, isSnapshotView: boolean) {
-  const normalBlocks = useWorkflowStore(useCallback((state) => state.blocks, []))
-  const baselineBlocks = useWorkflowDiffStore(
-    useCallback((state) => state.baselineWorkflow?.blocks || {}, [])
+  const normalBlockProps = useWorkflowStore(
+    useCallback(
+      (state) => {
+        if (!blockId) return { advancedMode: false, triggerMode: false }
+        const block = state.blocks?.[blockId]
+        return {
+          advancedMode: block?.advancedMode ?? false,
+          triggerMode: block?.triggerMode ?? false,
+        }
+      },
+      [blockId]
+    ),
+    shallow
   )
 
-  const blockProperties = useMemo(() => {
-    if (!blockId) {
-      return {
-        advancedMode: false,
-        triggerMode: false,
-      }
-    }
-
-    const blocks = isSnapshotView ? baselineBlocks : normalBlocks
-    const block = blocks?.[blockId]
-
-    return {
-      advancedMode: block?.advancedMode ?? false,
-      triggerMode: block?.triggerMode ?? false,
-    }
-  }, [blockId, isSnapshotView, normalBlocks, baselineBlocks])
+  const baselineBlockProps = useWorkflowDiffStore(
+    useCallback(
+      (state) => {
+        if (!blockId) return { advancedMode: false, triggerMode: false }
+        const block = state.baselineWorkflow?.blocks?.[blockId]
+        return {
+          advancedMode: block?.advancedMode ?? false,
+          triggerMode: block?.triggerMode ?? false,
+        }
+      },
+      [blockId]
+    ),
+    shallow
+  )
 
-  return blockProperties
+  // Use the appropriate props based on view mode
+  return isSnapshotView ? baselineBlockProps : normalBlockProps
 }
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/hooks/use-subflow-editor.ts b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/hooks/use-subflow-editor.ts
index 3c3b0ecf82..6945386872 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/hooks/use-subflow-editor.ts
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/hooks/use-subflow-editor.ts
@@ -53,22 +53,27 @@ const SUBFLOW_CONFIG = {
  * @returns Subflow editor state and handlers
  */
 export function useSubflowEditor(currentBlock: BlockState | null, currentBlockId: string | null) {
-  const workflowStore = useWorkflowStore()
   const textareaRef = useRef<HTMLTextAreaElement | null>(null)
   const editorContainerRef = useRef<HTMLDivElement>(null)
 
-  // State
   const [tempInputValue, setTempInputValue] = useState<string | null>(null)
   const [showTagDropdown, setShowTagDropdown] = useState(false)
   const [cursorPosition, setCursorPosition] = useState(0)
 
-  // Check if current block is a subflow
   const isSubflow =
     currentBlock && (currentBlock.type === 'loop' || currentBlock.type === 'parallel')
 
-  // Get subflow configuration
   const subflowConfig = isSubflow ? SUBFLOW_CONFIG[currentBlock.type as 'loop' | 'parallel'] : null
-  const nodeConfig = isSubflow ? workflowStore[subflowConfig!.storeKey][currentBlockId!] : null
+
+  const nodeConfig = useWorkflowStore(
+    useCallback(
+      (state) => {
+        if (!isSubflow || !subflowConfig || !currentBlockId) return null
+        return state[subflowConfig.storeKey][currentBlockId] ?? null
+      },
+      [isSubflow, subflowConfig, currentBlockId]
+    )
+  )
 
   // Get block data for fallback values
   const blockData = isSubflow ? currentBlock?.data : null
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/toolbar/toolbar.tsx b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/toolbar/toolbar.tsx
index 76637a7fcb..365379854a 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/toolbar/toolbar.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/toolbar/toolbar.tsx
@@ -2,6 +2,7 @@
 
 import {
   forwardRef,
+  memo,
   useCallback,
   useEffect,
   useImperativeHandle,
@@ -39,22 +40,133 @@ interface BlockItem {
   docsLink?: string
 }
 
+interface ToolbarItemProps {
+  item: BlockItem
+  isTrigger: boolean
+  onDragStart: (
+    e: React.DragEvent<HTMLElement>,
+    type: string,
+    enableTriggerMode: boolean,
+    dragItemInfo?: { name: string; bgColor: string; iconElement: HTMLElement | null }
+  ) => void
+  onClick: (type: string, enableTriggerMode: boolean) => void
+  onContextMenu: (e: React.MouseEvent, type: string, isTrigger: boolean, docsLink?: string) => void
+  itemRef: (el: HTMLDivElement | null) => void
+}
+
+const ToolbarItem = memo(function ToolbarItem({
+  item,
+  isTrigger,
+  onDragStart,
+  onClick,
+  onContextMenu,
+  itemRef,
+}: ToolbarItemProps) {
+  const Icon = item.icon
+  const isTriggerCapable = isTrigger && item.config ? hasTriggerCapability(item.config) : false
+
+  const handleDragStart = useCallback(
+    (e: React.DragEvent<HTMLElement>) => {
+      if (!isTrigger && (item.type === 'loop' || item.type === 'parallel')) {
+        document.body.classList.add('sim-drag-subflow')
+      }
+      const iconElement = e.currentTarget.querySelector('.toolbar-item-icon')
+      onDragStart(e, item.type, isTriggerCapable, {
+        name: item.name,
+        bgColor: item.bgColor ?? '#666666',
+        iconElement: iconElement as HTMLElement | null,
+      })
+    },
+    [item.type, item.name, item.bgColor, isTriggerCapable, onDragStart, isTrigger]
+  )
+
+  const handleDragEnd = useCallback(() => {
+    if (!isTrigger) {
+      document.body.classList.remove('sim-drag-subflow')
+    }
+  }, [isTrigger])
+
+  const handleClick = useCallback(() => {
+    onClick(item.type, isTriggerCapable)
+  }, [item.type, isTriggerCapable, onClick])
+
+  const handleContextMenu = useCallback(
+    (e: React.MouseEvent) => {
+      onContextMenu(e, item.type, isTrigger, item.docsLink ?? item.config?.docsLink)
+    },
+    [item, isTrigger, onContextMenu]
+  )
+
+  const handleKeyDown = useCallback(
+    (event: React.KeyboardEvent) => {
+      if (event.key === 'Enter') {
+        event.preventDefault()
+        event.stopPropagation()
+        onClick(item.type, isTriggerCapable)
+      }
+    },
+    [item.type, isTriggerCapable, onClick]
+  )
+
+  return (
+    <div
+      ref={itemRef}
+      tabIndex={-1}
+      draggable
+      onDragStart={handleDragStart}
+      onDragEnd={handleDragEnd}
+      onClick={handleClick}
+      onContextMenu={handleContextMenu}
+      className={clsx(
+        'group flex h-[28px] items-center gap-[8px] rounded-[8px] px-[6px] text-[14px]',
+        'cursor-pointer hover:bg-[var(--surface-6)] active:cursor-grabbing dark:hover:bg-[var(--surface-5)]',
+        'focus-visible:bg-[var(--surface-6)] focus-visible:outline-none dark:focus-visible:bg-[var(--surface-5)]'
+      )}
+      onKeyDown={handleKeyDown}
+    >
+      <div
+        className='relative flex h-[16px] w-[16px] flex-shrink-0 items-center justify-center overflow-hidden rounded-[4px]'
+        style={{ background: item.bgColor }}
+      >
+        {Icon && (
+          <Icon
+            className={clsx(
+              'toolbar-item-icon text-white transition-transform duration-200',
+              'group-hover:scale-110',
+              '!h-[10px] !w-[10px]'
+            )}
+          />
+        )}
+      </div>
+      <span
+        className={clsx(
+          'truncate font-medium',
+          'text-[var(--text-secondary)] group-hover:text-[var(--text-primary)]',
+          'group-focus-visible:text-[var(--text-primary)]'
+        )}
+      >
+        {item.name}
+      </span>
+    </div>
+  )
+})
+
 /**
  * Cached triggers data - lazy initialized on first access (client-side only)
  */
-let cachedTriggers: ReturnType<typeof getTriggersForSidebar> | null = null
+let cachedTriggers: BlockItem[] | null = null
 
 /**
  * Gets triggers data, computing it once and caching for subsequent calls.
  * Non-integration triggers (Start, Schedule, Webhook) are prioritized first,
  * followed by all other triggers sorted alphabetically.
  */
-function getTriggers() {
+function getTriggers(): BlockItem[] {
   if (cachedTriggers === null) {
     const allTriggers = getTriggersForSidebar()
     const priorityOrder = ['Start', 'Schedule', 'Webhook']
 
-    cachedTriggers = allTriggers.sort((a, b) => {
+    const sortedTriggers = allTriggers.sort((a, b) => {
       const aIndex = priorityOrder.indexOf(a.name)
       const bIndex = priorityOrder.indexOf(b.name)
       const aHasPriority = aIndex !== -1
@@ -65,6 +177,16 @@ function getTriggers() {
       if (bHasPriority) return 1
       return a.name.localeCompare(b.name)
     })
+
+    cachedTriggers = sortedTriggers.map((trigger) => ({
+      name: trigger.name,
+      type: trigger.type,
+      config: trigger,
+      icon: trigger.icon,
+      bgColor: trigger.bgColor,
+      docsLink: trigger.docsLink,
+      isSpecial: false,
+    }))
   }
   return cachedTriggers
 }
@@ -163,636 +285,542 @@ export interface ToolbarRef {
  */
 const TRIGGERS_MIN_THRESHOLD = 50
 
-export const Toolbar = forwardRef<ToolbarRef, ToolbarProps>(function Toolbar(
-  { isActive = true }: ToolbarProps,
-  ref
-) {
-  const rootRef = useRef<HTMLDivElement>(null)
-  const containerRef = useRef<HTMLDivElement>(null)
-  const triggersContentRef = useRef<HTMLDivElement>(null)
-  const triggersHeaderRef = useRef<HTMLDivElement>(null)
-  const blocksHeaderRef = useRef<HTMLDivElement>(null)
-  const searchInputRef = useRef<HTMLInputElement>(null)
-  const triggerItemRefs = useRef<Array<HTMLDivElement | null>>([])
-  const blockItemRefs = useRef<Array<HTMLDivElement | null>>([])
-
-  // Search state
-  const [isSearchActive, setIsSearchActive] = useState(false)
-  const [searchQuery, setSearchQuery] = useState('')
-
-  // Toggle animation state
-  const [isToggling, setIsToggling] = useState(false)
-
-  // Context menu state
-  const [isContextMenuOpen, setIsContextMenuOpen] = useState(false)
-  const [contextMenuPosition, setContextMenuPosition] = useState({ x: 0, y: 0 })
-  const contextMenuRef = useRef<HTMLDivElement>(null)
-  const [activeItemInfo, setActiveItemInfo] = useState<{
-    type: string
-    isTrigger: boolean
-    docsLink?: string
-  } | null>(null)
-
-  // Toolbar store
-  const { toolbarTriggersHeight, setToolbarTriggersHeight, preSearchHeight, setPreSearchHeight } =
-    useToolbarStore()
-
-  // Toolbar item interactions hook
-  const { handleDragStart, handleItemClick } = useToolbarItemInteractions({ disabled: false })
-
-  // Toolbar resize hook
-  const { handleMouseDown, isResizing } = useToolbarResize({
-    containerRef,
-    triggersContentRef,
-    triggersHeaderRef,
-  })
+export const Toolbar = memo(
+  forwardRef<ToolbarRef, ToolbarProps>(function Toolbar({ isActive = true }: ToolbarProps, ref) {
+    const rootRef = useRef<HTMLDivElement>(null)
+    const containerRef = useRef<HTMLDivElement>(null)
+    const triggersContentRef = useRef<HTMLDivElement>(null)
+    const triggersHeaderRef = useRef<HTMLDivElement>(null)
+    const blocksHeaderRef = useRef<HTMLDivElement>(null)
+    const searchInputRef = useRef<HTMLInputElement>(null)
+    const triggerItemRefs = useRef<Array<HTMLDivElement | null>>([])
+    const blockItemRefs = useRef<Array<HTMLDivElement | null>>([])
+
+    const triggerRefCallbacks = useRef<Record<number, (el: HTMLDivElement | null) => void>>({})
+    const blockRefCallbacks = useRef<Record<number, (el: HTMLDivElement | null) => void>>({})
+
+    const getTriggerRefCallback = useCallback((index: number) => {
+      if (!triggerRefCallbacks.current[index]) {
+        triggerRefCallbacks.current[index] = (el) => {
+          triggerItemRefs.current[index] = el
+        }
+      }
+      return triggerRefCallbacks.current[index]
+    }, [])
 
-  // Permission config for filtering
-  const { filterBlocks } = usePermissionConfig()
+    const getBlockRefCallback = useCallback((index: number) => {
+      if (!blockRefCallbacks.current[index]) {
+        blockRefCallbacks.current[index] = (el) => {
+          blockItemRefs.current[index] = el
+        }
+      }
+      return blockRefCallbacks.current[index]
+    }, [])
+
+    // Search state
+    const [isSearchActive, setIsSearchActive] = useState(false)
+    const [searchQuery, setSearchQuery] = useState('')
+
+    // Toggle animation state
+    const [isToggling, setIsToggling] = useState(false)
+
+    // Context menu state
+    const [isContextMenuOpen, setIsContextMenuOpen] = useState(false)
+    const [contextMenuPosition, setContextMenuPosition] = useState({ x: 0, y: 0 })
+    const contextMenuRef = useRef<HTMLDivElement>(null)
+    const [activeItemInfo, setActiveItemInfo] = useState<{
+      type: string
+      isTrigger: boolean
+      docsLink?: string
+    } | null>(null)
+
+    const toolbarTriggersHeight = useToolbarStore((state) => state.toolbarTriggersHeight)
+    const setToolbarTriggersHeight = useToolbarStore((state) => state.setToolbarTriggersHeight)
+    const preSearchHeight = useToolbarStore((state) => state.preSearchHeight)
+    const setPreSearchHeight = useToolbarStore((state) => state.setPreSearchHeight)
+
+    const toolbarInteractionsConfig = useMemo(() => ({ disabled: false }), [])
+    const { handleDragStart, handleItemClick } =
+      useToolbarItemInteractions(toolbarInteractionsConfig)
+
+    const { handleMouseDown, isResizing } = useToolbarResize({
+      containerRef,
+      triggersContentRef,
+      triggersHeaderRef,
+    })
 
-  // Get static data (computed once and cached)
-  const allTriggers = getTriggers()
-  const allBlocks = getBlocks()
+    const { filterBlocks } = usePermissionConfig()
 
-  // Apply permission-based filtering to blocks and triggers
-  const blocks = useMemo(() => filterBlocks(allBlocks), [filterBlocks, allBlocks])
-  const triggers = useMemo(() => filterBlocks(allTriggers), [filterBlocks, allTriggers])
+    const allTriggers = getTriggers()
+    const allBlocks = getBlocks()
 
-  // Determine if triggers are at minimum height (blocks are fully expanded)
-  const isTriggersAtMinimum = toolbarTriggersHeight <= TRIGGERS_MIN_THRESHOLD
+    const blocks = useMemo(() => filterBlocks(allBlocks), [filterBlocks, allBlocks])
+    const triggers = useMemo(() => filterBlocks(allTriggers), [filterBlocks, allTriggers])
 
-  /**
-   * Clear search when tab becomes inactive
-   */
-  useEffect(() => {
-    if (!isActive) {
-      setIsSearchActive(false)
-      setSearchQuery('')
-    }
-  }, [isActive])
+    const isTriggersAtMinimum = toolbarTriggersHeight <= TRIGGERS_MIN_THRESHOLD
 
-  /**
-   * Filter items based on search query
-   */
-  const filteredTriggers = useMemo(() => {
-    if (!searchQuery.trim()) return triggers
-    const query = searchQuery.toLowerCase()
-    return triggers.filter((trigger) => trigger.name.toLowerCase().includes(query))
-  }, [triggers, searchQuery])
-
-  const filteredBlocks = useMemo(() => {
-    if (!searchQuery.trim()) return blocks
-    const query = searchQuery.toLowerCase()
-    return blocks.filter((block) => block.name.toLowerCase().includes(query))
-  }, [blocks, searchQuery])
+    /**
+     * Clear search when tab becomes inactive
+     */
+    useEffect(() => {
+      if (!isActive) {
+        setIsSearchActive(false)
+        setSearchQuery('')
+      }
+    }, [isActive])
+
+    /**
+     * Filter items based on search query
+     */
+    const filteredTriggers = useMemo(() => {
+      if (!searchQuery.trim()) return triggers
+      const query = searchQuery.toLowerCase()
+      return triggers.filter((trigger) => trigger.name.toLowerCase().includes(query))
+    }, [triggers, searchQuery])
+
+    const filteredBlocks = useMemo(() => {
+      if (!searchQuery.trim()) return blocks
+      const query = searchQuery.toLowerCase()
+      return blocks.filter((block) => block.name.toLowerCase().includes(query))
+    }, [blocks, searchQuery])
+
+    /**
+     * Track pre-search height in a ref to avoid cascading re-renders.
+     * The store's preSearchHeight is still used for persistence, but we use
+     * this ref to prevent the effect from re-running when we update it.
+     */
+    const preSearchHeightRef = useRef(preSearchHeight)
+    preSearchHeightRef.current = preSearchHeight
+
+    /**
+     * Adjust heights based on search results
+     * - If no triggers found, collapse triggers to minimum (expand blocks)
+     * - If no blocks found, expand triggers to maximum (collapse blocks)
+     * - If triggers are found, dynamically resize to show all filtered triggers without scrolling
+     */
+    useEffect(() => {
+      const hasSearchQuery = searchQuery.trim().length > 0
+      const triggersCount = filteredTriggers.length
+      const blocksCount = filteredBlocks.length
+
+      if (hasSearchQuery && preSearchHeightRef.current === null) {
+        setPreSearchHeight(toolbarTriggersHeight)
+        return
+      }
 
-  /**
-   * Adjust heights based on search results
-   * - If no triggers found, collapse triggers to minimum (expand blocks)
-   * - If no blocks found, expand triggers to maximum (collapse blocks)
-   * - If triggers are found, dynamically resize to show all filtered triggers without scrolling
-   */
-  useEffect(() => {
-    const hasSearchQuery = searchQuery.trim().length > 0
-    const triggersCount = filteredTriggers.length
-    const blocksCount = filteredBlocks.length
-
-    // Save pre-search height when search starts
-    if (hasSearchQuery && preSearchHeight === null) {
-      setPreSearchHeight(toolbarTriggersHeight)
+      if (!hasSearchQuery && preSearchHeightRef.current !== null) {
+        const heightToRestore = preSearchHeightRef.current
+        setPreSearchHeight(null)
+        setToolbarTriggersHeight(heightToRestore)
+        return
+      }
+
+      if (hasSearchQuery) {
+        const { minHeight, maxHeight, optimalHeight } = calculateTriggerHeights(
+          containerRef,
+          triggersContentRef,
+          triggersHeaderRef
+        )
+
+        if (triggersCount === 0 && blocksCount > 0) {
+          setToolbarTriggersHeight(minHeight)
+        } else if (blocksCount === 0 && triggersCount > 0) {
+          setToolbarTriggersHeight(maxHeight)
+        } else if (triggersCount > 0) {
+          setToolbarTriggersHeight(optimalHeight)
+        }
+      }
+    }, [
+      searchQuery,
+      filteredTriggers.length,
+      filteredBlocks.length,
+      toolbarTriggersHeight,
+      setToolbarTriggersHeight,
+      setPreSearchHeight,
+    ])
+
+    /**
+     * Handle search icon click to activate search mode
+     */
+    const handleSearchClick = () => {
+      setIsSearchActive(true)
+      setTimeout(() => {
+        searchInputRef.current?.focus()
+      }, 0)
     }
 
-    // Restore pre-search height when search is cleared
-    if (!hasSearchQuery && preSearchHeight !== null) {
-      setToolbarTriggersHeight(preSearchHeight)
-      setPreSearchHeight(null)
-      return
+    /**
+     * Expose imperative handle for focusing the search input.
+     */
+    useImperativeHandle(
+      ref,
+      () => ({
+        focusSearch: () => {
+          setIsSearchActive(true)
+          setTimeout(() => {
+            searchInputRef.current?.focus()
+          }, 0)
+        },
+      }),
+      []
+    )
+
+    /**
+     * Handle search input blur.
+     *
+     * If the search query is empty, deactivate search mode to show the search icon again.
+     * If there's a query, keep search mode active so ArrowUp/Down navigation continues
+     * to work after focus moves into the triggers/blocks list (e.g. when initiated via Mod+F).
+     */
+    const handleSearchBlur = () => {
+      if (!searchQuery.trim()) {
+        setIsSearchActive(false)
+      }
     }
 
-    // Adjust heights based on search results
-    if (hasSearchQuery) {
-      const { minHeight, maxHeight, optimalHeight } = calculateTriggerHeights(
+    /**
+     * Handle blocks header click - toggle between min and max.
+     * If triggers are greater than minimum, collapse to minimum (just header).
+     * If triggers are at minimum, expand to maximum (full content height).
+     */
+    const handleBlocksHeaderClick = useCallback(() => {
+      setIsToggling(true)
+
+      const { minHeight, maxHeight } = calculateTriggerHeights(
         containerRef,
         triggersContentRef,
         triggersHeaderRef
       )
 
-      if (triggersCount === 0 && blocksCount > 0) {
-        // No triggers found - collapse triggers to minimum (expand blocks)
-        setToolbarTriggersHeight(minHeight)
-      } else if (blocksCount === 0 && triggersCount > 0) {
-        // No blocks found - expand triggers to maximum (collapse blocks)
-        setToolbarTriggersHeight(maxHeight)
-      } else if (triggersCount > 0) {
-        // Triggers are present - use optimal height to show all filtered triggers
-        setToolbarTriggersHeight(optimalHeight)
-      }
-    }
-  }, [
-    searchQuery,
-    filteredTriggers.length,
-    filteredBlocks.length,
-    preSearchHeight,
-    toolbarTriggersHeight,
-    setToolbarTriggersHeight,
-    setPreSearchHeight,
-  ])
-
-  /**
-   * Handle search icon click to activate search mode
-   */
-  const handleSearchClick = () => {
-    setIsSearchActive(true)
-    setTimeout(() => {
-      searchInputRef.current?.focus()
-    }, 0)
-  }
-
-  /**
-   * Expose imperative handle for focusing the search input.
-   */
-  useImperativeHandle(
-    ref,
-    () => ({
-      focusSearch: () => {
-        setIsSearchActive(true)
-        setTimeout(() => {
-          searchInputRef.current?.focus()
-        }, 0)
+      // Toggle between min and max
+      setToolbarTriggersHeight(isTriggersAtMinimum ? maxHeight : minHeight)
+    }, [isTriggersAtMinimum, setToolbarTriggersHeight])
+
+    /**
+     * Handle transition end - reset toggling state
+     */
+    const handleTransitionEnd = useCallback(() => {
+      setIsToggling(false)
+    }, [])
+
+    /**
+     * Handle context menu for toolbar items
+     */
+    const handleItemContextMenu = useCallback(
+      (e: React.MouseEvent, type: string, isTrigger: boolean, docsLink?: string) => {
+        e.preventDefault()
+        e.stopPropagation()
+        setContextMenuPosition({ x: e.clientX, y: e.clientY })
+        setActiveItemInfo({ type, isTrigger, docsLink })
+        setIsContextMenuOpen(true)
       },
-    }),
-    []
-  )
-
-  /**
-   * Handle search input blur.
-   *
-   * If the search query is empty, deactivate search mode to show the search icon again.
-   * If there's a query, keep search mode active so ArrowUp/Down navigation continues
-   * to work after focus moves into the triggers/blocks list (e.g. when initiated via Mod+F).
-   */
-  const handleSearchBlur = () => {
-    if (!searchQuery.trim()) {
-      setIsSearchActive(false)
-    }
-  }
-
-  /**
-   * Handle blocks header click - toggle between min and max.
-   * If triggers are greater than minimum, collapse to minimum (just header).
-   * If triggers are at minimum, expand to maximum (full content height).
-   */
-  const handleBlocksHeaderClick = useCallback(() => {
-    setIsToggling(true)
-
-    const { minHeight, maxHeight } = calculateTriggerHeights(
-      containerRef,
-      triggersContentRef,
-      triggersHeaderRef
+      []
     )
 
-    // Toggle between min and max
-    setToolbarTriggersHeight(isTriggersAtMinimum ? maxHeight : minHeight)
-  }, [isTriggersAtMinimum, setToolbarTriggersHeight])
-
-  /**
-   * Handle transition end - reset toggling state
-   */
-  const handleTransitionEnd = useCallback(() => {
-    setIsToggling(false)
-  }, [])
-
-  /**
-   * Handle context menu for toolbar items
-   */
-  const handleItemContextMenu = useCallback(
-    (e: React.MouseEvent, type: string, isTrigger: boolean, docsLink?: string) => {
-      e.preventDefault()
-      e.stopPropagation()
-      setContextMenuPosition({ x: e.clientX, y: e.clientY })
-      setActiveItemInfo({ type, isTrigger, docsLink })
-      setIsContextMenuOpen(true)
-    },
-    []
-  )
-
-  /**
-   * Close context menu and clear active item state
-   */
-  const closeContextMenu = useCallback(() => {
-    setIsContextMenuOpen(false)
-    setActiveItemInfo(null)
-  }, [])
-
-  /**
-   * Handle add to canvas from context menu
-   */
-  const handleContextMenuAddToCanvas = useCallback(() => {
-    if (activeItemInfo) {
-      handleItemClick(activeItemInfo.type, activeItemInfo.isTrigger)
-    }
-  }, [activeItemInfo, handleItemClick])
-
-  /**
-   * Handle view documentation from context menu
-   */
-  const handleViewDocumentation = useCallback(() => {
-    if (activeItemInfo?.docsLink) {
-      window.open(activeItemInfo.docsLink, '_blank', 'noopener,noreferrer')
-    }
-  }, [activeItemInfo])
-
-  /**
-   * Handle clicks outside the context menu to close it
-   */
-  useEffect(() => {
-    if (!isContextMenuOpen) return
-
-    const handleClickOutside = (e: MouseEvent) => {
-      if (contextMenuRef.current && !contextMenuRef.current.contains(e.target as Node)) {
-        closeContextMenu()
+    /**
+     * Close context menu and clear active item state
+     */
+    const closeContextMenu = useCallback(() => {
+      setIsContextMenuOpen(false)
+      setActiveItemInfo(null)
+    }, [])
+
+    /**
+     * Handle add to canvas from context menu
+     */
+    const handleContextMenuAddToCanvas = useCallback(() => {
+      if (activeItemInfo) {
+        handleItemClick(activeItemInfo.type, activeItemInfo.isTrigger)
       }
-    }
-
-    const timeoutId = setTimeout(() => {
-      document.addEventListener('click', handleClickOutside)
-    }, 0)
-
-    return () => {
-      clearTimeout(timeoutId)
-      document.removeEventListener('click', handleClickOutside)
-    }
-  }, [isContextMenuOpen, closeContextMenu])
+    }, [activeItemInfo, handleItemClick])
+
+    /**
+     * Handle view documentation from context menu
+     */
+    const handleViewDocumentation = useCallback(() => {
+      if (activeItemInfo?.docsLink) {
+        window.open(activeItemInfo.docsLink, '_blank', 'noopener,noreferrer')
+      }
+    }, [activeItemInfo])
 
-  /**
-   * Handle keyboard navigation with ArrowUp / ArrowDown when the toolbar tab
-   * is active and search is open (e.g. after Mod+F). Navigation order:
-   * - From search input or no current focus: first trigger, then subsequent triggers
-   * - After the last trigger: first block
-   * - Within blocks: linear navigation
-   * - ArrowUp from first trigger: moves focus back to search input
-   *
-   * This is designed to work seamlessly when the toolbar is opened via the
-   * Mod+F shortcut, and to take precedence over other global ArrowUp/Down
-   * handlers (e.g. terminal navigation) while the toolbar tab is active.
-   */
-  useEffect(() => {
-    if (!isActive || !isSearchActive) {
-      return
-    }
+    /**
+     * Handle clicks outside the context menu to close it
+     */
+    useEffect(() => {
+      if (!isContextMenuOpen) return
 
-    const handleKeyDown = (event: KeyboardEvent) => {
-      if (event.key !== 'ArrowDown' && event.key !== 'ArrowUp') {
-        return
+      const handleClickOutside = (e: MouseEvent) => {
+        if (contextMenuRef.current && !contextMenuRef.current.contains(e.target as Node)) {
+          closeContextMenu()
+        }
       }
 
-      const activeEl = document.activeElement as HTMLElement | null
+      const timeoutId = setTimeout(() => {
+        document.addEventListener('click', handleClickOutside)
+      }, 0)
 
-      // Only handle navigation when focus is currently inside the toolbar UI
-      const toolbarRoot = rootRef.current
-      if (!toolbarRoot || !activeEl || !toolbarRoot.contains(activeEl)) {
+      return () => {
+        clearTimeout(timeoutId)
+        document.removeEventListener('click', handleClickOutside)
+      }
+    }, [isContextMenuOpen, closeContextMenu])
+
+    /**
+     * Handle keyboard navigation with ArrowUp / ArrowDown when the toolbar tab
+     * is active and search is open (e.g. after Mod+F). Navigation order:
+     * - From search input or no current focus: first trigger, then subsequent triggers
+     * - After the last trigger: first block
+     * - Within blocks: linear navigation
+     * - ArrowUp from first trigger: moves focus back to search input
+     *
+     * This is designed to work seamlessly when the toolbar is opened via the
+     * Mod+F shortcut, and to take precedence over other global ArrowUp/Down
+     * handlers (e.g. terminal navigation) while the toolbar tab is active.
+     */
+    useEffect(() => {
+      if (!isActive || !isSearchActive) {
         return
       }
 
-      const triggers = triggerItemRefs.current.filter((el): el is HTMLDivElement => el !== null)
-      const blocks = blockItemRefs.current.filter((el): el is HTMLDivElement => el !== null)
-
-      type Region = 'search' | 'trigger' | 'block' | 'none'
-      let region: Region = 'none'
-      let index = -1
-
-      if (activeEl && searchInputRef.current && activeEl === searchInputRef.current) {
-        region = 'search'
-      } else if (activeEl) {
-        const triggerIndex = triggers.findIndex((el) => el === activeEl || el.contains(activeEl))
-        if (triggerIndex !== -1) {
-          region = 'trigger'
-          index = triggerIndex
-        } else {
-          const blockIndex = blocks.findIndex((el) => el === activeEl || el.contains(activeEl))
-          if (blockIndex !== -1) {
-            region = 'block'
-            index = blockIndex
-          }
+      const handleKeyDown = (event: KeyboardEvent) => {
+        if (event.key !== 'ArrowDown' && event.key !== 'ArrowUp') {
+          return
         }
-      }
 
-      const focusTrigger = (i: number) => {
-        const el = triggers[i]
-        if (el) {
-          event.preventDefault()
-          event.stopPropagation()
-          el.focus()
-        }
-      }
+        const activeEl = document.activeElement as HTMLElement | null
 
-      const focusBlock = (i: number) => {
-        const el = blocks[i]
-        if (el) {
-          event.preventDefault()
-          event.stopPropagation()
-          el.focus()
+        // Only handle navigation when focus is currently inside the toolbar UI
+        const toolbarRoot = rootRef.current
+        if (!toolbarRoot || !activeEl || !toolbarRoot.contains(activeEl)) {
+          return
         }
-      }
 
-      const focusSearchInput = () => {
-        if (searchInputRef.current) {
-          event.preventDefault()
-          event.stopPropagation()
-          searchInputRef.current.focus()
+        const triggers = triggerItemRefs.current.filter((el): el is HTMLDivElement => el !== null)
+        const blocks = blockItemRefs.current.filter((el): el is HTMLDivElement => el !== null)
+
+        type Region = 'search' | 'trigger' | 'block' | 'none'
+        let region: Region = 'none'
+        let index = -1
+
+        if (activeEl && searchInputRef.current && activeEl === searchInputRef.current) {
+          region = 'search'
+        } else if (activeEl) {
+          const triggerIndex = triggers.findIndex((el) => el === activeEl || el.contains(activeEl))
+          if (triggerIndex !== -1) {
+            region = 'trigger'
+            index = triggerIndex
+          } else {
+            const blockIndex = blocks.findIndex((el) => el === activeEl || el.contains(activeEl))
+            if (blockIndex !== -1) {
+              region = 'block'
+              index = blockIndex
+            }
+          }
         }
-      }
 
-      if (event.key === 'ArrowDown') {
-        if (region === 'none' || region === 'search') {
-          if (triggers.length > 0) {
-            focusTrigger(0)
-            return
-          }
-          if (blocks.length > 0) {
-            focusBlock(0)
+        const focusTrigger = (i: number) => {
+          const el = triggers[i]
+          if (el) {
+            event.preventDefault()
+            event.stopPropagation()
+            el.focus()
           }
-          return
         }
 
-        if (region === 'trigger') {
-          if (index < triggers.length - 1) {
-            focusTrigger(index + 1)
-            return
-          }
-          if (index === triggers.length - 1 && blocks.length > 0) {
-            focusBlock(0)
+        const focusBlock = (i: number) => {
+          const el = blocks[i]
+          if (el) {
+            event.preventDefault()
+            event.stopPropagation()
+            el.focus()
           }
-          return
         }
 
-        if (region === 'block') {
-          if (index < blocks.length - 1) {
-            focusBlock(index + 1)
+        const focusSearchInput = () => {
+          if (searchInputRef.current) {
+            event.preventDefault()
+            event.stopPropagation()
+            searchInputRef.current.focus()
           }
-          return
         }
-      } else if (event.key === 'ArrowUp') {
-        if (region === 'block') {
-          if (index > 0) {
-            focusBlock(index - 1)
+
+        if (event.key === 'ArrowDown') {
+          if (region === 'none' || region === 'search') {
+            if (triggers.length > 0) {
+              focusTrigger(0)
+              return
+            }
+            if (blocks.length > 0) {
+              focusBlock(0)
+            }
             return
           }
-          if (index === 0 && triggers.length > 0) {
-            focusTrigger(triggers.length - 1)
+
+          if (region === 'trigger') {
+            if (index < triggers.length - 1) {
+              focusTrigger(index + 1)
+              return
+            }
+            if (index === triggers.length - 1 && blocks.length > 0) {
+              focusBlock(0)
+            }
+            return
           }
-          return
-        }
 
-        if (region === 'trigger') {
-          if (index > 0) {
-            focusTrigger(index - 1)
+          if (region === 'block') {
+            if (index < blocks.length - 1) {
+              focusBlock(index + 1)
+            }
             return
           }
-          if (index === 0) {
-            focusSearchInput()
+        } else if (event.key === 'ArrowUp') {
+          if (region === 'block') {
+            if (index > 0) {
+              focusBlock(index - 1)
+              return
+            }
+            if (index === 0 && triggers.length > 0) {
+              focusTrigger(triggers.length - 1)
+            }
+            return
           }
-          return
-        }
 
-        if (region === 'none' || region === 'search') {
-          return
+          if (region === 'trigger') {
+            if (index > 0) {
+              focusTrigger(index - 1)
+              return
+            }
+            if (index === 0) {
+              focusSearchInput()
+            }
+            return
+          }
+
+          if (region === 'none' || region === 'search') {
+            return
+          }
         }
       }
-    }
 
-    window.addEventListener('keydown', handleKeyDown)
-    return () => window.removeEventListener('keydown', handleKeyDown)
-  }, [isActive, isSearchActive])
+      window.addEventListener('keydown', handleKeyDown)
+      return () => window.removeEventListener('keydown', handleKeyDown)
+    }, [isActive, isSearchActive])
 
-  return (
-    <div
-      ref={rootRef}
-      data-toolbar-root
-      data-search-active={isSearchActive ? 'true' : 'false'}
-      className='flex h-full flex-col'
-    >
-      {/* Header */}
+    return (
       <div
-        className='mx-[-1px] flex flex-shrink-0 cursor-pointer items-center justify-between rounded-[4px] border border-[var(--border)] bg-[var(--surface-4)] px-[12px] py-[6px]'
-        onClick={handleSearchClick}
+        ref={rootRef}
+        data-toolbar-root
+        data-search-active={isSearchActive ? 'true' : 'false'}
+        className='flex h-full flex-col'
       >
-        <h2 className='font-medium text-[14px] text-[var(--text-primary)]'>Toolbar</h2>
-        <div className='flex shrink-0 items-center gap-[8px]'>
-          {!isSearchActive ? (
-            <Button
-              variant='ghost'
-              className='p-0'
-              aria-label='Search toolbar'
-              onClick={handleSearchClick}
-            >
-              <Search className='h-[14px] w-[14px]' />
-            </Button>
-          ) : (
-            <input
-              ref={searchInputRef}
-              type='text'
-              value={searchQuery}
-              onChange={(e) => setSearchQuery(e.target.value)}
-              onBlur={handleSearchBlur}
-              className='w-full border-none bg-transparent pr-[2px] text-right font-medium text-[13px] text-[var(--text-primary)] placeholder:text-[#737373] focus:outline-none'
-            />
-          )}
-        </div>
-      </div>
-
-      <div ref={containerRef} className='flex flex-1 flex-col overflow-hidden pt-[0px]'>
-        {/* Triggers Section */}
+        {/* Header */}
         <div
-          className={clsx(
-            'triggers-section flex flex-col overflow-hidden',
-            isToggling && !isResizing && 'transition-100ms transition-[height]'
-          )}
-          style={{ height: 'var(--toolbar-triggers-height)' }}
-          onTransitionEnd={handleTransitionEnd}
+          className='mx-[-1px] flex flex-shrink-0 cursor-pointer items-center justify-between rounded-[4px] border border-[var(--border)] bg-[var(--surface-4)] px-[12px] py-[6px]'
+          onClick={handleSearchClick}
         >
+          <h2 className='font-medium text-[14px] text-[var(--text-primary)]'>Toolbar</h2>
+          <div className='flex shrink-0 items-center gap-[8px]'>
+            {!isSearchActive ? (
+              <Button
+                variant='ghost'
+                className='p-0'
+                aria-label='Search toolbar'
+                onClick={handleSearchClick}
+              >
+                <Search className='h-[14px] w-[14px]' />
+              </Button>
+            ) : (
+              <input
+                ref={searchInputRef}
+                type='text'
+                value={searchQuery}
+                onChange={(e) => setSearchQuery(e.target.value)}
+                onBlur={handleSearchBlur}
+                className='w-full border-none bg-transparent pr-[2px] text-right font-medium text-[13px] text-[var(--text-primary)] placeholder:text-[#737373] focus:outline-none'
+              />
+            )}
+          </div>
+        </div>
+
+        <div ref={containerRef} className='flex flex-1 flex-col overflow-hidden pt-[0px]'>
+          {/* Triggers Section */}
           <div
-            ref={triggersHeaderRef}
-            className='px-[10px] pt-[5px] pb-[5px] font-medium text-[13px] text-[var(--text-primary)]'
+            className={clsx(
+              'triggers-section flex flex-col overflow-hidden',
+              isToggling && !isResizing && 'transition-100ms transition-[height]'
+            )}
+            style={{ height: 'var(--toolbar-triggers-height)' }}
+            onTransitionEnd={handleTransitionEnd}
           >
-            Triggers
-          </div>
-          <div className='flex-1 overflow-y-auto overflow-x-hidden px-[6px]'>
-            <div ref={triggersContentRef} className='space-y-[2px] pb-[8px]'>
-              {filteredTriggers.map((trigger, index) => {
-                const Icon = trigger.icon
-                const isTriggerCapable = hasTriggerCapability(trigger)
-                return (
-                  <div
-                    ref={(el) => {
-                      triggerItemRefs.current[index] = el
-                    }}
+            <div
+              ref={triggersHeaderRef}
+              className='px-[10px] pt-[5px] pb-[5px] font-medium text-[13px] text-[var(--text-primary)]'
+            >
+              Triggers
+            </div>
+            <div className='flex-1 overflow-y-auto overflow-x-hidden px-[6px]'>
+              <div ref={triggersContentRef} className='space-y-[2px] pb-[8px]'>
+                {filteredTriggers.map((trigger, index) => (
+                  <ToolbarItem
                     key={trigger.type}
-                    tabIndex={-1}
-                    draggable
-                    onDragStart={(e) => {
-                      const iconElement = e.currentTarget.querySelector('.toolbar-item-icon')
-                      handleDragStart(e, trigger.type, isTriggerCapable, {
-                        name: trigger.name,
-                        bgColor: trigger.bgColor,
-                        iconElement: iconElement as HTMLElement | null,
-                      })
-                    }}
-                    onClick={() => handleItemClick(trigger.type, isTriggerCapable)}
-                    onContextMenu={(e) =>
-                      handleItemContextMenu(e, trigger.type, isTriggerCapable, trigger.docsLink)
-                    }
-                    className={clsx(
-                      'group flex h-[28px] items-center gap-[8px] rounded-[8px] px-[6px] text-[14px]',
-                      'cursor-pointer hover:bg-[var(--surface-6)] active:cursor-grabbing dark:hover:bg-[var(--surface-5)]',
-                      'focus-visible:bg-[var(--surface-6)] focus-visible:outline-none dark:focus-visible:bg-[var(--surface-5)]'
-                    )}
-                    onKeyDown={(event) => {
-                      if (event.key === 'Enter') {
-                        event.preventDefault()
-                        event.stopPropagation()
-                        handleItemClick(trigger.type, isTriggerCapable)
-                      }
-                    }}
-                  >
-                    <div
-                      className='relative flex h-[16px] w-[16px] flex-shrink-0 items-center justify-center overflow-hidden rounded-[4px]'
-                      style={{ background: trigger.bgColor }}
-                    >
-                      {Icon && (
-                        <Icon
-                          className={clsx(
-                            'toolbar-item-icon text-white transition-transform duration-200',
-                            'group-hover:scale-110',
-                            '!h-[10px] !w-[10px]'
-                          )}
-                        />
-                      )}
-                    </div>
-                    <span
-                      className={clsx(
-                        'truncate font-medium',
-                        'text-[var(--text-secondary)] group-hover:text-[var(--text-primary)]',
-                        'group-focus-visible:text-[var(--text-primary)]'
-                      )}
-                    >
-                      {trigger.name}
-                    </span>
-                  </div>
-                )
-              })}
+                    item={trigger}
+                    isTrigger={true}
+                    onDragStart={handleDragStart}
+                    onClick={handleItemClick}
+                    onContextMenu={handleItemContextMenu}
+                    itemRef={getTriggerRefCallback(index)}
+                  />
+                ))}
+              </div>
             </div>
           </div>
-        </div>
 
-        {/* Resize Handle */}
-        <div className='relative flex-shrink-0 border-[var(--border)] border-t'>
-          <div
-            className='absolute top-[-4px] right-0 left-0 z-30 h-[8px] cursor-ns-resize'
-            onMouseDown={handleMouseDown}
-          />
-        </div>
-
-        {/* Blocks Section */}
-        <div className='blocks-section flex flex-1 flex-col overflow-hidden'>
-          <div
-            ref={blocksHeaderRef}
-            onClick={handleBlocksHeaderClick}
-            className='cursor-pointer px-[10px] pt-[5px] pb-[5px] font-medium text-[13px] text-[var(--text-primary)]'
-          >
-            Blocks
+          {/* Resize Handle */}
+          <div className='relative flex-shrink-0 border-[var(--border)] border-t'>
+            <div
+              className='absolute top-[-4px] right-0 left-0 z-30 h-[8px] cursor-ns-resize'
+              onMouseDown={handleMouseDown}
+            />
           </div>
-          <div className='flex-1 overflow-y-auto overflow-x-hidden px-[6px]'>
-            <div className='space-y-[2px] pb-[8px]'>
-              {filteredBlocks.map((block, index) => {
-                const Icon = block.icon
-                return (
-                  <div
-                    ref={(el) => {
-                      blockItemRefs.current[index] = el
-                    }}
+
+          {/* Blocks Section */}
+          <div className='blocks-section flex flex-1 flex-col overflow-hidden'>
+            <div
+              ref={blocksHeaderRef}
+              onClick={handleBlocksHeaderClick}
+              className='cursor-pointer px-[10px] pt-[5px] pb-[5px] font-medium text-[13px] text-[var(--text-primary)]'
+            >
+              Blocks
+            </div>
+            <div className='flex-1 overflow-y-auto overflow-x-hidden px-[6px]'>
+              <div className='space-y-[2px] pb-[8px]'>
+                {filteredBlocks.map((block, index) => (
+                  <ToolbarItem
                     key={block.type}
-                    tabIndex={-1}
-                    draggable
-                    onDragStart={(e) => {
-                      // Mark subflow drag explicitly so canvas can reliably detect and suppress highlight
-                      if (block.type === 'loop' || block.type === 'parallel') {
-                        document.body.classList.add('sim-drag-subflow')
-                      }
-                      const iconElement = e.currentTarget.querySelector('.toolbar-item-icon')
-                      handleDragStart(e, block.type, false, {
-                        name: block.name,
-                        bgColor: block.bgColor ?? '#666666',
-                        iconElement: iconElement as HTMLElement | null,
-                      })
-                    }}
-                    onDragEnd={() => {
-                      // Always clear the flag at the end of a toolbar drag
-                      document.body.classList.remove('sim-drag-subflow')
-                    }}
-                    onClick={() => handleItemClick(block.type, false)}
-                    onContextMenu={(e) =>
-                      handleItemContextMenu(
-                        e,
-                        block.type,
-                        false,
-                        block.docsLink ?? block.config?.docsLink
-                      )
-                    }
-                    className={clsx(
-                      'group flex h-[28px] items-center gap-[8px] rounded-[8px] px-[6px] text-[14px]',
-                      'cursor-pointer hover:bg-[var(--surface-6)] active:cursor-grabbing dark:hover:bg-[var(--surface-5)]',
-                      'focus-visible:bg-[var(--surface-6)] focus-visible:outline-none dark:focus-visible:bg-[var(--surface-5)]'
-                    )}
-                    onKeyDown={(event) => {
-                      if (event.key === 'Enter') {
-                        event.preventDefault()
-                        event.stopPropagation()
-                        handleItemClick(block.type, false)
-                      }
-                    }}
-                  >
-                    <div
-                      className='relative flex h-[16px] w-[16px] flex-shrink-0 items-center justify-center overflow-hidden rounded-[4px]'
-                      style={{ background: block.bgColor }}
-                    >
-                      {Icon && (
-                        <Icon
-                          className={clsx(
-                            'toolbar-item-icon text-white transition-transform duration-200',
-                            'group-hover:scale-110',
-                            '!h-[10px] !w-[10px]'
-                          )}
-                        />
-                      )}
-                    </div>
-                    <span
-                      className={clsx(
-                        'truncate font-medium',
-                        'text-[var(--text-secondary)] group-hover:text-[var(--text-primary)]',
-                        'group-focus-visible:text-[var(--text-primary)]'
-                      )}
-                    >
-                      {block.name}
-                    </span>
-                  </div>
-                )
-              })}
+                    item={block}
+                    isTrigger={false}
+                    onDragStart={handleDragStart}
+                    onClick={handleItemClick}
+                    onContextMenu={handleItemContextMenu}
+                    itemRef={getBlockRefCallback(index)}
+                  />
+                ))}
+              </div>
             </div>
           </div>
         </div>
-      </div>
 
-      {/* Toolbar Item Context Menu */}
-      <ToolbarItemContextMenu
-        isOpen={isContextMenuOpen}
-        position={contextMenuPosition}
-        menuRef={contextMenuRef}
-        onClose={closeContextMenu}
-        onAddToCanvas={handleContextMenuAddToCanvas}
-        onViewDocumentation={handleViewDocumentation}
-        showViewDocumentation={Boolean(activeItemInfo?.docsLink)}
-      />
-    </div>
-  )
-})
+        {/* Toolbar Item Context Menu */}
+        <ToolbarItemContextMenu
+          isOpen={isContextMenuOpen}
+          position={contextMenuPosition}
+          menuRef={contextMenuRef}
+          onClose={closeContextMenu}
+          onAddToCanvas={handleContextMenuAddToCanvas}
+          onViewDocumentation={handleViewDocumentation}
+          showViewDocumentation={Boolean(activeItemInfo?.docsLink)}
+        />
+      </div>
+    )
+  })
+)
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/panel.tsx b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/panel.tsx
index 77c6b3da2f..cea18901e9 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/panel.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/panel.tsx
@@ -1,9 +1,10 @@
 'use client'
 
-import { useCallback, useEffect, useRef, useState } from 'react'
+import { memo, useCallback, useEffect, useRef, useState } from 'react'
 import { createLogger } from '@sim/logger'
 import { ArrowUp, Square } from 'lucide-react'
 import { useParams, useRouter } from 'next/navigation'
+import { useShallow } from 'zustand/react/shallow'
 import {
   BubbleChatClose,
   BubbleChatPreview,
@@ -49,7 +50,6 @@ import { usePanelStore, useVariablesStore as usePanelVariablesStore } from '@/st
 import { useVariablesStore } from '@/stores/variables/store'
 import { getWorkflowWithValues } from '@/stores/workflows'
 import { useWorkflowRegistry } from '@/stores/workflows/registry/store'
-import { useWorkflowStore } from '@/stores/workflows/workflow/store'
 
 const logger = createLogger('Panel')
 /**
@@ -69,14 +69,22 @@ const logger = createLogger('Panel')
  *
  * @returns Panel on the right side of the workflow
  */
-export function Panel() {
+export const Panel = memo(function Panel() {
   const router = useRouter()
   const params = useParams()
   const workspaceId = params.workspaceId as string
 
   const panelRef = useRef<HTMLElement>(null)
   const fileInputRef = useRef<HTMLInputElement>(null)
-  const { activeTab, setActiveTab, panelWidth, _hasHydrated, setHasHydrated } = usePanelStore()
+  const { activeTab, setActiveTab, panelWidth, _hasHydrated, setHasHydrated } = usePanelStore(
+    useShallow((state) => ({
+      activeTab: state.activeTab,
+      setActiveTab: state.setActiveTab,
+      panelWidth: state.panelWidth,
+      _hasHydrated: state._hasHydrated,
+      setHasHydrated: state.setHasHydrated,
+    }))
+  )
   const copilotRef = useRef<{
     createNewChat: () => void
     setInputValueAndFocus: (value: string) => void
@@ -97,12 +105,18 @@ export function Panel() {
   const userPermissions = useUserPermissionsContext()
   const { config: permissionConfig } = usePermissionConfig()
   const { isImporting, handleFileChange } = useImportWorkflow({ workspaceId })
-  const { workflows, activeWorkflowId, duplicateWorkflow, hydration } = useWorkflowRegistry()
+  const { workflows, activeWorkflowId, duplicateWorkflow, hydration } = useWorkflowRegistry(
+    useShallow((state) => ({
+      workflows: state.workflows,
+      activeWorkflowId: state.activeWorkflowId,
+      duplicateWorkflow: state.duplicateWorkflow,
+      hydration: state.hydration,
+    }))
+  )
   const isRegistryLoading =
     hydration.phase === 'idle' ||
     hydration.phase === 'metadata-loading' ||
     hydration.phase === 'state-loading'
-  const { blocks } = useWorkflowStore()
   const { handleAutoLayout: autoLayoutWithFitView } = useAutoLayout(activeWorkflowId || null)
 
   // Delete workflow hook
@@ -157,8 +171,18 @@ export function Panel() {
   }, [usageExceeded, handleRunWorkflow])
 
   // Chat state
-  const { isChatOpen, setIsChatOpen } = useChatStore()
-  const { isOpen: isVariablesOpen, setIsOpen: setVariablesOpen } = useVariablesStore()
+  const { isChatOpen, setIsChatOpen } = useChatStore(
+    useShallow((state) => ({
+      isChatOpen: state.isChatOpen,
+      setIsChatOpen: state.setIsChatOpen,
+    }))
+  )
+  const { isOpen: isVariablesOpen, setIsOpen: setVariablesOpen } = useVariablesStore(
+    useShallow((state) => ({
+      isOpen: state.isOpen,
+      setIsOpen: state.setIsOpen,
+    }))
+  )
 
   const currentWorkflow = activeWorkflowId ? workflows[activeWorkflowId] : null
 
@@ -583,4 +607,4 @@ export function Panel() {
       <Variables />
     </>
   )
-}
+})
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/terminal/terminal.tsx b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/terminal/terminal.tsx
index 56b9dc8bbe..570f13900d 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/terminal/terminal.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/terminal/terminal.tsx
@@ -1,6 +1,6 @@
 'use client'
 
-import React, { useCallback, useEffect, useMemo, useRef, useState } from 'react'
+import React, { memo, useCallback, useEffect, useMemo, useRef, useState } from 'react'
 import clsx from 'clsx'
 import {
   ArrowDown,
@@ -50,10 +50,10 @@ import {
 } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/terminal/hooks'
 import { useContextMenu } from '@/app/workspace/[workspaceId]/w/components/sidebar/hooks'
 import { getBlock } from '@/blocks'
+import { useShowTrainingControls } from '@/hooks/queries/general-settings'
 import { useCodeViewerFeatures } from '@/hooks/use-code-viewer'
 import { OUTPUT_PANEL_WIDTH, TERMINAL_HEIGHT } from '@/stores/constants'
 import { useCopilotTrainingStore } from '@/stores/copilot-training/store'
-import { useGeneralStore } from '@/stores/settings/general'
 import type { ConsoleEntry } from '@/stores/terminal'
 import { useTerminalConsoleStore, useTerminalStore } from '@/stores/terminal'
 import { useWorkflowRegistry } from '@/stores/workflows/registry/store'
@@ -272,6 +272,514 @@ const OutputCodeContent = React.memo(function OutputCodeContent({
   )
 })
 
+/**
+ * Props for the OutputPanel component
+ */
+interface OutputPanelProps {
+  selectedEntry: ConsoleEntry
+  outputPanelWidth: number
+  handleOutputPanelResizeMouseDown: (e: React.MouseEvent) => void
+  handleHeaderClick: () => void
+  isExpanded: boolean
+  expandToLastHeight: () => void
+  showInput: boolean
+  setShowInput: (show: boolean) => void
+  hasInputData: boolean
+  isPlaygroundEnabled: boolean
+  shouldShowTrainingButton: boolean
+  isTraining: boolean
+  handleTrainingClick: (e: React.MouseEvent) => void
+  showCopySuccess: boolean
+  handleCopy: () => void
+  filteredEntries: ConsoleEntry[]
+  handleExportConsole: (e: React.MouseEvent) => void
+  hasActiveFilters: boolean
+  clearFilters: () => void
+  handleClearConsole: (e: React.MouseEvent) => void
+  wrapText: boolean
+  setWrapText: (wrap: boolean) => void
+  openOnRun: boolean
+  setOpenOnRun: (open: boolean) => void
+  outputOptionsOpen: boolean
+  setOutputOptionsOpen: (open: boolean) => void
+  shouldShowCodeDisplay: boolean
+  outputDataStringified: string
+  handleClearConsoleFromMenu: () => void
+}
+
+/**
+ * Output panel component that manages its own search state.
+ */
+const OutputPanel = React.memo(function OutputPanel({
+  selectedEntry,
+  outputPanelWidth,
+  handleOutputPanelResizeMouseDown,
+  handleHeaderClick,
+  isExpanded,
+  expandToLastHeight,
+  showInput,
+  setShowInput,
+  hasInputData,
+  isPlaygroundEnabled,
+  shouldShowTrainingButton,
+  isTraining,
+  handleTrainingClick,
+  showCopySuccess,
+  handleCopy,
+  filteredEntries,
+  handleExportConsole,
+  hasActiveFilters,
+  clearFilters,
+  handleClearConsole,
+  wrapText,
+  setWrapText,
+  openOnRun,
+  setOpenOnRun,
+  outputOptionsOpen,
+  setOutputOptionsOpen,
+  shouldShowCodeDisplay,
+  outputDataStringified,
+  handleClearConsoleFromMenu,
+}: OutputPanelProps) {
+  const outputContentRef = useRef<HTMLDivElement>(null)
+  const {
+    isSearchActive: isOutputSearchActive,
+    searchQuery: outputSearchQuery,
+    setSearchQuery: setOutputSearchQuery,
+    matchCount,
+    currentMatchIndex,
+    activateSearch: activateOutputSearch,
+    closeSearch: closeOutputSearch,
+    goToNextMatch,
+    goToPreviousMatch,
+    handleMatchCountChange,
+    searchInputRef: outputSearchInputRef,
+  } = useCodeViewerFeatures({
+    contentRef: outputContentRef,
+    externalWrapText: wrapText,
+    onWrapTextChange: setWrapText,
+  })
+
+  // Context menu state for output panel
+  const [hasSelection, setHasSelection] = useState(false)
+  const [storedSelectionText, setStoredSelectionText] = useState('')
+  const {
+    isOpen: isOutputMenuOpen,
+    position: outputMenuPosition,
+    menuRef: outputMenuRef,
+    handleContextMenu: handleOutputContextMenu,
+    closeMenu: closeOutputMenu,
+  } = useContextMenu()
+
+  const handleOutputPanelContextMenu = useCallback(
+    (e: React.MouseEvent) => {
+      const selection = window.getSelection()
+      const selectionText = selection?.toString() || ''
+      setStoredSelectionText(selectionText)
+      setHasSelection(selectionText.length > 0)
+      handleOutputContextMenu(e)
+    },
+    [handleOutputContextMenu]
+  )
+
+  const handleCopySelection = useCallback(() => {
+    if (storedSelectionText) {
+      navigator.clipboard.writeText(storedSelectionText)
+    }
+  }, [storedSelectionText])
+
+  /**
+   * Track text selection state for context menu.
+   * Skip updates when the context menu is open to prevent the selection
+   * state from changing mid-click (which would disable the copy button).
+   */
+  useEffect(() => {
+    const handleSelectionChange = () => {
+      if (isOutputMenuOpen) return
+
+      const selection = window.getSelection()
+      setHasSelection(Boolean(selection && selection.toString().length > 0))
+    }
+
+    document.addEventListener('selectionchange', handleSelectionChange)
+    return () => document.removeEventListener('selectionchange', handleSelectionChange)
+  }, [isOutputMenuOpen])
+
+  return (
+    <>
+      <div
+        className='absolute top-0 right-0 bottom-0 flex flex-col border-[var(--border)] border-l bg-[var(--surface-1)]'
+        style={{ width: `${outputPanelWidth}px` }}
+      >
+        {/* Horizontal Resize Handle */}
+        <div
+          className='-ml-[4px] absolute top-0 bottom-0 left-0 z-20 w-[8px] cursor-ew-resize'
+          onMouseDown={handleOutputPanelResizeMouseDown}
+          role='separator'
+          aria-label='Resize output panel'
+          aria-orientation='vertical'
+        />
+
+        {/* Header */}
+        <div
+          className='group flex h-[30px] flex-shrink-0 cursor-pointer items-center justify-between bg-[var(--surface-1)] pr-[16px] pl-[10px]'
+          onClick={handleHeaderClick}
+        >
+          <div className='flex items-center'>
+            <Button
+              variant='ghost'
+              className={clsx(
+                'px-[8px] py-[6px] text-[12px]',
+                !showInput ? '!text-[var(--text-primary)]' : '!text-[var(--text-tertiary)]'
+              )}
+              onClick={(e) => {
+                e.stopPropagation()
+                if (!isExpanded) {
+                  expandToLastHeight()
+                }
+                if (showInput) setShowInput(false)
+              }}
+              aria-label='Show output'
+            >
+              Output
+            </Button>
+            {hasInputData && (
+              <Button
+                variant='ghost'
+                className={clsx(
+                  'px-[8px] py-[6px] text-[12px]',
+                  showInput ? '!text-[var(--text-primary)]' : '!text-[var(--text-tertiary)]'
+                )}
+                onClick={(e) => {
+                  e.stopPropagation()
+                  if (!isExpanded) {
+                    expandToLastHeight()
+                  }
+                  setShowInput(true)
+                }}
+                aria-label='Show input'
+              >
+                Input
+              </Button>
+            )}
+          </div>
+          <div className='flex flex-shrink-0 items-center gap-[8px]'>
+            {isOutputSearchActive ? (
+              <Tooltip.Root>
+                <Tooltip.Trigger asChild>
+                  <Button
+                    variant='ghost'
+                    onClick={(e) => {
+                      e.stopPropagation()
+                      closeOutputSearch()
+                    }}
+                    aria-label='Search in output'
+                    className='!p-1.5 -m-1.5'
+                  >
+                    <X className='h-[12px] w-[12px]' />
+                  </Button>
+                </Tooltip.Trigger>
+                <Tooltip.Content>
+                  <span>Close search</span>
+                </Tooltip.Content>
+              </Tooltip.Root>
+            ) : (
+              <Tooltip.Root>
+                <Tooltip.Trigger asChild>
+                  <Button
+                    variant='ghost'
+                    onClick={(e) => {
+                      e.stopPropagation()
+                      activateOutputSearch()
+                    }}
+                    aria-label='Search in output'
+                    className='!p-1.5 -m-1.5'
+                  >
+                    <Search className='h-[12px] w-[12px]' />
+                  </Button>
+                </Tooltip.Trigger>
+                <Tooltip.Content>
+                  <span>Search</span>
+                </Tooltip.Content>
+              </Tooltip.Root>
+            )}
+
+            {isPlaygroundEnabled && (
+              <Tooltip.Root>
+                <Tooltip.Trigger asChild>
+                  <Link href='/playground'>
+                    <Button
+                      variant='ghost'
+                      aria-label='Component Playground'
+                      className='!p-1.5 -m-1.5'
+                    >
+                      <Palette className='h-[12px] w-[12px]' />
+                    </Button>
+                  </Link>
+                </Tooltip.Trigger>
+                <Tooltip.Content>
+                  <span>Component Playground</span>
+                </Tooltip.Content>
+              </Tooltip.Root>
+            )}
+
+            {shouldShowTrainingButton && (
+              <Tooltip.Root>
+                <Tooltip.Trigger asChild>
+                  <Button
+                    variant='ghost'
+                    onClick={handleTrainingClick}
+                    aria-label={isTraining ? 'Stop training' : 'Train Copilot'}
+                    className={clsx(
+                      '!p-1.5 -m-1.5',
+                      isTraining && 'text-orange-600 dark:text-orange-400'
+                    )}
+                  >
+                    {isTraining ? (
+                      <Pause className='h-[12px] w-[12px]' />
+                    ) : (
+                      <Database className='h-[12px] w-[12px]' />
+                    )}
+                  </Button>
+                </Tooltip.Trigger>
+                <Tooltip.Content>
+                  <span>{isTraining ? 'Stop Training' : 'Train Copilot'}</span>
+                </Tooltip.Content>
+              </Tooltip.Root>
+            )}
+
+            <Tooltip.Root>
+              <Tooltip.Trigger asChild>
+                <Button
+                  variant='ghost'
+                  onClick={(e) => {
+                    e.stopPropagation()
+                    handleCopy()
+                  }}
+                  aria-label='Copy output'
+                  className='!p-1.5 -m-1.5'
+                >
+                  {showCopySuccess ? (
+                    <Check className='h-[12px] w-[12px]' />
+                  ) : (
+                    <Clipboard className='h-[12px] w-[12px]' />
+                  )}
+                </Button>
+              </Tooltip.Trigger>
+              <Tooltip.Content>
+                <span>{showCopySuccess ? 'Copied' : 'Copy output'}</span>
+              </Tooltip.Content>
+            </Tooltip.Root>
+            {filteredEntries.length > 0 && (
+              <Tooltip.Root>
+                <Tooltip.Trigger asChild>
+                  <Button
+                    variant='ghost'
+                    onClick={handleExportConsole}
+                    aria-label='Download console CSV'
+                    className='!p-1.5 -m-1.5'
+                  >
+                    <ArrowDownToLine className='h-3 w-3' />
+                  </Button>
+                </Tooltip.Trigger>
+                <Tooltip.Content>
+                  <span>Download CSV</span>
+                </Tooltip.Content>
+              </Tooltip.Root>
+            )}
+            {hasActiveFilters && (
+              <Tooltip.Root>
+                <Tooltip.Trigger asChild>
+                  <Button
+                    variant='ghost'
+                    onClick={(e) => {
+                      e.stopPropagation()
+                      clearFilters()
+                    }}
+                    aria-label='Clear filters'
+                    className='!p-1.5 -m-1.5'
+                  >
+                    <FilterX className='h-3 w-3' />
+                  </Button>
+                </Tooltip.Trigger>
+                <Tooltip.Content>
+                  <span>Clear filters</span>
+                </Tooltip.Content>
+              </Tooltip.Root>
+            )}
+            {filteredEntries.length > 0 && (
+              <Tooltip.Root>
+                <Tooltip.Trigger asChild>
+                  <Button
+                    variant='ghost'
+                    onClick={handleClearConsole}
+                    aria-label='Clear console'
+                    className='!p-1.5 -m-1.5'
+                  >
+                    <Trash2 className='h-3 w-3' />
+                  </Button>
+                </Tooltip.Trigger>
+                <Tooltip.Content>
+                  <Tooltip.Shortcut keys='⌘D'>Clear console</Tooltip.Shortcut>
+                </Tooltip.Content>
+              </Tooltip.Root>
+            )}
+            <Popover open={outputOptionsOpen} onOpenChange={setOutputOptionsOpen}>
+              <PopoverTrigger asChild>
+                <Button
+                  variant='ghost'
+                  onClick={(e) => {
+                    e.stopPropagation()
+                  }}
+                  aria-label='Terminal options'
+                  className='!p-1.5 -m-1.5'
+                >
+                  <MoreHorizontal className='h-3.5 w-3.5' />
+                </Button>
+              </PopoverTrigger>
+              <PopoverContent
+                side='bottom'
+                align='end'
+                sideOffset={4}
+                collisionPadding={0}
+                onClick={(e) => e.stopPropagation()}
+                style={{ minWidth: '140px', maxWidth: '160px' }}
+                className='gap-[2px]'
+              >
+                <PopoverItem
+                  active={wrapText}
+                  showCheck
+                  onClick={(e) => {
+                    e.stopPropagation()
+                    setWrapText(!wrapText)
+                  }}
+                >
+                  <span>Wrap text</span>
+                </PopoverItem>
+                <PopoverItem
+                  active={openOnRun}
+                  showCheck
+                  onClick={(e) => {
+                    e.stopPropagation()
+                    setOpenOnRun(!openOnRun)
+                  }}
+                >
+                  <span>Open on run</span>
+                </PopoverItem>
+              </PopoverContent>
+            </Popover>
+            <ToggleButton
+              isExpanded={isExpanded}
+              onClick={(e) => {
+                e.stopPropagation()
+                handleHeaderClick()
+              }}
+            />
+          </div>
+        </div>
+
+        {/* Search Overlay */}
+        {isOutputSearchActive && (
+          <div
+            className='absolute top-[30px] right-[8px] z-30 flex h-[34px] items-center gap-[6px] rounded-b-[4px] border border-[var(--border)] border-t-0 bg-[var(--surface-1)] px-[6px] shadow-sm'
+            onClick={(e) => e.stopPropagation()}
+            data-toolbar-root
+            data-search-active='true'
+          >
+            <Input
+              ref={outputSearchInputRef}
+              type='text'
+              value={outputSearchQuery}
+              onChange={(e) => setOutputSearchQuery(e.target.value)}
+              placeholder='Search...'
+              className='mr-[2px] h-[23px] w-[94px] text-[12px]'
+            />
+            <span
+              className={clsx(
+                'w-[58px] font-medium text-[11px]',
+                matchCount > 0 ? 'text-[var(--text-secondary)]' : 'text-[var(--text-tertiary)]'
+              )}
+            >
+              {matchCount > 0 ? `${currentMatchIndex + 1}/${matchCount}` : 'No results'}
+            </span>
+            <Button
+              variant='ghost'
+              onClick={goToPreviousMatch}
+              aria-label='Previous match'
+              className='!p-1.5 -m-1.5'
+              disabled={matchCount === 0}
+            >
+              <ArrowUp className='h-[12px] w-[12px]' />
+            </Button>
+            <Button
+              variant='ghost'
+              onClick={goToNextMatch}
+              aria-label='Next match'
+              className='!p-1.5 -m-1.5'
+              disabled={matchCount === 0}
+            >
+              <ArrowDown className='h-[12px] w-[12px]' />
+            </Button>
+            <Button
+              variant='ghost'
+              onClick={closeOutputSearch}
+              aria-label='Close search'
+              className='!p-1.5 -m-1.5'
+            >
+              <X className='h-[12px] w-[12px]' />
+            </Button>
+          </div>
+        )}
+
+        {/* Content */}
+        <div
+          className={clsx('flex-1 overflow-y-auto', !wrapText && 'overflow-x-auto')}
+          onContextMenu={handleOutputPanelContextMenu}
+        >
+          {shouldShowCodeDisplay ? (
+            <OutputCodeContent
+              code={selectedEntry.input.code}
+              language={(selectedEntry.input.language as 'javascript' | 'json') || 'javascript'}
+              wrapText={wrapText}
+              searchQuery={isOutputSearchActive ? outputSearchQuery : undefined}
+              currentMatchIndex={currentMatchIndex}
+              onMatchCountChange={handleMatchCountChange}
+              contentRef={outputContentRef}
+            />
+          ) : (
+            <OutputCodeContent
+              code={outputDataStringified}
+              language='json'
+              wrapText={wrapText}
+              searchQuery={isOutputSearchActive ? outputSearchQuery : undefined}
+              currentMatchIndex={currentMatchIndex}
+              onMatchCountChange={handleMatchCountChange}
+              contentRef={outputContentRef}
+            />
+          )}
+        </div>
+      </div>
+
+      {/* Output Panel Context Menu */}
+      <OutputContextMenu
+        isOpen={isOutputMenuOpen}
+        position={outputMenuPosition}
+        menuRef={outputMenuRef}
+        onClose={closeOutputMenu}
+        onCopySelection={handleCopySelection}
+        onCopyAll={handleCopy}
+        onSearch={activateOutputSearch}
+        wrapText={wrapText}
+        onToggleWrap={() => setWrapText(!wrapText)}
+        openOnRun={openOnRun}
+        onToggleOpenOnRun={() => setOpenOnRun(!openOnRun)}
+        onClearConsole={handleClearConsoleFromMenu}
+        hasSelection={hasSelection}
+      />
+    </>
+  )
+})
+
 /**
  * Terminal component with resizable height that persists across page refreshes.
  *
@@ -284,24 +792,22 @@ const OutputCodeContent = React.memo(function OutputCodeContent({
  *
  * @returns Terminal at the bottom of the workflow
  */
-export function Terminal() {
+export const Terminal = memo(function Terminal() {
   const terminalRef = useRef<HTMLElement>(null)
   const prevEntriesLengthRef = useRef(0)
   const prevWorkflowEntriesLengthRef = useRef(0)
   const isTerminalFocusedRef = useRef(false)
-  const {
-    setTerminalHeight,
-    lastExpandedHeight,
-    outputPanelWidth,
-    setOutputPanelWidth,
-    openOnRun,
-    setOpenOnRun,
-    wrapText,
-    setWrapText,
-    setHasHydrated,
-  } = useTerminalStore()
+  const lastExpandedHeightRef = useRef<number>(DEFAULT_EXPANDED_HEIGHT)
+  const setTerminalHeight = useTerminalStore((state) => state.setTerminalHeight)
+  const outputPanelWidth = useTerminalStore((state) => state.outputPanelWidth)
+  const setOutputPanelWidth = useTerminalStore((state) => state.setOutputPanelWidth)
+  const openOnRun = useTerminalStore((state) => state.openOnRun)
+  const setOpenOnRun = useTerminalStore((state) => state.setOpenOnRun)
+  const wrapText = useTerminalStore((state) => state.wrapText)
+  const setWrapText = useTerminalStore((state) => state.setWrapText)
+  const setHasHydrated = useTerminalStore((state) => state.setHasHydrated)
   const isExpanded = useTerminalStore((state) => state.terminalHeight > NEAR_MIN_THRESHOLD)
-  const { activeWorkflowId } = useWorkflowRegistry()
+  const activeWorkflowId = useWorkflowRegistry((state) => state.activeWorkflowId)
   const hasConsoleHydrated = useTerminalConsoleStore((state) => state._hasHydrated)
   const workflowEntriesSelector = useCallback(
     (state: { entries: ConsoleEntry[] }) =>
@@ -323,27 +829,8 @@ export function Terminal() {
   const [mainOptionsOpen, setMainOptionsOpen] = useState(false)
   const [outputOptionsOpen, setOutputOptionsOpen] = useState(false)
 
-  const outputContentRef = useRef<HTMLDivElement>(null)
-  const {
-    isSearchActive: isOutputSearchActive,
-    searchQuery: outputSearchQuery,
-    setSearchQuery: setOutputSearchQuery,
-    matchCount,
-    currentMatchIndex,
-    activateSearch: activateOutputSearch,
-    closeSearch: closeOutputSearch,
-    goToNextMatch,
-    goToPreviousMatch,
-    handleMatchCountChange,
-    searchInputRef: outputSearchInputRef,
-  } = useCodeViewerFeatures({
-    contentRef: outputContentRef,
-    externalWrapText: wrapText,
-    onWrapTextChange: setWrapText,
-  })
-
   const [isTrainingEnvEnabled, setIsTrainingEnvEnabled] = useState(false)
-  const showTrainingControls = useGeneralStore((state) => state.showTrainingControls)
+  const showTrainingControls = useShowTrainingControls()
   const { isTraining, toggleModal: toggleTrainingModal, stopTraining } = useCopilotTrainingStore()
 
   const [isPlaygroundEnabled, setIsPlaygroundEnabled] = useState(false)
@@ -363,9 +850,7 @@ export function Terminal() {
     hasActiveFilters,
   } = useTerminalFilters()
 
-  const [hasSelection, setHasSelection] = useState(false)
   const [contextMenuEntry, setContextMenuEntry] = useState<ConsoleEntry | null>(null)
-  const [storedSelectionText, setStoredSelectionText] = useState('')
 
   const {
     isOpen: isLogRowMenuOpen,
@@ -375,29 +860,23 @@ export function Terminal() {
     closeMenu: closeLogRowMenu,
   } = useContextMenu()
 
-  const {
-    isOpen: isOutputMenuOpen,
-    position: outputMenuPosition,
-    menuRef: outputMenuRef,
-    handleContextMenu: handleOutputContextMenu,
-    closeMenu: closeOutputMenu,
-  } = useContextMenu()
-
   /**
    * Expands the terminal to its last meaningful height, with safeguards:
    * - Never expands below {@link DEFAULT_EXPANDED_HEIGHT}.
    * - Never exceeds 70% of the viewport height.
+   *
+   * Uses ref for lastExpandedHeight to avoid re-renders during resize.
    */
   const expandToLastHeight = useCallback(() => {
     setIsToggling(true)
     const maxHeight = window.innerHeight * 0.7
     const desiredHeight = Math.max(
-      lastExpandedHeight || DEFAULT_EXPANDED_HEIGHT,
+      lastExpandedHeightRef.current || DEFAULT_EXPANDED_HEIGHT,
       DEFAULT_EXPANDED_HEIGHT
     )
     const targetHeight = Math.min(desiredHeight, maxHeight)
     setTerminalHeight(targetHeight)
-  }, [lastExpandedHeight, setTerminalHeight])
+  }, [setTerminalHeight])
 
   const allWorkflowEntries = entries
 
@@ -636,24 +1115,6 @@ export function Terminal() {
     [activeWorkflowId, exportConsoleCSV]
   )
 
-  const handleCopySelection = useCallback(() => {
-    if (storedSelectionText) {
-      navigator.clipboard.writeText(storedSelectionText)
-      setShowCopySuccess(true)
-    }
-  }, [storedSelectionText])
-
-  const handleOutputPanelContextMenu = useCallback(
-    (e: React.MouseEvent) => {
-      const selection = window.getSelection()
-      const selectionText = selection?.toString() || ''
-      setStoredSelectionText(selectionText)
-      setHasSelection(selectionText.length > 0)
-      handleOutputContextMenu(e)
-    },
-    [handleOutputContextMenu]
-  )
-
   const handleRowContextMenu = useCallback(
     (e: React.MouseEvent, entry: ConsoleEntry) => {
       setContextMenuEntry(entry)
@@ -740,6 +1201,20 @@ export function Terminal() {
     setHasHydrated(true)
   }, [setHasHydrated])
 
+  /**
+   * Sync lastExpandedHeightRef with store value on mount.
+   * Uses subscription to keep ref updated without causing re-renders.
+   */
+  useEffect(() => {
+    // Initialize with current value
+    lastExpandedHeightRef.current = useTerminalStore.getState().lastExpandedHeight
+
+    const unsub = useTerminalStore.subscribe((state) => {
+      lastExpandedHeightRef.current = state.lastExpandedHeight
+    })
+    return unsub
+  }, [])
+
   /**
    * Check environment variables on mount
    */
@@ -784,23 +1259,6 @@ export function Terminal() {
     }
   }, [showCopySuccess])
 
-  /**
-   * Track text selection state for context menu.
-   * Skip updates when the context menu is open to prevent the selection
-   * state from changing mid-click (which would disable the copy button).
-   */
-  useEffect(() => {
-    const handleSelectionChange = () => {
-      if (isOutputMenuOpen) return
-
-      const selection = window.getSelection()
-      setHasSelection(Boolean(selection && selection.toString().length > 0))
-    }
-
-    document.addEventListener('selectionchange', handleSelectionChange)
-    return () => document.removeEventListener('selectionchange', handleSelectionChange)
-  }, [isOutputMenuOpen])
-
   /**
    * Auto-select the latest entry when new logs arrive
    * Re-enables auto-selection when all entries are cleared
@@ -903,19 +1361,27 @@ export function Terminal() {
 
   /**
    * Handle Escape to unselect entry (search close is handled by useCodeViewerFeatures)
+   * Check if the focused element is in the search overlay to avoid conflicting with search close.
    */
   useEffect(() => {
     const handleKeyDown = (e: KeyboardEvent) => {
-      if (e.key === 'Escape' && !isOutputSearchActive && selectedEntry) {
-        e.preventDefault()
-        setSelectedEntry(null)
-        setAutoSelectEnabled(true)
+      if (e.key !== 'Escape' || !selectedEntry) return
+
+      // Don't unselect if focus is in the search overlay (search close takes priority)
+      const activeElement = document.activeElement as HTMLElement | null
+      const searchOverlay = document.querySelector('[data-toolbar-root][data-search-active="true"]')
+      if (searchOverlay && activeElement && searchOverlay.contains(activeElement)) {
+        return
       }
+
+      e.preventDefault()
+      setSelectedEntry(null)
+      setAutoSelectEnabled(true)
     }
 
     window.addEventListener('keydown', handleKeyDown)
     return () => window.removeEventListener('keydown', handleKeyDown)
-  }, [selectedEntry, isOutputSearchActive])
+  }, [selectedEntry])
 
   /**
    * Adjust output panel width when sidebar or panel width changes.
@@ -1431,362 +1897,37 @@ export function Terminal() {
 
           {/* Right Section - Block Output (Overlay) */}
           {selectedEntry && (
-            <div
-              className='absolute top-0 right-0 bottom-0 flex flex-col border-[var(--border)] border-l bg-[var(--surface-1)]'
-              style={{ width: `${outputPanelWidth}px` }}
-            >
-              {/* Horizontal Resize Handle */}
-              <div
-                className='-ml-[4px] absolute top-0 bottom-0 left-0 z-20 w-[8px] cursor-ew-resize'
-                onMouseDown={handleOutputPanelResizeMouseDown}
-                role='separator'
-                aria-label='Resize output panel'
-                aria-orientation='vertical'
-              />
-
-              {/* Header */}
-              <div
-                className='group flex h-[30px] flex-shrink-0 cursor-pointer items-center justify-between bg-[var(--surface-1)] pr-[16px] pl-[10px]'
-                onClick={handleHeaderClick}
-              >
-                <div className='flex items-center'>
-                  <Button
-                    variant='ghost'
-                    className={clsx(
-                      'px-[8px] py-[6px] text-[12px]',
-                      !showInput ? '!text-[var(--text-primary)]' : '!text-[var(--text-tertiary)]'
-                    )}
-                    onClick={(e) => {
-                      e.stopPropagation()
-                      if (!isExpanded) {
-                        expandToLastHeight()
-                      }
-                      if (showInput) setShowInput(false)
-                    }}
-                    aria-label='Show output'
-                  >
-                    Output
-                  </Button>
-                  {hasInputData && (
-                    <Button
-                      variant='ghost'
-                      className={clsx(
-                        'px-[8px] py-[6px] text-[12px]',
-                        showInput ? '!text-[var(--text-primary)]' : '!text-[var(--text-tertiary)]'
-                      )}
-                      onClick={(e) => {
-                        e.stopPropagation()
-                        if (!isExpanded) {
-                          expandToLastHeight()
-                        }
-                        setShowInput(true)
-                      }}
-                      aria-label='Show input'
-                    >
-                      Input
-                    </Button>
-                  )}
-                </div>
-                <div className='flex flex-shrink-0 items-center gap-[8px]'>
-                  {isOutputSearchActive ? (
-                    <Tooltip.Root>
-                      <Tooltip.Trigger asChild>
-                        <Button
-                          variant='ghost'
-                          onClick={(e) => {
-                            e.stopPropagation()
-                            closeOutputSearch()
-                          }}
-                          aria-label='Search in output'
-                          className='!p-1.5 -m-1.5'
-                        >
-                          <X className='h-[12px] w-[12px]' />
-                        </Button>
-                      </Tooltip.Trigger>
-                      <Tooltip.Content>
-                        <span>Close search</span>
-                      </Tooltip.Content>
-                    </Tooltip.Root>
-                  ) : (
-                    <Tooltip.Root>
-                      <Tooltip.Trigger asChild>
-                        <Button
-                          variant='ghost'
-                          onClick={(e) => {
-                            e.stopPropagation()
-                            activateOutputSearch()
-                          }}
-                          aria-label='Search in output'
-                          className='!p-1.5 -m-1.5'
-                        >
-                          <Search className='h-[12px] w-[12px]' />
-                        </Button>
-                      </Tooltip.Trigger>
-                      <Tooltip.Content>
-                        <span>Search</span>
-                      </Tooltip.Content>
-                    </Tooltip.Root>
-                  )}
-
-                  {isPlaygroundEnabled && (
-                    <Tooltip.Root>
-                      <Tooltip.Trigger asChild>
-                        <Link href='/playground'>
-                          <Button
-                            variant='ghost'
-                            aria-label='Component Playground'
-                            className='!p-1.5 -m-1.5'
-                          >
-                            <Palette className='h-[12px] w-[12px]' />
-                          </Button>
-                        </Link>
-                      </Tooltip.Trigger>
-                      <Tooltip.Content>
-                        <span>Component Playground</span>
-                      </Tooltip.Content>
-                    </Tooltip.Root>
-                  )}
-
-                  {shouldShowTrainingButton && (
-                    <Tooltip.Root>
-                      <Tooltip.Trigger asChild>
-                        <Button
-                          variant='ghost'
-                          onClick={handleTrainingClick}
-                          aria-label={isTraining ? 'Stop training' : 'Train Copilot'}
-                          className={clsx(
-                            '!p-1.5 -m-1.5',
-                            isTraining && 'text-orange-600 dark:text-orange-400'
-                          )}
-                        >
-                          {isTraining ? (
-                            <Pause className='h-[12px] w-[12px]' />
-                          ) : (
-                            <Database className='h-[12px] w-[12px]' />
-                          )}
-                        </Button>
-                      </Tooltip.Trigger>
-                      <Tooltip.Content>
-                        <span>{isTraining ? 'Stop Training' : 'Train Copilot'}</span>
-                      </Tooltip.Content>
-                    </Tooltip.Root>
-                  )}
-
-                  <Tooltip.Root>
-                    <Tooltip.Trigger asChild>
-                      <Button
-                        variant='ghost'
-                        onClick={(e) => {
-                          e.stopPropagation()
-                          handleCopy()
-                        }}
-                        aria-label='Copy output'
-                        className='!p-1.5 -m-1.5'
-                      >
-                        {showCopySuccess ? (
-                          <Check className='h-[12px] w-[12px]' />
-                        ) : (
-                          <Clipboard className='h-[12px] w-[12px]' />
-                        )}
-                      </Button>
-                    </Tooltip.Trigger>
-                    <Tooltip.Content>
-                      <span>{showCopySuccess ? 'Copied' : 'Copy output'}</span>
-                    </Tooltip.Content>
-                  </Tooltip.Root>
-                  {filteredEntries.length > 0 && (
-                    <Tooltip.Root>
-                      <Tooltip.Trigger asChild>
-                        <Button
-                          variant='ghost'
-                          onClick={handleExportConsole}
-                          aria-label='Download console CSV'
-                          className='!p-1.5 -m-1.5'
-                        >
-                          <ArrowDownToLine className='h-3 w-3' />
-                        </Button>
-                      </Tooltip.Trigger>
-                      <Tooltip.Content>
-                        <span>Download CSV</span>
-                      </Tooltip.Content>
-                    </Tooltip.Root>
-                  )}
-                  {hasActiveFilters && (
-                    <Tooltip.Root>
-                      <Tooltip.Trigger asChild>
-                        <Button
-                          variant='ghost'
-                          onClick={(e) => {
-                            e.stopPropagation()
-                            clearFilters()
-                          }}
-                          aria-label='Clear filters'
-                          className='!p-1.5 -m-1.5'
-                        >
-                          <FilterX className='h-3 w-3' />
-                        </Button>
-                      </Tooltip.Trigger>
-                      <Tooltip.Content>
-                        <span>Clear filters</span>
-                      </Tooltip.Content>
-                    </Tooltip.Root>
-                  )}
-                  {filteredEntries.length > 0 && (
-                    <Tooltip.Root>
-                      <Tooltip.Trigger asChild>
-                        <Button
-                          variant='ghost'
-                          onClick={handleClearConsole}
-                          aria-label='Clear console'
-                          className='!p-1.5 -m-1.5'
-                        >
-                          <Trash2 className='h-3 w-3' />
-                        </Button>
-                      </Tooltip.Trigger>
-                      <Tooltip.Content>
-                        <Tooltip.Shortcut keys='⌘D'>Clear console</Tooltip.Shortcut>
-                      </Tooltip.Content>
-                    </Tooltip.Root>
-                  )}
-                  <Popover open={outputOptionsOpen} onOpenChange={setOutputOptionsOpen}>
-                    <PopoverTrigger asChild>
-                      <Button
-                        variant='ghost'
-                        onClick={(e) => {
-                          e.stopPropagation()
-                        }}
-                        aria-label='Terminal options'
-                        className='!p-1.5 -m-1.5'
-                      >
-                        <MoreHorizontal className='h-3.5 w-3.5' />
-                      </Button>
-                    </PopoverTrigger>
-                    <PopoverContent
-                      side='bottom'
-                      align='end'
-                      sideOffset={4}
-                      collisionPadding={0}
-                      onClick={(e) => e.stopPropagation()}
-                      style={{ minWidth: '140px', maxWidth: '160px' }}
-                      className='gap-[2px]'
-                    >
-                      <PopoverItem
-                        active={wrapText}
-                        showCheck
-                        onClick={(e) => {
-                          e.stopPropagation()
-                          setWrapText(!wrapText)
-                        }}
-                      >
-                        <span>Wrap text</span>
-                      </PopoverItem>
-                      <PopoverItem
-                        active={openOnRun}
-                        showCheck
-                        onClick={(e) => {
-                          e.stopPropagation()
-                          setOpenOnRun(!openOnRun)
-                        }}
-                      >
-                        <span>Open on run</span>
-                      </PopoverItem>
-                    </PopoverContent>
-                  </Popover>
-                  <ToggleButton
-                    isExpanded={isExpanded}
-                    onClick={(e) => {
-                      e.stopPropagation()
-                      handleHeaderClick()
-                    }}
-                  />
-                </div>
-              </div>
-
-              {/* Search Overlay */}
-              {isOutputSearchActive && (
-                <div
-                  className='absolute top-[30px] right-[8px] z-30 flex h-[34px] items-center gap-[6px] rounded-b-[4px] border border-[var(--border)] border-t-0 bg-[var(--surface-1)] px-[6px] shadow-sm'
-                  onClick={(e) => e.stopPropagation()}
-                  data-toolbar-root
-                  data-search-active='true'
-                >
-                  <Input
-                    ref={outputSearchInputRef}
-                    type='text'
-                    value={outputSearchQuery}
-                    onChange={(e) => setOutputSearchQuery(e.target.value)}
-                    placeholder='Search...'
-                    className='mr-[2px] h-[23px] w-[94px] text-[12px]'
-                  />
-                  <span
-                    className={clsx(
-                      'w-[58px] font-medium text-[11px]',
-                      matchCount > 0
-                        ? 'text-[var(--text-secondary)]'
-                        : 'text-[var(--text-tertiary)]'
-                    )}
-                  >
-                    {matchCount > 0 ? `${currentMatchIndex + 1}/${matchCount}` : 'No results'}
-                  </span>
-                  <Button
-                    variant='ghost'
-                    onClick={goToPreviousMatch}
-                    aria-label='Previous match'
-                    className='!p-1.5 -m-1.5'
-                    disabled={matchCount === 0}
-                  >
-                    <ArrowUp className='h-[12px] w-[12px]' />
-                  </Button>
-                  <Button
-                    variant='ghost'
-                    onClick={goToNextMatch}
-                    aria-label='Next match'
-                    className='!p-1.5 -m-1.5'
-                    disabled={matchCount === 0}
-                  >
-                    <ArrowDown className='h-[12px] w-[12px]' />
-                  </Button>
-                  <Button
-                    variant='ghost'
-                    onClick={closeOutputSearch}
-                    aria-label='Close search'
-                    className='!p-1.5 -m-1.5'
-                  >
-                    <X className='h-[12px] w-[12px]' />
-                  </Button>
-                </div>
-              )}
-
-              {/* Content */}
-              <div
-                className={clsx('flex-1 overflow-y-auto', !wrapText && 'overflow-x-auto')}
-                onContextMenu={handleOutputPanelContextMenu}
-              >
-                {shouldShowCodeDisplay ? (
-                  <OutputCodeContent
-                    code={selectedEntry.input.code}
-                    language={
-                      (selectedEntry.input.language as 'javascript' | 'json') || 'javascript'
-                    }
-                    wrapText={wrapText}
-                    searchQuery={isOutputSearchActive ? outputSearchQuery : undefined}
-                    currentMatchIndex={currentMatchIndex}
-                    onMatchCountChange={handleMatchCountChange}
-                    contentRef={outputContentRef}
-                  />
-                ) : (
-                  <OutputCodeContent
-                    code={outputDataStringified}
-                    language='json'
-                    wrapText={wrapText}
-                    searchQuery={isOutputSearchActive ? outputSearchQuery : undefined}
-                    currentMatchIndex={currentMatchIndex}
-                    onMatchCountChange={handleMatchCountChange}
-                    contentRef={outputContentRef}
-                  />
-                )}
-              </div>
-            </div>
+            <OutputPanel
+              selectedEntry={selectedEntry}
+              outputPanelWidth={outputPanelWidth}
+              handleOutputPanelResizeMouseDown={handleOutputPanelResizeMouseDown}
+              handleHeaderClick={handleHeaderClick}
+              isExpanded={isExpanded}
+              expandToLastHeight={expandToLastHeight}
+              showInput={showInput}
+              setShowInput={setShowInput}
+              hasInputData={hasInputData}
+              isPlaygroundEnabled={isPlaygroundEnabled}
+              shouldShowTrainingButton={shouldShowTrainingButton}
+              isTraining={isTraining}
+              handleTrainingClick={handleTrainingClick}
+              showCopySuccess={showCopySuccess}
+              handleCopy={handleCopy}
+              filteredEntries={filteredEntries}
+              handleExportConsole={handleExportConsole}
+              hasActiveFilters={hasActiveFilters}
+              clearFilters={clearFilters}
+              handleClearConsole={handleClearConsole}
+              wrapText={wrapText}
+              setWrapText={setWrapText}
+              openOnRun={openOnRun}
+              setOpenOnRun={setOpenOnRun}
+              outputOptionsOpen={outputOptionsOpen}
+              setOutputOptionsOpen={setOutputOptionsOpen}
+              shouldShowCodeDisplay={shouldShowCodeDisplay}
+              outputDataStringified={outputDataStringified}
+              handleClearConsoleFromMenu={handleClearConsoleFromMenu}
+            />
           )}
         </div>
       </aside>
@@ -1810,23 +1951,6 @@ export function Terminal() {
         onClearConsole={handleClearConsoleFromMenu}
         hasActiveFilters={hasActiveFilters}
       />
-
-      {/* Output Panel Context Menu */}
-      <OutputContextMenu
-        isOpen={isOutputMenuOpen}
-        position={outputMenuPosition}
-        menuRef={outputMenuRef}
-        onClose={closeOutputMenu}
-        onCopySelection={handleCopySelection}
-        onCopyAll={handleCopy}
-        onSearch={activateOutputSearch}
-        wrapText={wrapText}
-        onToggleWrap={() => setWrapText(!wrapText)}
-        openOnRun={openOnRun}
-        onToggleOpenOnRun={() => setOpenOnRun(!openOnRun)}
-        onClearConsole={handleClearConsoleFromMenu}
-        hasSelection={hasSelection}
-      />
     </>
   )
-}
+})
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/workflow-block/utils.ts b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/workflow-block/utils.ts
index be9c855c95..1d41ca5546 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/workflow-block/utils.ts
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/workflow-block/utils.ts
@@ -14,8 +14,12 @@ export function getProviderName(providerId: string): string {
 }
 
 /**
- * Compares two WorkflowBlock props to determine if a re-render should be skipped
- * Used as the comparison function for React.memo
+ * Compares two WorkflowBlock props to determine if a re-render should be skipped.
+ * Used as the comparison function for React.memo.
+ *
+ * Note: xPos and yPos are intentionally excluded since WorkflowBlock doesn't use
+ * position props - ReactFlow handles positioning via CSS transforms. Including them
+ * would cause unnecessary re-renders during drag (100+ times per drag operation).
  *
  * @param prevProps - Previous node props
  * @param nextProps - Next node props
@@ -37,9 +41,7 @@ export function shouldSkipBlockRender(
     prevProps.data.subBlockValues === nextProps.data.subBlockValues &&
     prevProps.data.blockState === nextProps.data.blockState &&
     prevProps.selected === nextProps.selected &&
-    prevProps.dragging === nextProps.dragging &&
-    prevProps.xPos === nextProps.xPos &&
-    prevProps.yPos === nextProps.yPos
+    prevProps.dragging === nextProps.dragging
   )
 }
 
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/workflow-block/workflow-block.tsx b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/workflow-block/workflow-block.tsx
index 8c8897fbd3..5c0f42d1fa 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/workflow-block/workflow-block.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/workflow-block/workflow-block.tsx
@@ -1,5 +1,6 @@
 import { memo, useCallback, useEffect, useMemo, useRef } from 'react'
 import { createLogger } from '@sim/logger'
+import { isEqual } from 'lodash'
 import { useParams } from 'next/navigation'
 import { Handle, type NodeProps, Position, useUpdateNodeInternals } from 'reactflow'
 import { Badge, Tooltip } from '@/components/emcn'
@@ -7,6 +8,7 @@ import { cn } from '@/lib/core/utils/cn'
 import { getBaseUrl } from '@/lib/core/utils/urls'
 import { createMcpToolId } from '@/lib/mcp/utils'
 import { getProviderIdFromServiceId } from '@/lib/oauth'
+import { BLOCK_DIMENSIONS, HANDLE_POSITIONS } from '@/lib/workflows/blocks/block-dimensions'
 import {
   buildCanonicalIndex,
   evaluateSubBlockCondition,
@@ -28,11 +30,7 @@ import {
   shouldSkipBlockRender,
 } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/workflow-block/utils'
 import { useBlockVisual } from '@/app/workspace/[workspaceId]/w/[workflowId]/hooks'
-import {
-  BLOCK_DIMENSIONS,
-  HANDLE_POSITIONS,
-  useBlockDimensions,
-} from '@/app/workspace/[workspaceId]/w/[workflowId]/hooks/use-block-dimensions'
+import { useBlockDimensions } from '@/app/workspace/[workspaceId]/w/[workflowId]/hooks/use-block-dimensions'
 import { SELECTOR_TYPES_HYDRATION_REQUIRED, type SubBlockConfig } from '@/blocks/types'
 import { getDependsOnFields } from '@/blocks/utils'
 import { useKnowledgeBase } from '@/hooks/kb/use-knowledge'
@@ -49,6 +47,9 @@ import { wouldCreateCycle } from '@/stores/workflows/workflow/utils'
 
 const logger = createLogger('WorkflowBlock')
 
+/** Stable empty object to avoid creating new references */
+const EMPTY_SUBBLOCK_VALUES = {} as Record<string, any>
+
 /**
  * Type guard for table row structure
  */
@@ -323,11 +324,53 @@ export const getDisplayValue = (value: unknown): string => {
   return stringValue.trim().length > 0 ? stringValue : '-'
 }
 
+interface SubBlockRowProps {
+  title: string
+  value?: string
+  subBlock?: SubBlockConfig
+  rawValue?: unknown
+  workspaceId?: string
+  workflowId?: string
+  blockId?: string
+  allSubBlockValues?: Record<string, { value: unknown }>
+  displayAdvancedOptions?: boolean
+  canonicalIndex?: ReturnType<typeof buildCanonicalIndex>
+  canonicalModeOverrides?: Record<string, 'basic' | 'advanced'>
+}
+
+/**
+ * Compares SubBlockRow props for memo equality check.
+ */
+const areSubBlockRowPropsEqual = (
+  prevProps: SubBlockRowProps,
+  nextProps: SubBlockRowProps
+): boolean => {
+  const subBlockId = prevProps.subBlock?.id
+  const prevValue = subBlockId ? prevProps.allSubBlockValues?.[subBlockId]?.value : undefined
+  const nextValue = subBlockId ? nextProps.allSubBlockValues?.[subBlockId]?.value : undefined
+  const valueEqual = prevValue === nextValue || isEqual(prevValue, nextValue)
+
+  return (
+    prevProps.title === nextProps.title &&
+    prevProps.value === nextProps.value &&
+    prevProps.subBlock === nextProps.subBlock &&
+    prevProps.rawValue === nextProps.rawValue &&
+    prevProps.workspaceId === nextProps.workspaceId &&
+    prevProps.workflowId === nextProps.workflowId &&
+    prevProps.blockId === nextProps.blockId &&
+    valueEqual &&
+    prevProps.displayAdvancedOptions === nextProps.displayAdvancedOptions &&
+    prevProps.canonicalIndex === nextProps.canonicalIndex &&
+    prevProps.canonicalModeOverrides === nextProps.canonicalModeOverrides
+  )
+}
+
 /**
  * Renders a single subblock row with title and optional value.
  * Automatically hydrates IDs to display names for all selector types.
+ * Memoized to prevent excessive re-renders when parent components update.
  */
-const SubBlockRow = ({
+const SubBlockRow = memo(function SubBlockRow({
   title,
   value,
   subBlock,
@@ -339,19 +382,7 @@ const SubBlockRow = ({
   displayAdvancedOptions,
   canonicalIndex,
   canonicalModeOverrides,
-}: {
-  title: string
-  value?: string
-  subBlock?: SubBlockConfig
-  rawValue?: unknown
-  workspaceId?: string
-  workflowId?: string
-  blockId?: string
-  allSubBlockValues?: Record<string, { value: unknown }>
-  displayAdvancedOptions?: boolean
-  canonicalIndex?: ReturnType<typeof buildCanonicalIndex>
-  canonicalModeOverrides?: Record<string, 'basic' | 'advanced'>
-}) => {
+}: SubBlockRowProps) {
   const getStringValue = useCallback(
     (key?: string): string | undefined => {
       if (!key || !allSubBlockValues) return undefined
@@ -489,21 +520,34 @@ const SubBlockRow = ({
       : `${baseUrl}/api/webhooks/trigger/${blockId}`
   }, [subBlock?.id, blockId, allSubBlockValues])
 
-  const allVariables = useVariablesStore((state) => state.variables)
+  /**
+   * Subscribe only to variables for this workflow to avoid re-renders from other workflows.
+   * Uses isEqual for deep comparison since Object.fromEntries creates a new object each time.
+   */
+  const workflowVariables = useVariablesStore(
+    useCallback(
+      (state) => {
+        if (!workflowId) return {}
+        return Object.fromEntries(
+          Object.entries(state.variables).filter(([, v]) => v.workflowId === workflowId)
+        )
+      },
+      [workflowId]
+    ),
+    isEqual
+  )
 
   const variablesDisplayValue = useMemo(() => {
     if (subBlock?.type !== 'variables-input' || !isVariableAssignmentsArray(rawValue)) {
       return null
     }
 
-    const workflowVariables = Object.values(allVariables).filter(
-      (v: any) => v.workflowId === workflowId
-    )
+    const variablesArray = Object.values(workflowVariables)
 
     const names = rawValue
       .map((a) => {
         if (a.variableId) {
-          const variable = workflowVariables.find((v: any) => v.id === a.variableId)
+          const variable = variablesArray.find((v: any) => v.id === a.variableId)
           return variable?.name
         }
         if (a.variableName) return a.variableName
@@ -515,7 +559,7 @@ const SubBlockRow = ({
     if (names.length === 1) return names[0]
     if (names.length === 2) return `${names[0]}, ${names[1]}`
     return `${names[0]}, ${names[1]} +${names.length - 2}`
-  }, [subBlock?.type, rawValue, workflowId, allVariables])
+  }, [subBlock?.type, rawValue, workflowVariables])
 
   const isPasswordField = subBlock?.password === true
   const maskedValue = isPasswordField && value && value !== '-' ? '•••' : null
@@ -551,7 +595,7 @@ const SubBlockRow = ({
       )}
     </div>
   )
-}
+}, areSubBlockRowPropsEqual)
 
 export const WorkflowBlock = memo(function WorkflowBlock({
   id,
@@ -629,18 +673,15 @@ export const WorkflowBlock = memo(function WorkflowBlock({
   const isStarterBlock = type === 'starter'
   const isWebhookTriggerBlock = type === 'webhook' || type === 'generic_webhook'
 
-  /**
-   * Subscribe to this block's subblock values to track changes for conditional rendering
-   * of subblocks based on their conditions.
-   */
   const blockSubBlockValues = useSubBlockStore(
     useCallback(
       (state) => {
-        if (!activeWorkflowId) return {}
-        return state.workflowValues[activeWorkflowId]?.[id] || {}
+        if (!activeWorkflowId) return EMPTY_SUBBLOCK_VALUES
+        return state.workflowValues[activeWorkflowId]?.[id] ?? EMPTY_SUBBLOCK_VALUES
       },
       [activeWorkflowId, id]
-    )
+    ),
+    isEqual
   )
   const canonicalIndex = useMemo(() => buildCanonicalIndex(config.subBlocks), [config.subBlocks])
   const canonicalModeOverrides = currentStoreBlock?.data?.canonicalModes
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/workflow-controls/workflow-controls.tsx b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/workflow-controls/workflow-controls.tsx
index a9bd36e0d2..e646d61dcf 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/workflow-controls/workflow-controls.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/workflow-controls/workflow-controls.tsx
@@ -1,6 +1,6 @@
 'use client'
 
-import { useCallback, useRef, useState } from 'react'
+import { memo, useCallback, useRef, useState } from 'react'
 import { createLogger } from '@sim/logger'
 import clsx from 'clsx'
 import { Scan } from 'lucide-react'
@@ -22,27 +22,29 @@ import {
 import { useSession } from '@/lib/auth/auth-client'
 import { useRegisterGlobalCommands } from '@/app/workspace/[workspaceId]/providers/global-commands-provider'
 import { createCommand } from '@/app/workspace/[workspaceId]/utils/commands-utils'
-import { useUpdateGeneralSetting } from '@/hooks/queries/general-settings'
+import { useShowActionBar, useUpdateGeneralSetting } from '@/hooks/queries/general-settings'
 import { useCanvasViewport } from '@/hooks/use-canvas-viewport'
 import { useCollaborativeWorkflow } from '@/hooks/use-collaborative-workflow'
 import { useCanvasModeStore } from '@/stores/canvas-mode'
-import { useGeneralStore } from '@/stores/settings/general'
 import { useTerminalStore } from '@/stores/terminal'
 import { useUndoRedoStore } from '@/stores/undo-redo'
 import { useWorkflowRegistry } from '@/stores/workflows/registry/store'
 
 const logger = createLogger('WorkflowControls')
 
-export function WorkflowControls() {
+/**
+ * Floating controls for canvas mode, undo/redo, and fit-to-view.
+ */
+export const WorkflowControls = memo(function WorkflowControls() {
   const reactFlowInstance = useReactFlow()
   const { fitViewToBounds } = useCanvasViewport(reactFlowInstance)
   const { mode, setMode } = useCanvasModeStore()
   const { undo, redo } = useCollaborativeWorkflow()
-  const showWorkflowControls = useGeneralStore((s) => s.showActionBar)
+  const showWorkflowControls = useShowActionBar()
   const updateSetting = useUpdateGeneralSetting()
   const isTerminalResizing = useTerminalStore((state) => state.isResizing)
 
-  const { activeWorkflowId } = useWorkflowRegistry()
+  const activeWorkflowId = useWorkflowRegistry((state) => state.activeWorkflowId)
   const { data: session } = useSession()
   const userId = session?.user?.id || 'unknown'
   const stacks = useUndoRedoStore((s) => s.stacks)
@@ -222,4 +224,4 @@ export function WorkflowControls() {
       </Popover>
     </>
   )
-}
+})
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/hooks/index.ts b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/hooks/index.ts
index b80f7749a8..31ebdc27a9 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/hooks/index.ts
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/hooks/index.ts
@@ -1,18 +1,14 @@
-export {
-  clearDragHighlights,
-  computeClampedPositionUpdates,
-  computeParentUpdateEntries,
-  getClampedPositionForNode,
-  isInEditableElement,
-  resolveParentChildSelectionConflicts,
-  validateTriggerPaste,
-} from '@/app/workspace/[workspaceId]/w/[workflowId]/utils/workflow-canvas-helpers'
 export { useFloatBoundarySync, useFloatDrag, useFloatResize } from './float'
+export { useAccessibleReferencePrefixes } from './use-accessible-reference-prefixes'
 export { useAutoLayout } from './use-auto-layout'
-export { BLOCK_DIMENSIONS, useBlockDimensions } from './use-block-dimensions'
+export { useBlockDimensions } from './use-block-dimensions'
+export { useBlockOutputFields } from './use-block-output-fields'
 export { useBlockVisual } from './use-block-visual'
+export { useCanvasContextMenu } from './use-canvas-context-menu'
 export { type CurrentWorkflow, useCurrentWorkflow } from './use-current-workflow'
-export { calculateContainerDimensions, useNodeUtilities } from './use-node-utilities'
+export { useNodeUtilities } from './use-node-utilities'
 export { usePreventZoom } from './use-prevent-zoom'
 export { useScrollManagement } from './use-scroll-management'
+export { useShiftSelectionLock } from './use-shift-selection-lock'
+export { useWand, type WandConfig } from './use-wand'
 export { useWorkflowExecution } from './use-workflow-execution'
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/hooks/use-block-dimensions.ts b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/hooks/use-block-dimensions.ts
index e8c7f9f154..aaa2025423 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/hooks/use-block-dimensions.ts
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/hooks/use-block-dimensions.ts
@@ -2,9 +2,6 @@ import { useEffect, useRef } from 'react'
 import { useUpdateNodeInternals } from 'reactflow'
 import { useWorkflowStore } from '@/stores/workflows/workflow/store'
 
-// Re-export for backwards compatibility
-export { BLOCK_DIMENSIONS, HANDLE_POSITIONS } from '@/lib/workflows/blocks/block-dimensions'
-
 interface BlockDimensions {
   width: number
   height: number
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/hooks/use-block-visual.ts b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/hooks/use-block-visual.ts
index 33f83bdb94..cd99dc9a8b 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/hooks/use-block-visual.ts
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/hooks/use-block-visual.ts
@@ -50,8 +50,18 @@ export function useBlockVisual({
   } = useBlockState(blockId, currentWorkflow, data)
 
   const currentBlockId = usePanelEditorStore((state) => state.currentBlockId)
-  const activeTab = usePanelStore((state) => state.activeTab)
-  const isEditorOpen = !isPreview && currentBlockId === blockId && activeTab === 'editor'
+
+  const isThisBlockInEditor = currentBlockId === blockId
+  const activeTabIsEditor = usePanelStore(
+    useCallback(
+      (state) => {
+        if (isPreview || !isThisBlockInEditor) return false
+        return state.activeTab === 'editor'
+      },
+      [isPreview, isThisBlockInEditor]
+    )
+  )
+  const isEditorOpen = !isPreview && isThisBlockInEditor && activeTabIsEditor
 
   const lastRunPath = useExecutionStore((state) => state.lastRunPath)
   const runPathStatus = isPreview ? undefined : lastRunPath.get(blockId)
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/hooks/use-canvas-context-menu.ts b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/hooks/use-canvas-context-menu.ts
index fec22a0970..5dade163b5 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/hooks/use-canvas-context-menu.ts
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/hooks/use-canvas-context-menu.ts
@@ -8,13 +8,14 @@ type MenuType = 'block' | 'pane' | null
 interface UseCanvasContextMenuProps {
   blocks: Record<string, BlockState>
   getNodes: () => Node[]
+  setNodes: (updater: (nodes: Node[]) => Node[]) => void
 }
 
 /**
  * Hook for managing workflow canvas context menus.
  * Handles right-click events, menu state, click-outside detection, and block info extraction.
  */
-export function useCanvasContextMenu({ blocks, getNodes }: UseCanvasContextMenuProps) {
+export function useCanvasContextMenu({ blocks, getNodes, setNodes }: UseCanvasContextMenuProps) {
   const [activeMenu, setActiveMenu] = useState<MenuType>(null)
   const [position, setPosition] = useState({ x: 0, y: 0 })
   const [selectedBlocks, setSelectedBlocks] = useState<BlockInfo[]>([])
@@ -44,14 +45,26 @@ export function useCanvasContextMenu({ blocks, getNodes }: UseCanvasContextMenuP
       event.preventDefault()
       event.stopPropagation()
 
+      const isMultiSelect = event.shiftKey || event.metaKey || event.ctrlKey
+      setNodes((nodes) =>
+        nodes.map((n) => ({
+          ...n,
+          selected: isMultiSelect ? (n.id === node.id ? true : n.selected) : n.id === node.id,
+        }))
+      )
+
       const selectedNodes = getNodes().filter((n) => n.selected)
-      const nodesToUse = selectedNodes.some((n) => n.id === node.id) ? selectedNodes : [node]
+      const nodesToUse = isMultiSelect
+        ? selectedNodes.some((n) => n.id === node.id)
+          ? selectedNodes
+          : [...selectedNodes, node]
+        : [node]
 
       setPosition({ x: event.clientX, y: event.clientY })
       setSelectedBlocks(nodesToBlockInfos(nodesToUse))
       setActiveMenu('block')
     },
-    [getNodes, nodesToBlockInfos]
+    [getNodes, nodesToBlockInfos, setNodes]
   )
 
   const handlePaneContextMenu = useCallback((event: React.MouseEvent) => {
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/hooks/use-node-utilities.ts b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/hooks/use-node-utilities.ts
index e137506618..06329a6b71 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/hooks/use-node-utilities.ts
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/hooks/use-node-utilities.ts
@@ -2,107 +2,15 @@ import { useCallback } from 'react'
 import { createLogger } from '@sim/logger'
 import { useReactFlow } from 'reactflow'
 import { BLOCK_DIMENSIONS, CONTAINER_DIMENSIONS } from '@/lib/workflows/blocks/block-dimensions'
-import { getBlock } from '@/blocks/registry'
+import {
+  calculateContainerDimensions,
+  clampPositionToContainer,
+  estimateBlockDimensions,
+} from '@/app/workspace/[workspaceId]/w/[workflowId]/utils/node-position-utils'
 import { useWorkflowStore } from '@/stores/workflows/workflow/store'
 
 const logger = createLogger('NodeUtilities')
 
-/**
- * Estimates block dimensions based on block type.
- * Uses subblock count to estimate height for blocks that haven't been measured yet.
- *
- * @param blockType - The type of block (e.g., 'condition', 'agent')
- * @returns Estimated width and height for the block
- */
-export function estimateBlockDimensions(blockType: string): { width: number; height: number } {
-  const blockConfig = getBlock(blockType)
-  const subBlockCount = blockConfig?.subBlocks?.length ?? 3
-  // Many subblocks are conditionally rendered (advanced mode, provider-specific, etc.)
-  // Use roughly half the config count as a reasonable estimate, capped between 3-7 rows
-  const estimatedRows = Math.max(3, Math.min(Math.ceil(subBlockCount / 2), 7))
-  const hasErrorRow = blockType !== 'starter' && blockType !== 'response' ? 1 : 0
-
-  const height =
-    BLOCK_DIMENSIONS.HEADER_HEIGHT +
-    BLOCK_DIMENSIONS.WORKFLOW_CONTENT_PADDING +
-    (estimatedRows + hasErrorRow) * BLOCK_DIMENSIONS.WORKFLOW_ROW_HEIGHT
-
-  return {
-    width: BLOCK_DIMENSIONS.FIXED_WIDTH,
-    height: Math.max(height, BLOCK_DIMENSIONS.MIN_HEIGHT),
-  }
-}
-
-/**
- * Clamps a position to keep a block fully inside a container's content area.
- * Content area starts after the header and padding, and ends before the right/bottom padding.
- *
- * @param position - Raw position relative to container origin
- * @param containerDimensions - Container width and height
- * @param blockDimensions - Block width and height
- * @returns Clamped position that keeps block inside content area
- */
-export function clampPositionToContainer(
-  position: { x: number; y: number },
-  containerDimensions: { width: number; height: number },
-  blockDimensions: { width: number; height: number }
-): { x: number; y: number } {
-  const { width: containerWidth, height: containerHeight } = containerDimensions
-  const { width: blockWidth, height: blockHeight } = blockDimensions
-
-  // Content area bounds (where blocks can be placed)
-  const minX = CONTAINER_DIMENSIONS.LEFT_PADDING
-  const minY = CONTAINER_DIMENSIONS.HEADER_HEIGHT + CONTAINER_DIMENSIONS.TOP_PADDING
-  const maxX = containerWidth - CONTAINER_DIMENSIONS.RIGHT_PADDING - blockWidth
-  const maxY = containerHeight - CONTAINER_DIMENSIONS.BOTTOM_PADDING - blockHeight
-
-  return {
-    x: Math.max(minX, Math.min(position.x, Math.max(minX, maxX))),
-    y: Math.max(minY, Math.min(position.y, Math.max(minY, maxY))),
-  }
-}
-
-/**
- * Calculates container dimensions based on child block positions.
- * Single source of truth for container sizing - ensures consistency between
- * live drag updates and final dimension calculations.
- *
- * @param childPositions - Array of child positions with their dimensions
- * @returns Calculated width and height for the container
- */
-export function calculateContainerDimensions(
-  childPositions: Array<{ x: number; y: number; width: number; height: number }>
-): { width: number; height: number } {
-  if (childPositions.length === 0) {
-    return {
-      width: CONTAINER_DIMENSIONS.DEFAULT_WIDTH,
-      height: CONTAINER_DIMENSIONS.DEFAULT_HEIGHT,
-    }
-  }
-
-  let maxRight = 0
-  let maxBottom = 0
-
-  for (const child of childPositions) {
-    maxRight = Math.max(maxRight, child.x + child.width)
-    maxBottom = Math.max(maxBottom, child.y + child.height)
-  }
-
-  const width = Math.max(
-    CONTAINER_DIMENSIONS.DEFAULT_WIDTH,
-    CONTAINER_DIMENSIONS.LEFT_PADDING + maxRight + CONTAINER_DIMENSIONS.RIGHT_PADDING
-  )
-  const height = Math.max(
-    CONTAINER_DIMENSIONS.DEFAULT_HEIGHT,
-    CONTAINER_DIMENSIONS.HEADER_HEIGHT +
-      CONTAINER_DIMENSIONS.TOP_PADDING +
-      maxBottom +
-      CONTAINER_DIMENSIONS.BOTTOM_PADDING
-  )
-
-  return { width, height }
-}
-
 /**
  * Hook providing utilities for node position, hierarchy, and dimension calculations
  */
@@ -138,7 +46,6 @@ export function useNodeUtilities(blocks: Record<string, any>) {
         }
       }
 
-      // Prefer deterministic height published by the block component; fallback to estimate
       if (block.height) {
         return {
           width: BLOCK_DIMENSIONS.FIXED_WIDTH,
@@ -146,7 +53,6 @@ export function useNodeUtilities(blocks: Record<string, any>) {
         }
       }
 
-      // Use shared estimation utility for blocks without measured height
       return estimateBlockDimensions(block.type)
     },
     [blocks, isContainerType]
@@ -230,8 +136,6 @@ export function useNodeUtilities(blocks: Record<string, any>) {
 
       const parentPos = getNodeAbsolutePosition(parentId)
 
-      // Child positions are stored relative to the content area (after header and padding)
-      // Add these offsets when calculating absolute position
       const headerHeight = 50
       const leftPadding = 16
       const topPadding = 16
@@ -314,7 +218,6 @@ export function useNodeUtilities(blocks: Record<string, any>) {
         })
         .map((n) => ({
           loopId: n.id,
-          // Return absolute position so callers can compute relative placement correctly
           loopPosition: getNodeAbsolutePosition(n.id),
           dimensions: {
             width: n.data?.width || CONTAINER_DIMENSIONS.DEFAULT_WIDTH,
@@ -449,7 +352,6 @@ export function useNodeUtilities(blocks: Record<string, any>) {
         return absPos
       }
 
-      // Use known defaults per node type without type casting
       const isSubflow = node.type === 'subflowNode'
       const width = isSubflow
         ? typeof node.data?.width === 'number'
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/hooks/use-shift-selection-lock.ts b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/hooks/use-shift-selection-lock.ts
new file mode 100644
index 0000000000..d50ec82551
--- /dev/null
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/hooks/use-shift-selection-lock.ts
@@ -0,0 +1,63 @@
+import { useCallback, useEffect, useState } from 'react'
+
+interface UseShiftSelectionLockProps {
+  isHandMode: boolean
+}
+
+interface UseShiftSelectionLockResult {
+  /** Whether a shift-selection is currently active (locked in until mouseup) */
+  isShiftSelecting: boolean
+  /** Handler to attach to canvas mousedown */
+  handleCanvasMouseDown: (event: React.MouseEvent) => void
+  /** Computed ReactFlow props based on current selection state */
+  selectionProps: {
+    selectionOnDrag: boolean
+    panOnDrag: [number, number] | false
+    selectionKeyCode: string | null
+  }
+}
+
+/**
+ * Locks shift-selection mode from mousedown to mouseup.
+ * Prevents selection from canceling when shift is released mid-drag.
+ */
+export function useShiftSelectionLock({
+  isHandMode,
+}: UseShiftSelectionLockProps): UseShiftSelectionLockResult {
+  const [isShiftSelecting, setIsShiftSelecting] = useState(false)
+
+  const handleCanvasMouseDown = useCallback(
+    (event: React.MouseEvent) => {
+      if (!event.shiftKey) return
+
+      const target = event.target as HTMLElement | null
+      const isPaneTarget = Boolean(target?.closest('.react-flow__pane, .react-flow__selectionpane'))
+
+      if (isPaneTarget && isHandMode) {
+        setIsShiftSelecting(true)
+      }
+
+      if (isPaneTarget) {
+        event.preventDefault()
+        window.getSelection()?.removeAllRanges()
+      }
+    },
+    [isHandMode]
+  )
+
+  useEffect(() => {
+    if (!isShiftSelecting) return
+
+    const handleMouseUp = () => setIsShiftSelecting(false)
+    window.addEventListener('mouseup', handleMouseUp)
+    return () => window.removeEventListener('mouseup', handleMouseUp)
+  }, [isShiftSelecting])
+
+  const selectionProps = {
+    selectionOnDrag: !isHandMode || isShiftSelecting,
+    panOnDrag: (isHandMode && !isShiftSelecting ? [0, 1] : false) as [number, number] | false,
+    selectionKeyCode: isShiftSelecting ? null : 'Shift',
+  }
+
+  return { isShiftSelecting, handleCanvasMouseDown, selectionProps }
+}
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/utils/index.ts b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/utils/index.ts
index adf8b5f8a3..d2845af28b 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/utils/index.ts
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/utils/index.ts
@@ -1,3 +1,5 @@
 export * from './auto-layout-utils'
 export * from './block-ring-utils'
+export * from './node-position-utils'
+export * from './workflow-canvas-helpers'
 export * from './workflow-execution-utils'
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/utils/node-position-utils.ts b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/utils/node-position-utils.ts
new file mode 100644
index 0000000000..01068ff111
--- /dev/null
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/utils/node-position-utils.ts
@@ -0,0 +1,95 @@
+import { BLOCK_DIMENSIONS, CONTAINER_DIMENSIONS } from '@/lib/workflows/blocks/block-dimensions'
+import { getBlock } from '@/blocks/registry'
+
+/**
+ * Estimates block dimensions based on block type.
+ * Uses subblock count to estimate height for blocks that haven't been measured yet.
+ *
+ * @param blockType - The type of block (e.g., 'condition', 'agent')
+ * @returns Estimated width and height for the block
+ */
+export function estimateBlockDimensions(blockType: string): { width: number; height: number } {
+  const blockConfig = getBlock(blockType)
+  const subBlockCount = blockConfig?.subBlocks?.length ?? 3
+  const estimatedRows = Math.max(3, Math.min(Math.ceil(subBlockCount / 2), 7))
+  const hasErrorRow = blockType !== 'starter' && blockType !== 'response' ? 1 : 0
+
+  const height =
+    BLOCK_DIMENSIONS.HEADER_HEIGHT +
+    BLOCK_DIMENSIONS.WORKFLOW_CONTENT_PADDING +
+    (estimatedRows + hasErrorRow) * BLOCK_DIMENSIONS.WORKFLOW_ROW_HEIGHT
+
+  return {
+    width: BLOCK_DIMENSIONS.FIXED_WIDTH,
+    height: Math.max(height, BLOCK_DIMENSIONS.MIN_HEIGHT),
+  }
+}
+
+/**
+ * Clamps a position to keep a block fully inside a container's content area.
+ * Content area starts after the header and padding, and ends before the right/bottom padding.
+ *
+ * @param position - Raw position relative to container origin
+ * @param containerDimensions - Container width and height
+ * @param blockDimensions - Block width and height
+ * @returns Clamped position that keeps block inside content area
+ */
+export function clampPositionToContainer(
+  position: { x: number; y: number },
+  containerDimensions: { width: number; height: number },
+  blockDimensions: { width: number; height: number }
+): { x: number; y: number } {
+  const { width: containerWidth, height: containerHeight } = containerDimensions
+  const { width: blockWidth, height: blockHeight } = blockDimensions
+
+  const minX = CONTAINER_DIMENSIONS.LEFT_PADDING
+  const minY = CONTAINER_DIMENSIONS.HEADER_HEIGHT + CONTAINER_DIMENSIONS.TOP_PADDING
+  const maxX = containerWidth - CONTAINER_DIMENSIONS.RIGHT_PADDING - blockWidth
+  const maxY = containerHeight - CONTAINER_DIMENSIONS.BOTTOM_PADDING - blockHeight
+
+  return {
+    x: Math.max(minX, Math.min(position.x, Math.max(minX, maxX))),
+    y: Math.max(minY, Math.min(position.y, Math.max(minY, maxY))),
+  }
+}
+
+/**
+ * Calculates container dimensions based on child block positions.
+ * Single source of truth for container sizing - ensures consistency between
+ * live drag updates and final dimension calculations.
+ *
+ * @param childPositions - Array of child positions with their dimensions
+ * @returns Calculated width and height for the container
+ */
+export function calculateContainerDimensions(
+  childPositions: Array<{ x: number; y: number; width: number; height: number }>
+): { width: number; height: number } {
+  if (childPositions.length === 0) {
+    return {
+      width: CONTAINER_DIMENSIONS.DEFAULT_WIDTH,
+      height: CONTAINER_DIMENSIONS.DEFAULT_HEIGHT,
+    }
+  }
+
+  let maxRight = 0
+  let maxBottom = 0
+
+  for (const child of childPositions) {
+    maxRight = Math.max(maxRight, child.x + child.width)
+    maxBottom = Math.max(maxBottom, child.y + child.height)
+  }
+
+  const width = Math.max(
+    CONTAINER_DIMENSIONS.DEFAULT_WIDTH,
+    CONTAINER_DIMENSIONS.LEFT_PADDING + maxRight + CONTAINER_DIMENSIONS.RIGHT_PADDING
+  )
+  const height = Math.max(
+    CONTAINER_DIMENSIONS.DEFAULT_HEIGHT,
+    CONTAINER_DIMENSIONS.HEADER_HEIGHT +
+      CONTAINER_DIMENSIONS.TOP_PADDING +
+      maxBottom +
+      CONTAINER_DIMENSIONS.BOTTOM_PADDING
+  )
+
+  return { width, height }
+}
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/utils/workflow-canvas-helpers.ts b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/utils/workflow-canvas-helpers.ts
index a6d6ea9136..7f24907c47 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/utils/workflow-canvas-helpers.ts
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/utils/workflow-canvas-helpers.ts
@@ -1,7 +1,7 @@
 import type { Edge, Node } from 'reactflow'
 import { BLOCK_DIMENSIONS, CONTAINER_DIMENSIONS } from '@/lib/workflows/blocks/block-dimensions'
 import { TriggerUtils } from '@/lib/workflows/triggers/triggers'
-import { clampPositionToContainer } from '@/app/workspace/[workspaceId]/w/[workflowId]/hooks/use-node-utilities'
+import { clampPositionToContainer } from '@/app/workspace/[workspaceId]/w/[workflowId]/utils/node-position-utils'
 import type { BlockState } from '@/stores/workflows/workflow/types'
 
 /**
diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/workflow.tsx b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/workflow.tsx
index f2a0db4d7a..b2d2a4caa2 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/workflow.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/workflow.tsx
@@ -42,26 +42,28 @@ import { WorkflowBlock } from '@/app/workspace/[workspaceId]/w/[workflowId]/comp
 import { WorkflowControls } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/workflow-controls/workflow-controls'
 import { WorkflowEdge } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/workflow-edge/workflow-edge'
 import {
-  clearDragHighlights,
-  computeClampedPositionUpdates,
-  getClampedPositionForNode,
-  isInEditableElement,
-  resolveParentChildSelectionConflicts,
   useAutoLayout,
+  useCanvasContextMenu,
   useCurrentWorkflow,
   useNodeUtilities,
-  validateTriggerPaste,
+  useShiftSelectionLock,
 } from '@/app/workspace/[workspaceId]/w/[workflowId]/hooks'
-import { useCanvasContextMenu } from '@/app/workspace/[workspaceId]/w/[workflowId]/hooks/use-canvas-context-menu'
 import {
   calculateContainerDimensions,
   clampPositionToContainer,
+  clearDragHighlights,
+  computeClampedPositionUpdates,
   estimateBlockDimensions,
-} from '@/app/workspace/[workspaceId]/w/[workflowId]/hooks/use-node-utilities'
+  getClampedPositionForNode,
+  isInEditableElement,
+  resolveParentChildSelectionConflicts,
+  validateTriggerPaste,
+} from '@/app/workspace/[workspaceId]/w/[workflowId]/utils'
 import { useSocket } from '@/app/workspace/providers/socket-provider'
 import { getBlock } from '@/blocks'
 import { isAnnotationOnlyBlock } from '@/executor/constants'
 import { useWorkspaceEnvironment } from '@/hooks/queries/environment'
+import { useAutoConnect, useSnapToGridSize } from '@/hooks/queries/general-settings'
 import { useCanvasViewport } from '@/hooks/use-canvas-viewport'
 import { useCollaborativeWorkflow } from '@/hooks/use-collaborative-workflow'
 import { usePermissionConfig } from '@/hooks/use-permission-config'
@@ -73,7 +75,6 @@ import { useExecutionStore } from '@/stores/execution'
 import { useSearchModalStore } from '@/stores/modals/search/store'
 import { useNotificationStore } from '@/stores/notifications'
 import { useCopilotStore, usePanelEditorStore } from '@/stores/panel'
-import { useGeneralStore } from '@/stores/settings/general'
 import { useUndoRedoStore } from '@/stores/undo-redo'
 import { useVariablesStore } from '@/stores/variables/store'
 import { useWorkflowDiffStore } from '@/stores/workflow-diff/store'
@@ -233,8 +234,10 @@ const WorkflowContent = React.memo(() => {
   const [potentialParentId, setPotentialParentId] = useState<string | null>(null)
   const [selectedEdges, setSelectedEdges] = useState<SelectedEdgesMap>(new Map())
   const [isErrorConnectionDrag, setIsErrorConnectionDrag] = useState(false)
+  const selectedIdsRef = useRef<string[] | null>(null)
   const canvasMode = useCanvasModeStore((state) => state.mode)
   const isHandMode = canvasMode === 'hand'
+  const { handleCanvasMouseDown, selectionProps } = useShiftSelectionLock({ isHandMode })
   const [oauthModal, setOauthModal] = useState<{
     provider: OAuthProvider
     serviceId: string
@@ -264,6 +267,9 @@ const WorkflowContent = React.memo(() => {
     preparePasteData,
     hasClipboard,
     clipboard,
+    pendingSelection,
+    setPendingSelection,
+    clearPendingSelection,
   } = useWorkflowRegistry(
     useShallow((state) => ({
       workflows: state.workflows,
@@ -274,6 +280,9 @@ const WorkflowContent = React.memo(() => {
       preparePasteData: state.preparePasteData,
       hasClipboard: state.hasClipboard,
       clipboard: state.clipboard,
+      pendingSelection: state.pendingSelection,
+      setPendingSelection: state.setPendingSelection,
+      clearPendingSelection: state.clearPendingSelection,
     }))
   )
 
@@ -300,9 +309,15 @@ const WorkflowContent = React.memo(() => {
 
   const showTrainingModal = useCopilotTrainingStore((state) => state.showModal)
 
-  const snapToGridSize = useGeneralStore((state) => state.snapToGridSize)
+  const snapToGridSize = useSnapToGridSize()
   const snapToGrid = snapToGridSize > 0
 
+  const isAutoConnectEnabled = useAutoConnect()
+  const autoConnectRef = useRef(isAutoConnectEnabled)
+  useEffect(() => {
+    autoConnectRef.current = isAutoConnectEnabled
+  }, [isAutoConnectEnabled])
+
   // Panel open states for context menu
   const isVariablesOpen = useVariablesStore((state) => state.isOpen)
   const isChatOpen = useChatStore((state) => state.isChatOpen)
@@ -441,9 +456,6 @@ const WorkflowContent = React.memo(() => {
     new Map()
   )
 
-  /** Stores node IDs to select on next derivedNodes sync (for paste/duplicate operations). */
-  const pendingSelectionRef = useRef<Set<string> | null>(null)
-
   /** Re-applies diff markers when blocks change after socket rehydration. */
   const blocksRef = useRef(blocks)
   useEffect(() => {
@@ -682,7 +694,7 @@ const WorkflowContent = React.memo(() => {
       autoConnectEdge?: Edge,
       triggerMode?: boolean
     ) => {
-      pendingSelectionRef.current = new Set([id])
+      setPendingSelection([id])
       setSelectedEdges(new Map())
 
       const blockData: Record<string, unknown> = { ...(data || {}) }
@@ -719,7 +731,7 @@ const WorkflowContent = React.memo(() => {
       )
       usePanelEditorStore.getState().setCurrentBlockId(id)
     },
-    [collaborativeBatchAddBlocks, setSelectedEdges]
+    [collaborativeBatchAddBlocks, setSelectedEdges, setPendingSelection]
   )
 
   const { activeBlockIds, pendingBlocks, isDebugging } = useExecutionStore(
@@ -853,7 +865,7 @@ const WorkflowContent = React.memo(() => {
     handlePaneContextMenu,
     handleSelectionContextMenu,
     closeMenu: closeContextMenu,
-  } = useCanvasContextMenu({ blocks, getNodes })
+  } = useCanvasContextMenu({ blocks, getNodes, setNodes })
 
   const handleContextCopy = useCallback(() => {
     const blockIds = contextMenuBlocks.map((b) => b.id)
@@ -881,10 +893,7 @@ const WorkflowContent = React.memo(() => {
       }
 
       // Set pending selection before adding blocks - sync effect will apply it (accumulates for rapid pastes)
-      pendingSelectionRef.current = new Set([
-        ...(pendingSelectionRef.current ?? []),
-        ...pastedBlocksArray.map((b) => b.id),
-      ])
+      setPendingSelection(pastedBlocksArray.map((b) => b.id))
 
       collaborativeBatchAddBlocks(
         pastedBlocksArray,
@@ -894,7 +903,14 @@ const WorkflowContent = React.memo(() => {
         pasteData.subBlockValues
       )
     },
-    [preparePasteData, blocks, addNotification, activeWorkflowId, collaborativeBatchAddBlocks]
+    [
+      preparePasteData,
+      blocks,
+      addNotification,
+      activeWorkflowId,
+      collaborativeBatchAddBlocks,
+      setPendingSelection,
+    ]
   )
 
   const handleContextPaste = useCallback(() => {
@@ -1208,8 +1224,7 @@ const WorkflowContent = React.memo(() => {
         containerId?: string
       }
     ): Edge | undefined => {
-      const isAutoConnectEnabled = useGeneralStore.getState().isAutoConnectEnabled
-      if (!isAutoConnectEnabled) return undefined
+      if (!autoConnectRef.current) return undefined
 
       // Don't auto-connect starter or annotation-only blocks
       if (options.blockType === 'starter' || isAnnotationOnlyBlock(options.blockType)) {
@@ -2041,26 +2056,28 @@ const WorkflowContent = React.memo(() => {
 
   useEffect(() => {
     // Check for pending selection (from paste/duplicate), otherwise preserve existing selection
-    const pendingSelection = pendingSelectionRef.current
-    pendingSelectionRef.current = null
+    if (pendingSelection && pendingSelection.length > 0) {
+      const pendingSet = new Set(pendingSelection)
+      clearPendingSelection()
 
+      // Apply pending selection and resolve parent-child conflicts
+      const withSelection = derivedNodes.map((node) => ({
+        ...node,
+        selected: pendingSet.has(node.id),
+      }))
+      setDisplayNodes(resolveParentChildSelectionConflicts(withSelection, blocks))
+      return
+    }
+
+    // Preserve existing selection state
     setDisplayNodes((currentNodes) => {
-      if (pendingSelection) {
-        // Apply pending selection and resolve parent-child conflicts
-        const withSelection = derivedNodes.map((node) => ({
-          ...node,
-          selected: pendingSelection.has(node.id),
-        }))
-        return resolveParentChildSelectionConflicts(withSelection, blocks)
-      }
-      // Preserve existing selection state
       const selectedIds = new Set(currentNodes.filter((n) => n.selected).map((n) => n.id))
       return derivedNodes.map((node) => ({
         ...node,
         selected: selectedIds.has(node.id),
       }))
     })
-  }, [derivedNodes, blocks])
+  }, [derivedNodes, blocks, pendingSelection, clearPendingSelection])
 
   /** Handles ActionBar remove-from-subflow events. */
   useEffect(() => {
@@ -2137,11 +2154,25 @@ const WorkflowContent = React.memo(() => {
   /** Handles node changes - applies changes and resolves parent-child selection conflicts. */
   const onNodesChange = useCallback(
     (changes: NodeChange[]) => {
+      selectedIdsRef.current = null
       setDisplayNodes((nds) => {
         const updated = applyNodeChanges(changes, nds)
         const hasSelectionChange = changes.some((c) => c.type === 'select')
-        return hasSelectionChange ? resolveParentChildSelectionConflicts(updated, blocks) : updated
+        if (!hasSelectionChange) return updated
+        const resolved = resolveParentChildSelectionConflicts(updated, blocks)
+        selectedIdsRef.current = resolved.filter((node) => node.selected).map((node) => node.id)
+        return resolved
       })
+      const selectedIds = selectedIdsRef.current as string[] | null
+      if (selectedIds !== null) {
+        const { currentBlockId, clearCurrentBlock, setCurrentBlockId } =
+          usePanelEditorStore.getState()
+        if (selectedIds.length === 1 && selectedIds[0] !== currentBlockId) {
+          setCurrentBlockId(selectedIds[0])
+        } else if (selectedIds.length === 0 && currentBlockId) {
+          clearCurrentBlock()
+        }
+      }
     },
     [blocks]
   )
@@ -3010,23 +3041,6 @@ const WorkflowContent = React.memo(() => {
     usePanelEditorStore.getState().clearCurrentBlock()
   }, [])
 
-  /** Prevents native text selection when starting a shift-drag on the pane. */
-  const handleCanvasMouseDown = useCallback((event: React.MouseEvent) => {
-    if (!event.shiftKey) return
-
-    const target = event.target as HTMLElement | null
-    if (!target) return
-
-    const isPaneTarget = Boolean(target.closest('.react-flow__pane, .react-flow__selectionpane'))
-    if (!isPaneTarget) return
-
-    event.preventDefault()
-    const selection = window.getSelection()
-    if (selection && selection.rangeCount > 0) {
-      selection.removeAllRanges()
-    }
-  }, [])
-
   /**
    * Handles node click to select the node in ReactFlow.
    * Parent-child conflict resolution happens automatically in onNodesChange.
@@ -3226,9 +3240,10 @@ const WorkflowContent = React.memo(() => {
               onPointerMove={handleCanvasPointerMove}
               onPointerLeave={handleCanvasPointerLeave}
               elementsSelectable={true}
-              selectionOnDrag={!isHandMode}
+              selectionOnDrag={selectionProps.selectionOnDrag}
               selectionMode={SelectionMode.Partial}
-              panOnDrag={isHandMode ? [0, 1] : false}
+              panOnDrag={selectionProps.panOnDrag}
+              selectionKeyCode={selectionProps.selectionKeyCode}
               multiSelectionKeyCode={['Meta', 'Control', 'Shift']}
               nodesConnectable={effectivePermissions.canEdit}
               nodesDraggable={effectivePermissions.canEdit}
diff --git a/apps/sim/app/workspace/[workspaceId]/w/components/preview/preview.tsx b/apps/sim/app/workspace/[workspaceId]/w/components/preview/preview.tsx
index e3c5a159d0..77e2c1dcd7 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/components/preview/preview.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/components/preview/preview.tsx
@@ -19,7 +19,7 @@ import { NoteBlock } from '@/app/workspace/[workspaceId]/w/[workflowId]/componen
 import { SubflowNodeComponent } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/subflows/subflow-node'
 import { WorkflowBlock } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/workflow-block/workflow-block'
 import { WorkflowEdge } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/workflow-edge/workflow-edge'
-import { estimateBlockDimensions } from '@/app/workspace/[workspaceId]/w/[workflowId]/hooks/use-node-utilities'
+import { estimateBlockDimensions } from '@/app/workspace/[workspaceId]/w/[workflowId]/utils'
 import { WorkflowPreviewBlock } from '@/app/workspace/[workspaceId]/w/components/preview/components/block'
 import { WorkflowPreviewSubflow } from '@/app/workspace/[workspaceId]/w/components/preview/components/subflow'
 import { getBlock } from '@/blocks'
diff --git a/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/search-modal/search-modal.tsx b/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/search-modal/search-modal.tsx
index 0d8fd312cc..47125fa4de 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/search-modal/search-modal.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/search-modal/search-modal.tsx
@@ -1,6 +1,6 @@
 'use client'
 
-import { useCallback, useEffect, useMemo, useState } from 'react'
+import { memo, useCallback, useEffect, useMemo, useState } from 'react'
 import * as DialogPrimitive from '@radix-ui/react-dialog'
 import * as VisuallyHidden from '@radix-ui/react-visually-hidden'
 import { BookOpen, Layout, RepeatIcon, ScrollText, Search, SplitIcon } from 'lucide-react'
@@ -87,7 +87,90 @@ type SearchItem = {
   config?: any
 }
 
-export function SearchModal({
+interface SearchResultItemProps {
+  item: SearchItem
+  visualIndex: number
+  isSelected: boolean
+  onItemClick: (item: SearchItem) => void
+}
+
+const SearchResultItem = memo(function SearchResultItem({
+  item,
+  visualIndex,
+  isSelected,
+  onItemClick,
+}: SearchResultItemProps) {
+  const Icon = item.icon
+  const showColoredIcon = item.type === 'block' || item.type === 'trigger' || item.type === 'tool'
+  const isWorkflow = item.type === 'workflow'
+  const isWorkspace = item.type === 'workspace'
+
+  const handleClick = useCallback(() => {
+    onItemClick(item)
+  }, [onItemClick, item])
+
+  return (
+    <button
+      data-search-item-index={visualIndex}
+      onClick={handleClick}
+      onMouseDown={(e) => e.preventDefault()}
+      className={cn(
+        'group flex h-[28px] w-full items-center gap-[8px] rounded-[6px] bg-[var(--surface-4)]/60 px-[10px] text-left text-[15px] transition-all focus:outline-none',
+        isSelected ? 'bg-[var(--border)] shadow-sm' : 'hover:bg-[var(--border)]'
+      )}
+    >
+      {/* Icon - different rendering for workflows vs others */}
+      {!isWorkspace && (
+        <>
+          {isWorkflow ? (
+            <div
+              className='h-[14px] w-[14px] flex-shrink-0 rounded-[3px]'
+              style={{ backgroundColor: item.color }}
+            />
+          ) : (
+            Icon && (
+              <div
+                className='relative flex h-[16px] w-[16px] flex-shrink-0 items-center justify-center overflow-hidden rounded-[4px]'
+                style={{ background: showColoredIcon ? item.bgColor : 'transparent' }}
+              >
+                <Icon
+                  className={cn(
+                    'transition-transform duration-100 group-hover:scale-110',
+                    showColoredIcon
+                      ? '!h-[10px] !w-[10px] text-white'
+                      : 'h-[14px] w-[14px] text-[var(--text-tertiary)] group-hover:text-[var(--text-primary)]'
+                  )}
+                />
+              </div>
+            )
+          )}
+        </>
+      )}
+
+      {/* Content */}
+      <span
+        className={cn(
+          'truncate font-medium',
+          isSelected
+            ? 'text-[var(--text-primary)]'
+            : 'text-[var(--text-tertiary)] group-hover:text-[var(--text-primary)]'
+        )}
+      >
+        {item.name}
+        {item.isCurrent && ' (current)'}
+      </span>
+
+      {/* Shortcut */}
+      {item.shortcut && (
+        <span className='ml-auto flex-shrink-0 font-medium text-[13px] text-[var(--text-subtle)]'>
+          {item.shortcut}
+        </span>
+      )}
+    </button>
+  )
+})
+
+export const SearchModal = memo(function SearchModal({
   open,
   onOpenChange,
   workflows = [],
@@ -103,7 +186,7 @@ export function SearchModal({
   const { filterBlocks } = usePermissionConfig()
 
   const blocks = useMemo(() => {
-    if (!isOnWorkflowPage) return []
+    if (!open || !isOnWorkflowPage) return []
 
     const allBlocks = getAllBlocks()
     const filteredAllBlocks = filterBlocks(allBlocks)
@@ -142,10 +225,10 @@ export function SearchModal({
     ]
 
     return [...regularBlocks, ...filterBlocks(specialBlocks)]
-  }, [isOnWorkflowPage, filterBlocks])
+  }, [open, isOnWorkflowPage, filterBlocks])
 
   const triggers = useMemo(() => {
-    if (!isOnWorkflowPage) return []
+    if (!open || !isOnWorkflowPage) return []
 
     const allTriggers = getTriggersForSidebar()
     const filteredTriggers = filterBlocks(allTriggers)
@@ -174,10 +257,10 @@ export function SearchModal({
         config: block,
       })
     )
-  }, [isOnWorkflowPage, filterBlocks])
+  }, [open, isOnWorkflowPage, filterBlocks])
 
   const tools = useMemo(() => {
-    if (!isOnWorkflowPage) return []
+    if (!open || !isOnWorkflowPage) return []
 
     const allBlocks = getAllBlocks()
     const filteredAllBlocks = filterBlocks(allBlocks)
@@ -193,7 +276,7 @@ export function SearchModal({
           type: block.type,
         })
       )
-  }, [isOnWorkflowPage, filterBlocks])
+  }, [open, isOnWorkflowPage, filterBlocks])
 
   const pages = useMemo(
     (): PageItem[] => [
@@ -221,6 +304,8 @@ export function SearchModal({
   )
 
   const docs = useMemo((): DocItem[] => {
+    if (!open) return []
+
     const allBlocks = getAllBlocks()
     const docsItems: DocItem[] = []
 
@@ -237,7 +322,7 @@ export function SearchModal({
     })
 
     return docsItems
-  }, [])
+  }, [open])
 
   const allItems = useMemo((): SearchItem[] => {
     const items: SearchItem[] = []
@@ -549,78 +634,16 @@ export function SearchModal({
 
                     {/* Section items */}
                     <div className='space-y-[2px]'>
-                      {items.map((item, itemIndex) => {
-                        const Icon = item.icon
+                      {items.map((item) => {
                         const visualIndex = displayedItemsInVisualOrder.indexOf(item)
-                        const isSelected = visualIndex === selectedIndex
-                        const showColoredIcon =
-                          item.type === 'block' || item.type === 'trigger' || item.type === 'tool'
-                        const isWorkflow = item.type === 'workflow'
-                        const isWorkspace = item.type === 'workspace'
-
                         return (
-                          <button
+                          <SearchResultItem
                             key={`${item.type}-${item.id}`}
-                            data-search-item-index={visualIndex}
-                            onClick={() => handleItemClick(item)}
-                            onMouseDown={(e) => e.preventDefault()}
-                            className={cn(
-                              'group flex h-[28px] w-full items-center gap-[8px] rounded-[6px] bg-[var(--surface-4)]/60 px-[10px] text-left text-[15px] transition-all focus:outline-none',
-                              isSelected
-                                ? 'bg-[var(--border)] shadow-sm'
-                                : 'hover:bg-[var(--border)]'
-                            )}
-                          >
-                            {/* Icon - different rendering for workflows vs others */}
-                            {!isWorkspace && (
-                              <>
-                                {isWorkflow ? (
-                                  <div
-                                    className='h-[14px] w-[14px] flex-shrink-0 rounded-[3px]'
-                                    style={{ backgroundColor: item.color }}
-                                  />
-                                ) : (
-                                  Icon && (
-                                    <div
-                                      className='relative flex h-[16px] w-[16px] flex-shrink-0 items-center justify-center overflow-hidden rounded-[4px]'
-                                      style={{
-                                        background: showColoredIcon ? item.bgColor : 'transparent',
-                                      }}
-                                    >
-                                      <Icon
-                                        className={cn(
-                                          'transition-transform duration-100 group-hover:scale-110',
-                                          showColoredIcon
-                                            ? '!h-[10px] !w-[10px] text-white'
-                                            : 'h-[14px] w-[14px] text-[var(--text-tertiary)] group-hover:text-[var(--text-primary)]'
-                                        )}
-                                      />
-                                    </div>
-                                  )
-                                )}
-                              </>
-                            )}
-
-                            {/* Content */}
-                            <span
-                              className={cn(
-                                'truncate font-medium',
-                                isSelected
-                                  ? 'text-[var(--text-primary)]'
-                                  : 'text-[var(--text-tertiary)] group-hover:text-[var(--text-primary)]'
-                              )}
-                            >
-                              {item.name}
-                              {item.isCurrent && ' (current)'}
-                            </span>
-
-                            {/* Shortcut */}
-                            {item.shortcut && (
-                              <span className='ml-auto flex-shrink-0 font-medium text-[13px] text-[var(--text-subtle)]'>
-                                {item.shortcut}
-                              </span>
-                            )}
-                          </button>
+                            item={item}
+                            visualIndex={visualIndex}
+                            isSelected={visualIndex === selectedIndex}
+                            onItemClick={handleItemClick}
+                          />
                         )
                       })}
                     </div>
@@ -639,4 +662,4 @@ export function SearchModal({
       </DialogPortal>
     </Dialog>
   )
-}
+})
diff --git a/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/settings-modal/components/access-control/access-control.tsx b/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/settings-modal/components/access-control/access-control.tsx
index 38c2886139..067db3cc9d 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/settings-modal/components/access-control/access-control.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/settings-modal/components/access-control/access-control.tsx
@@ -1078,7 +1078,7 @@ export function AccessControl() {
             </ModalBody>
             <ModalFooter>
               <Button
-                variant='default'
+                variant='destructive'
                 onClick={() => {
                   setShowUnsavedChanges(false)
                   setShowConfigModal(false)
diff --git a/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/settings-modal/components/byok/byok.tsx b/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/settings-modal/components/byok/byok.tsx
index 42a2348fe2..449c3bb44a 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/settings-modal/components/byok/byok.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/settings-modal/components/byok/byok.tsx
@@ -294,10 +294,9 @@ export function BYOK() {
               Cancel
             </Button>
             <Button
-              variant='primary'
+              variant='tertiary'
               onClick={handleSave}
               disabled={!apiKeyInput.trim() || upsertKey.isPending}
-              className='!bg-[var(--brand-tertiary-2)] !text-[var(--text-inverse)] hover:!bg-[var(--brand-tertiary-2)]/90'
             >
               {upsertKey.isPending ? 'Saving...' : 'Save'}
             </Button>
@@ -321,12 +320,7 @@ export function BYOK() {
             <Button variant='default' onClick={() => setDeleteConfirmProvider(null)}>
               Cancel
             </Button>
-            <Button
-              variant='primary'
-              onClick={handleDelete}
-              disabled={deleteKey.isPending}
-              className='!bg-[var(--brand-tertiary-2)] !text-[var(--text-inverse)] hover:!bg-[var(--brand-tertiary-2)]/90'
-            >
+            <Button variant='destructive' onClick={handleDelete} disabled={deleteKey.isPending}>
               {deleteKey.isPending ? 'Deleting...' : 'Delete'}
             </Button>
           </ModalFooter>
diff --git a/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/settings-modal/components/copilot/copilot.tsx b/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/settings-modal/components/copilot/copilot.tsx
index f59e970244..e2d85bca6c 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/settings-modal/components/copilot/copilot.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/settings-modal/components/copilot/copilot.tsx
@@ -334,7 +334,7 @@ export function Copilot() {
               Cancel
             </Button>
             <Button
-              variant='ghost'
+              variant='destructive'
               onClick={handleDeleteKey}
               disabled={deleteKeyMutation.isPending}
             >
diff --git a/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/settings-modal/components/environment/environment.tsx b/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/settings-modal/components/environment/environment.tsx
index 63d7072971..7f22ca3969 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/settings-modal/components/environment/environment.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/settings-modal/components/environment/environment.tsx
@@ -831,7 +831,7 @@ export function EnvironmentVariables({ registerBeforeLeaveHandler }: Environment
             </p>
           </ModalBody>
           <ModalFooter>
-            <Button variant='default' onClick={handleCancel}>
+            <Button variant='destructive' onClick={handleCancel}>
               Discard Changes
             </Button>
             {hasConflicts || hasInvalidKeys ? (
diff --git a/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/settings-modal/components/subscription/subscription.tsx b/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/settings-modal/components/subscription/subscription.tsx
index 01fdab5a27..ee8ec7499d 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/settings-modal/components/subscription/subscription.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/settings-modal/components/subscription/subscription.tsx
@@ -32,11 +32,13 @@ import {
   UsageLimit,
   type UsageLimitRef,
 } from '@/app/workspace/[workspaceId]/w/components/sidebar/components/settings-modal/components/usage-limit'
-import { useUpdateGeneralSetting } from '@/hooks/queries/general-settings'
+import {
+  useBillingUsageNotifications,
+  useUpdateGeneralSetting,
+} from '@/hooks/queries/general-settings'
 import { useOrganizationBilling, useOrganizations } from '@/hooks/queries/organization'
 import { useSubscriptionData, useUsageLimitData } from '@/hooks/queries/subscription'
 import { useUpdateWorkspaceSettings, useWorkspaceSettings } from '@/hooks/queries/workspace'
-import { useGeneralStore } from '@/stores/settings/general'
 
 const CONSTANTS = {
   UPGRADE_ERROR_TIMEOUT: 3000, // 3 seconds
@@ -627,7 +629,7 @@ export function Subscription() {
 }
 
 function BillingUsageNotificationsToggle() {
-  const enabled = useGeneralStore((s) => s.isBillingUsageNotificationsEnabled)
+  const enabled = useBillingUsageNotifications()
   const updateSetting = useUpdateGeneralSetting()
   const isLoading = updateSetting.isPending
 
diff --git a/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/settings-modal/components/team-management/components/team-seats/team-seats.tsx b/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/settings-modal/components/team-management/components/team-seats/team-seats.tsx
index 58e8a2acd3..82418420ee 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/settings-modal/components/team-management/components/team-seats/team-seats.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/settings-modal/components/team-management/components/team-seats/team-seats.tsx
@@ -117,7 +117,7 @@ export function TeamSeats({
         </ModalBody>
 
         <ModalFooter>
-          <Button variant='active' onClick={() => onOpenChange(false)} disabled={isLoading}>
+          <Button variant='default' onClick={() => onOpenChange(false)} disabled={isLoading}>
             Cancel
           </Button>
 
diff --git a/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/workflow-list/components/context-menu/context-menu.tsx b/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/workflow-list/components/context-menu/context-menu.tsx
index 1c1984d4a1..b03138de55 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/workflow-list/components/context-menu/context-menu.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/workflow-list/components/context-menu/context-menu.tsx
@@ -1,6 +1,6 @@
 'use client'
 
-import { useCallback, useEffect, useMemo, useState } from 'react'
+import { useCallback, useEffect, useMemo, useRef, useState } from 'react'
 import { Check } from 'lucide-react'
 import {
   Button,
@@ -11,10 +11,110 @@ import {
   PopoverDivider,
   PopoverFolder,
   PopoverItem,
+  usePopoverContext,
 } from '@/components/emcn'
 import { cn } from '@/lib/core/utils/cn'
 import { WORKFLOW_COLORS } from '@/lib/workflows/colors'
 
+const GRID_COLUMNS = 6
+
+/**
+ * Color grid with keyboard navigation support.
+ * Uses roving tabindex pattern for accessibility.
+ */
+function ColorGrid({
+  hexInput,
+  setHexInput,
+}: {
+  hexInput: string
+  setHexInput: (color: string) => void
+}) {
+  const { isInFolder } = usePopoverContext()
+  const [focusedIndex, setFocusedIndex] = useState(-1)
+  const gridRef = useRef<HTMLDivElement>(null)
+  const buttonRefs = useRef<(HTMLButtonElement | null)[]>([])
+
+  useEffect(() => {
+    if (isInFolder && gridRef.current) {
+      const selectedIndex = WORKFLOW_COLORS.findIndex(
+        ({ color }) => color.toLowerCase() === hexInput.toLowerCase()
+      )
+      const initialIndex = selectedIndex >= 0 ? selectedIndex : 0
+      setFocusedIndex(initialIndex)
+      setTimeout(() => {
+        buttonRefs.current[initialIndex]?.focus()
+      }, 50)
+    }
+  }, [isInFolder, hexInput])
+
+  const handleKeyDown = useCallback(
+    (e: React.KeyboardEvent, index: number) => {
+      const totalItems = WORKFLOW_COLORS.length
+      let newIndex = index
+
+      switch (e.key) {
+        case 'ArrowRight':
+          e.preventDefault()
+          newIndex = index + 1 < totalItems ? index + 1 : index
+          break
+        case 'ArrowLeft':
+          e.preventDefault()
+          newIndex = index - 1 >= 0 ? index - 1 : index
+          break
+        case 'ArrowDown':
+          e.preventDefault()
+          newIndex = index + GRID_COLUMNS < totalItems ? index + GRID_COLUMNS : index
+          break
+        case 'ArrowUp':
+          e.preventDefault()
+          newIndex = index - GRID_COLUMNS >= 0 ? index - GRID_COLUMNS : index
+          break
+        case 'Enter':
+        case ' ':
+          e.preventDefault()
+          setHexInput(WORKFLOW_COLORS[index].color)
+          return
+        default:
+          return
+      }
+
+      if (newIndex !== index) {
+        setFocusedIndex(newIndex)
+        buttonRefs.current[newIndex]?.focus()
+      }
+    },
+    [setHexInput]
+  )
+
+  return (
+    <div ref={gridRef} className='grid grid-cols-6 gap-[4px]' role='grid'>
+      {WORKFLOW_COLORS.map(({ color, name }, index) => (
+        <button
+          key={color}
+          ref={(el) => {
+            buttonRefs.current[index] = el
+          }}
+          type='button'
+          role='gridcell'
+          title={name}
+          tabIndex={focusedIndex === index ? 0 : -1}
+          onClick={(e) => {
+            e.stopPropagation()
+            setHexInput(color)
+          }}
+          onKeyDown={(e) => handleKeyDown(e, index)}
+          onFocus={() => setFocusedIndex(index)}
+          className={cn(
+            'h-[20px] w-[20px] rounded-[4px] focus:outline-none focus:ring-2 focus:ring-white focus:ring-offset-1 focus:ring-offset-[#1b1b1b]',
+            hexInput.toLowerCase() === color.toLowerCase() && 'ring-1 ring-white'
+          )}
+          style={{ backgroundColor: color }}
+        />
+      ))}
+    </div>
+  )
+}
+
 /**
  * Validates a hex color string.
  * Accepts 3 or 6 character hex codes with or without #.
@@ -349,25 +449,8 @@ export function ContextMenu({
             className={disableColorChange ? 'pointer-events-none opacity-50' : ''}
           >
             <div className='flex w-[140px] flex-col gap-[8px] p-[2px]'>
-              {/* Preset colors */}
-              <div className='grid grid-cols-6 gap-[4px]'>
-                {WORKFLOW_COLORS.map(({ color, name }) => (
-                  <button
-                    key={color}
-                    type='button'
-                    title={name}
-                    onClick={(e) => {
-                      e.stopPropagation()
-                      setHexInput(color)
-                    }}
-                    className={cn(
-                      'h-[20px] w-[20px] rounded-[4px]',
-                      hexInput.toLowerCase() === color.toLowerCase() && 'ring-1 ring-white'
-                    )}
-                    style={{ backgroundColor: color }}
-                  />
-                ))}
-              </div>
+              {/* Preset colors with keyboard navigation */}
+              <ColorGrid hexInput={hexInput} setHexInput={setHexInput} />
 
               {/* Hex input */}
               <div className='flex items-center gap-[4px]'>
diff --git a/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/workflow-list/components/delete-modal/delete-modal.tsx b/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/workflow-list/components/delete-modal/delete-modal.tsx
index 59d17232a2..597d0e6cde 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/workflow-list/components/delete-modal/delete-modal.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/workflow-list/components/delete-modal/delete-modal.tsx
@@ -97,6 +97,15 @@ export function DeleteModal({
       return 'Are you sure you want to delete this folder? This will permanently remove all associated workflows, logs, and knowledge bases.'
     }
 
+    if (isSingle && displayNames.length > 0) {
+      return (
+        <>
+          Are you sure you want to delete{' '}
+          <span className='font-medium text-[var(--text-primary)]'>{displayNames[0]}</span>? This
+          will permanently remove all associated workflows, folders, logs, and knowledge bases.
+        </>
+      )
+    }
     return 'Are you sure you want to delete this workspace? This will permanently remove all associated workflows, folders, logs, and knowledge bases.'
   }
 
diff --git a/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/workflow-list/components/workflow-item/workflow-item.tsx b/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/workflow-list/components/workflow-item/workflow-item.tsx
index 8c3e7c2663..8050f7b0e9 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/workflow-list/components/workflow-item/workflow-item.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/workflow-list/components/workflow-item/workflow-item.tsx
@@ -52,8 +52,8 @@ export function WorkflowItem({
 }: WorkflowItemProps) {
   const params = useParams()
   const workspaceId = params.workspaceId as string
-  const { selectedWorkflows } = useFolderStore()
-  const { updateWorkflow, workflows } = useWorkflowRegistry()
+  const selectedWorkflows = useFolderStore((state) => state.selectedWorkflows)
+  const updateWorkflow = useWorkflowRegistry((state) => state.updateWorkflow)
   const userPermissions = useUserPermissionsContext()
   const isSelected = selectedWorkflows.has(workflow.id)
 
@@ -141,6 +141,7 @@ export function WorkflowItem({
     const workflowIds =
       finalIsSelected && finalSelection.size > 1 ? Array.from(finalSelection) : [workflow.id]
 
+    const { workflows } = useWorkflowRegistry.getState()
     const workflowNames = workflowIds
       .map((id) => workflows[id]?.name)
       .filter((name): name is string => !!name)
@@ -151,7 +152,7 @@ export function WorkflowItem({
     }
 
     setCanDeleteCaptured(canDeleteWorkflows(workflowIds))
-  }, [workflow.id, workflows, canDeleteWorkflows])
+  }, [workflow.id, canDeleteWorkflows])
 
   /**
    * Handle right-click - ensure proper selection behavior and capture selection state
diff --git a/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/workspace-header/components/invite-modal/invite-modal.tsx b/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/workspace-header/components/invite-modal/invite-modal.tsx
index 8cb9efcaba..660389c247 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/workspace-header/components/invite-modal/invite-modal.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/workspace-header/components/invite-modal/invite-modal.tsx
@@ -709,7 +709,7 @@ export function InviteModal({ open, onOpenChange, workspaceName }: InviteModalPr
                 </Button>
                 <Button
                   type='button'
-                  variant='default'
+                  variant='tertiary'
                   disabled={isSaving || isSubmitting}
                   onClick={handleSaveChanges}
                   className='h-[32px] gap-[8px] px-[12px] font-medium'
diff --git a/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/hooks/use-workflow-operations.ts b/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/hooks/use-workflow-operations.ts
index 6e9bed0441..3402ff96bf 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/hooks/use-workflow-operations.ts
+++ b/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/hooks/use-workflow-operations.ts
@@ -1,6 +1,7 @@
-import { useCallback } from 'react'
+import { useCallback, useMemo } from 'react'
 import { createLogger } from '@sim/logger'
 import { useRouter } from 'next/navigation'
+import { useShallow } from 'zustand/react/shallow'
 import { getNextWorkflowColor } from '@/lib/workflows/colors'
 import { useCreateWorkflow, useWorkflows } from '@/hooks/queries/workflows'
 import { useWorkflowDiffStore } from '@/stores/workflow-diff/store'
@@ -15,19 +16,19 @@ interface UseWorkflowOperationsProps {
 
 export function useWorkflowOperations({ workspaceId }: UseWorkflowOperationsProps) {
   const router = useRouter()
-  const { workflows } = useWorkflowRegistry()
+  const workflows = useWorkflowRegistry(useShallow((state) => state.workflows))
   const workflowsQuery = useWorkflows(workspaceId)
   const createWorkflowMutation = useCreateWorkflow()
 
-  /**
-   * Filter and sort workflows for the current workspace
-   */
-  const regularWorkflows = Object.values(workflows)
-    .filter((workflow) => workflow.workspaceId === workspaceId)
-    .sort((a, b) => {
-      // Sort by creation date (newest first) for stable ordering
-      return b.createdAt.getTime() - a.createdAt.getTime()
-    })
+  const regularWorkflows = useMemo(
+    () =>
+      Object.values(workflows)
+        .filter((workflow) => workflow.workspaceId === workspaceId)
+        .sort((a, b) => {
+          return b.createdAt.getTime() - a.createdAt.getTime()
+        }),
+    [workflows, workspaceId]
+  )
 
   const handleCreateWorkflow = useCallback(async (): Promise<string | null> => {
     try {
@@ -55,13 +56,11 @@ export function useWorkflowOperations({ workspaceId }: UseWorkflowOperationsProp
   }, [createWorkflowMutation, workspaceId, router])
 
   return {
-    // State
     workflows,
     regularWorkflows,
     workflowsLoading: workflowsQuery.isLoading,
     isCreatingWorkflow: createWorkflowMutation.isPending,
 
-    // Operations
     handleCreateWorkflow,
   }
 }
diff --git a/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/hooks/use-workspace-management.ts b/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/hooks/use-workspace-management.ts
index 2b9eee714e..15aedd57a5 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/hooks/use-workspace-management.ts
+++ b/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/hooks/use-workspace-management.ts
@@ -33,7 +33,7 @@ export function useWorkspaceManagement({
 }: UseWorkspaceManagementProps) {
   const router = useRouter()
   const pathname = usePathname()
-  const { switchToWorkspace } = useWorkflowRegistry()
+  const switchToWorkspace = useWorkflowRegistry((state) => state.switchToWorkspace)
 
   // Workspace management state
   const [workspaces, setWorkspaces] = useState<Workspace[]>([])
@@ -95,10 +95,6 @@ export function useWorkspaceManagement({
     }
   }, [])
 
-  /**
-   * Fetch workspaces for the current user with full validation and URL handling
-   * Uses refs for workspaceId and router to avoid unnecessary recreations
-   */
   const fetchWorkspaces = useCallback(async () => {
     setIsWorkspacesLoading(true)
     try {
@@ -181,10 +177,6 @@ export function useWorkspaceManagement({
     []
   )
 
-  /**
-   * Switch to a different workspace
-   * Uses refs for activeWorkspace and router to avoid unnecessary recreations
-   */
   const switchWorkspace = useCallback(
     async (workspace: Workspace) => {
       // If already on this workspace, return
diff --git a/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/sidebar.tsx b/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/sidebar.tsx
index 294a34aff3..5d5f36dc38 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/sidebar.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/sidebar.tsx
@@ -1,6 +1,6 @@
 'use client'
 
-import { useCallback, useEffect, useMemo, useRef, useState } from 'react'
+import { memo, useCallback, useEffect, useMemo, useRef, useState } from 'react'
 import { createLogger } from '@sim/logger'
 import { Database, HelpCircle, Layout, Plus, Search, Settings } from 'lucide-react'
 import Link from 'next/link'
@@ -60,7 +60,7 @@ export const SIDEBAR_SCROLL_EVENT = 'sidebar-scroll-to-item'
  *
  * @returns Sidebar with workflows panel
  */
-export function Sidebar() {
+export const Sidebar = memo(function Sidebar() {
   const params = useParams()
   const workspaceId = params.workspaceId as string
   const workflowId = params.workflowId as string | undefined
@@ -142,11 +142,9 @@ export function Sidebar() {
       window.removeEventListener(SIDEBAR_SCROLL_EVENT, handleScrollToItem as EventListener)
   }, [])
 
-  const {
-    isOpen: isSearchModalOpen,
-    setOpen: setIsSearchModalOpen,
-    open: openSearchModal,
-  } = useSearchModalStore()
+  const isSearchModalOpen = useSearchModalStore((state) => state.isOpen)
+  const setIsSearchModalOpen = useSearchModalStore((state) => state.setOpen)
+  const openSearchModal = useSearchModalStore((state) => state.open)
 
   const {
     workspaces,
@@ -176,7 +174,6 @@ export function Sidebar() {
     workspaceId,
   })
 
-  /** Context menu state for navigation items */
   const [activeNavItemHref, setActiveNavItemHref] = useState<string | null>(null)
   const {
     isOpen: isNavContextMenuOpen,
@@ -285,7 +282,6 @@ export function Sidebar() {
   const isLoading = workflowsLoading || sessionLoading
   const initialScrollDoneRef = useRef(false)
 
-  /** Scrolls to active workflow on initial page load only */
   useEffect(() => {
     if (!workflowId || workflowsLoading || initialScrollDoneRef.current) return
     initialScrollDoneRef.current = true
@@ -296,7 +292,6 @@ export function Sidebar() {
     })
   }, [workflowId, workflowsLoading])
 
-  /** Forces sidebar to minimum width and ensures it's expanded when not on a workflow page */
   useEffect(() => {
     if (!isOnWorkflowPage) {
       if (isCollapsed) {
@@ -306,7 +301,6 @@ export function Sidebar() {
     }
   }, [isOnWorkflowPage, isCollapsed, setIsCollapsed, setSidebarWidth])
 
-  /** Creates a workflow and scrolls to it */
   const handleCreateWorkflow = useCallback(async () => {
     const workflowId = await createWorkflow()
     if (workflowId) {
@@ -316,7 +310,6 @@ export function Sidebar() {
     }
   }, [createWorkflow])
 
-  /** Creates a folder and scrolls to it */
   const handleCreateFolder = useCallback(async () => {
     const folderId = await createFolder()
     if (folderId) {
@@ -324,12 +317,10 @@ export function Sidebar() {
     }
   }, [createFolder])
 
-  /** Triggers file input for workflow import */
   const handleImportWorkflow = useCallback(() => {
     fileInputRef.current?.click()
   }, [])
 
-  /** Handles workspace switch from popover menu */
   const handleWorkspaceSwitch = useCallback(
     async (workspace: { id: string; name: string; ownerId: string; role?: string }) => {
       if (workspace.id === workspaceId) {
@@ -342,12 +333,10 @@ export function Sidebar() {
     [workspaceId, switchWorkspace]
   )
 
-  /** Toggles sidebar collapse state */
   const handleToggleCollapse = useCallback(() => {
     setIsCollapsed(!isCollapsed)
   }, [isCollapsed, setIsCollapsed])
 
-  /** Reverts to active workflow selection when clicking sidebar background */
   const handleSidebarClick = useCallback(
     (e: React.MouseEvent<HTMLElement>) => {
       const target = e.target as HTMLElement
@@ -360,7 +349,6 @@ export function Sidebar() {
     [workflowId]
   )
 
-  /** Renames a workspace */
   const handleRenameWorkspace = useCallback(
     async (workspaceIdToRename: string, newName: string) => {
       await updateWorkspaceName(workspaceIdToRename, newName)
@@ -368,7 +356,6 @@ export function Sidebar() {
     [updateWorkspaceName]
   )
 
-  /** Deletes a workspace */
   const handleDeleteWorkspace = useCallback(
     async (workspaceIdToDelete: string) => {
       const workspaceToDelete = workspaces.find((w) => w.id === workspaceIdToDelete)
@@ -379,7 +366,6 @@ export function Sidebar() {
     [workspaces, confirmDeleteWorkspace]
   )
 
-  /** Leaves a workspace */
   const handleLeaveWorkspaceWrapper = useCallback(
     async (workspaceIdToLeave: string) => {
       const workspaceToLeave = workspaces.find((w) => w.id === workspaceIdToLeave)
@@ -390,7 +376,6 @@ export function Sidebar() {
     [workspaces, handleLeaveWorkspace]
   )
 
-  /** Duplicates a workspace */
   const handleDuplicateWorkspace = useCallback(
     async (_workspaceIdToDuplicate: string, workspaceName: string) => {
       await duplicateWorkspace(workspaceName)
@@ -398,7 +383,6 @@ export function Sidebar() {
     [duplicateWorkspace]
   )
 
-  /** Exports a workspace */
   const handleExportWorkspace = useCallback(
     async (workspaceIdToExport: string, workspaceName: string) => {
       await exportWorkspace(workspaceIdToExport, workspaceName)
@@ -406,12 +390,10 @@ export function Sidebar() {
     [exportWorkspace]
   )
 
-  /** Triggers file input for workspace import */
   const handleImportWorkspace = useCallback(() => {
     workspaceFileInputRef.current?.click()
   }, [])
 
-  /** Handles workspace import file selection */
   const handleWorkspaceFileChange = useCallback(
     async (event: React.ChangeEvent<HTMLInputElement>) => {
       const files = event.target.files
@@ -427,7 +409,6 @@ export function Sidebar() {
     [importWorkspace]
   )
 
-  /** Resolves workspace ID from params or URL path */
   const resolveWorkspaceIdFromPath = useCallback((): string | undefined => {
     if (workspaceId) return workspaceId
     if (typeof window === 'undefined') return undefined
@@ -439,7 +420,6 @@ export function Sidebar() {
     return parts[idx + 1]
   }, [workspaceId])
 
-  /** Registers global sidebar commands with the central commands registry */
   useRegisterGlobalCommands(() =>
     createCommands([
       {
@@ -772,4 +752,4 @@ export function Sidebar() {
       />
     </>
   )
-}
+})
diff --git a/apps/sim/app/workspace/[workspaceId]/w/hooks/use-duplicate-workflow.ts b/apps/sim/app/workspace/[workspaceId]/w/hooks/use-duplicate-workflow.ts
index 734fed6cdf..eefb28ab00 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/hooks/use-duplicate-workflow.ts
+++ b/apps/sim/app/workspace/[workspaceId]/w/hooks/use-duplicate-workflow.ts
@@ -1,4 +1,4 @@
-import { useCallback } from 'react'
+import { useCallback, useRef } from 'react'
 import { createLogger } from '@sim/logger'
 import { useRouter } from 'next/navigation'
 import { getNextWorkflowColor } from '@/lib/workflows/colors'
@@ -27,9 +27,21 @@ interface UseDuplicateWorkflowProps {
  */
 export function useDuplicateWorkflow({ workspaceId, onSuccess }: UseDuplicateWorkflowProps) {
   const router = useRouter()
-  const { workflows } = useWorkflowRegistry()
   const duplicateMutation = useDuplicateWorkflowMutation()
 
+  const workspaceIdRef = useRef(workspaceId)
+  workspaceIdRef.current = workspaceId
+
+  const onSuccessRef = useRef(onSuccess)
+  onSuccessRef.current = onSuccess
+
+  /**
+   * Store a ref to the mutation to access isPending without causing callback recreation.
+   * The mutateAsync function from React Query is already stable.
+   */
+  const mutationRef = useRef(duplicateMutation)
+  mutationRef.current = duplicateMutation
+
   /**
    * Duplicate the workflow(s)
    * @param workflowIds - The workflow ID(s) to duplicate
@@ -40,7 +52,7 @@ export function useDuplicateWorkflow({ workspaceId, onSuccess }: UseDuplicateWor
         return
       }
 
-      if (duplicateMutation.isPending) {
+      if (mutationRef.current.isPending) {
         return
       }
 
@@ -49,6 +61,8 @@ export function useDuplicateWorkflow({ workspaceId, onSuccess }: UseDuplicateWor
       const duplicatedIds: string[] = []
 
       try {
+        const { workflows } = useWorkflowRegistry.getState()
+
         for (const sourceId of workflowIdsToDuplicate) {
           const sourceWorkflow = workflows[sourceId]
           if (!sourceWorkflow) {
@@ -56,8 +70,8 @@ export function useDuplicateWorkflow({ workspaceId, onSuccess }: UseDuplicateWor
             continue
           }
 
-          const result = await duplicateMutation.mutateAsync({
-            workspaceId,
+          const result = await mutationRef.current.mutateAsync({
+            workspaceId: workspaceIdRef.current,
             sourceId,
             name: `${sourceWorkflow.name} (Copy)`,
             description: sourceWorkflow.description,
@@ -77,16 +91,16 @@ export function useDuplicateWorkflow({ workspaceId, onSuccess }: UseDuplicateWor
         })
 
         if (duplicatedIds.length === 1) {
-          router.push(`/workspace/${workspaceId}/w/${duplicatedIds[0]}`)
+          router.push(`/workspace/${workspaceIdRef.current}/w/${duplicatedIds[0]}`)
         }
 
-        onSuccess?.()
+        onSuccessRef.current?.()
       } catch (error) {
         logger.error('Error duplicating workflow(s):', { error })
         throw error
       }
     },
-    [duplicateMutation, workflows, workspaceId, router, onSuccess]
+    [router]
   )
 
   return {
diff --git a/apps/sim/app/workspace/[workspaceId]/w/hooks/use-export-workflow.ts b/apps/sim/app/workspace/[workspaceId]/w/hooks/use-export-workflow.ts
index e3fa6507ab..afa812ed54 100644
--- a/apps/sim/app/workspace/[workspaceId]/w/hooks/use-export-workflow.ts
+++ b/apps/sim/app/workspace/[workspaceId]/w/hooks/use-export-workflow.ts
@@ -1,4 +1,4 @@
-import { useCallback, useState } from 'react'
+import { useCallback, useRef, useState } from 'react'
 import { createLogger } from '@sim/logger'
 import {
   downloadFile,
@@ -23,9 +23,11 @@ interface UseExportWorkflowProps {
  * Hook for managing workflow export to JSON or ZIP.
  */
 export function useExportWorkflow({ onSuccess }: UseExportWorkflowProps = {}) {
-  const { workflows } = useWorkflowRegistry()
   const [isExporting, setIsExporting] = useState(false)
 
+  const onSuccessRef = useRef(onSuccess)
+  onSuccessRef.current = onSuccess
+
   /**
    * Export the workflow(s) to JSON or ZIP
    * - Single workflow: exports as JSON file
@@ -50,6 +52,7 @@ export function useExportWorkflow({ onSuccess }: UseExportWorkflowProps = {}) {
           count: workflowIdsToExport.length,
         })
 
+        const { workflows } = useWorkflowRegistry.getState()
         const exportedWorkflows = []
 
         for (const workflowId of workflowIdsToExport) {
@@ -96,7 +99,7 @@ export function useExportWorkflow({ onSuccess }: UseExportWorkflowProps = {}) {
           format: exportedWorkflows.length === 1 ? 'JSON' : 'ZIP',
         })
 
-        onSuccess?.()
+        onSuccessRef.current?.()
       } catch (error) {
         logger.error('Error exporting workflow(s):', { error })
         throw error
@@ -104,7 +107,7 @@ export function useExportWorkflow({ onSuccess }: UseExportWorkflowProps = {}) {
         setIsExporting(false)
       }
     },
-    [isExporting, workflows, onSuccess]
+    [isExporting]
   )
 
   return {
diff --git a/apps/sim/app/workspace/providers/socket-provider.tsx b/apps/sim/app/workspace/providers/socket-provider.tsx
index 434af6891b..c4753b384c 100644
--- a/apps/sim/app/workspace/providers/socket-provider.tsx
+++ b/apps/sim/app/workspace/providers/socket-provider.tsx
@@ -6,6 +6,7 @@ import {
   useCallback,
   useContext,
   useEffect,
+  useMemo,
   useRef,
   useState,
 } from 'react'
@@ -739,38 +740,60 @@ export function SocketProvider({ children, user }: SocketProviderProps) {
     eventHandlers.current.operationFailed = handler
   }, [])
 
-  return (
-    <SocketContext.Provider
-      value={{
-        socket,
-        isConnected,
-        isConnecting,
-        currentWorkflowId,
-        currentSocketId,
-        presenceUsers,
-        joinWorkflow,
-        leaveWorkflow,
-        emitWorkflowOperation,
-        emitSubblockUpdate,
-        emitVariableUpdate,
-
-        emitCursorUpdate,
-        emitSelectionUpdate,
-        onWorkflowOperation,
-        onSubblockUpdate,
-        onVariableUpdate,
-
-        onCursorUpdate,
-        onSelectionUpdate,
-        onUserJoined,
-        onUserLeft,
-        onWorkflowDeleted,
-        onWorkflowReverted,
-        onOperationConfirmed,
-        onOperationFailed,
-      }}
-    >
-      {children}
-    </SocketContext.Provider>
+  const contextValue = useMemo(
+    () => ({
+      socket,
+      isConnected,
+      isConnecting,
+      currentWorkflowId,
+      currentSocketId,
+      presenceUsers,
+      joinWorkflow,
+      leaveWorkflow,
+      emitWorkflowOperation,
+      emitSubblockUpdate,
+      emitVariableUpdate,
+      emitCursorUpdate,
+      emitSelectionUpdate,
+      onWorkflowOperation,
+      onSubblockUpdate,
+      onVariableUpdate,
+      onCursorUpdate,
+      onSelectionUpdate,
+      onUserJoined,
+      onUserLeft,
+      onWorkflowDeleted,
+      onWorkflowReverted,
+      onOperationConfirmed,
+      onOperationFailed,
+    }),
+    [
+      socket,
+      isConnected,
+      isConnecting,
+      currentWorkflowId,
+      currentSocketId,
+      presenceUsers,
+      joinWorkflow,
+      leaveWorkflow,
+      emitWorkflowOperation,
+      emitSubblockUpdate,
+      emitVariableUpdate,
+      emitCursorUpdate,
+      emitSelectionUpdate,
+      onWorkflowOperation,
+      onSubblockUpdate,
+      onVariableUpdate,
+      onCursorUpdate,
+      onSelectionUpdate,
+      onUserJoined,
+      onUserLeft,
+      onWorkflowDeleted,
+      onWorkflowReverted,
+      onOperationConfirmed,
+      onOperationFailed,
+    ]
   )
+
+  return <SocketContext.Provider value={contextValue}>{children}</SocketContext.Provider>
 }
diff --git a/apps/sim/blocks/blocks/github.ts b/apps/sim/blocks/blocks/github.ts
index 9b44dcdf01..4a2ae20a9d 100644
--- a/apps/sim/blocks/blocks/github.ts
+++ b/apps/sim/blocks/blocks/github.ts
@@ -84,6 +84,44 @@ export const GitHubBlock: BlockConfig<GitHubResponse> = {
         { label: 'Create project', id: 'github_create_project' },
         { label: 'Update project', id: 'github_update_project' },
         { label: 'Delete project', id: 'github_delete_project' },
+        // Search Operations
+        { label: 'Search code', id: 'github_search_code' },
+        { label: 'Search commits', id: 'github_search_commits' },
+        { label: 'Search issues', id: 'github_search_issues' },
+        { label: 'Search repositories', id: 'github_search_repos' },
+        { label: 'Search users', id: 'github_search_users' },
+        // Commit Operations
+        { label: 'List commits', id: 'github_list_commits' },
+        { label: 'Get commit', id: 'github_get_commit' },
+        { label: 'Compare commits', id: 'github_compare_commits' },
+        // Gist Operations
+        { label: 'Create gist', id: 'github_create_gist' },
+        { label: 'Get gist', id: 'github_get_gist' },
+        { label: 'List gists', id: 'github_list_gists' },
+        { label: 'Update gist', id: 'github_update_gist' },
+        { label: 'Delete gist', id: 'github_delete_gist' },
+        { label: 'Fork gist', id: 'github_fork_gist' },
+        { label: 'Star gist', id: 'github_star_gist' },
+        { label: 'Unstar gist', id: 'github_unstar_gist' },
+        // Fork Operations
+        { label: 'Fork repository', id: 'github_fork_repo' },
+        { label: 'List forks', id: 'github_list_forks' },
+        // Milestone Operations
+        { label: 'Create milestone', id: 'github_create_milestone' },
+        { label: 'Get milestone', id: 'github_get_milestone' },
+        { label: 'List milestones', id: 'github_list_milestones' },
+        { label: 'Update milestone', id: 'github_update_milestone' },
+        { label: 'Delete milestone', id: 'github_delete_milestone' },
+        // Reaction Operations
+        { label: 'Add issue reaction', id: 'github_create_issue_reaction' },
+        { label: 'Remove issue reaction', id: 'github_delete_issue_reaction' },
+        { label: 'Add comment reaction', id: 'github_create_comment_reaction' },
+        { label: 'Remove comment reaction', id: 'github_delete_comment_reaction' },
+        // Star Operations
+        { label: 'Star repository', id: 'github_star_repo' },
+        { label: 'Unstar repository', id: 'github_unstar_repo' },
+        { label: 'Check if starred', id: 'github_check_star' },
+        { label: 'List stargazers', id: 'github_list_stargazers' },
       ],
       value: () => 'github_pr',
     },
@@ -998,6 +1036,440 @@ export const GitHubBlock: BlockConfig<GitHubResponse> = {
       required: true,
       condition: { field: 'operation', value: 'github_delete_project' },
     },
+    // Search operations parameters
+    {
+      id: 'q',
+      title: 'Search Query',
+      type: 'short-input',
+      placeholder: 'e.g., react language:typescript',
+      required: true,
+      condition: {
+        field: 'operation',
+        value: [
+          'github_search_code',
+          'github_search_commits',
+          'github_search_issues',
+          'github_search_repos',
+          'github_search_users',
+        ],
+      },
+      wandConfig: {
+        enabled: true,
+        prompt: `Generate a GitHub search query based on the user's description.
+GitHub search supports these qualifiers:
+- For repos: language:python, stars:>1000, forks:>100, topic:react, user:owner, org:name, created:>2023-01-01
+- For code: repo:owner/name, path:src, extension:ts, language:javascript
+- For issues/PRs: is:issue, is:pr, is:open, is:closed, label:bug, author:user, assignee:user
+- For commits: repo:owner/name, author:user, committer:user, author-date:>2023-01-01
+- For users: type:user, type:org, followers:>100, repos:>10, location:city
+
+Examples:
+- "Python repos with more than 1000 stars" -> language:python stars:>1000
+- "Open bugs in facebook/react" -> repo:facebook/react is:issue is:open label:bug
+- "TypeScript files in src folder" -> language:typescript path:src
+
+Return ONLY the search query - no explanations.`,
+        placeholder: 'Describe what you want to search for...',
+      },
+    },
+    {
+      id: 'sort',
+      title: 'Sort By',
+      type: 'dropdown',
+      options: [
+        { label: 'Best match', id: '' },
+        { label: 'Stars', id: 'stars' },
+        { label: 'Forks', id: 'forks' },
+        { label: 'Updated', id: 'updated' },
+      ],
+      condition: { field: 'operation', value: 'github_search_repos' },
+    },
+    {
+      id: 'order',
+      title: 'Order',
+      type: 'dropdown',
+      options: [
+        { label: 'Descending', id: 'desc' },
+        { label: 'Ascending', id: 'asc' },
+      ],
+      condition: {
+        field: 'operation',
+        value: [
+          'github_search_code',
+          'github_search_commits',
+          'github_search_issues',
+          'github_search_repos',
+          'github_search_users',
+        ],
+      },
+    },
+    // Commit operations parameters
+    {
+      id: 'sha',
+      title: 'SHA or Branch',
+      type: 'short-input',
+      placeholder: 'e.g., main or abc123',
+      condition: { field: 'operation', value: 'github_list_commits' },
+    },
+    {
+      id: 'author',
+      title: 'Author Filter',
+      type: 'short-input',
+      placeholder: 'GitHub username or email',
+      condition: { field: 'operation', value: 'github_list_commits' },
+    },
+    {
+      id: 'since',
+      title: 'Since Date',
+      type: 'short-input',
+      placeholder: 'ISO 8601: 2024-01-01T00:00:00Z',
+      condition: { field: 'operation', value: ['github_list_commits', 'github_list_gists'] },
+      wandConfig: {
+        enabled: true,
+        prompt: `Generate an ISO 8601 timestamp based on the user's description.
+The timestamp should be in the format: YYYY-MM-DDTHH:MM:SSZ (UTC timezone).
+Examples:
+- "last week" -> Calculate 7 days ago at 00:00:00Z
+- "yesterday" -> Calculate yesterday's date at 00:00:00Z
+- "beginning of this month" -> First day of current month at 00:00:00Z
+- "30 days ago" -> Calculate 30 days before current time
+- "January 1st 2024" -> 2024-01-01T00:00:00Z
+
+Return ONLY the timestamp string - no explanations, no quotes, no extra text.`,
+        placeholder: 'Describe the start date (e.g., "last week", "beginning of month")...',
+        generationType: 'timestamp',
+      },
+    },
+    {
+      id: 'until',
+      title: 'Until Date',
+      type: 'short-input',
+      placeholder: 'ISO 8601: 2024-12-31T23:59:59Z',
+      condition: { field: 'operation', value: 'github_list_commits' },
+      wandConfig: {
+        enabled: true,
+        prompt: `Generate an ISO 8601 timestamp based on the user's description.
+The timestamp should be in the format: YYYY-MM-DDTHH:MM:SSZ (UTC timezone).
+Examples:
+- "now" -> Current timestamp
+- "end of today" -> Today's date at 23:59:59Z
+- "end of last week" -> Calculate end of last week
+- "yesterday" -> Yesterday's date at 23:59:59Z
+
+Return ONLY the timestamp string - no explanations, no quotes, no extra text.`,
+        placeholder: 'Describe the end date (e.g., "now", "end of yesterday")...',
+        generationType: 'timestamp',
+      },
+    },
+    {
+      id: 'ref',
+      title: 'Commit Reference',
+      type: 'short-input',
+      placeholder: 'SHA, branch, or tag',
+      required: true,
+      condition: { field: 'operation', value: 'github_get_commit' },
+    },
+    {
+      id: 'base',
+      title: 'Base Reference',
+      type: 'short-input',
+      placeholder: 'Base branch/tag/SHA',
+      required: true,
+      condition: { field: 'operation', value: 'github_compare_commits' },
+    },
+    {
+      id: 'head',
+      title: 'Head Reference',
+      type: 'short-input',
+      placeholder: 'Head branch/tag/SHA',
+      required: true,
+      condition: { field: 'operation', value: 'github_compare_commits' },
+    },
+    // Gist operations parameters
+    {
+      id: 'gist_id',
+      title: 'Gist ID',
+      type: 'short-input',
+      placeholder: 'e.g., aa5a315d61ae9438b18d',
+      required: true,
+      condition: {
+        field: 'operation',
+        value: [
+          'github_get_gist',
+          'github_update_gist',
+          'github_delete_gist',
+          'github_fork_gist',
+          'github_star_gist',
+          'github_unstar_gist',
+        ],
+      },
+    },
+    {
+      id: 'description',
+      title: 'Description',
+      type: 'short-input',
+      placeholder: 'Gist description',
+      condition: { field: 'operation', value: ['github_create_gist', 'github_update_gist'] },
+    },
+    {
+      id: 'files',
+      title: 'Files (JSON)',
+      type: 'long-input',
+      placeholder: '{"file.txt": {"content": "Hello"}}',
+      required: true,
+      condition: { field: 'operation', value: 'github_create_gist' },
+      wandConfig: {
+        enabled: true,
+        prompt: `Generate a JSON object for GitHub Gist files based on the user's description.
+The format is: {"filename.ext": {"content": "file contents"}}
+
+Examples:
+- "A Python hello world file" -> {"hello.py": {"content": "print('Hello, World!')"}}
+- "A README with project title" -> {"README.md": {"content": "# My Project\\n\\nDescription here"}}
+- "JavaScript function to add numbers" -> {"add.js": {"content": "function add(a, b) {\\n  return a + b;\\n}"}}
+- "Two files: index.html and style.css" -> {"index.html": {"content": "<!DOCTYPE html>..."}, "style.css": {"content": "body { margin: 0; }"}}
+
+Return ONLY valid JSON - no explanations, no markdown formatting.`,
+        placeholder: 'Describe the files you want to create...',
+        generationType: 'json-object',
+      },
+    },
+    {
+      id: 'files',
+      title: 'Files (JSON)',
+      type: 'long-input',
+      placeholder: '{"file.txt": {"content": "Updated"}}',
+      condition: { field: 'operation', value: 'github_update_gist' },
+      wandConfig: {
+        enabled: true,
+        prompt: `Generate a JSON object for updating GitHub Gist files based on the user's description.
+The format is: {"filename.ext": {"content": "new contents"}}
+To delete a file, set its value to null: {"old-file.txt": null}
+To rename a file, set the new filename: {"old-name.txt": {"filename": "new-name.txt", "content": "..."}}
+
+Examples:
+- "Update hello.py to print goodbye" -> {"hello.py": {"content": "print('Goodbye!')"}}
+- "Delete the old readme" -> {"README.md": null}
+- "Rename script.js to main.js" -> {"script.js": {"filename": "main.js"}}
+
+Return ONLY valid JSON - no explanations, no markdown formatting.`,
+        placeholder: 'Describe the file changes...',
+        generationType: 'json-object',
+      },
+    },
+    {
+      id: 'gist_public',
+      title: 'Public',
+      type: 'dropdown',
+      options: [
+        { label: 'Secret', id: 'false' },
+        { label: 'Public', id: 'true' },
+      ],
+      condition: { field: 'operation', value: 'github_create_gist' },
+    },
+    {
+      id: 'username',
+      title: 'Username',
+      type: 'short-input',
+      placeholder: 'GitHub username (optional)',
+      condition: { field: 'operation', value: 'github_list_gists' },
+    },
+    // Fork operations parameters
+    {
+      id: 'organization',
+      title: 'Organization',
+      type: 'short-input',
+      placeholder: 'Fork to org (optional)',
+      condition: { field: 'operation', value: 'github_fork_repo' },
+    },
+    {
+      id: 'fork_name',
+      title: 'Fork Name',
+      type: 'short-input',
+      placeholder: 'Custom name (optional)',
+      condition: { field: 'operation', value: 'github_fork_repo' },
+    },
+    {
+      id: 'default_branch_only',
+      title: 'Default Branch Only',
+      type: 'dropdown',
+      options: [
+        { label: 'No', id: 'false' },
+        { label: 'Yes', id: 'true' },
+      ],
+      condition: { field: 'operation', value: 'github_fork_repo' },
+    },
+    {
+      id: 'fork_sort',
+      title: 'Sort By',
+      type: 'dropdown',
+      options: [
+        { label: 'Newest', id: 'newest' },
+        { label: 'Oldest', id: 'oldest' },
+        { label: 'Stargazers', id: 'stargazers' },
+        { label: 'Watchers', id: 'watchers' },
+      ],
+      condition: { field: 'operation', value: 'github_list_forks' },
+    },
+    // Milestone operations parameters
+    {
+      id: 'milestone_title',
+      title: 'Milestone Title',
+      type: 'short-input',
+      placeholder: 'e.g., v1.0 Release',
+      required: true,
+      condition: { field: 'operation', value: 'github_create_milestone' },
+    },
+    {
+      id: 'milestone_title',
+      title: 'New Title',
+      type: 'short-input',
+      placeholder: 'Updated title (optional)',
+      condition: { field: 'operation', value: 'github_update_milestone' },
+    },
+    {
+      id: 'milestone_description',
+      title: 'Description',
+      type: 'long-input',
+      placeholder: 'Milestone description',
+      condition: {
+        field: 'operation',
+        value: ['github_create_milestone', 'github_update_milestone'],
+      },
+    },
+    {
+      id: 'due_on',
+      title: 'Due Date',
+      type: 'short-input',
+      placeholder: 'ISO 8601: 2024-12-31T23:59:59Z',
+      condition: {
+        field: 'operation',
+        value: ['github_create_milestone', 'github_update_milestone'],
+      },
+      wandConfig: {
+        enabled: true,
+        prompt: `Generate an ISO 8601 timestamp for a milestone due date based on the user's description.
+The timestamp should be in the format: YYYY-MM-DDTHH:MM:SSZ (UTC timezone).
+Examples:
+- "end of this month" -> Last day of current month at 23:59:59Z
+- "next Friday" -> Calculate next Friday's date at 23:59:59Z
+- "in 2 weeks" -> Calculate 14 days from now at 23:59:59Z
+- "December 31st" -> 2024-12-31T23:59:59Z (current year)
+- "Q1 2025" -> 2025-03-31T23:59:59Z (end of Q1)
+
+Return ONLY the timestamp string - no explanations, no quotes, no extra text.`,
+        placeholder: 'Describe the due date (e.g., "end of month", "next Friday")...',
+        generationType: 'timestamp',
+      },
+    },
+    {
+      id: 'milestone_number',
+      title: 'Milestone Number',
+      type: 'short-input',
+      placeholder: 'e.g., 1',
+      required: true,
+      condition: {
+        field: 'operation',
+        value: ['github_get_milestone', 'github_update_milestone', 'github_delete_milestone'],
+      },
+    },
+    {
+      id: 'milestone_state',
+      title: 'State Filter',
+      type: 'dropdown',
+      options: [
+        { label: 'Open', id: 'open' },
+        { label: 'Closed', id: 'closed' },
+        { label: 'All', id: 'all' },
+      ],
+      condition: { field: 'operation', value: 'github_list_milestones' },
+    },
+    {
+      id: 'milestone_sort',
+      title: 'Sort By',
+      type: 'dropdown',
+      options: [
+        { label: 'Due Date', id: 'due_on' },
+        { label: 'Completeness', id: 'completeness' },
+      ],
+      condition: { field: 'operation', value: 'github_list_milestones' },
+    },
+    // Reaction operations parameters
+    {
+      id: 'reaction_content',
+      title: 'Reaction',
+      type: 'dropdown',
+      options: [
+        { label: '👍 +1', id: '+1' },
+        { label: '👎 -1', id: '-1' },
+        { label: '😄 Laugh', id: 'laugh' },
+        { label: '😕 Confused', id: 'confused' },
+        { label: '❤️ Heart', id: 'heart' },
+        { label: '🎉 Hooray', id: 'hooray' },
+        { label: '🚀 Rocket', id: 'rocket' },
+        { label: '👀 Eyes', id: 'eyes' },
+      ],
+      required: true,
+      condition: {
+        field: 'operation',
+        value: ['github_create_issue_reaction', 'github_create_comment_reaction'],
+      },
+    },
+    {
+      id: 'issue_number',
+      title: 'Issue Number',
+      type: 'short-input',
+      placeholder: 'e.g., 123',
+      required: true,
+      condition: {
+        field: 'operation',
+        value: ['github_create_issue_reaction', 'github_delete_issue_reaction'],
+      },
+    },
+    {
+      id: 'reaction_id',
+      title: 'Reaction ID',
+      type: 'short-input',
+      placeholder: 'e.g., 12345678',
+      required: true,
+      condition: {
+        field: 'operation',
+        value: ['github_delete_issue_reaction', 'github_delete_comment_reaction'],
+      },
+    },
+    {
+      id: 'comment_id',
+      title: 'Comment ID',
+      type: 'short-input',
+      placeholder: 'e.g., 987654321',
+      required: true,
+      condition: {
+        field: 'operation',
+        value: ['github_create_comment_reaction', 'github_delete_comment_reaction'],
+      },
+    },
+    // Star operations parameters - owner/repo already covered by existing subBlocks
+    {
+      id: 'per_page',
+      title: 'Results Per Page',
+      type: 'short-input',
+      placeholder: 'e.g., 30 (default: 30, max: 100)',
+      condition: {
+        field: 'operation',
+        value: [
+          'github_search_code',
+          'github_search_commits',
+          'github_search_issues',
+          'github_search_repos',
+          'github_search_users',
+          'github_list_commits',
+          'github_list_gists',
+          'github_list_forks',
+          'github_list_milestones',
+          'github_list_stargazers',
+        ],
+      },
+    },
     {
       id: 'apiKey',
       title: 'GitHub Token',
@@ -1118,6 +1590,44 @@ export const GitHubBlock: BlockConfig<GitHubResponse> = {
       'github_create_project',
       'github_update_project',
       'github_delete_project',
+      // Search tools
+      'github_search_code',
+      'github_search_commits',
+      'github_search_issues',
+      'github_search_repos',
+      'github_search_users',
+      // Commit tools
+      'github_list_commits',
+      'github_get_commit',
+      'github_compare_commits',
+      // Gist tools
+      'github_create_gist',
+      'github_get_gist',
+      'github_list_gists',
+      'github_update_gist',
+      'github_delete_gist',
+      'github_fork_gist',
+      'github_star_gist',
+      'github_unstar_gist',
+      // Fork tools
+      'github_fork_repo',
+      'github_list_forks',
+      // Milestone tools
+      'github_create_milestone',
+      'github_get_milestone',
+      'github_list_milestones',
+      'github_update_milestone',
+      'github_delete_milestone',
+      // Reaction tools
+      'github_create_issue_reaction',
+      'github_delete_issue_reaction',
+      'github_create_comment_reaction',
+      'github_delete_comment_reaction',
+      // Star tools
+      'github_star_repo',
+      'github_unstar_repo',
+      'github_check_star',
+      'github_list_stargazers',
     ],
     config: {
       tool: (params) => {
@@ -1234,6 +1744,75 @@ export const GitHubBlock: BlockConfig<GitHubResponse> = {
             return 'github_update_project'
           case 'github_delete_project':
             return 'github_delete_project'
+          // Search operations
+          case 'github_search_code':
+            return 'github_search_code'
+          case 'github_search_commits':
+            return 'github_search_commits'
+          case 'github_search_issues':
+            return 'github_search_issues'
+          case 'github_search_repos':
+            return 'github_search_repos'
+          case 'github_search_users':
+            return 'github_search_users'
+          // Commit operations
+          case 'github_list_commits':
+            return 'github_list_commits'
+          case 'github_get_commit':
+            return 'github_get_commit'
+          case 'github_compare_commits':
+            return 'github_compare_commits'
+          // Gist operations
+          case 'github_create_gist':
+            return 'github_create_gist'
+          case 'github_get_gist':
+            return 'github_get_gist'
+          case 'github_list_gists':
+            return 'github_list_gists'
+          case 'github_update_gist':
+            return 'github_update_gist'
+          case 'github_delete_gist':
+            return 'github_delete_gist'
+          case 'github_fork_gist':
+            return 'github_fork_gist'
+          case 'github_star_gist':
+            return 'github_star_gist'
+          case 'github_unstar_gist':
+            return 'github_unstar_gist'
+          // Fork operations
+          case 'github_fork_repo':
+            return 'github_fork_repo'
+          case 'github_list_forks':
+            return 'github_list_forks'
+          // Milestone operations
+          case 'github_create_milestone':
+            return 'github_create_milestone'
+          case 'github_get_milestone':
+            return 'github_get_milestone'
+          case 'github_list_milestones':
+            return 'github_list_milestones'
+          case 'github_update_milestone':
+            return 'github_update_milestone'
+          case 'github_delete_milestone':
+            return 'github_delete_milestone'
+          // Reaction operations
+          case 'github_create_issue_reaction':
+            return 'github_create_issue_reaction'
+          case 'github_delete_issue_reaction':
+            return 'github_delete_issue_reaction'
+          case 'github_create_comment_reaction':
+            return 'github_create_comment_reaction'
+          case 'github_delete_comment_reaction':
+            return 'github_delete_comment_reaction'
+          // Star operations
+          case 'github_star_repo':
+            return 'github_star_repo'
+          case 'github_unstar_repo':
+            return 'github_unstar_repo'
+          case 'github_check_star':
+            return 'github_check_star'
+          case 'github_list_stargazers':
+            return 'github_list_stargazers'
           default:
             return 'github_repo_info'
         }
@@ -1297,6 +1876,38 @@ export const GitHubBlock: BlockConfig<GitHubResponse> = {
     project_number: { type: 'number', description: 'Project number' },
     project_id: { type: 'string', description: 'Project node ID' },
     project_public: { type: 'boolean', description: 'Project public status' },
+    // Search parameters
+    q: { type: 'string', description: 'Search query with qualifiers' },
+    sort: { type: 'string', description: 'Sort field' },
+    order: { type: 'string', description: 'Sort order (asc or desc)' },
+    // Commit parameters
+    author: { type: 'string', description: 'Author filter' },
+    committer: { type: 'string', description: 'Committer filter' },
+    since: { type: 'string', description: 'Date filter (since)' },
+    until: { type: 'string', description: 'Date filter (until)' },
+    // Gist parameters
+    gist_id: { type: 'string', description: 'Gist ID' },
+    description: { type: 'string', description: 'Description' },
+    files: { type: 'string', description: 'Files JSON object' },
+    gist_public: { type: 'boolean', description: 'Public gist status' },
+    username: { type: 'string', description: 'GitHub username' },
+    // Fork parameters
+    organization: { type: 'string', description: 'Target organization for fork' },
+    fork_name: { type: 'string', description: 'Custom name for fork' },
+    default_branch_only: { type: 'boolean', description: 'Fork only default branch' },
+    fork_sort: { type: 'string', description: 'Fork list sort field' },
+    // Milestone parameters
+    milestone_title: { type: 'string', description: 'Milestone title' },
+    milestone_description: { type: 'string', description: 'Milestone description' },
+    due_on: { type: 'string', description: 'Milestone due date' },
+    milestone_number: { type: 'number', description: 'Milestone number' },
+    milestone_state: { type: 'string', description: 'Milestone state filter' },
+    milestone_sort: { type: 'string', description: 'Milestone sort field' },
+    // Reaction parameters
+    reaction_content: { type: 'string', description: 'Reaction type' },
+    reaction_id: { type: 'number', description: 'Reaction ID' },
+    // Pagination parameters
+    page: { type: 'number', description: 'Page number for pagination' },
   },
   outputs: {
     content: { type: 'string', description: 'Response content' },
diff --git a/apps/sim/blocks/blocks/google_calendar.ts b/apps/sim/blocks/blocks/google_calendar.ts
index 4f09c65d26..db010d696b 100644
--- a/apps/sim/blocks/blocks/google_calendar.ts
+++ b/apps/sim/blocks/blocks/google_calendar.ts
@@ -25,6 +25,11 @@ export const GoogleCalendarBlock: BlockConfig<GoogleCalendarResponse> = {
         { label: 'Create Event', id: 'create' },
         { label: 'List Events', id: 'list' },
         { label: 'Get Event', id: 'get' },
+        { label: 'Update Event', id: 'update' },
+        { label: 'Delete Event', id: 'delete' },
+        { label: 'Move Event', id: 'move' },
+        { label: 'Get Recurring Instances', id: 'instances' },
+        { label: 'List Calendars', id: 'list_calendars' },
         { label: 'Quick Add (Natural Language)', id: 'quick_add' },
         { label: 'Invite Attendees', id: 'invite' },
       ],
@@ -39,7 +44,7 @@ export const GoogleCalendarBlock: BlockConfig<GoogleCalendarResponse> = {
       requiredScopes: ['https://www.googleapis.com/auth/calendar'],
       placeholder: 'Select Google Calendar account',
     },
-    // Calendar selector (basic mode)
+    // Calendar selector (basic mode) - not needed for list_calendars
     {
       id: 'calendarId',
       title: 'Calendar',
@@ -50,8 +55,9 @@ export const GoogleCalendarBlock: BlockConfig<GoogleCalendarResponse> = {
       placeholder: 'Select calendar',
       dependsOn: ['credential'],
       mode: 'basic',
+      condition: { field: 'operation', value: 'list_calendars', not: true },
     },
-    // Manual calendar ID input (advanced mode)
+    // Manual calendar ID input (advanced mode) - not needed for list_calendars
     {
       id: 'manualCalendarId',
       title: 'Calendar ID',
@@ -59,6 +65,7 @@ export const GoogleCalendarBlock: BlockConfig<GoogleCalendarResponse> = {
       canonicalParamId: 'calendarId',
       placeholder: 'Enter calendar ID (e.g., primary or calendar@gmail.com)',
       mode: 'advanced',
+      condition: { field: 'operation', value: 'list_calendars', not: true },
     },
 
     // Create Event Fields
@@ -204,8 +211,193 @@ Return ONLY the timestamp string - no explanations, no quotes, no extra text.`,
       title: 'Event ID',
       type: 'short-input',
       placeholder: 'Event ID',
-      condition: { field: 'operation', value: ['get', 'invite'] },
+      condition: {
+        field: 'operation',
+        value: ['get', 'update', 'delete', 'move', 'instances', 'invite'],
+      },
+      required: true,
+    },
+
+    // Update Event Fields
+    {
+      id: 'summary',
+      title: 'New Event Title',
+      type: 'short-input',
+      placeholder: 'Updated meeting title',
+      condition: { field: 'operation', value: 'update' },
+      wandConfig: {
+        enabled: true,
+        prompt: `Generate a clear, descriptive calendar event title based on the user's request.
+The title should be concise but informative about the event's purpose.
+
+Return ONLY the event title - no explanations, no extra text.`,
+        placeholder: 'Describe the new event title...',
+      },
+    },
+    {
+      id: 'description',
+      title: 'New Description',
+      type: 'long-input',
+      placeholder: 'Updated event description',
+      condition: { field: 'operation', value: 'update' },
+      wandConfig: {
+        enabled: true,
+        prompt: `Generate a helpful calendar event description based on the user's request.
+Include relevant details like:
+- Purpose of the event
+- Agenda items
+- Preparation notes
+- Links or resources
+
+Return ONLY the description - no explanations, no extra text.`,
+        placeholder: 'Describe the new event details...',
+      },
+    },
+    {
+      id: 'location',
+      title: 'New Location',
+      type: 'short-input',
+      placeholder: 'Updated location',
+      condition: { field: 'operation', value: 'update' },
+    },
+    {
+      id: 'startDateTime',
+      title: 'New Start Date & Time',
+      type: 'short-input',
+      placeholder: '2025-06-03T10:00:00-08:00',
+      condition: { field: 'operation', value: 'update' },
+      wandConfig: {
+        enabled: true,
+        prompt: `Generate an ISO 8601 timestamp with timezone offset based on the user's description.
+The timestamp should be in the format: YYYY-MM-DDTHH:MM:SS+HH:MM or YYYY-MM-DDTHH:MM:SS-HH:MM
+Examples:
+- "tomorrow at 2pm" -> Calculate tomorrow's date at 14:00:00 with local timezone offset
+- "next Monday at 9am" -> Calculate next Monday at 09:00:00 with local timezone offset
+- "in 2 hours" -> Calculate current time + 2 hours with local timezone offset
+
+Return ONLY the timestamp string - no explanations, no quotes, no extra text.`,
+        placeholder: 'Describe the new start time (e.g., "tomorrow at 2pm")...',
+        generationType: 'timestamp',
+      },
+    },
+    {
+      id: 'endDateTime',
+      title: 'New End Date & Time',
+      type: 'short-input',
+      placeholder: '2025-06-03T11:00:00-08:00',
+      condition: { field: 'operation', value: 'update' },
+      wandConfig: {
+        enabled: true,
+        prompt: `Generate an ISO 8601 timestamp with timezone offset based on the user's description.
+The timestamp should be in the format: YYYY-MM-DDTHH:MM:SS+HH:MM or YYYY-MM-DDTHH:MM:SS-HH:MM
+Examples:
+- "tomorrow at 3pm" -> Calculate tomorrow's date at 15:00:00 with local timezone offset
+- "1 hour after start" -> Calculate start time + 1 hour with local timezone offset
+- "next Monday at 5pm" -> Calculate next Monday at 17:00:00 with local timezone offset
+
+Return ONLY the timestamp string - no explanations, no quotes, no extra text.`,
+        placeholder: 'Describe the new end time (e.g., "tomorrow at 3pm")...',
+        generationType: 'timestamp',
+      },
+    },
+    {
+      id: 'attendees',
+      title: 'New Attendees (comma-separated emails)',
+      type: 'short-input',
+      placeholder: 'john@example.com, jane@example.com',
+      condition: { field: 'operation', value: 'update' },
+    },
+
+    // Move Event Fields - Destination calendar selector (basic mode)
+    {
+      id: 'destinationCalendar',
+      title: 'Destination Calendar',
+      type: 'file-selector',
+      canonicalParamId: 'destinationCalendarId',
+      serviceId: 'google-calendar',
+      requiredScopes: ['https://www.googleapis.com/auth/calendar'],
+      placeholder: 'Select destination calendar',
+      dependsOn: ['credential'],
+      condition: { field: 'operation', value: 'move' },
       required: true,
+      mode: 'basic',
+    },
+    // Move Event Fields - Manual destination calendar ID (advanced mode)
+    {
+      id: 'manualDestinationCalendarId',
+      title: 'Destination Calendar ID',
+      type: 'short-input',
+      canonicalParamId: 'destinationCalendarId',
+      placeholder: 'destination@group.calendar.google.com',
+      condition: { field: 'operation', value: 'move' },
+      required: true,
+      mode: 'advanced',
+    },
+
+    // Instances Fields
+    {
+      id: 'timeMin',
+      title: 'Start Time Filter',
+      type: 'short-input',
+      placeholder: '2025-06-03T00:00:00Z',
+      condition: { field: 'operation', value: 'instances' },
+      wandConfig: {
+        enabled: true,
+        prompt: `Generate an ISO 8601 timestamp in UTC based on the user's description.
+The timestamp should be in the format: YYYY-MM-DDTHH:MM:SSZ (UTC timezone).
+Examples:
+- "today" -> Calculate today's date at 00:00:00Z
+- "yesterday" -> Calculate yesterday's date at 00:00:00Z
+- "last week" -> Calculate 7 days ago at 00:00:00Z
+- "beginning of this month" -> Calculate the first day of current month at 00:00:00Z
+
+Return ONLY the timestamp string - no explanations, no quotes, no extra text.`,
+        placeholder: 'Describe the start of time range (e.g., "today", "last week")...',
+        generationType: 'timestamp',
+      },
+    },
+    {
+      id: 'timeMax',
+      title: 'End Time Filter',
+      type: 'short-input',
+      placeholder: '2025-06-04T00:00:00Z',
+      condition: { field: 'operation', value: 'instances' },
+      wandConfig: {
+        enabled: true,
+        prompt: `Generate an ISO 8601 timestamp in UTC based on the user's description.
+The timestamp should be in the format: YYYY-MM-DDTHH:MM:SSZ (UTC timezone).
+Examples:
+- "tomorrow" -> Calculate tomorrow's date at 00:00:00Z
+- "end of today" -> Calculate today's date at 23:59:59Z
+- "next week" -> Calculate 7 days from now at 00:00:00Z
+- "end of this month" -> Calculate the last day of current month at 23:59:59Z
+
+Return ONLY the timestamp string - no explanations, no quotes, no extra text.`,
+        placeholder: 'Describe the end of time range (e.g., "tomorrow", "end of this week")...',
+        generationType: 'timestamp',
+      },
+    },
+    {
+      id: 'maxResults',
+      title: 'Max Results',
+      type: 'short-input',
+      placeholder: '250',
+      condition: { field: 'operation', value: ['instances', 'list_calendars'] },
+    },
+
+    // List Calendars Fields
+    {
+      id: 'minAccessRole',
+      title: 'Minimum Access Role',
+      type: 'dropdown',
+      condition: { field: 'operation', value: 'list_calendars' },
+      options: [
+        { label: 'Any Role', id: '' },
+        { label: 'Free/Busy Reader', id: 'freeBusyReader' },
+        { label: 'Reader', id: 'reader' },
+        { label: 'Writer', id: 'writer' },
+        { label: 'Owner', id: 'owner' },
+      ],
     },
 
     // Invite Attendees Fields
@@ -262,14 +454,14 @@ Return ONLY the natural language event text - no explanations.`,
       required: true,
     },
 
-    // Notification setting (for create, quick_add, invite)
+    // Notification setting (for create, update, delete, move, quick_add, invite)
     {
       id: 'sendUpdates',
       title: 'Send Email Notifications',
       type: 'dropdown',
       condition: {
         field: 'operation',
-        value: ['create', 'quick_add', 'invite'],
+        value: ['create', 'update', 'delete', 'move', 'quick_add', 'invite'],
       },
       options: [
         { label: 'All attendees', id: 'all' },
@@ -283,6 +475,11 @@ Return ONLY the natural language event text - no explanations.`,
       'google_calendar_create',
       'google_calendar_list',
       'google_calendar_get',
+      'google_calendar_update',
+      'google_calendar_delete',
+      'google_calendar_move',
+      'google_calendar_instances',
+      'google_calendar_list_calendars',
       'google_calendar_quick_add',
       'google_calendar_invite',
     ],
@@ -295,6 +492,16 @@ Return ONLY the natural language event text - no explanations.`,
             return 'google_calendar_list'
           case 'get':
             return 'google_calendar_get'
+          case 'update':
+            return 'google_calendar_update'
+          case 'delete':
+            return 'google_calendar_delete'
+          case 'move':
+            return 'google_calendar_move'
+          case 'instances':
+            return 'google_calendar_instances'
+          case 'list_calendars':
+            return 'google_calendar_list_calendars'
           case 'quick_add':
             return 'google_calendar_quick_add'
           case 'invite':
@@ -311,17 +518,31 @@ Return ONLY the natural language event text - no explanations.`,
           replaceExisting,
           calendarId,
           manualCalendarId,
+          destinationCalendar,
+          manualDestinationCalendarId,
           ...rest
         } = params
 
         // Handle calendar ID (selector or manual)
         const effectiveCalendarId = (calendarId || manualCalendarId || '').trim()
 
+        // Handle destination calendar ID for move operation (selector or manual)
+        const effectiveDestinationCalendarId = (
+          destinationCalendar ||
+          manualDestinationCalendarId ||
+          ''
+        ).trim()
+
         const processedParams: Record<string, any> = {
           ...rest,
           calendarId: effectiveCalendarId || 'primary',
         }
 
+        // Add destination calendar ID for move operation
+        if (operation === 'move' && effectiveDestinationCalendarId) {
+          processedParams.destinationCalendarId = effectiveDestinationCalendarId
+        }
+
         // Convert comma-separated attendees string to array, only if it has content
         if (attendees && typeof attendees === 'string' && attendees.trim().length > 0) {
           const attendeeList = attendees
@@ -341,10 +562,23 @@ Return ONLY the natural language event text - no explanations.`,
         }
 
         // Set default sendUpdates to 'all' if not specified for operations that support it
-        if (['create', 'quick_add', 'invite'].includes(operation) && !processedParams.sendUpdates) {
+        if (
+          ['create', 'update', 'delete', 'move', 'quick_add', 'invite'].includes(operation) &&
+          !processedParams.sendUpdates
+        ) {
           processedParams.sendUpdates = 'all'
         }
 
+        // Convert maxResults to number if provided
+        if (processedParams.maxResults && typeof processedParams.maxResults === 'string') {
+          processedParams.maxResults = Number.parseInt(processedParams.maxResults, 10)
+        }
+
+        // Remove empty minAccessRole
+        if (processedParams.minAccessRole === '') {
+          processedParams.minAccessRole = undefined
+        }
+
         return {
           credential,
           ...processedParams,
@@ -358,7 +592,7 @@ Return ONLY the natural language event text - no explanations.`,
     calendarId: { type: 'string', description: 'Calendar identifier' },
     manualCalendarId: { type: 'string', description: 'Manual calendar identifier' },
 
-    // Create operation inputs
+    // Create/Update operation inputs
     summary: { type: 'string', description: 'Event title' },
     description: { type: 'string', description: 'Event description' },
     location: { type: 'string', description: 'Event location' },
@@ -366,13 +600,21 @@ Return ONLY the natural language event text - no explanations.`,
     endDateTime: { type: 'string', description: 'Event end time' },
     attendees: { type: 'string', description: 'Attendee email list' },
 
-    // List operation inputs
+    // List/Instances operation inputs
     timeMin: { type: 'string', description: 'Start time filter' },
     timeMax: { type: 'string', description: 'End time filter' },
+    maxResults: { type: 'string', description: 'Maximum number of results' },
 
-    // Get/Invite operation inputs
+    // Get/Update/Delete/Move/Instances/Invite operation inputs
     eventId: { type: 'string', description: 'Event identifier' },
 
+    // Move operation inputs
+    destinationCalendar: { type: 'string', description: 'Destination calendar selector' },
+    manualDestinationCalendarId: { type: 'string', description: 'Manual destination calendar ID' },
+
+    // List Calendars operation inputs
+    minAccessRole: { type: 'string', description: 'Minimum access role filter' },
+
     // Quick add inputs
     text: { type: 'string', description: 'Natural language event' },
 
@@ -384,7 +626,7 @@ Return ONLY the natural language event text - no explanations.`,
   },
   outputs: {
     content: { type: 'string', description: 'Operation response content' },
-    metadata: { type: 'json', description: 'Event metadata' },
+    metadata: { type: 'json', description: 'Event or calendar metadata' },
   },
 }
 
@@ -399,6 +641,11 @@ export const GoogleCalendarV2Block: BlockConfig<GoogleCalendarResponse> = {
       'google_calendar_create_v2',
       'google_calendar_list_v2',
       'google_calendar_get_v2',
+      'google_calendar_update_v2',
+      'google_calendar_delete_v2',
+      'google_calendar_move_v2',
+      'google_calendar_instances_v2',
+      'google_calendar_list_calendars_v2',
       'google_calendar_quick_add_v2',
       'google_calendar_invite_v2',
     ],
@@ -413,6 +660,7 @@ export const GoogleCalendarV2Block: BlockConfig<GoogleCalendarResponse> = {
     },
   },
   outputs: {
+    // Event outputs (create, get, update, move, quick_add, invite)
     id: { type: 'string', description: 'Event ID' },
     htmlLink: { type: 'string', description: 'Event link' },
     status: { type: 'string', description: 'Event status' },
@@ -424,9 +672,17 @@ export const GoogleCalendarV2Block: BlockConfig<GoogleCalendarResponse> = {
     attendees: { type: 'json', description: 'Event attendees' },
     creator: { type: 'json', description: 'Event creator' },
     organizer: { type: 'json', description: 'Event organizer' },
+    // List events outputs
     events: { type: 'json', description: 'List of events (list operation)' },
+    // Delete outputs
+    eventId: { type: 'string', description: 'Deleted event ID' },
+    deleted: { type: 'boolean', description: 'Whether deletion was successful' },
+    // Instances outputs
+    instances: { type: 'json', description: 'List of recurring event instances' },
+    // List calendars outputs
+    calendars: { type: 'json', description: 'List of calendars' },
+    // Common outputs
     nextPageToken: { type: 'string', description: 'Next page token' },
-    nextSyncToken: { type: 'string', description: 'Next sync token' },
     timeZone: { type: 'string', description: 'Calendar time zone' },
   },
 }
diff --git a/apps/sim/blocks/blocks/google_drive.ts b/apps/sim/blocks/blocks/google_drive.ts
index 6bed9c18a9..209bd12f91 100644
--- a/apps/sim/blocks/blocks/google_drive.ts
+++ b/apps/sim/blocks/blocks/google_drive.ts
@@ -6,9 +6,10 @@ import type { GoogleDriveResponse } from '@/tools/google_drive/types'
 export const GoogleDriveBlock: BlockConfig<GoogleDriveResponse> = {
   type: 'google_drive',
   name: 'Google Drive',
-  description: 'Create, upload, and list files',
+  description: 'Manage files, folders, and permissions',
   authMode: AuthMode.OAuth,
-  longDescription: 'Integrate Google Drive into the workflow. Can create, upload, and list files.',
+  longDescription:
+    'Integrate Google Drive into the workflow. Can create, upload, download, copy, move, delete, share files and manage permissions.',
   docsLink: 'https://docs.sim.ai/tools/google_drive',
   category: 'tools',
   bgColor: '#E0E0E0',
@@ -20,13 +21,22 @@ export const GoogleDriveBlock: BlockConfig<GoogleDriveResponse> = {
       title: 'Operation',
       type: 'dropdown',
       options: [
+        { label: 'List Files', id: 'list' },
+        { label: 'Get File Info', id: 'get_file' },
         { label: 'Create Folder', id: 'create_folder' },
         { label: 'Create File', id: 'create_file' },
         { label: 'Upload File', id: 'upload' },
         { label: 'Download File', id: 'download' },
-        { label: 'List Files', id: 'list' },
+        { label: 'Copy File', id: 'copy' },
+        { label: 'Update File', id: 'update' },
+        { label: 'Move to Trash', id: 'trash' },
+        { label: 'Delete Permanently', id: 'delete' },
+        { label: 'Share File', id: 'share' },
+        { label: 'Remove Sharing', id: 'unshare' },
+        { label: 'List Permissions', id: 'list_permissions' },
+        { label: 'Get Drive Info', id: 'get_about' },
       ],
-      value: () => 'create_folder',
+      value: () => 'list',
     },
     // Google Drive Credentials
     {
@@ -326,26 +336,440 @@ Return ONLY the query string - no explanations, no quotes around the whole thing
       placeholder: 'Optional: Override the filename',
       condition: { field: 'operation', value: 'download' },
     },
+    // Get File Info Fields
+    {
+      id: 'fileSelector',
+      title: 'Select File',
+      type: 'file-selector',
+      canonicalParamId: 'fileId',
+      serviceId: 'google-drive',
+      requiredScopes: [
+        'https://www.googleapis.com/auth/drive.file',
+        'https://www.googleapis.com/auth/drive',
+      ],
+      placeholder: 'Select a file to get info for',
+      mode: 'basic',
+      dependsOn: ['credential'],
+      condition: { field: 'operation', value: 'get_file' },
+    },
+    {
+      id: 'manualFileId',
+      title: 'File ID',
+      type: 'short-input',
+      canonicalParamId: 'fileId',
+      placeholder: 'Enter file ID',
+      mode: 'advanced',
+      condition: { field: 'operation', value: 'get_file' },
+      required: true,
+    },
+    // Copy File Fields
+    {
+      id: 'fileSelector',
+      title: 'Select File to Copy',
+      type: 'file-selector',
+      canonicalParamId: 'fileId',
+      serviceId: 'google-drive',
+      requiredScopes: [
+        'https://www.googleapis.com/auth/drive.file',
+        'https://www.googleapis.com/auth/drive',
+      ],
+      placeholder: 'Select a file to copy',
+      mode: 'basic',
+      dependsOn: ['credential'],
+      condition: { field: 'operation', value: 'copy' },
+    },
+    {
+      id: 'manualFileId',
+      title: 'File ID',
+      type: 'short-input',
+      canonicalParamId: 'fileId',
+      placeholder: 'Enter file ID to copy',
+      mode: 'advanced',
+      condition: { field: 'operation', value: 'copy' },
+      required: true,
+    },
+    {
+      id: 'newName',
+      title: 'New File Name',
+      type: 'short-input',
+      placeholder: 'Name for the copy (optional)',
+      condition: { field: 'operation', value: 'copy' },
+    },
+    {
+      id: 'folderSelector',
+      title: 'Destination Folder',
+      type: 'file-selector',
+      canonicalParamId: 'destinationFolderId',
+      serviceId: 'google-drive',
+      requiredScopes: [
+        'https://www.googleapis.com/auth/drive.file',
+        'https://www.googleapis.com/auth/drive',
+      ],
+      mimeType: 'application/vnd.google-apps.folder',
+      placeholder: 'Select destination folder (optional)',
+      mode: 'basic',
+      dependsOn: ['credential'],
+      condition: { field: 'operation', value: 'copy' },
+    },
+    {
+      id: 'manualDestinationFolderId',
+      title: 'Destination Folder ID',
+      type: 'short-input',
+      canonicalParamId: 'destinationFolderId',
+      placeholder: 'Enter destination folder ID (optional)',
+      mode: 'advanced',
+      condition: { field: 'operation', value: 'copy' },
+    },
+    // Update File Fields
+    {
+      id: 'fileSelector',
+      title: 'Select File to Update',
+      type: 'file-selector',
+      canonicalParamId: 'fileId',
+      serviceId: 'google-drive',
+      requiredScopes: [
+        'https://www.googleapis.com/auth/drive.file',
+        'https://www.googleapis.com/auth/drive',
+      ],
+      placeholder: 'Select a file to update',
+      mode: 'basic',
+      dependsOn: ['credential'],
+      condition: { field: 'operation', value: 'update' },
+    },
+    {
+      id: 'manualFileId',
+      title: 'File ID',
+      type: 'short-input',
+      canonicalParamId: 'fileId',
+      placeholder: 'Enter file ID to update',
+      mode: 'advanced',
+      condition: { field: 'operation', value: 'update' },
+      required: true,
+    },
+    {
+      id: 'name',
+      title: 'New Name',
+      type: 'short-input',
+      placeholder: 'New name for the file (optional)',
+      condition: { field: 'operation', value: 'update' },
+    },
+    {
+      id: 'description',
+      title: 'Description',
+      type: 'long-input',
+      placeholder: 'New description for the file (optional)',
+      condition: { field: 'operation', value: 'update' },
+      wandConfig: {
+        enabled: true,
+        prompt: `Generate a clear, informative file description based on the user's input.
+The description should help users understand the file's purpose and contents.
+Keep it concise but comprehensive - typically 1-3 sentences.
+
+Return ONLY the description text - no explanations, no quotes, no extra text.`,
+        placeholder: 'Describe what this file is about...',
+      },
+    },
+    {
+      id: 'starred',
+      title: 'Starred',
+      type: 'dropdown',
+      options: [
+        { label: 'No Change', id: '' },
+        { label: 'Star', id: 'true' },
+        { label: 'Unstar', id: 'false' },
+      ],
+      placeholder: 'Star or unstar the file',
+      condition: { field: 'operation', value: 'update' },
+    },
+    {
+      id: 'addParents',
+      title: 'Add to Folders',
+      type: 'short-input',
+      placeholder: 'Comma-separated folder IDs to add file to',
+      mode: 'advanced',
+      condition: { field: 'operation', value: 'update' },
+    },
+    {
+      id: 'removeParents',
+      title: 'Remove from Folders',
+      type: 'short-input',
+      placeholder: 'Comma-separated folder IDs to remove file from',
+      mode: 'advanced',
+      condition: { field: 'operation', value: 'update' },
+    },
+    // Trash File Fields
+    {
+      id: 'fileSelector',
+      title: 'Select File to Trash',
+      type: 'file-selector',
+      canonicalParamId: 'fileId',
+      serviceId: 'google-drive',
+      requiredScopes: [
+        'https://www.googleapis.com/auth/drive.file',
+        'https://www.googleapis.com/auth/drive',
+      ],
+      placeholder: 'Select a file to move to trash',
+      mode: 'basic',
+      dependsOn: ['credential'],
+      condition: { field: 'operation', value: 'trash' },
+    },
+    {
+      id: 'manualFileId',
+      title: 'File ID',
+      type: 'short-input',
+      canonicalParamId: 'fileId',
+      placeholder: 'Enter file ID to trash',
+      mode: 'advanced',
+      condition: { field: 'operation', value: 'trash' },
+      required: true,
+    },
+    // Delete File Fields
+    {
+      id: 'fileSelector',
+      title: 'Select File to Delete',
+      type: 'file-selector',
+      canonicalParamId: 'fileId',
+      serviceId: 'google-drive',
+      requiredScopes: [
+        'https://www.googleapis.com/auth/drive.file',
+        'https://www.googleapis.com/auth/drive',
+      ],
+      placeholder: 'Select a file to permanently delete',
+      mode: 'basic',
+      dependsOn: ['credential'],
+      condition: { field: 'operation', value: 'delete' },
+    },
+    {
+      id: 'manualFileId',
+      title: 'File ID',
+      type: 'short-input',
+      canonicalParamId: 'fileId',
+      placeholder: 'Enter file ID to permanently delete',
+      mode: 'advanced',
+      condition: { field: 'operation', value: 'delete' },
+      required: true,
+    },
+    // Share File Fields
+    {
+      id: 'fileSelector',
+      title: 'Select File to Share',
+      type: 'file-selector',
+      canonicalParamId: 'fileId',
+      serviceId: 'google-drive',
+      requiredScopes: [
+        'https://www.googleapis.com/auth/drive.file',
+        'https://www.googleapis.com/auth/drive',
+      ],
+      placeholder: 'Select a file to share',
+      mode: 'basic',
+      dependsOn: ['credential'],
+      condition: { field: 'operation', value: 'share' },
+    },
+    {
+      id: 'manualFileId',
+      title: 'File ID',
+      type: 'short-input',
+      canonicalParamId: 'fileId',
+      placeholder: 'Enter file ID to share',
+      mode: 'advanced',
+      condition: { field: 'operation', value: 'share' },
+      required: true,
+    },
+    {
+      id: 'shareType',
+      title: 'Share With',
+      type: 'dropdown',
+      options: [
+        { label: 'User (email)', id: 'user' },
+        { label: 'Group (email)', id: 'group' },
+        { label: 'Domain', id: 'domain' },
+        { label: 'Anyone with link', id: 'anyone' },
+      ],
+      placeholder: 'Who to share with',
+      condition: { field: 'operation', value: 'share' },
+      required: true,
+    },
+    {
+      id: 'role',
+      title: 'Permission Level',
+      type: 'dropdown',
+      options: [
+        { label: 'Viewer (read only)', id: 'reader' },
+        { label: 'Commenter (view & comment)', id: 'commenter' },
+        { label: 'Editor (can edit)', id: 'writer' },
+        { label: 'Transfer Ownership', id: 'owner' },
+      ],
+      placeholder: 'Permission level',
+      condition: { field: 'operation', value: 'share' },
+      required: true,
+    },
+    {
+      id: 'email',
+      title: 'Email Address',
+      type: 'short-input',
+      placeholder: 'Email of user or group to share with',
+      condition: {
+        field: 'operation',
+        value: 'share',
+        and: { field: 'shareType', value: ['user', 'group'] },
+      },
+      required: true,
+    },
+    {
+      id: 'domain',
+      title: 'Domain',
+      type: 'short-input',
+      placeholder: 'Domain to share with (e.g., example.com)',
+      condition: {
+        field: 'operation',
+        value: 'share',
+        and: { field: 'shareType', value: 'domain' },
+      },
+      required: true,
+    },
+    {
+      id: 'sendNotification',
+      title: 'Send Notification',
+      type: 'dropdown',
+      options: [
+        { label: 'Yes (default)', id: 'true' },
+        { label: 'No', id: 'false' },
+      ],
+      placeholder: 'Send email notification',
+      condition: {
+        field: 'operation',
+        value: 'share',
+        and: { field: 'shareType', value: ['user', 'group'] },
+      },
+    },
+    {
+      id: 'emailMessage',
+      title: 'Custom Message',
+      type: 'long-input',
+      placeholder: 'Custom message for the notification email (optional)',
+      condition: {
+        field: 'operation',
+        value: 'share',
+        and: { field: 'shareType', value: ['user', 'group'] },
+      },
+      wandConfig: {
+        enabled: true,
+        prompt: `Generate a professional, friendly sharing notification message based on the user's input.
+The message should clearly explain why the file is being shared and any relevant context.
+Keep it concise and appropriate for a business email - typically 2-4 sentences.
+
+Return ONLY the message text - no subject line, no greetings/signatures, no extra formatting.`,
+        placeholder: 'Describe why you are sharing this file...',
+      },
+    },
+    // Unshare (Remove Permission) Fields
+    {
+      id: 'fileSelector',
+      title: 'Select File',
+      type: 'file-selector',
+      canonicalParamId: 'fileId',
+      serviceId: 'google-drive',
+      requiredScopes: [
+        'https://www.googleapis.com/auth/drive.file',
+        'https://www.googleapis.com/auth/drive',
+      ],
+      placeholder: 'Select a file to remove sharing from',
+      mode: 'basic',
+      dependsOn: ['credential'],
+      condition: { field: 'operation', value: 'unshare' },
+    },
+    {
+      id: 'manualFileId',
+      title: 'File ID',
+      type: 'short-input',
+      canonicalParamId: 'fileId',
+      placeholder: 'Enter file ID',
+      mode: 'advanced',
+      condition: { field: 'operation', value: 'unshare' },
+      required: true,
+    },
+    {
+      id: 'permissionId',
+      title: 'Permission ID',
+      type: 'short-input',
+      placeholder: 'Permission ID to remove (use List Permissions to find)',
+      condition: { field: 'operation', value: 'unshare' },
+      required: true,
+    },
+    // List Permissions Fields
+    {
+      id: 'fileSelector',
+      title: 'Select File',
+      type: 'file-selector',
+      canonicalParamId: 'fileId',
+      serviceId: 'google-drive',
+      requiredScopes: [
+        'https://www.googleapis.com/auth/drive.file',
+        'https://www.googleapis.com/auth/drive',
+      ],
+      placeholder: 'Select a file to list permissions for',
+      mode: 'basic',
+      dependsOn: ['credential'],
+      condition: { field: 'operation', value: 'list_permissions' },
+    },
+    {
+      id: 'manualFileId',
+      title: 'File ID',
+      type: 'short-input',
+      canonicalParamId: 'fileId',
+      placeholder: 'Enter file ID',
+      mode: 'advanced',
+      condition: { field: 'operation', value: 'list_permissions' },
+      required: true,
+    },
+    // Get Drive Info has no additional fields (just needs credential)
   ],
   tools: {
     access: [
-      'google_drive_upload',
+      'google_drive_list',
+      'google_drive_get_file',
       'google_drive_create_folder',
+      'google_drive_upload',
       'google_drive_download',
-      'google_drive_list',
+      'google_drive_copy',
+      'google_drive_update',
+      'google_drive_trash',
+      'google_drive_delete',
+      'google_drive_share',
+      'google_drive_unshare',
+      'google_drive_list_permissions',
+      'google_drive_get_about',
     ],
     config: {
       tool: (params) => {
         switch (params.operation) {
+          case 'list':
+            return 'google_drive_list'
+          case 'get_file':
+            return 'google_drive_get_file'
+          case 'create_folder':
+            return 'google_drive_create_folder'
           case 'create_file':
           case 'upload':
             return 'google_drive_upload'
-          case 'create_folder':
-            return 'google_drive_create_folder'
           case 'download':
             return 'google_drive_download'
-          case 'list':
-            return 'google_drive_list'
+          case 'copy':
+            return 'google_drive_copy'
+          case 'update':
+            return 'google_drive_update'
+          case 'trash':
+            return 'google_drive_trash'
+          case 'delete':
+            return 'google_drive_delete'
+          case 'share':
+            return 'google_drive_share'
+          case 'unshare':
+            return 'google_drive_unshare'
+          case 'list_permissions':
+            return 'google_drive_list_permissions'
+          case 'get_about':
+            return 'google_drive_get_about'
           default:
             throw new Error(`Invalid Google Drive operation: ${params.operation}`)
         }
@@ -355,9 +779,13 @@ Return ONLY the query string - no explanations, no quotes around the whole thing
           credential,
           folderSelector,
           manualFolderId,
+          manualDestinationFolderId,
           fileSelector,
           manualFileId,
           mimeType,
+          shareType,
+          starred,
+          sendNotification,
           ...rest
         } = params
 
@@ -367,12 +795,30 @@ Return ONLY the query string - no explanations, no quotes around the whole thing
         // Use fileSelector if provided, otherwise use manualFileId
         const effectiveFileId = (fileSelector || manualFileId || '').trim()
 
+        // Use folderSelector for destination or manualDestinationFolderId for copy operation
+        const effectiveDestinationFolderId =
+          params.operation === 'copy'
+            ? (folderSelector || manualDestinationFolderId || '').trim()
+            : undefined
+
+        // Convert starred dropdown to boolean
+        const starredValue = starred === 'true' ? true : starred === 'false' ? false : undefined
+
+        // Convert sendNotification dropdown to boolean
+        const sendNotificationValue =
+          sendNotification === 'true' ? true : sendNotification === 'false' ? false : undefined
+
         return {
           credential,
           folderId: effectiveFolderId || undefined,
           fileId: effectiveFileId || undefined,
+          destinationFolderId: effectiveDestinationFolderId || undefined,
           pageSize: rest.pageSize ? Number.parseInt(rest.pageSize as string, 10) : undefined,
           mimeType: mimeType,
+          type: shareType, // Map shareType to type for share tool
+          starred: starredValue,
+          sendNotification: sendNotificationValue,
+          transferOwnership: rest.role === 'owner' ? true : undefined,
           ...rest,
         }
       },
@@ -381,22 +827,57 @@ Return ONLY the query string - no explanations, no quotes around the whole thing
   inputs: {
     operation: { type: 'string', description: 'Operation to perform' },
     credential: { type: 'string', description: 'Google Drive access token' },
-    // Upload and Create Folder operation inputs
+    // File selection inputs
+    fileSelector: { type: 'string', description: 'Selected file' },
+    manualFileId: { type: 'string', description: 'Manual file identifier' },
+    // Folder selection inputs
+    folderSelector: { type: 'string', description: 'Selected folder' },
+    manualFolderId: { type: 'string', description: 'Manual folder identifier' },
+    manualDestinationFolderId: { type: 'string', description: 'Destination folder for copy' },
+    // Upload and Create inputs
     fileName: { type: 'string', description: 'File or folder name' },
     file: { type: 'json', description: 'File to upload (UserFile object)' },
     content: { type: 'string', description: 'Text content to upload' },
     mimeType: { type: 'string', description: 'File MIME type or export format' },
-    // Download operation inputs
-    fileSelector: { type: 'string', description: 'Selected file to download' },
-    manualFileId: { type: 'string', description: 'Manual file identifier' },
     // List operation inputs
-    folderSelector: { type: 'string', description: 'Selected folder' },
-    manualFolderId: { type: 'string', description: 'Manual folder identifier' },
     query: { type: 'string', description: 'Search query' },
     pageSize: { type: 'number', description: 'Results per page' },
+    // Copy operation inputs
+    newName: { type: 'string', description: 'New name for copied file' },
+    // Update operation inputs
+    name: { type: 'string', description: 'New name for file' },
+    description: { type: 'string', description: 'New description for file' },
+    starred: { type: 'string', description: 'Star or unstar the file' },
+    addParents: { type: 'string', description: 'Folder IDs to add file to' },
+    removeParents: { type: 'string', description: 'Folder IDs to remove file from' },
+    // Share operation inputs
+    shareType: { type: 'string', description: 'Type of sharing (user, group, domain, anyone)' },
+    role: { type: 'string', description: 'Permission role' },
+    email: { type: 'string', description: 'Email address to share with' },
+    domain: { type: 'string', description: 'Domain to share with' },
+    sendNotification: { type: 'string', description: 'Send notification email' },
+    emailMessage: { type: 'string', description: 'Custom notification message' },
+    // Unshare operation inputs
+    permissionId: { type: 'string', description: 'Permission ID to remove' },
   },
   outputs: {
-    file: { type: 'json', description: 'File data' },
-    files: { type: 'json', description: 'Files list' },
+    file: { type: 'json', description: 'File metadata or downloaded file data' },
+    files: { type: 'json', description: 'List of files' },
+    metadata: { type: 'json', description: 'Complete file metadata (from download)' },
+    content: { type: 'string', description: 'File content as text' },
+    nextPageToken: { type: 'string', description: 'Token for fetching the next page of results' },
+    permission: { type: 'json', description: 'Permission details' },
+    permissions: { type: 'json', description: 'List of permissions' },
+    user: { type: 'json', description: 'User information' },
+    storageQuota: { type: 'json', description: 'Storage quota information' },
+    canCreateDrives: { type: 'boolean', description: 'Whether user can create shared drives' },
+    importFormats: { type: 'json', description: 'Map of MIME types that can be imported' },
+    exportFormats: {
+      type: 'json',
+      description: 'Map of Google Workspace MIME types and export formats',
+    },
+    maxUploadSize: { type: 'string', description: 'Maximum upload size in bytes' },
+    deleted: { type: 'boolean', description: 'Whether file was deleted' },
+    removed: { type: 'boolean', description: 'Whether permission was removed' },
   },
 }
diff --git a/apps/sim/blocks/blocks/google_form.ts b/apps/sim/blocks/blocks/google_form.ts
deleted file mode 100644
index dbc0afa59f..0000000000
--- a/apps/sim/blocks/blocks/google_form.ts
+++ /dev/null
@@ -1,86 +0,0 @@
-import { GoogleFormsIcon } from '@/components/icons'
-import type { BlockConfig } from '@/blocks/types'
-import { getTrigger } from '@/triggers'
-
-export const GoogleFormsBlock: BlockConfig = {
-  type: 'google_forms',
-  name: 'Google Forms',
-  description: 'Read responses from a Google Form',
-  longDescription:
-    'Integrate Google Forms into your workflow. Provide a Form ID to list responses, or specify a Response ID to fetch a single response. Requires OAuth.',
-  docsLink: 'https://docs.sim.ai/tools/google_forms',
-  category: 'tools',
-  bgColor: '#E0E0E0',
-  icon: GoogleFormsIcon,
-  subBlocks: [
-    {
-      id: 'credential',
-      title: 'Google Account',
-      type: 'oauth-input',
-      required: true,
-      serviceId: 'google-forms',
-      requiredScopes: [
-        'https://www.googleapis.com/auth/userinfo.email',
-        'https://www.googleapis.com/auth/userinfo.profile',
-        'https://www.googleapis.com/auth/forms.responses.readonly',
-      ],
-      placeholder: 'Select Google account',
-    },
-    {
-      id: 'formId',
-      title: 'Form ID',
-      type: 'short-input',
-      required: true,
-      placeholder: 'Enter the Google Form ID',
-      dependsOn: ['credential'],
-    },
-    {
-      id: 'responseId',
-      title: 'Response ID',
-      type: 'short-input',
-      placeholder: 'Enter a specific response ID',
-    },
-    {
-      id: 'pageSize',
-      title: 'Page Size',
-      type: 'short-input',
-      placeholder: 'Max responses to retrieve (default 5000)',
-    },
-    ...getTrigger('google_forms_webhook').subBlocks,
-  ],
-  tools: {
-    access: ['google_forms_get_responses'],
-    config: {
-      tool: () => 'google_forms_get_responses',
-      params: (params) => {
-        const { credential, formId, responseId, pageSize, ...rest } = params
-
-        const effectiveFormId = String(formId || '').trim()
-        if (!effectiveFormId) {
-          throw new Error('Form ID is required.')
-        }
-
-        return {
-          ...rest,
-          formId: effectiveFormId,
-          responseId: responseId ? String(responseId).trim() : undefined,
-          pageSize: pageSize ? Number(pageSize) : undefined,
-          credential,
-        }
-      },
-    },
-  },
-  inputs: {
-    credential: { type: 'string', description: 'Google OAuth credential' },
-    formId: { type: 'string', description: 'Google Form ID' },
-    responseId: { type: 'string', description: 'Specific response ID' },
-    pageSize: { type: 'string', description: 'Max responses to retrieve (default 5000)' },
-  },
-  outputs: {
-    data: { type: 'json', description: 'Response or list of responses' },
-  },
-  triggers: {
-    enabled: true,
-    available: ['google_forms_webhook'],
-  },
-}
diff --git a/apps/sim/blocks/blocks/google_forms.ts b/apps/sim/blocks/blocks/google_forms.ts
new file mode 100644
index 0000000000..0dee689774
--- /dev/null
+++ b/apps/sim/blocks/blocks/google_forms.ts
@@ -0,0 +1,471 @@
+import { GoogleFormsIcon } from '@/components/icons'
+import type { BlockConfig } from '@/blocks/types'
+import { getTrigger } from '@/triggers'
+
+export const GoogleFormsBlock: BlockConfig = {
+  type: 'google_forms',
+  name: 'Google Forms',
+  description: 'Manage Google Forms and responses',
+  longDescription:
+    'Integrate Google Forms into your workflow. Read form structure, get responses, create forms, update content, and manage notification watches.',
+  docsLink: 'https://docs.sim.ai/tools/google_forms',
+  category: 'tools',
+  bgColor: '#E0E0E0',
+  icon: GoogleFormsIcon,
+  subBlocks: [
+    {
+      id: 'operation',
+      title: 'Operation',
+      type: 'dropdown',
+      options: [
+        { label: 'Get Responses', id: 'get_responses' },
+        { label: 'Get Form', id: 'get_form' },
+        { label: 'Create Form', id: 'create_form' },
+        { label: 'Batch Update', id: 'batch_update' },
+        { label: 'Set Publish Settings', id: 'set_publish_settings' },
+        { label: 'Create Watch', id: 'create_watch' },
+        { label: 'List Watches', id: 'list_watches' },
+        { label: 'Delete Watch', id: 'delete_watch' },
+        { label: 'Renew Watch', id: 'renew_watch' },
+      ],
+      value: () => 'get_responses',
+    },
+    {
+      id: 'credential',
+      title: 'Google Account',
+      type: 'oauth-input',
+      required: true,
+      serviceId: 'google-forms',
+      requiredScopes: [
+        'https://www.googleapis.com/auth/userinfo.email',
+        'https://www.googleapis.com/auth/userinfo.profile',
+        'https://www.googleapis.com/auth/drive',
+        'https://www.googleapis.com/auth/forms.body',
+        'https://www.googleapis.com/auth/forms.responses.readonly',
+      ],
+      placeholder: 'Select Google account',
+    },
+    // Form selector (basic mode)
+    {
+      id: 'formId',
+      title: 'Select Form',
+      type: 'file-selector',
+      canonicalParamId: 'formId',
+      serviceId: 'google-forms',
+      requiredScopes: [],
+      mimeType: 'application/vnd.google-apps.form',
+      placeholder: 'Select a form',
+      dependsOn: ['credential'],
+      mode: 'basic',
+      condition: {
+        field: 'operation',
+        value: 'create_form',
+        not: true,
+      },
+    },
+    // Manual form ID input (advanced mode)
+    {
+      id: 'manualFormId',
+      title: 'Form ID',
+      type: 'short-input',
+      canonicalParamId: 'formId',
+      required: true,
+      placeholder: 'Enter the Google Form ID',
+      dependsOn: ['credential'],
+      mode: 'advanced',
+      condition: {
+        field: 'operation',
+        value: 'create_form',
+        not: true,
+      },
+    },
+    // Get Responses specific fields
+    {
+      id: 'responseId',
+      title: 'Response ID',
+      type: 'short-input',
+      placeholder: 'Enter a specific response ID (optional)',
+      condition: { field: 'operation', value: 'get_responses' },
+    },
+    {
+      id: 'pageSize',
+      title: 'Page Size',
+      type: 'short-input',
+      placeholder: 'Max responses to retrieve (default 5000)',
+      condition: { field: 'operation', value: 'get_responses' },
+    },
+    // Create Form specific fields
+    {
+      id: 'title',
+      title: 'Form Title',
+      type: 'short-input',
+      required: true,
+      placeholder: 'Enter the form title',
+      condition: { field: 'operation', value: 'create_form' },
+    },
+    {
+      id: 'documentTitle',
+      title: 'Document Title',
+      type: 'short-input',
+      placeholder: 'Title visible in Drive (optional)',
+      condition: { field: 'operation', value: 'create_form' },
+    },
+    {
+      id: 'unpublished',
+      title: 'Create Unpublished',
+      type: 'switch',
+      condition: { field: 'operation', value: 'create_form' },
+    },
+    // Batch Update specific fields
+    {
+      id: 'requests',
+      title: 'Update Requests',
+      type: 'code',
+      placeholder: 'JSON array of update requests',
+      required: true,
+      condition: { field: 'operation', value: 'batch_update' },
+      wandConfig: {
+        enabled: true,
+        prompt: `Generate a Google Forms batchUpdate requests array based on the user's description.
+
+The requests array can contain these operation types:
+- updateFormInfo: Update form title/description. Structure: {updateFormInfo: {info: {title?, description?}, updateMask: "title,description"}}
+- updateSettings: Update form settings. Structure: {updateSettings: {settings: {quizSettings?: {isQuiz: boolean}}, updateMask: "quizSettings.isQuiz"}}
+- createItem: Add a question/section. Structure: {createItem: {item: {title, questionItem?: {question: {required?: boolean, choiceQuestion?: {type: "RADIO"|"CHECKBOX"|"DROP_DOWN", options: [{value: string}]}, textQuestion?: {paragraph?: boolean}, scaleQuestion?: {low: number, high: number}}}}, location: {index: number}}}
+- updateItem: Modify existing item. Structure: {updateItem: {item: {...}, location: {index: number}, updateMask: "..."}}
+- moveItem: Reorder item. Structure: {moveItem: {originalLocation: {index: number}, newLocation: {index: number}}}
+- deleteItem: Remove item. Structure: {deleteItem: {location: {index: number}}}
+
+Return ONLY a valid JSON array of request objects. No explanations.
+
+Example for "Add a required multiple choice question about favorite color":
+[{"createItem":{"item":{"title":"What is your favorite color?","questionItem":{"question":{"required":true,"choiceQuestion":{"type":"RADIO","options":[{"value":"Red"},{"value":"Blue"},{"value":"Green"}]}}}},"location":{"index":0}}}]`,
+        placeholder: 'Describe what you want to add or change in the form...',
+      },
+    },
+    {
+      id: 'includeFormInResponse',
+      title: 'Include Form in Response',
+      type: 'switch',
+      condition: { field: 'operation', value: 'batch_update' },
+    },
+    // Set Publish Settings specific fields
+    {
+      id: 'isPublished',
+      title: 'Published',
+      type: 'switch',
+      required: true,
+      condition: { field: 'operation', value: 'set_publish_settings' },
+    },
+    {
+      id: 'isAcceptingResponses',
+      title: 'Accepting Responses',
+      type: 'switch',
+      condition: { field: 'operation', value: 'set_publish_settings' },
+    },
+    // Watch specific fields
+    {
+      id: 'eventType',
+      title: 'Event Type',
+      type: 'dropdown',
+      options: [
+        { label: 'Form Responses', id: 'RESPONSES' },
+        { label: 'Form Schema Changes', id: 'SCHEMA' },
+      ],
+      required: true,
+      condition: { field: 'operation', value: 'create_watch' },
+    },
+    {
+      id: 'topicName',
+      title: 'Pub/Sub Topic',
+      type: 'short-input',
+      required: true,
+      placeholder: 'projects/{project}/topics/{topic}',
+      condition: { field: 'operation', value: 'create_watch' },
+    },
+    {
+      id: 'watchId',
+      title: 'Watch ID',
+      type: 'short-input',
+      placeholder: 'Custom watch ID (optional)',
+      condition: { field: 'operation', value: ['create_watch', 'delete_watch', 'renew_watch'] },
+      required: { field: 'operation', value: ['delete_watch', 'renew_watch'] },
+    },
+    ...getTrigger('google_forms_webhook').subBlocks,
+  ],
+  tools: {
+    access: [
+      'google_forms_get_responses',
+      'google_forms_get_form',
+      'google_forms_create_form',
+      'google_forms_batch_update',
+      'google_forms_set_publish_settings',
+      'google_forms_create_watch',
+      'google_forms_list_watches',
+      'google_forms_delete_watch',
+      'google_forms_renew_watch',
+    ],
+    config: {
+      tool: (params) => {
+        switch (params.operation) {
+          case 'get_responses':
+            return 'google_forms_get_responses'
+          case 'get_form':
+            return 'google_forms_get_form'
+          case 'create_form':
+            return 'google_forms_create_form'
+          case 'batch_update':
+            return 'google_forms_batch_update'
+          case 'set_publish_settings':
+            return 'google_forms_set_publish_settings'
+          case 'create_watch':
+            return 'google_forms_create_watch'
+          case 'list_watches':
+            return 'google_forms_list_watches'
+          case 'delete_watch':
+            return 'google_forms_delete_watch'
+          case 'renew_watch':
+            return 'google_forms_renew_watch'
+          default:
+            throw new Error(`Invalid Google Forms operation: ${params.operation}`)
+        }
+      },
+      params: (params) => {
+        const {
+          credential,
+          operation,
+          formId,
+          manualFormId,
+          responseId,
+          pageSize,
+          title,
+          documentTitle,
+          unpublished,
+          requests,
+          includeFormInResponse,
+          isPublished,
+          isAcceptingResponses,
+          eventType,
+          topicName,
+          watchId,
+          ...rest
+        } = params
+
+        const baseParams = { ...rest, credential }
+        const effectiveFormId = (formId || manualFormId || '').toString().trim() || undefined
+
+        switch (operation) {
+          case 'get_responses':
+            if (!effectiveFormId) throw new Error('Form ID is required.')
+            return {
+              ...baseParams,
+              formId: effectiveFormId,
+              responseId: responseId ? String(responseId).trim() : undefined,
+              pageSize: pageSize ? Number(pageSize) : undefined,
+            }
+          case 'get_form':
+          case 'list_watches':
+            if (!effectiveFormId) throw new Error('Form ID is required.')
+            return { ...baseParams, formId: effectiveFormId }
+          case 'create_form':
+            if (!title) throw new Error('Form title is required.')
+            return {
+              ...baseParams,
+              title: String(title).trim(),
+              documentTitle: documentTitle ? String(documentTitle).trim() : undefined,
+              unpublished: unpublished ?? false,
+            }
+          case 'batch_update':
+            if (!effectiveFormId) throw new Error('Form ID is required.')
+            if (!requests) throw new Error('Update requests are required.')
+            return {
+              ...baseParams,
+              formId: effectiveFormId,
+              requests: typeof requests === 'string' ? JSON.parse(requests) : requests,
+              includeFormInResponse: includeFormInResponse ?? false,
+            }
+          case 'set_publish_settings':
+            if (!effectiveFormId) throw new Error('Form ID is required.')
+            return {
+              ...baseParams,
+              formId: effectiveFormId,
+              isPublished: isPublished ?? false,
+              isAcceptingResponses: isAcceptingResponses,
+            }
+          case 'create_watch':
+            if (!effectiveFormId) throw new Error('Form ID is required.')
+            if (!eventType) throw new Error('Event type is required.')
+            if (!topicName) throw new Error('Pub/Sub topic is required.')
+            return {
+              ...baseParams,
+              formId: effectiveFormId,
+              eventType: String(eventType),
+              topicName: String(topicName).trim(),
+              watchId: watchId ? String(watchId).trim() : undefined,
+            }
+          case 'delete_watch':
+          case 'renew_watch':
+            if (!effectiveFormId) throw new Error('Form ID is required.')
+            if (!watchId) throw new Error('Watch ID is required.')
+            return {
+              ...baseParams,
+              formId: effectiveFormId,
+              watchId: String(watchId).trim(),
+            }
+          default:
+            throw new Error(`Invalid Google Forms operation: ${operation}`)
+        }
+      },
+    },
+  },
+  inputs: {
+    operation: { type: 'string', description: 'Operation to perform' },
+    credential: { type: 'string', description: 'Google OAuth credential' },
+    formId: { type: 'string', description: 'Google Form ID (from selector)' },
+    manualFormId: { type: 'string', description: 'Google Form ID (manual entry)' },
+    responseId: { type: 'string', description: 'Specific response ID' },
+    pageSize: { type: 'string', description: 'Max responses to retrieve' },
+    title: { type: 'string', description: 'Form title for creation' },
+    documentTitle: { type: 'string', description: 'Document title in Drive' },
+    unpublished: { type: 'boolean', description: 'Create as unpublished' },
+    requests: { type: 'json', description: 'Batch update requests' },
+    includeFormInResponse: { type: 'boolean', description: 'Include form in response' },
+    isPublished: { type: 'boolean', description: 'Form published state' },
+    isAcceptingResponses: { type: 'boolean', description: 'Form accepting responses' },
+    eventType: { type: 'string', description: 'Watch event type' },
+    topicName: { type: 'string', description: 'Pub/Sub topic name' },
+    watchId: { type: 'string', description: 'Watch ID' },
+  },
+  outputs: {
+    responses: {
+      type: 'json',
+      description: 'Array of form responses',
+      condition: {
+        field: 'operation',
+        value: 'get_responses',
+        and: { field: 'responseId', value: ['', undefined, null] },
+      },
+    },
+    response: {
+      type: 'json',
+      description: 'Single form response',
+      condition: {
+        field: 'operation',
+        value: 'get_responses',
+        and: { field: 'responseId', value: ['', undefined, null], not: true },
+      },
+    },
+    // Get Form outputs
+    formId: {
+      type: 'string',
+      description: 'Form ID',
+      condition: { field: 'operation', value: ['get_form', 'create_form', 'set_publish_settings'] },
+    },
+    title: {
+      type: 'string',
+      description: 'Form title',
+      condition: { field: 'operation', value: ['get_form', 'create_form'] },
+    },
+    description: {
+      type: 'string',
+      description: 'Form description',
+      condition: { field: 'operation', value: 'get_form' },
+    },
+    documentTitle: {
+      type: 'string',
+      description: 'Document title in Drive',
+      condition: { field: 'operation', value: ['get_form', 'create_form'] },
+    },
+    responderUri: {
+      type: 'string',
+      description: 'Form responder URL',
+      condition: { field: 'operation', value: ['get_form', 'create_form'] },
+    },
+    linkedSheetId: {
+      type: 'string',
+      description: 'Linked Google Sheet ID',
+      condition: { field: 'operation', value: 'get_form' },
+    },
+    revisionId: {
+      type: 'string',
+      description: 'Form revision ID',
+      condition: { field: 'operation', value: ['get_form', 'create_form'] },
+    },
+    items: {
+      type: 'json',
+      description: 'Form items (questions, sections, etc.)',
+      condition: { field: 'operation', value: 'get_form' },
+    },
+    settings: {
+      type: 'json',
+      description: 'Form settings',
+      condition: { field: 'operation', value: 'get_form' },
+    },
+    publishSettings: {
+      type: 'json',
+      description: 'Form publish settings',
+      condition: { field: 'operation', value: ['get_form', 'set_publish_settings'] },
+    },
+    // Batch Update outputs
+    replies: {
+      type: 'json',
+      description: 'Replies from each update request',
+      condition: { field: 'operation', value: 'batch_update' },
+    },
+    writeControl: {
+      type: 'json',
+      description: 'Write control with revision IDs',
+      condition: { field: 'operation', value: 'batch_update' },
+    },
+    form: {
+      type: 'json',
+      description: 'Updated form (if includeFormInResponse is true)',
+      condition: { field: 'operation', value: 'batch_update' },
+    },
+    // Watch outputs
+    watches: {
+      type: 'json',
+      description: 'Array of form watches',
+      condition: { field: 'operation', value: 'list_watches' },
+    },
+    id: {
+      type: 'string',
+      description: 'Watch ID',
+      condition: { field: 'operation', value: ['create_watch', 'renew_watch'] },
+    },
+    eventType: {
+      type: 'string',
+      description: 'Watch event type',
+      condition: { field: 'operation', value: ['create_watch', 'renew_watch'] },
+    },
+    topicName: {
+      type: 'string',
+      description: 'Cloud Pub/Sub topic',
+      condition: { field: 'operation', value: 'create_watch' },
+    },
+    createTime: {
+      type: 'string',
+      description: 'Watch creation time',
+      condition: { field: 'operation', value: 'create_watch' },
+    },
+    expireTime: {
+      type: 'string',
+      description: 'Watch expiration time',
+      condition: { field: 'operation', value: ['create_watch', 'renew_watch'] },
+    },
+    state: {
+      type: 'string',
+      description: 'Watch state (ACTIVE, SUSPENDED)',
+      condition: { field: 'operation', value: ['create_watch', 'renew_watch'] },
+    },
+    deleted: {
+      type: 'boolean',
+      description: 'Whether the watch was deleted',
+      condition: { field: 'operation', value: 'delete_watch' },
+    },
+  },
+  triggers: {
+    enabled: true,
+    available: ['google_forms_webhook'],
+  },
+}
diff --git a/apps/sim/blocks/blocks/google_groups.ts b/apps/sim/blocks/blocks/google_groups.ts
index de3d28ca5f..2e847d8c71 100644
--- a/apps/sim/blocks/blocks/google_groups.ts
+++ b/apps/sim/blocks/blocks/google_groups.ts
@@ -30,6 +30,11 @@ export const GoogleGroupsBlock: BlockConfig = {
         { label: 'Update Member Role', id: 'update_member' },
         { label: 'Remove Member', id: 'remove_member' },
         { label: 'Check Membership', id: 'has_member' },
+        { label: 'List Aliases', id: 'list_aliases' },
+        { label: 'Add Alias', id: 'add_alias' },
+        { label: 'Remove Alias', id: 'remove_alias' },
+        { label: 'Get Settings', id: 'get_settings' },
+        { label: 'Update Settings', id: 'update_settings' },
       ],
       value: () => 'list_groups',
     },
@@ -112,10 +117,37 @@ Return ONLY the query string - no explanations, no quotes, no extra text.`,
           'update_member',
           'remove_member',
           'has_member',
+          'list_aliases',
+          'add_alias',
+          'remove_alias',
         ],
       },
     },
 
+    {
+      id: 'groupEmail',
+      title: 'Group Email',
+      type: 'short-input',
+      placeholder: 'group@example.com',
+      required: true,
+      condition: {
+        field: 'operation',
+        value: ['get_settings', 'update_settings'],
+      },
+    },
+
+    {
+      id: 'alias',
+      title: 'Alias Email',
+      type: 'short-input',
+      placeholder: 'alias@example.com',
+      required: true,
+      condition: {
+        field: 'operation',
+        value: ['add_alias', 'remove_alias'],
+      },
+    },
+
     {
       id: 'email',
       title: 'Group Email',
@@ -233,6 +265,11 @@ Return ONLY the description text - no explanations, no quotes, no extra text.`,
       'google_groups_remove_member',
       'google_groups_update_member',
       'google_groups_has_member',
+      'google_groups_list_aliases',
+      'google_groups_add_alias',
+      'google_groups_remove_alias',
+      'google_groups_get_settings',
+      'google_groups_update_settings',
     ],
     config: {
       tool: (params) => {
@@ -259,6 +296,16 @@ Return ONLY the description text - no explanations, no quotes, no extra text.`,
             return 'google_groups_remove_member'
           case 'has_member':
             return 'google_groups_has_member'
+          case 'list_aliases':
+            return 'google_groups_list_aliases'
+          case 'add_alias':
+            return 'google_groups_add_alias'
+          case 'remove_alias':
+            return 'google_groups_remove_alias'
+          case 'get_settings':
+            return 'google_groups_get_settings'
+          case 'update_settings':
+            return 'google_groups_update_settings'
           default:
             throw new Error(`Invalid Google Groups operation: ${params.operation}`)
         }
@@ -330,6 +377,33 @@ Return ONLY the description text - no explanations, no quotes, no extra text.`,
               groupKey: rest.groupKey,
               memberKey: rest.memberKey,
             }
+          case 'list_aliases':
+            return {
+              credential,
+              groupKey: rest.groupKey,
+            }
+          case 'add_alias':
+            return {
+              credential,
+              groupKey: rest.groupKey,
+              alias: rest.alias,
+            }
+          case 'remove_alias':
+            return {
+              credential,
+              groupKey: rest.groupKey,
+              alias: rest.alias,
+            }
+          case 'get_settings':
+            return {
+              credential,
+              groupEmail: rest.groupEmail,
+            }
+          case 'update_settings':
+            return {
+              credential,
+              groupEmail: rest.groupEmail,
+            }
           default:
             return { credential, ...rest }
         }
@@ -353,6 +427,8 @@ Return ONLY the description text - no explanations, no quotes, no extra text.`,
     memberEmail: { type: 'string', description: 'Email of member to add' },
     role: { type: 'string', description: 'Member role (MEMBER, MANAGER, OWNER)' },
     roles: { type: 'string', description: 'Filter by roles for list members' },
+    alias: { type: 'string', description: 'Alias email address' },
+    groupEmail: { type: 'string', description: 'Group email address for settings operations' },
   },
   outputs: {
     groups: { type: 'json', description: 'Array of group objects (for list_groups)' },
@@ -362,5 +438,8 @@ Return ONLY the description text - no explanations, no quotes, no extra text.`,
     isMember: { type: 'boolean', description: 'Membership check result (for has_member)' },
     message: { type: 'string', description: 'Success message (for delete/remove operations)' },
     nextPageToken: { type: 'string', description: 'Token for fetching next page of results' },
+    aliases: { type: 'json', description: 'Array of alias objects (for list_aliases)' },
+    settings: { type: 'json', description: 'Group settings object (for get/update_settings)' },
+    deleted: { type: 'boolean', description: 'Deletion result (for remove_alias)' },
   },
 }
diff --git a/apps/sim/blocks/blocks/google_sheets.ts b/apps/sim/blocks/blocks/google_sheets.ts
index bb653f7950..2598425848 100644
--- a/apps/sim/blocks/blocks/google_sheets.ts
+++ b/apps/sim/blocks/blocks/google_sheets.ts
@@ -1,7 +1,7 @@
 import { GoogleSheetsIcon } from '@/components/icons'
 import type { BlockConfig } from '@/blocks/types'
 import { AuthMode } from '@/blocks/types'
-import type { GoogleSheetsResponse } from '@/tools/google_sheets/types'
+import type { GoogleSheetsResponse, GoogleSheetsV2Response } from '@/tools/google_sheets/types'
 
 // Legacy block - hidden from toolbar
 export const GoogleSheetsBlock: BlockConfig<GoogleSheetsResponse> = {
@@ -284,3 +284,725 @@ Return ONLY the JSON array - no explanations, no markdown, no extra text.`,
     tableRange: { type: 'string', description: 'Table range' },
   },
 }
+
+export const GoogleSheetsV2Block: BlockConfig<GoogleSheetsV2Response> = {
+  type: 'google_sheets_v2',
+  name: 'Google Sheets',
+  description: 'Read, write, and update data with sheet selection',
+  authMode: AuthMode.OAuth,
+  hideFromToolbar: false,
+  longDescription:
+    'Integrate Google Sheets into the workflow with explicit sheet selection. Can read, write, append, update, clear data, create spreadsheets, get spreadsheet info, and copy sheets.',
+  docsLink: 'https://docs.sim.ai/tools/google_sheets',
+  category: 'tools',
+  bgColor: '#E0E0E0',
+  icon: GoogleSheetsIcon,
+  subBlocks: [
+    // Operation selector
+    {
+      id: 'operation',
+      title: 'Operation',
+      type: 'dropdown',
+      options: [
+        { label: 'Read Data', id: 'read' },
+        { label: 'Write Data', id: 'write' },
+        { label: 'Update Data', id: 'update' },
+        { label: 'Append Data', id: 'append' },
+        { label: 'Clear Data', id: 'clear' },
+        { label: 'Get Spreadsheet Info', id: 'get_info' },
+        { label: 'Create Spreadsheet', id: 'create' },
+        { label: 'Batch Read', id: 'batch_get' },
+        { label: 'Batch Update', id: 'batch_update' },
+        { label: 'Batch Clear', id: 'batch_clear' },
+        { label: 'Copy Sheet', id: 'copy_sheet' },
+      ],
+      value: () => 'read',
+    },
+    // Google Sheets Credentials
+    {
+      id: 'credential',
+      title: 'Google Account',
+      type: 'oauth-input',
+      required: true,
+      serviceId: 'google-sheets',
+      requiredScopes: [
+        'https://www.googleapis.com/auth/drive.file',
+        'https://www.googleapis.com/auth/drive',
+      ],
+      placeholder: 'Select Google account',
+    },
+    // Spreadsheet Selector (basic mode) - not for create operation
+    {
+      id: 'spreadsheetId',
+      title: 'Select Spreadsheet',
+      type: 'file-selector',
+      canonicalParamId: 'spreadsheetId',
+      serviceId: 'google-sheets',
+      requiredScopes: [
+        'https://www.googleapis.com/auth/drive.file',
+        'https://www.googleapis.com/auth/drive',
+      ],
+      mimeType: 'application/vnd.google-apps.spreadsheet',
+      placeholder: 'Select a spreadsheet',
+      dependsOn: ['credential'],
+      mode: 'basic',
+      condition: { field: 'operation', value: 'create', not: true },
+    },
+    // Manual Spreadsheet ID (advanced mode) - not for create operation
+    {
+      id: 'manualSpreadsheetId',
+      title: 'Spreadsheet ID',
+      type: 'short-input',
+      canonicalParamId: 'spreadsheetId',
+      placeholder: 'ID of the spreadsheet (from URL)',
+      dependsOn: ['credential'],
+      mode: 'advanced',
+      condition: { field: 'operation', value: 'create', not: true },
+    },
+    // Sheet Name Selector (basic mode) - for operations that need sheet name
+    {
+      id: 'sheetName',
+      title: 'Sheet (Tab)',
+      type: 'sheet-selector',
+      canonicalParamId: 'sheetName',
+      serviceId: 'google-sheets',
+      placeholder: 'Select a sheet',
+      required: true,
+      dependsOn: { all: ['credential'], any: ['spreadsheetId', 'manualSpreadsheetId'] },
+      mode: 'basic',
+      condition: { field: 'operation', value: ['read', 'write', 'update', 'append', 'clear'] },
+    },
+    // Manual Sheet Name (advanced mode) - for operations that need sheet name
+    {
+      id: 'manualSheetName',
+      title: 'Sheet Name',
+      type: 'short-input',
+      canonicalParamId: 'sheetName',
+      placeholder: 'Name of the sheet/tab (e.g., Sheet1)',
+      required: true,
+      dependsOn: ['credential'],
+      mode: 'advanced',
+      condition: { field: 'operation', value: ['read', 'write', 'update', 'append', 'clear'] },
+    },
+    // Cell Range (optional for read/write/update/clear)
+    {
+      id: 'cellRange',
+      title: 'Cell Range',
+      type: 'short-input',
+      placeholder: 'Cell range (e.g., A1:D10). Defaults to A1 for write.',
+      condition: { field: 'operation', value: ['read', 'write', 'update', 'clear'] },
+      wandConfig: {
+        enabled: true,
+        prompt: `Generate a valid cell range based on the user's description.
+
+### VALID FORMATS
+- Single cell: A1
+- Range: A1:D10
+- Entire column: A:A
+- Entire row: 1:1
+- Multiple columns: A:D
+- Multiple rows: 1:10
+
+### RANGE RULES
+- Column letters are uppercase: A, B, C, ... Z, AA, AB, etc.
+- Row numbers start at 1 (not 0)
+
+### EXAMPLES
+- "first 100 rows" -> A1:Z100
+- "cells A1 through C50" -> A1:C50
+- "column A" -> A:A
+- "just the headers row" -> 1:1
+- "first cell" -> A1
+
+Return ONLY the range string - no sheet name, no explanations, no quotes.`,
+        placeholder: 'Describe the range (e.g., "first 50 rows" or "column A")...',
+      },
+    },
+    // Write-specific Fields
+    {
+      id: 'values',
+      title: 'Values',
+      type: 'long-input',
+      placeholder:
+        'Enter values as JSON array of arrays (e.g., [["A1", "B1"], ["A2", "B2"]]) or an array of objects (e.g., [{"name":"John", "age":30}])',
+      condition: { field: 'operation', value: 'write' },
+      required: true,
+      wandConfig: {
+        enabled: true,
+        prompt: `Generate Google Sheets data as a JSON array based on the user's description.
+
+Format options:
+1. Array of arrays: [["Header1", "Header2"], ["Value1", "Value2"]]
+2. Array of objects: [{"column1": "value1", "column2": "value2"}]
+
+Examples:
+- "sales data with product and revenue columns" -> [["Product", "Revenue"], ["Widget A", 1500], ["Widget B", 2300]]
+- "list of employees with name and email" -> [{"name": "John Doe", "email": "john@example.com"}, {"name": "Jane Smith", "email": "jane@example.com"}]
+
+Return ONLY the JSON array - no explanations, no markdown, no extra text.`,
+        placeholder: 'Describe the data you want to write...',
+        generationType: 'json-object',
+      },
+    },
+    {
+      id: 'valueInputOption',
+      title: 'Value Input Option',
+      type: 'dropdown',
+      options: [
+        { label: 'User Entered (Parse formulas)', id: 'USER_ENTERED' },
+        { label: "Raw (Don't parse formulas)", id: 'RAW' },
+      ],
+      condition: { field: 'operation', value: ['write', 'batch_update'] },
+    },
+    // Update-specific Fields
+    {
+      id: 'values',
+      title: 'Values',
+      type: 'long-input',
+      placeholder:
+        'Enter values as JSON array of arrays (e.g., [["A1", "B1"], ["A2", "B2"]]) or an array of objects',
+      condition: { field: 'operation', value: 'update' },
+      required: true,
+      wandConfig: {
+        enabled: true,
+        prompt: `Generate Google Sheets data as a JSON array based on the user's description.
+
+Format options:
+1. Array of arrays: [["Header1", "Header2"], ["Value1", "Value2"]]
+2. Array of objects: [{"column1": "value1", "column2": "value2"}]
+
+Examples:
+- "update with new prices" -> [["Product", "Price"], ["Widget A", 29.99], ["Widget B", 49.99]]
+- "quarterly targets" -> [{"Q1": 10000, "Q2": 12000, "Q3": 15000, "Q4": 18000}]
+
+Return ONLY the JSON array - no explanations, no markdown, no extra text.`,
+        placeholder: 'Describe the data you want to update...',
+        generationType: 'json-object',
+      },
+    },
+    // Append-specific Fields
+    {
+      id: 'values',
+      title: 'Values',
+      type: 'long-input',
+      placeholder:
+        'Enter values as JSON array of arrays (e.g., [["A1", "B1"], ["A2", "B2"]]) or an array of objects',
+      condition: { field: 'operation', value: 'append' },
+      required: true,
+      wandConfig: {
+        enabled: true,
+        prompt: `Generate Google Sheets data as a JSON array based on the user's description.
+
+Format options:
+1. Array of arrays: [["Value1", "Value2"], ["Value3", "Value4"]]
+2. Array of objects: [{"column1": "value1", "column2": "value2"}]
+
+Examples:
+- "add new sales record" -> [["2024-01-15", "Widget Pro", 5, 249.99]]
+- "append customer info" -> [{"name": "Acme Corp", "contact": "John Smith", "status": "Active"}]
+
+Return ONLY the JSON array - no explanations, no markdown, no extra text.`,
+        placeholder: 'Describe the data you want to append...',
+        generationType: 'json-object',
+      },
+    },
+    {
+      id: 'insertDataOption',
+      title: 'Insert Data Option',
+      type: 'dropdown',
+      options: [
+        { label: 'Insert Rows (Add new rows)', id: 'INSERT_ROWS' },
+        { label: 'Overwrite (Add to existing data)', id: 'OVERWRITE' },
+      ],
+      condition: { field: 'operation', value: 'append' },
+    },
+    // Create Spreadsheet Fields
+    {
+      id: 'title',
+      title: 'Spreadsheet Title',
+      type: 'short-input',
+      placeholder: 'Title for the new spreadsheet',
+      condition: { field: 'operation', value: 'create' },
+      required: true,
+    },
+    {
+      id: 'sheetTitles',
+      title: 'Sheet Names',
+      type: 'short-input',
+      placeholder: 'Comma-separated sheet names (e.g., Sheet1, Data, Summary)',
+      condition: { field: 'operation', value: 'create' },
+    },
+    // Batch Get Fields
+    {
+      id: 'ranges',
+      title: 'Ranges',
+      type: 'long-input',
+      placeholder:
+        'JSON array of ranges to read (e.g., ["Sheet1!A1:D10", "Sheet2!A1:B5"]). Include sheet name in each range.',
+      condition: { field: 'operation', value: 'batch_get' },
+      required: true,
+      wandConfig: {
+        enabled: true,
+        prompt: `Generate a JSON array of Google Sheets ranges based on the user's description.
+
+### FORMAT
+Return a JSON array of range strings. Each range must include the sheet name.
+Format: ["SheetName!CellRange", "SheetName!CellRange", ...]
+
+### RANGE RULES
+- Always include sheet name: Sheet1!A1:D10 (not just A1:D10)
+- Sheet names with spaces must be quoted: 'My Sheet'!A1:B10
+- Column letters are uppercase: A, B, C, ... Z, AA, AB
+- Row numbers start at 1
+- For entire column: Sheet1!A:A
+- For entire row: Sheet1!1:1
+
+### EXAMPLES
+- "all data from Sales and the summary from Reports" -> ["Sales!A1:Z1000", "Reports!A1:D20"]
+- "first 100 rows from Sheet1 and Sheet2" -> ["Sheet1!A1:Z100", "Sheet2!A1:Z100"]
+- "headers from all three sheets" -> ["Sheet1!1:1", "Sheet2!1:1", "Sheet3!1:1"]
+- "column A from Products and Orders" -> ["Products!A:A", "Orders!A:A"]
+
+Return ONLY the JSON array - no explanations, no markdown, no extra text.`,
+        placeholder:
+          'Describe the ranges you want to read (e.g., "all data from Sales and summary from Reports")...',
+        generationType: 'json-object',
+      },
+    },
+    // Batch Update Fields
+    {
+      id: 'batchData',
+      title: 'Data',
+      type: 'long-input',
+      placeholder:
+        'JSON array of {range, values} objects (e.g., [{"range": "Sheet1!A1:B2", "values": [["A","B"],["C","D"]]}])',
+      condition: { field: 'operation', value: 'batch_update' },
+      required: true,
+      wandConfig: {
+        enabled: true,
+        prompt: `Generate a JSON array of data updates for Google Sheets based on the user's description.
+
+### FORMAT
+Return a JSON array where each item has:
+- "range": The target range including sheet name (e.g., "Sheet1!A1:B2")
+- "values": A 2D array of values to write
+
+Format: [{"range": "SheetName!CellRange", "values": [[row1], [row2], ...]}, ...]
+
+### RANGE RULES
+- Always include sheet name: Sheet1!A1:D10
+- Sheet names with spaces must be quoted: 'My Sheet'!A1:B10
+- The range size should match the values array dimensions
+
+### EXAMPLES
+- "set headers to Name, Email, Phone in Sheet1 and Status, Date in Sheet2" ->
+  [{"range": "Sheet1!A1:C1", "values": [["Name", "Email", "Phone"]]}, {"range": "Sheet2!A1:B1", "values": [["Status", "Date"]]}]
+
+- "add totals row in A10 of Sales with formula" ->
+  [{"range": "Sales!A10:B10", "values": [["Total", "=SUM(B1:B9)"]]}]
+
+- "update the first three rows of data in Products" ->
+  [{"range": "Products!A2:C4", "values": [["Widget", 10, 29.99], ["Gadget", 5, 49.99], ["Tool", 20, 9.99]]}]
+
+Return ONLY the JSON array - no explanations, no markdown, no extra text.`,
+        placeholder:
+          'Describe the updates (e.g., "set headers in Sheet1 and add totals in Sheet2")...',
+        generationType: 'json-object',
+      },
+    },
+    // Batch Clear Fields
+    {
+      id: 'ranges',
+      title: 'Ranges to Clear',
+      type: 'long-input',
+      placeholder:
+        'JSON array of ranges to clear (e.g., ["Sheet1!A1:D10", "Sheet2!A1:B5"]). Include sheet name in each range.',
+      condition: { field: 'operation', value: 'batch_clear' },
+      required: true,
+      wandConfig: {
+        enabled: true,
+        prompt: `Generate a JSON array of Google Sheets ranges to clear based on the user's description.
+
+### FORMAT
+Return a JSON array of range strings. Each range must include the sheet name.
+Format: ["SheetName!CellRange", "SheetName!CellRange", ...]
+
+### RANGE RULES
+- Always include sheet name: Sheet1!A1:D10 (not just A1:D10)
+- Sheet names with spaces must be quoted: 'My Sheet'!A1:B10
+- Column letters are uppercase: A, B, C, ... Z, AA, AB
+- Row numbers start at 1
+- For entire column: Sheet1!A:A
+- For entire row: Sheet1!1:1
+- For entire sheet: Sheet1!A:ZZ (or use large range)
+
+### EXAMPLES
+- "clear all data from Sales and Reports" -> ["Sales!A1:ZZ10000", "Reports!A1:ZZ10000"]
+- "clear rows 2-100 from Sheet1 and Sheet2, keep headers" -> ["Sheet1!A2:ZZ100", "Sheet2!A2:ZZ100"]
+- "clear column A from Products and Orders" -> ["Products!A:A", "Orders!A:A"]
+- "clear the summary section in Reports" -> ["Reports!A1:D20"]
+
+Return ONLY the JSON array - no explanations, no markdown, no extra text.`,
+        placeholder:
+          'Describe the ranges to clear (e.g., "clear all data from Sales and Reports, keep headers")...',
+        generationType: 'json-object',
+      },
+    },
+    // Copy Sheet Fields
+    {
+      id: 'sheetId',
+      title: 'Sheet ID',
+      type: 'short-input',
+      placeholder: 'Numeric ID of the sheet to copy (use Get Spreadsheet Info to find IDs)',
+      condition: { field: 'operation', value: 'copy_sheet' },
+      required: true,
+    },
+    {
+      id: 'destinationSpreadsheetId',
+      title: 'Destination Spreadsheet ID',
+      type: 'short-input',
+      placeholder: 'ID of the spreadsheet to copy to',
+      condition: { field: 'operation', value: 'copy_sheet' },
+      required: true,
+    },
+  ],
+  tools: {
+    access: [
+      'google_sheets_read_v2',
+      'google_sheets_write_v2',
+      'google_sheets_update_v2',
+      'google_sheets_append_v2',
+      'google_sheets_clear_v2',
+      'google_sheets_get_spreadsheet_v2',
+      'google_sheets_create_spreadsheet_v2',
+      'google_sheets_batch_get_v2',
+      'google_sheets_batch_update_v2',
+      'google_sheets_batch_clear_v2',
+      'google_sheets_copy_sheet_v2',
+    ],
+    config: {
+      tool: (params) => {
+        switch (params.operation) {
+          case 'read':
+            return 'google_sheets_read_v2'
+          case 'write':
+            return 'google_sheets_write_v2'
+          case 'update':
+            return 'google_sheets_update_v2'
+          case 'append':
+            return 'google_sheets_append_v2'
+          case 'clear':
+            return 'google_sheets_clear_v2'
+          case 'get_info':
+            return 'google_sheets_get_spreadsheet_v2'
+          case 'create':
+            return 'google_sheets_create_spreadsheet_v2'
+          case 'batch_get':
+            return 'google_sheets_batch_get_v2'
+          case 'batch_update':
+            return 'google_sheets_batch_update_v2'
+          case 'batch_clear':
+            return 'google_sheets_batch_clear_v2'
+          case 'copy_sheet':
+            return 'google_sheets_copy_sheet_v2'
+          default:
+            throw new Error(`Invalid Google Sheets V2 operation: ${params.operation}`)
+        }
+      },
+      params: (params) => {
+        const {
+          credential,
+          values,
+          spreadsheetId,
+          manualSpreadsheetId,
+          sheetName,
+          manualSheetName,
+          cellRange,
+          title,
+          sheetTitles,
+          ranges,
+          batchData,
+          sheetId,
+          destinationSpreadsheetId,
+          ...rest
+        } = params
+
+        const operation = params.operation as string
+
+        // Handle create operation
+        if (operation === 'create') {
+          const sheetTitlesArray = sheetTitles
+            ? (sheetTitles as string).split(',').map((s: string) => s.trim())
+            : undefined
+          return {
+            title: (title as string)?.trim(),
+            sheetTitles: sheetTitlesArray,
+            credential,
+          }
+        }
+
+        const effectiveSpreadsheetId = (
+          (spreadsheetId || manualSpreadsheetId || '') as string
+        ).trim()
+
+        if (!effectiveSpreadsheetId) {
+          throw new Error('Spreadsheet ID is required.')
+        }
+
+        // Handle get_info operation
+        if (operation === 'get_info') {
+          return {
+            spreadsheetId: effectiveSpreadsheetId,
+            credential,
+          }
+        }
+
+        // Handle batch_get operation
+        if (operation === 'batch_get') {
+          const parsedRanges = ranges ? JSON.parse(ranges as string) : []
+          return {
+            spreadsheetId: effectiveSpreadsheetId,
+            ranges: parsedRanges,
+            credential,
+          }
+        }
+
+        // Handle batch_update operation
+        if (operation === 'batch_update') {
+          const parsedData = batchData ? JSON.parse(batchData as string) : []
+          return {
+            ...rest,
+            spreadsheetId: effectiveSpreadsheetId,
+            data: parsedData,
+            credential,
+          }
+        }
+
+        // Handle batch_clear operation
+        if (operation === 'batch_clear') {
+          const parsedRanges = ranges ? JSON.parse(ranges as string) : []
+          return {
+            spreadsheetId: effectiveSpreadsheetId,
+            ranges: parsedRanges,
+            credential,
+          }
+        }
+
+        // Handle copy_sheet operation
+        if (operation === 'copy_sheet') {
+          return {
+            sourceSpreadsheetId: effectiveSpreadsheetId,
+            sheetId: Number.parseInt(sheetId as string, 10),
+            destinationSpreadsheetId: (destinationSpreadsheetId as string)?.trim(),
+            credential,
+          }
+        }
+
+        // Handle read/write/update/append/clear operations (require sheet name)
+        const effectiveSheetName = ((sheetName || manualSheetName || '') as string).trim()
+
+        if (!effectiveSheetName) {
+          throw new Error('Sheet name is required. Please select or enter a sheet name.')
+        }
+
+        const parsedValues = values ? JSON.parse(values as string) : undefined
+
+        return {
+          ...rest,
+          spreadsheetId: effectiveSpreadsheetId,
+          sheetName: effectiveSheetName,
+          cellRange: cellRange ? (cellRange as string).trim() : undefined,
+          values: parsedValues,
+          credential,
+        }
+      },
+    },
+  },
+  inputs: {
+    operation: { type: 'string', description: 'Operation to perform' },
+    credential: { type: 'string', description: 'Google Sheets access token' },
+    spreadsheetId: { type: 'string', description: 'Spreadsheet identifier' },
+    manualSpreadsheetId: { type: 'string', description: 'Manual spreadsheet identifier' },
+    sheetName: { type: 'string', description: 'Name of the sheet/tab' },
+    manualSheetName: { type: 'string', description: 'Manual sheet name entry' },
+    cellRange: { type: 'string', description: 'Cell range (e.g., A1:D10)' },
+    values: { type: 'string', description: 'Cell values data' },
+    valueInputOption: { type: 'string', description: 'Value input option' },
+    insertDataOption: { type: 'string', description: 'Data insertion option' },
+    title: { type: 'string', description: 'Title for new spreadsheet' },
+    sheetTitles: { type: 'string', description: 'Comma-separated sheet names for new spreadsheet' },
+    ranges: { type: 'string', description: 'JSON array of ranges for batch operations' },
+    batchData: { type: 'string', description: 'JSON array of data for batch update' },
+    sheetId: { type: 'string', description: 'Numeric sheet ID for copy operation' },
+    destinationSpreadsheetId: {
+      type: 'string',
+      description: 'Destination spreadsheet ID for copy',
+    },
+  },
+  outputs: {
+    // Read outputs
+    sheetName: {
+      type: 'string',
+      description: 'Name of the sheet',
+      condition: { field: 'operation', value: ['read', 'clear'] },
+    },
+    range: {
+      type: 'string',
+      description: 'Range that was read',
+      condition: { field: 'operation', value: 'read' },
+    },
+    values: {
+      type: 'json',
+      description: 'Cell values as 2D array',
+      condition: { field: 'operation', value: 'read' },
+    },
+    // Write/Update/Append outputs
+    updatedRange: {
+      type: 'string',
+      description: 'Updated range',
+      condition: { field: 'operation', value: ['write', 'update', 'append'] },
+    },
+    updatedRows: {
+      type: 'number',
+      description: 'Updated rows count',
+      condition: { field: 'operation', value: ['write', 'update', 'append'] },
+    },
+    updatedColumns: {
+      type: 'number',
+      description: 'Updated columns count',
+      condition: { field: 'operation', value: ['write', 'update', 'append'] },
+    },
+    updatedCells: {
+      type: 'number',
+      description: 'Updated cells count',
+      condition: { field: 'operation', value: ['write', 'update', 'append'] },
+    },
+    tableRange: {
+      type: 'string',
+      description: 'Table range',
+      condition: { field: 'operation', value: 'append' },
+    },
+    // Clear outputs
+    clearedRange: {
+      type: 'string',
+      description: 'Range that was cleared',
+      condition: { field: 'operation', value: 'clear' },
+    },
+    // Get Info / Create / Batch outputs
+    spreadsheetId: {
+      type: 'string',
+      description: 'Spreadsheet ID',
+      condition: {
+        field: 'operation',
+        value: ['get_info', 'create', 'batch_get', 'batch_update', 'batch_clear'],
+      },
+    },
+    title: {
+      type: 'string',
+      description: 'Spreadsheet title (or copied sheet title for copy_sheet)',
+      condition: { field: 'operation', value: ['get_info', 'create', 'copy_sheet'] },
+    },
+    sheets: {
+      type: 'json',
+      description: 'List of sheets in the spreadsheet',
+      condition: { field: 'operation', value: ['get_info', 'create'] },
+    },
+    locale: {
+      type: 'string',
+      description: 'Spreadsheet locale',
+      condition: { field: 'operation', value: 'get_info' },
+    },
+    timeZone: {
+      type: 'string',
+      description: 'Spreadsheet time zone',
+      condition: { field: 'operation', value: 'get_info' },
+    },
+    spreadsheetUrl: {
+      type: 'string',
+      description: 'Spreadsheet URL',
+      condition: { field: 'operation', value: ['get_info', 'create'] },
+    },
+    // Batch Get outputs
+    valueRanges: {
+      type: 'json',
+      description: 'Array of value ranges read from the spreadsheet',
+      condition: { field: 'operation', value: 'batch_get' },
+    },
+    // Batch Update outputs
+    totalUpdatedRows: {
+      type: 'number',
+      description: 'Total rows updated',
+      condition: { field: 'operation', value: 'batch_update' },
+    },
+    totalUpdatedColumns: {
+      type: 'number',
+      description: 'Total columns updated',
+      condition: { field: 'operation', value: 'batch_update' },
+    },
+    totalUpdatedCells: {
+      type: 'number',
+      description: 'Total cells updated',
+      condition: { field: 'operation', value: 'batch_update' },
+    },
+    totalUpdatedSheets: {
+      type: 'number',
+      description: 'Total sheets updated',
+      condition: { field: 'operation', value: 'batch_update' },
+    },
+    responses: {
+      type: 'json',
+      description: 'Array of update responses for each range',
+      condition: { field: 'operation', value: 'batch_update' },
+    },
+    // Batch Clear outputs
+    clearedRanges: {
+      type: 'json',
+      description: 'Array of ranges that were cleared',
+      condition: { field: 'operation', value: 'batch_clear' },
+    },
+    // Copy Sheet outputs
+    sheetId: {
+      type: 'number',
+      description: 'ID of the copied sheet in the destination',
+      condition: { field: 'operation', value: 'copy_sheet' },
+    },
+    index: {
+      type: 'number',
+      description: 'Position/index of the copied sheet',
+      condition: { field: 'operation', value: 'copy_sheet' },
+    },
+    sheetType: {
+      type: 'string',
+      description: 'Type of the sheet (GRID, CHART, etc.)',
+      condition: { field: 'operation', value: 'copy_sheet' },
+    },
+    destinationSpreadsheetId: {
+      type: 'string',
+      description: 'ID of the destination spreadsheet',
+      condition: { field: 'operation', value: 'copy_sheet' },
+    },
+    destinationSpreadsheetUrl: {
+      type: 'string',
+      description: 'URL of the destination spreadsheet',
+      condition: { field: 'operation', value: 'copy_sheet' },
+    },
+    // Common metadata
+    metadata: {
+      type: 'json',
+      description: 'Spreadsheet metadata including ID and URL',
+      condition: {
+        field: 'operation',
+        value: [
+          'read',
+          'write',
+          'update',
+          'append',
+          'clear',
+          'batch_get',
+          'batch_update',
+          'batch_clear',
+        ],
+      },
+    },
+  },
+}
diff --git a/apps/sim/blocks/blocks/google_sheets_v2.ts b/apps/sim/blocks/blocks/google_sheets_v2.ts
deleted file mode 100644
index 798b9ce221..0000000000
--- a/apps/sim/blocks/blocks/google_sheets_v2.ts
+++ /dev/null
@@ -1,360 +0,0 @@
-import { GoogleSheetsIcon } from '@/components/icons'
-import type { BlockConfig } from '@/blocks/types'
-import { AuthMode } from '@/blocks/types'
-import type { GoogleSheetsV2Response } from '@/tools/google_sheets/types'
-
-export const GoogleSheetsV2Block: BlockConfig<GoogleSheetsV2Response> = {
-  type: 'google_sheets_v2',
-  name: 'Google Sheets',
-  description: 'Read, write, and update data with sheet selection',
-  authMode: AuthMode.OAuth,
-  hideFromToolbar: false,
-  longDescription:
-    'Integrate Google Sheets into the workflow with explicit sheet selection. Can read, write, append, and update data in specific sheets.',
-  docsLink: 'https://docs.sim.ai/tools/google_sheets',
-  category: 'tools',
-  bgColor: '#E0E0E0',
-  icon: GoogleSheetsIcon,
-  subBlocks: [
-    // Operation selector
-    {
-      id: 'operation',
-      title: 'Operation',
-      type: 'dropdown',
-      options: [
-        { label: 'Read Data', id: 'read' },
-        { label: 'Write Data', id: 'write' },
-        { label: 'Update Data', id: 'update' },
-        { label: 'Append Data', id: 'append' },
-      ],
-      value: () => 'read',
-    },
-    // Google Sheets Credentials
-    {
-      id: 'credential',
-      title: 'Google Account',
-      type: 'oauth-input',
-      required: true,
-      serviceId: 'google-sheets',
-      requiredScopes: [
-        'https://www.googleapis.com/auth/drive.file',
-        'https://www.googleapis.com/auth/drive',
-      ],
-      placeholder: 'Select Google account',
-    },
-    // Spreadsheet Selector (basic mode)
-    {
-      id: 'spreadsheetId',
-      title: 'Select Spreadsheet',
-      type: 'file-selector',
-      canonicalParamId: 'spreadsheetId',
-      serviceId: 'google-sheets',
-      requiredScopes: [
-        'https://www.googleapis.com/auth/drive.file',
-        'https://www.googleapis.com/auth/drive',
-      ],
-      mimeType: 'application/vnd.google-apps.spreadsheet',
-      placeholder: 'Select a spreadsheet',
-      dependsOn: ['credential'],
-      mode: 'basic',
-    },
-    // Manual Spreadsheet ID (advanced mode)
-    {
-      id: 'manualSpreadsheetId',
-      title: 'Spreadsheet ID',
-      type: 'short-input',
-      canonicalParamId: 'spreadsheetId',
-      placeholder: 'ID of the spreadsheet (from URL)',
-      dependsOn: ['credential'],
-      mode: 'advanced',
-    },
-    // Sheet Name Selector (basic mode)
-    {
-      id: 'sheetName',
-      title: 'Sheet (Tab)',
-      type: 'sheet-selector',
-      canonicalParamId: 'sheetName',
-      serviceId: 'google-sheets',
-      placeholder: 'Select a sheet',
-      required: true,
-      dependsOn: { all: ['credential'], any: ['spreadsheetId', 'manualSpreadsheetId'] },
-      mode: 'basic',
-    },
-    // Manual Sheet Name (advanced mode)
-    {
-      id: 'manualSheetName',
-      title: 'Sheet Name',
-      type: 'short-input',
-      canonicalParamId: 'sheetName',
-      placeholder: 'Name of the sheet/tab (e.g., Sheet1)',
-      required: true,
-      dependsOn: ['credential'],
-      mode: 'advanced',
-    },
-    // Cell Range (optional for read/write/update)
-    {
-      id: 'cellRange',
-      title: 'Cell Range',
-      type: 'short-input',
-      placeholder: 'Cell range (e.g., A1:D10). Defaults to A1 for write.',
-      condition: { field: 'operation', value: ['read', 'write', 'update'] },
-      wandConfig: {
-        enabled: true,
-        prompt: `Generate a valid cell range based on the user's description.
-
-### VALID FORMATS
-- Single cell: A1
-- Range: A1:D10
-- Entire column: A:A
-- Entire row: 1:1
-- Multiple columns: A:D
-- Multiple rows: 1:10
-
-### RANGE RULES
-- Column letters are uppercase: A, B, C, ... Z, AA, AB, etc.
-- Row numbers start at 1 (not 0)
-
-### EXAMPLES
-- "first 100 rows" -> A1:Z100
-- "cells A1 through C50" -> A1:C50
-- "column A" -> A:A
-- "just the headers row" -> 1:1
-- "first cell" -> A1
-
-Return ONLY the range string - no sheet name, no explanations, no quotes.`,
-        placeholder: 'Describe the range (e.g., "first 50 rows" or "column A")...',
-      },
-    },
-    // Write-specific Fields
-    {
-      id: 'values',
-      title: 'Values',
-      type: 'long-input',
-      placeholder:
-        'Enter values as JSON array of arrays (e.g., [["A1", "B1"], ["A2", "B2"]]) or an array of objects (e.g., [{"name":"John", "age":30}])',
-      condition: { field: 'operation', value: 'write' },
-      required: true,
-      wandConfig: {
-        enabled: true,
-        prompt: `Generate Google Sheets data as a JSON array based on the user's description.
-
-Format options:
-1. Array of arrays: [["Header1", "Header2"], ["Value1", "Value2"]]
-2. Array of objects: [{"column1": "value1", "column2": "value2"}]
-
-Examples:
-- "sales data with product and revenue columns" -> [["Product", "Revenue"], ["Widget A", 1500], ["Widget B", 2300]]
-- "list of employees with name and email" -> [{"name": "John Doe", "email": "john@example.com"}, {"name": "Jane Smith", "email": "jane@example.com"}]
-
-Return ONLY the JSON array - no explanations, no markdown, no extra text.`,
-        placeholder: 'Describe the data you want to write...',
-        generationType: 'json-object',
-      },
-    },
-    {
-      id: 'valueInputOption',
-      title: 'Value Input Option',
-      type: 'dropdown',
-      options: [
-        { label: 'User Entered (Parse formulas)', id: 'USER_ENTERED' },
-        { label: "Raw (Don't parse formulas)", id: 'RAW' },
-      ],
-      condition: { field: 'operation', value: 'write' },
-    },
-    // Update-specific Fields
-    {
-      id: 'values',
-      title: 'Values',
-      type: 'long-input',
-      placeholder:
-        'Enter values as JSON array of arrays (e.g., [["A1", "B1"], ["A2", "B2"]]) or an array of objects',
-      condition: { field: 'operation', value: 'update' },
-      required: true,
-      wandConfig: {
-        enabled: true,
-        prompt: `Generate Google Sheets data as a JSON array based on the user's description.
-
-Format options:
-1. Array of arrays: [["Header1", "Header2"], ["Value1", "Value2"]]
-2. Array of objects: [{"column1": "value1", "column2": "value2"}]
-
-Examples:
-- "update with new prices" -> [["Product", "Price"], ["Widget A", 29.99], ["Widget B", 49.99]]
-- "quarterly targets" -> [{"Q1": 10000, "Q2": 12000, "Q3": 15000, "Q4": 18000}]
-
-Return ONLY the JSON array - no explanations, no markdown, no extra text.`,
-        placeholder: 'Describe the data you want to update...',
-        generationType: 'json-object',
-      },
-    },
-    {
-      id: 'valueInputOption',
-      title: 'Value Input Option',
-      type: 'dropdown',
-      options: [
-        { label: 'User Entered (Parse formulas)', id: 'USER_ENTERED' },
-        { label: "Raw (Don't parse formulas)", id: 'RAW' },
-      ],
-      condition: { field: 'operation', value: 'update' },
-    },
-    // Append-specific Fields
-    {
-      id: 'values',
-      title: 'Values',
-      type: 'long-input',
-      placeholder:
-        'Enter values as JSON array of arrays (e.g., [["A1", "B1"], ["A2", "B2"]]) or an array of objects',
-      condition: { field: 'operation', value: 'append' },
-      required: true,
-      wandConfig: {
-        enabled: true,
-        prompt: `Generate Google Sheets data as a JSON array based on the user's description.
-
-Format options:
-1. Array of arrays: [["Value1", "Value2"], ["Value3", "Value4"]]
-2. Array of objects: [{"column1": "value1", "column2": "value2"}]
-
-Examples:
-- "add new sales record" -> [["2024-01-15", "Widget Pro", 5, 249.99]]
-- "append customer info" -> [{"name": "Acme Corp", "contact": "John Smith", "status": "Active"}]
-
-Return ONLY the JSON array - no explanations, no markdown, no extra text.`,
-        placeholder: 'Describe the data you want to append...',
-        generationType: 'json-object',
-      },
-    },
-    {
-      id: 'valueInputOption',
-      title: 'Value Input Option',
-      type: 'dropdown',
-      options: [
-        { label: 'User Entered (Parse formulas)', id: 'USER_ENTERED' },
-        { label: "Raw (Don't parse formulas)", id: 'RAW' },
-      ],
-      condition: { field: 'operation', value: 'append' },
-    },
-    {
-      id: 'insertDataOption',
-      title: 'Insert Data Option',
-      type: 'dropdown',
-      options: [
-        { label: 'Insert Rows (Add new rows)', id: 'INSERT_ROWS' },
-        { label: 'Overwrite (Add to existing data)', id: 'OVERWRITE' },
-      ],
-      condition: { field: 'operation', value: 'append' },
-    },
-  ],
-  tools: {
-    access: [
-      'google_sheets_read_v2',
-      'google_sheets_write_v2',
-      'google_sheets_update_v2',
-      'google_sheets_append_v2',
-    ],
-    config: {
-      tool: (params) => {
-        switch (params.operation) {
-          case 'read':
-            return 'google_sheets_read_v2'
-          case 'write':
-            return 'google_sheets_write_v2'
-          case 'update':
-            return 'google_sheets_update_v2'
-          case 'append':
-            return 'google_sheets_append_v2'
-          default:
-            throw new Error(`Invalid Google Sheets V2 operation: ${params.operation}`)
-        }
-      },
-      params: (params) => {
-        const {
-          credential,
-          values,
-          spreadsheetId,
-          manualSpreadsheetId,
-          sheetName,
-          manualSheetName,
-          cellRange,
-          ...rest
-        } = params
-
-        const parsedValues = values ? JSON.parse(values as string) : undefined
-
-        const effectiveSpreadsheetId = (spreadsheetId || manualSpreadsheetId || '').trim()
-        const effectiveSheetName = ((sheetName || manualSheetName || '') as string).trim()
-
-        if (!effectiveSpreadsheetId) {
-          throw new Error('Spreadsheet ID is required.')
-        }
-
-        if (!effectiveSheetName) {
-          throw new Error('Sheet name is required. Please select or enter a sheet name.')
-        }
-
-        return {
-          ...rest,
-          spreadsheetId: effectiveSpreadsheetId,
-          sheetName: effectiveSheetName,
-          cellRange: cellRange ? (cellRange as string).trim() : undefined,
-          values: parsedValues,
-          credential,
-        }
-      },
-    },
-  },
-  inputs: {
-    operation: { type: 'string', description: 'Operation to perform' },
-    credential: { type: 'string', description: 'Google Sheets access token' },
-    spreadsheetId: { type: 'string', description: 'Spreadsheet identifier' },
-    manualSpreadsheetId: { type: 'string', description: 'Manual spreadsheet identifier' },
-    sheetName: { type: 'string', description: 'Name of the sheet/tab' },
-    manualSheetName: { type: 'string', description: 'Manual sheet name entry' },
-    cellRange: { type: 'string', description: 'Cell range (e.g., A1:D10)' },
-    values: { type: 'string', description: 'Cell values data' },
-    valueInputOption: { type: 'string', description: 'Value input option' },
-    insertDataOption: { type: 'string', description: 'Data insertion option' },
-  },
-  outputs: {
-    sheetName: {
-      type: 'string',
-      description: 'Name of the sheet',
-      condition: { field: 'operation', value: 'read' },
-    },
-    range: {
-      type: 'string',
-      description: 'Range that was read',
-      condition: { field: 'operation', value: 'read' },
-    },
-    values: {
-      type: 'json',
-      description: 'Cell values as 2D array',
-      condition: { field: 'operation', value: 'read' },
-    },
-    updatedRange: {
-      type: 'string',
-      description: 'Updated range',
-      condition: { field: 'operation', value: ['write', 'update', 'append'] },
-    },
-    updatedRows: {
-      type: 'number',
-      description: 'Updated rows count',
-      condition: { field: 'operation', value: ['write', 'update', 'append'] },
-    },
-    updatedColumns: {
-      type: 'number',
-      description: 'Updated columns count',
-      condition: { field: 'operation', value: ['write', 'update', 'append'] },
-    },
-    updatedCells: {
-      type: 'number',
-      description: 'Updated cells count',
-      condition: { field: 'operation', value: ['write', 'update', 'append'] },
-    },
-    tableRange: {
-      type: 'string',
-      description: 'Table range',
-      condition: { field: 'operation', value: 'append' },
-    },
-    metadata: { type: 'json', description: 'Spreadsheet metadata including ID and URL' },
-  },
-}
diff --git a/apps/sim/blocks/blocks/google_slides.ts b/apps/sim/blocks/blocks/google_slides.ts
index bbab20654d..016d04a74d 100644
--- a/apps/sim/blocks/blocks/google_slides.ts
+++ b/apps/sim/blocks/blocks/google_slides.ts
@@ -9,7 +9,7 @@ export const GoogleSlidesBlock: BlockConfig<GoogleSlidesResponse> = {
   description: 'Read, write, and create presentations',
   authMode: AuthMode.OAuth,
   longDescription:
-    'Integrate Google Slides into the workflow. Can read, write, create presentations, replace text, add slides, add images, and get thumbnails.',
+    'Integrate Google Slides into the workflow. Can read, write, create presentations, replace text, add slides, add images, get thumbnails, get page details, delete objects, duplicate objects, reorder slides, create tables, create shapes, and insert text.',
   docsLink: 'https://docs.sim.ai/tools/google_slides',
   category: 'tools',
   bgColor: '#E0E0E0',
@@ -28,6 +28,13 @@ export const GoogleSlidesBlock: BlockConfig<GoogleSlidesResponse> = {
         { label: 'Add Slide', id: 'add_slide' },
         { label: 'Add Image', id: 'add_image' },
         { label: 'Get Thumbnail', id: 'get_thumbnail' },
+        { label: 'Get Page', id: 'get_page' },
+        { label: 'Delete Object', id: 'delete_object' },
+        { label: 'Duplicate Object', id: 'duplicate_object' },
+        { label: 'Reorder Slides', id: 'reorder_slides' },
+        { label: 'Create Table', id: 'create_table' },
+        { label: 'Create Shape', id: 'create_shape' },
+        { label: 'Insert Text', id: 'insert_text' },
       ],
       value: () => 'read',
     },
@@ -58,7 +65,21 @@ export const GoogleSlidesBlock: BlockConfig<GoogleSlidesResponse> = {
       mode: 'basic',
       condition: {
         field: 'operation',
-        value: ['read', 'write', 'replace_all_text', 'add_slide', 'add_image', 'get_thumbnail'],
+        value: [
+          'read',
+          'write',
+          'replace_all_text',
+          'add_slide',
+          'add_image',
+          'get_thumbnail',
+          'get_page',
+          'delete_object',
+          'duplicate_object',
+          'reorder_slides',
+          'create_table',
+          'create_shape',
+          'insert_text',
+        ],
       },
     },
     // Manual presentation ID input (advanced mode)
@@ -72,7 +93,21 @@ export const GoogleSlidesBlock: BlockConfig<GoogleSlidesResponse> = {
       mode: 'advanced',
       condition: {
         field: 'operation',
-        value: ['read', 'write', 'replace_all_text', 'add_slide', 'add_image', 'get_thumbnail'],
+        value: [
+          'read',
+          'write',
+          'replace_all_text',
+          'add_slide',
+          'add_image',
+          'get_thumbnail',
+          'get_page',
+          'delete_object',
+          'duplicate_object',
+          'reorder_slides',
+          'create_table',
+          'create_shape',
+          'insert_text',
+        ],
       },
     },
 
@@ -348,6 +383,213 @@ Return ONLY the JSON array - no explanations, no markdown, no extra text.`,
       condition: { field: 'operation', value: 'get_thumbnail' },
       value: () => 'PNG',
     },
+
+    // ========== Get Page Operation Fields ==========
+    {
+      id: 'getPageObjectId',
+      title: 'Page/Slide ID',
+      type: 'short-input',
+      placeholder: 'Object ID of the slide/page to retrieve',
+      condition: { field: 'operation', value: 'get_page' },
+      required: true,
+    },
+
+    // ========== Delete Object Operation Fields ==========
+    {
+      id: 'deleteObjectId',
+      title: 'Object ID',
+      type: 'short-input',
+      placeholder: 'Object ID of the element or slide to delete',
+      condition: { field: 'operation', value: 'delete_object' },
+      required: true,
+    },
+
+    // ========== Duplicate Object Operation Fields ==========
+    {
+      id: 'duplicateObjectId',
+      title: 'Object ID',
+      type: 'short-input',
+      placeholder: 'Object ID of the element or slide to duplicate',
+      condition: { field: 'operation', value: 'duplicate_object' },
+      required: true,
+    },
+    {
+      id: 'duplicateObjectIds',
+      title: 'Object ID Mappings',
+      type: 'long-input',
+      placeholder: 'JSON object: {"sourceId1":"newId1","sourceId2":"newId2"}',
+      condition: { field: 'operation', value: 'duplicate_object' },
+      mode: 'advanced',
+    },
+
+    // ========== Reorder Slides Operation Fields ==========
+    {
+      id: 'reorderSlideIds',
+      title: 'Slide IDs',
+      type: 'short-input',
+      placeholder: 'Comma-separated slide object IDs to move',
+      condition: { field: 'operation', value: 'reorder_slides' },
+      required: true,
+    },
+    {
+      id: 'reorderInsertionIndex',
+      title: 'New Position',
+      type: 'short-input',
+      placeholder: 'Zero-based index where slides should be moved',
+      condition: { field: 'operation', value: 'reorder_slides' },
+      required: true,
+    },
+
+    // ========== Create Table Operation Fields ==========
+    {
+      id: 'tablePageObjectId',
+      title: 'Slide ID',
+      type: 'short-input',
+      placeholder: 'Object ID of the slide to add the table to',
+      condition: { field: 'operation', value: 'create_table' },
+      required: true,
+    },
+    {
+      id: 'tableRows',
+      title: 'Rows',
+      type: 'short-input',
+      placeholder: 'Number of rows (minimum 1)',
+      condition: { field: 'operation', value: 'create_table' },
+      required: true,
+    },
+    {
+      id: 'tableColumns',
+      title: 'Columns',
+      type: 'short-input',
+      placeholder: 'Number of columns (minimum 1)',
+      condition: { field: 'operation', value: 'create_table' },
+      required: true,
+    },
+    {
+      id: 'tableWidth',
+      title: 'Width (points)',
+      type: 'short-input',
+      placeholder: 'Table width in points (default: 400)',
+      condition: { field: 'operation', value: 'create_table' },
+    },
+    {
+      id: 'tableHeight',
+      title: 'Height (points)',
+      type: 'short-input',
+      placeholder: 'Table height in points (default: 200)',
+      condition: { field: 'operation', value: 'create_table' },
+    },
+    {
+      id: 'tablePositionX',
+      title: 'X Position (points)',
+      type: 'short-input',
+      placeholder: 'X position from left (default: 100)',
+      condition: { field: 'operation', value: 'create_table' },
+    },
+    {
+      id: 'tablePositionY',
+      title: 'Y Position (points)',
+      type: 'short-input',
+      placeholder: 'Y position from top (default: 100)',
+      condition: { field: 'operation', value: 'create_table' },
+    },
+
+    // ========== Create Shape Operation Fields ==========
+    {
+      id: 'shapePageObjectId',
+      title: 'Slide ID',
+      type: 'short-input',
+      placeholder: 'Object ID of the slide to add the shape to',
+      condition: { field: 'operation', value: 'create_shape' },
+      required: true,
+    },
+    {
+      id: 'shapeType',
+      title: 'Shape Type',
+      type: 'dropdown',
+      options: [
+        { label: 'Text Box', id: 'TEXT_BOX' },
+        { label: 'Rectangle', id: 'RECTANGLE' },
+        { label: 'Rounded Rectangle', id: 'ROUND_RECTANGLE' },
+        { label: 'Ellipse', id: 'ELLIPSE' },
+        { label: 'Triangle', id: 'TRIANGLE' },
+        { label: 'Diamond', id: 'DIAMOND' },
+        { label: 'Star (5 points)', id: 'STAR_5' },
+        { label: 'Arrow (Right)', id: 'RIGHT_ARROW' },
+        { label: 'Arrow (Left)', id: 'LEFT_ARROW' },
+        { label: 'Arrow (Up)', id: 'UP_ARROW' },
+        { label: 'Arrow (Down)', id: 'DOWN_ARROW' },
+        { label: 'Heart', id: 'HEART' },
+        { label: 'Cloud', id: 'CLOUD' },
+        { label: 'Lightning Bolt', id: 'LIGHTNING_BOLT' },
+      ],
+      condition: { field: 'operation', value: 'create_shape' },
+      value: () => 'RECTANGLE',
+    },
+    {
+      id: 'shapeWidth',
+      title: 'Width (points)',
+      type: 'short-input',
+      placeholder: 'Shape width in points (default: 200)',
+      condition: { field: 'operation', value: 'create_shape' },
+    },
+    {
+      id: 'shapeHeight',
+      title: 'Height (points)',
+      type: 'short-input',
+      placeholder: 'Shape height in points (default: 100)',
+      condition: { field: 'operation', value: 'create_shape' },
+    },
+    {
+      id: 'shapePositionX',
+      title: 'X Position (points)',
+      type: 'short-input',
+      placeholder: 'X position from left (default: 100)',
+      condition: { field: 'operation', value: 'create_shape' },
+    },
+    {
+      id: 'shapePositionY',
+      title: 'Y Position (points)',
+      type: 'short-input',
+      placeholder: 'Y position from top (default: 100)',
+      condition: { field: 'operation', value: 'create_shape' },
+    },
+
+    // ========== Insert Text Operation Fields ==========
+    {
+      id: 'insertTextObjectId',
+      title: 'Object ID',
+      type: 'short-input',
+      placeholder: 'Object ID of the shape or table cell',
+      condition: { field: 'operation', value: 'insert_text' },
+      required: true,
+    },
+    {
+      id: 'insertTextContent',
+      title: 'Text',
+      type: 'long-input',
+      placeholder: 'Text to insert',
+      condition: { field: 'operation', value: 'insert_text' },
+      required: true,
+      wandConfig: {
+        enabled: true,
+        prompt: `Generate text content for a presentation slide based on the user's description.
+The text should be:
+- Clear and concise
+- Professional and appropriate for presentations
+- Well-structured with bullet points if listing items
+
+Return ONLY the text content - no explanations, no markdown formatting markers, no extra text.`,
+        placeholder: 'Describe the text you want to insert...',
+      },
+    },
+    {
+      id: 'insertTextIndex',
+      title: 'Insertion Index',
+      type: 'short-input',
+      placeholder: 'Zero-based index (default: 0)',
+      condition: { field: 'operation', value: 'insert_text' },
+    },
   ],
   tools: {
     access: [
@@ -358,6 +600,13 @@ Return ONLY the JSON array - no explanations, no markdown, no extra text.`,
       'google_slides_add_slide',
       'google_slides_add_image',
       'google_slides_get_thumbnail',
+      'google_slides_get_page',
+      'google_slides_delete_object',
+      'google_slides_duplicate_object',
+      'google_slides_update_slides_position',
+      'google_slides_create_table',
+      'google_slides_create_shape',
+      'google_slides_insert_text',
     ],
     config: {
       tool: (params) => {
@@ -376,6 +625,20 @@ Return ONLY the JSON array - no explanations, no markdown, no extra text.`,
             return 'google_slides_add_image'
           case 'get_thumbnail':
             return 'google_slides_get_thumbnail'
+          case 'get_page':
+            return 'google_slides_get_page'
+          case 'delete_object':
+            return 'google_slides_delete_object'
+          case 'duplicate_object':
+            return 'google_slides_duplicate_object'
+          case 'reorder_slides':
+            return 'google_slides_update_slides_position'
+          case 'create_table':
+            return 'google_slides_create_table'
+          case 'create_shape':
+            return 'google_slides_create_shape'
+          case 'insert_text':
+            return 'google_slides_insert_text'
           default:
             throw new Error(`Invalid Google Slides operation: ${params.operation}`)
         }
@@ -439,6 +702,82 @@ Return ONLY the JSON array - no explanations, no markdown, no extra text.`,
           result.pageObjectId = thumbnailPageId
         }
 
+        // Get Page operation
+        if (params.operation === 'get_page') {
+          result.pageObjectId = params.getPageObjectId
+        }
+
+        // Delete Object operation
+        if (params.operation === 'delete_object') {
+          result.objectId = params.deleteObjectId
+        }
+
+        // Duplicate Object operation
+        if (params.operation === 'duplicate_object') {
+          result.objectId = params.duplicateObjectId
+          if (params.duplicateObjectIds) {
+            result.objectIds = params.duplicateObjectIds
+          }
+        }
+
+        // Reorder Slides operation
+        if (params.operation === 'reorder_slides') {
+          result.slideObjectIds = params.reorderSlideIds
+          if (params.reorderInsertionIndex) {
+            result.insertionIndex = Number.parseInt(params.reorderInsertionIndex as string, 10)
+          }
+        }
+
+        // Create Table operation
+        if (params.operation === 'create_table') {
+          result.pageObjectId = params.tablePageObjectId
+          if (params.tableRows) {
+            result.rows = Number.parseInt(params.tableRows as string, 10)
+          }
+          if (params.tableColumns) {
+            result.columns = Number.parseInt(params.tableColumns as string, 10)
+          }
+          if (params.tableWidth) {
+            result.width = Number.parseInt(params.tableWidth as string, 10)
+          }
+          if (params.tableHeight) {
+            result.height = Number.parseInt(params.tableHeight as string, 10)
+          }
+          if (params.tablePositionX) {
+            result.positionX = Number.parseInt(params.tablePositionX as string, 10)
+          }
+          if (params.tablePositionY) {
+            result.positionY = Number.parseInt(params.tablePositionY as string, 10)
+          }
+        }
+
+        // Create Shape operation
+        if (params.operation === 'create_shape') {
+          result.pageObjectId = params.shapePageObjectId
+          result.shapeType = params.shapeType
+          if (params.shapeWidth) {
+            result.width = Number.parseInt(params.shapeWidth as string, 10)
+          }
+          if (params.shapeHeight) {
+            result.height = Number.parseInt(params.shapeHeight as string, 10)
+          }
+          if (params.shapePositionX) {
+            result.positionX = Number.parseInt(params.shapePositionX as string, 10)
+          }
+          if (params.shapePositionY) {
+            result.positionY = Number.parseInt(params.shapePositionY as string, 10)
+          }
+        }
+
+        // Insert Text operation
+        if (params.operation === 'insert_text') {
+          result.objectId = params.insertTextObjectId
+          result.text = params.insertTextContent
+          if (params.insertTextIndex) {
+            result.insertionIndex = Number.parseInt(params.insertTextIndex as string, 10)
+          }
+        }
+
         return result
       },
     },
@@ -479,6 +818,35 @@ Return ONLY the JSON array - no explanations, no markdown, no extra text.`,
     thumbnailPageId: { type: 'string', description: 'Slide object ID for thumbnail' },
     thumbnailSize: { type: 'string', description: 'Thumbnail size' },
     mimeType: { type: 'string', description: 'Image format (PNG or GIF)' },
+    // Get page operation
+    getPageObjectId: { type: 'string', description: 'Page/slide object ID to retrieve' },
+    // Delete object operation
+    deleteObjectId: { type: 'string', description: 'Object ID to delete' },
+    // Duplicate object operation
+    duplicateObjectId: { type: 'string', description: 'Object ID to duplicate' },
+    duplicateObjectIds: { type: 'string', description: 'JSON object ID mappings' },
+    // Reorder slides operation
+    reorderSlideIds: { type: 'string', description: 'Comma-separated slide IDs to move' },
+    reorderInsertionIndex: { type: 'number', description: 'New position for slides' },
+    // Create table operation
+    tablePageObjectId: { type: 'string', description: 'Slide ID for table' },
+    tableRows: { type: 'number', description: 'Number of rows' },
+    tableColumns: { type: 'number', description: 'Number of columns' },
+    tableWidth: { type: 'number', description: 'Table width in points' },
+    tableHeight: { type: 'number', description: 'Table height in points' },
+    tablePositionX: { type: 'number', description: 'Table X position in points' },
+    tablePositionY: { type: 'number', description: 'Table Y position in points' },
+    // Create shape operation
+    shapePageObjectId: { type: 'string', description: 'Slide ID for shape' },
+    shapeType: { type: 'string', description: 'Shape type' },
+    shapeWidth: { type: 'number', description: 'Shape width in points' },
+    shapeHeight: { type: 'number', description: 'Shape height in points' },
+    shapePositionX: { type: 'number', description: 'Shape X position in points' },
+    shapePositionY: { type: 'number', description: 'Shape Y position in points' },
+    // Insert text operation
+    insertTextObjectId: { type: 'string', description: 'Object ID for text insertion' },
+    insertTextContent: { type: 'string', description: 'Text to insert' },
+    insertTextIndex: { type: 'number', description: 'Insertion index' },
   },
   outputs: {
     // Read operation
@@ -496,5 +864,26 @@ Return ONLY the JSON array - no explanations, no markdown, no extra text.`,
     contentUrl: { type: 'string', description: 'URL to the thumbnail image' },
     width: { type: 'number', description: 'Thumbnail width in pixels' },
     height: { type: 'number', description: 'Thumbnail height in pixels' },
+    // Get page operation
+    objectId: { type: 'string', description: 'Page object ID' },
+    pageType: { type: 'string', description: 'Page type (SLIDE, MASTER, etc.)' },
+    pageElements: { type: 'json', description: 'Page elements array' },
+    slideProperties: { type: 'json', description: 'Slide-specific properties' },
+    // Delete object operation
+    deleted: { type: 'boolean', description: 'Whether object was deleted' },
+    // Duplicate object operation
+    duplicatedObjectId: { type: 'string', description: 'Object ID of the duplicate' },
+    // Reorder slides operation
+    moved: { type: 'boolean', description: 'Whether slides were moved' },
+    slideObjectIds: { type: 'json', description: 'Slide IDs that were moved' },
+    // Create table operation
+    tableId: { type: 'string', description: 'Object ID of newly created table' },
+    rows: { type: 'number', description: 'Number of rows created' },
+    columns: { type: 'number', description: 'Number of columns created' },
+    // Create shape operation
+    shapeId: { type: 'string', description: 'Object ID of newly created shape' },
+    // Insert text operation
+    inserted: { type: 'boolean', description: 'Whether text was inserted' },
+    text: { type: 'string', description: 'Text that was inserted' },
   },
 }
diff --git a/apps/sim/blocks/blocks/linear.ts b/apps/sim/blocks/blocks/linear.ts
index c31ebfd8d6..f576829325 100644
--- a/apps/sim/blocks/blocks/linear.ts
+++ b/apps/sim/blocks/blocks/linear.ts
@@ -535,6 +535,51 @@ Return ONLY the search query - no explanations.`,
         value: ['linear_read_issues', 'linear_search_issues', 'linear_list_projects'],
       },
     },
+    // Issue filtering options for read_issues (advanced)
+    {
+      id: 'labelIds',
+      title: 'Label IDs',
+      type: 'short-input',
+      placeholder: 'Array of label IDs to filter by',
+      mode: 'advanced',
+      condition: {
+        field: 'operation',
+        value: 'linear_read_issues',
+      },
+    },
+    {
+      id: 'createdAfter',
+      title: 'Created After',
+      type: 'short-input',
+      placeholder: 'Filter issues created after this date (ISO 8601 format)',
+      mode: 'advanced',
+      condition: {
+        field: 'operation',
+        value: 'linear_read_issues',
+      },
+    },
+    {
+      id: 'updatedAfter',
+      title: 'Updated After',
+      type: 'short-input',
+      placeholder: 'Filter issues updated after this date (ISO 8601 format)',
+      mode: 'advanced',
+      condition: {
+        field: 'operation',
+        value: 'linear_read_issues',
+      },
+    },
+    {
+      id: 'orderBy',
+      title: 'Order By',
+      type: 'short-input',
+      placeholder: 'Sort order: "createdAt" or "updatedAt" (default: "updatedAt")',
+      mode: 'advanced',
+      condition: {
+        field: 'operation',
+        value: 'linear_read_issues',
+      },
+    },
     // Cycle ID
     {
       id: 'cycleId',
@@ -2188,6 +2233,16 @@ Return ONLY the date string in YYYY-MM-DD format - no explanations, no quotes, n
     estimate: { type: 'string', description: 'Estimate points' },
     query: { type: 'string', description: 'Search query' },
     includeArchived: { type: 'boolean', description: 'Include archived items' },
+    labelIds: { type: 'array', description: 'Array of label IDs to filter by' },
+    createdAfter: {
+      type: 'string',
+      description: 'Filter issues created after this date (ISO 8601)',
+    },
+    updatedAfter: {
+      type: 'string',
+      description: 'Filter issues updated after this date (ISO 8601)',
+    },
+    orderBy: { type: 'string', description: 'Sort order: createdAt or updatedAt' },
     cycleId: { type: 'string', description: 'Cycle identifier' },
     startDate: { type: 'string', description: 'Start date' },
     endDate: { type: 'string', description: 'End date' },
diff --git a/apps/sim/blocks/blocks/microsoft_excel.ts b/apps/sim/blocks/blocks/microsoft_excel.ts
index 872e740ab8..adb4c5fa17 100644
--- a/apps/sim/blocks/blocks/microsoft_excel.ts
+++ b/apps/sim/blocks/blocks/microsoft_excel.ts
@@ -1,7 +1,10 @@
 import { MicrosoftExcelIcon } from '@/components/icons'
 import type { BlockConfig } from '@/blocks/types'
 import { AuthMode } from '@/blocks/types'
-import type { MicrosoftExcelResponse } from '@/tools/microsoft_excel/types'
+import type {
+  MicrosoftExcelResponse,
+  MicrosoftExcelV2Response,
+} from '@/tools/microsoft_excel/types'
 
 export const MicrosoftExcelBlock: BlockConfig<MicrosoftExcelResponse> = {
   type: 'microsoft_excel',
@@ -325,3 +328,260 @@ Return ONLY the JSON array - no explanations, no markdown, no extra text.`,
     },
   },
 }
+
+export const MicrosoftExcelV2Block: BlockConfig<MicrosoftExcelV2Response> = {
+  type: 'microsoft_excel_v2',
+  name: 'Microsoft Excel',
+  description: 'Read and write data with sheet selection',
+  authMode: AuthMode.OAuth,
+  hideFromToolbar: false,
+  longDescription:
+    'Integrate Microsoft Excel into the workflow with explicit sheet selection. Can read and write data in specific sheets.',
+  docsLink: 'https://docs.sim.ai/tools/microsoft_excel',
+  category: 'tools',
+  bgColor: '#E0E0E0',
+  icon: MicrosoftExcelIcon,
+  subBlocks: [
+    // Operation selector
+    {
+      id: 'operation',
+      title: 'Operation',
+      type: 'dropdown',
+      options: [
+        { label: 'Read Data', id: 'read' },
+        { label: 'Write Data', id: 'write' },
+      ],
+      value: () => 'read',
+    },
+    // Microsoft Excel Credentials
+    {
+      id: 'credential',
+      title: 'Microsoft Account',
+      type: 'oauth-input',
+      serviceId: 'microsoft-excel',
+      requiredScopes: [
+        'openid',
+        'profile',
+        'email',
+        'Files.Read',
+        'Files.ReadWrite',
+        'offline_access',
+      ],
+      placeholder: 'Select Microsoft account',
+      required: true,
+    },
+    // Spreadsheet Selector (basic mode)
+    {
+      id: 'spreadsheetId',
+      title: 'Select Spreadsheet',
+      type: 'file-selector',
+      canonicalParamId: 'spreadsheetId',
+      serviceId: 'microsoft-excel',
+      requiredScopes: [],
+      mimeType: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
+      placeholder: 'Select a spreadsheet',
+      dependsOn: ['credential'],
+      mode: 'basic',
+    },
+    // Manual Spreadsheet ID (advanced mode)
+    {
+      id: 'manualSpreadsheetId',
+      title: 'Spreadsheet ID',
+      type: 'short-input',
+      canonicalParamId: 'spreadsheetId',
+      placeholder: 'Enter spreadsheet ID',
+      dependsOn: ['credential'],
+      mode: 'advanced',
+    },
+    // Sheet Name Selector (basic mode)
+    {
+      id: 'sheetName',
+      title: 'Sheet (Tab)',
+      type: 'sheet-selector',
+      canonicalParamId: 'sheetName',
+      serviceId: 'microsoft-excel',
+      placeholder: 'Select a sheet',
+      required: true,
+      dependsOn: { all: ['credential'], any: ['spreadsheetId', 'manualSpreadsheetId'] },
+      mode: 'basic',
+    },
+    // Manual Sheet Name (advanced mode)
+    {
+      id: 'manualSheetName',
+      title: 'Sheet Name',
+      type: 'short-input',
+      canonicalParamId: 'sheetName',
+      placeholder: 'Name of the sheet/tab (e.g., Sheet1)',
+      required: true,
+      dependsOn: ['credential'],
+      mode: 'advanced',
+    },
+    // Cell Range (optional for read/write)
+    {
+      id: 'cellRange',
+      title: 'Cell Range',
+      type: 'short-input',
+      placeholder: 'Cell range (e.g., A1:D10). Defaults to used range for read, A1 for write.',
+      wandConfig: {
+        enabled: true,
+        prompt: `Generate a valid cell range based on the user's description.
+
+### VALID FORMATS
+- Single cell: A1
+- Range: A1:D10
+- Entire column: A:A
+- Entire row: 1:1
+- Multiple columns: A:D
+- Multiple rows: 1:10
+
+### RANGE RULES
+- Column letters are uppercase: A, B, C, ... Z, AA, AB, etc.
+- Row numbers start at 1 (not 0)
+
+### EXAMPLES
+- "first 100 rows" -> A1:Z100
+- "cells A1 through C50" -> A1:C50
+- "column A" -> A:A
+- "just the headers row" -> 1:1
+- "first cell" -> A1
+
+Return ONLY the range string - no sheet name, no explanations, no quotes.`,
+        placeholder: 'Describe the range (e.g., "first 50 rows" or "column A")...',
+      },
+    },
+    // Write-specific Fields
+    {
+      id: 'values',
+      title: 'Values',
+      type: 'long-input',
+      placeholder:
+        'Enter values as JSON array of arrays (e.g., [["A1", "B1"], ["A2", "B2"]]) or an array of objects (e.g., [{"name":"John", "age":30}])',
+      condition: { field: 'operation', value: 'write' },
+      required: true,
+      wandConfig: {
+        enabled: true,
+        prompt: `Generate Microsoft Excel data as a JSON array based on the user's description.
+
+Format options:
+1. Array of arrays: [["Header1", "Header2"], ["Value1", "Value2"]]
+2. Array of objects: [{"column1": "value1", "column2": "value2"}]
+
+Examples:
+- "sales data with product and revenue columns" -> [["Product", "Revenue"], ["Widget A", 1500], ["Widget B", 2300]]
+- "list of employees with name and email" -> [{"name": "John Doe", "email": "john@example.com"}, {"name": "Jane Smith", "email": "jane@example.com"}]
+
+Return ONLY the JSON array - no explanations, no markdown, no extra text.`,
+        placeholder: 'Describe the data you want to write...',
+        generationType: 'json-object',
+      },
+    },
+    {
+      id: 'valueInputOption',
+      title: 'Value Input Option',
+      type: 'dropdown',
+      options: [
+        { label: 'User Entered (Parse formulas)', id: 'USER_ENTERED' },
+        { label: "Raw (Don't parse formulas)", id: 'RAW' },
+      ],
+      condition: { field: 'operation', value: 'write' },
+    },
+  ],
+  tools: {
+    access: ['microsoft_excel_read_v2', 'microsoft_excel_write_v2'],
+    config: {
+      tool: (params) => {
+        switch (params.operation) {
+          case 'read':
+            return 'microsoft_excel_read_v2'
+          case 'write':
+            return 'microsoft_excel_write_v2'
+          default:
+            throw new Error(`Invalid Microsoft Excel V2 operation: ${params.operation}`)
+        }
+      },
+      params: (params) => {
+        const {
+          credential,
+          values,
+          spreadsheetId,
+          manualSpreadsheetId,
+          sheetName,
+          manualSheetName,
+          cellRange,
+          ...rest
+        } = params
+
+        const parsedValues = values ? JSON.parse(values as string) : undefined
+
+        const effectiveSpreadsheetId = (spreadsheetId || manualSpreadsheetId || '').trim()
+        const effectiveSheetName = ((sheetName || manualSheetName || '') as string).trim()
+
+        if (!effectiveSpreadsheetId) {
+          throw new Error('Spreadsheet ID is required.')
+        }
+
+        if (!effectiveSheetName) {
+          throw new Error('Sheet name is required. Please select or enter a sheet name.')
+        }
+
+        return {
+          ...rest,
+          spreadsheetId: effectiveSpreadsheetId,
+          sheetName: effectiveSheetName,
+          cellRange: cellRange ? (cellRange as string).trim() : undefined,
+          values: parsedValues,
+          credential,
+        }
+      },
+    },
+  },
+  inputs: {
+    operation: { type: 'string', description: 'Operation to perform' },
+    credential: { type: 'string', description: 'Microsoft Excel access token' },
+    spreadsheetId: { type: 'string', description: 'Spreadsheet identifier' },
+    manualSpreadsheetId: { type: 'string', description: 'Manual spreadsheet identifier' },
+    sheetName: { type: 'string', description: 'Name of the sheet/tab' },
+    manualSheetName: { type: 'string', description: 'Manual sheet name entry' },
+    cellRange: { type: 'string', description: 'Cell range (e.g., A1:D10)' },
+    values: { type: 'string', description: 'Cell values data' },
+    valueInputOption: { type: 'string', description: 'Value input option' },
+  },
+  outputs: {
+    sheetName: {
+      type: 'string',
+      description: 'Name of the sheet',
+      condition: { field: 'operation', value: 'read' },
+    },
+    range: {
+      type: 'string',
+      description: 'Range that was read',
+      condition: { field: 'operation', value: 'read' },
+    },
+    values: {
+      type: 'json',
+      description: 'Cell values as 2D array',
+      condition: { field: 'operation', value: 'read' },
+    },
+    updatedRange: {
+      type: 'string',
+      description: 'Updated range',
+      condition: { field: 'operation', value: 'write' },
+    },
+    updatedRows: {
+      type: 'number',
+      description: 'Updated rows count',
+      condition: { field: 'operation', value: 'write' },
+    },
+    updatedColumns: {
+      type: 'number',
+      description: 'Updated columns count',
+      condition: { field: 'operation', value: 'write' },
+    },
+    updatedCells: {
+      type: 'number',
+      description: 'Updated cells count',
+      condition: { field: 'operation', value: 'write' },
+    },
+    metadata: { type: 'json', description: 'Spreadsheet metadata including ID and URL' },
+  },
+}
diff --git a/apps/sim/blocks/blocks/microsoft_excel_v2.ts b/apps/sim/blocks/blocks/microsoft_excel_v2.ts
deleted file mode 100644
index e637637d08..0000000000
--- a/apps/sim/blocks/blocks/microsoft_excel_v2.ts
+++ /dev/null
@@ -1,261 +0,0 @@
-import { MicrosoftExcelIcon } from '@/components/icons'
-import type { BlockConfig } from '@/blocks/types'
-import { AuthMode } from '@/blocks/types'
-import type { MicrosoftExcelV2Response } from '@/tools/microsoft_excel/types'
-
-export const MicrosoftExcelV2Block: BlockConfig<MicrosoftExcelV2Response> = {
-  type: 'microsoft_excel_v2',
-  name: 'Microsoft Excel',
-  description: 'Read and write data with sheet selection',
-  authMode: AuthMode.OAuth,
-  hideFromToolbar: false,
-  longDescription:
-    'Integrate Microsoft Excel into the workflow with explicit sheet selection. Can read and write data in specific sheets.',
-  docsLink: 'https://docs.sim.ai/tools/microsoft_excel',
-  category: 'tools',
-  bgColor: '#E0E0E0',
-  icon: MicrosoftExcelIcon,
-  subBlocks: [
-    // Operation selector
-    {
-      id: 'operation',
-      title: 'Operation',
-      type: 'dropdown',
-      options: [
-        { label: 'Read Data', id: 'read' },
-        { label: 'Write Data', id: 'write' },
-      ],
-      value: () => 'read',
-    },
-    // Microsoft Excel Credentials
-    {
-      id: 'credential',
-      title: 'Microsoft Account',
-      type: 'oauth-input',
-      serviceId: 'microsoft-excel',
-      requiredScopes: [
-        'openid',
-        'profile',
-        'email',
-        'Files.Read',
-        'Files.ReadWrite',
-        'offline_access',
-      ],
-      placeholder: 'Select Microsoft account',
-      required: true,
-    },
-    // Spreadsheet Selector (basic mode)
-    {
-      id: 'spreadsheetId',
-      title: 'Select Spreadsheet',
-      type: 'file-selector',
-      canonicalParamId: 'spreadsheetId',
-      serviceId: 'microsoft-excel',
-      requiredScopes: [],
-      mimeType: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
-      placeholder: 'Select a spreadsheet',
-      dependsOn: ['credential'],
-      mode: 'basic',
-    },
-    // Manual Spreadsheet ID (advanced mode)
-    {
-      id: 'manualSpreadsheetId',
-      title: 'Spreadsheet ID',
-      type: 'short-input',
-      canonicalParamId: 'spreadsheetId',
-      placeholder: 'Enter spreadsheet ID',
-      dependsOn: ['credential'],
-      mode: 'advanced',
-    },
-    // Sheet Name Selector (basic mode)
-    {
-      id: 'sheetName',
-      title: 'Sheet (Tab)',
-      type: 'sheet-selector',
-      canonicalParamId: 'sheetName',
-      serviceId: 'microsoft-excel',
-      placeholder: 'Select a sheet',
-      required: true,
-      dependsOn: { all: ['credential'], any: ['spreadsheetId', 'manualSpreadsheetId'] },
-      mode: 'basic',
-    },
-    // Manual Sheet Name (advanced mode)
-    {
-      id: 'manualSheetName',
-      title: 'Sheet Name',
-      type: 'short-input',
-      canonicalParamId: 'sheetName',
-      placeholder: 'Name of the sheet/tab (e.g., Sheet1)',
-      required: true,
-      dependsOn: ['credential'],
-      mode: 'advanced',
-    },
-    // Cell Range (optional for read/write)
-    {
-      id: 'cellRange',
-      title: 'Cell Range',
-      type: 'short-input',
-      placeholder: 'Cell range (e.g., A1:D10). Defaults to used range for read, A1 for write.',
-      wandConfig: {
-        enabled: true,
-        prompt: `Generate a valid cell range based on the user's description.
-
-### VALID FORMATS
-- Single cell: A1
-- Range: A1:D10
-- Entire column: A:A
-- Entire row: 1:1
-- Multiple columns: A:D
-- Multiple rows: 1:10
-
-### RANGE RULES
-- Column letters are uppercase: A, B, C, ... Z, AA, AB, etc.
-- Row numbers start at 1 (not 0)
-
-### EXAMPLES
-- "first 100 rows" -> A1:Z100
-- "cells A1 through C50" -> A1:C50
-- "column A" -> A:A
-- "just the headers row" -> 1:1
-- "first cell" -> A1
-
-Return ONLY the range string - no sheet name, no explanations, no quotes.`,
-        placeholder: 'Describe the range (e.g., "first 50 rows" or "column A")...',
-      },
-    },
-    // Write-specific Fields
-    {
-      id: 'values',
-      title: 'Values',
-      type: 'long-input',
-      placeholder:
-        'Enter values as JSON array of arrays (e.g., [["A1", "B1"], ["A2", "B2"]]) or an array of objects (e.g., [{"name":"John", "age":30}])',
-      condition: { field: 'operation', value: 'write' },
-      required: true,
-      wandConfig: {
-        enabled: true,
-        prompt: `Generate Microsoft Excel data as a JSON array based on the user's description.
-
-Format options:
-1. Array of arrays: [["Header1", "Header2"], ["Value1", "Value2"]]
-2. Array of objects: [{"column1": "value1", "column2": "value2"}]
-
-Examples:
-- "sales data with product and revenue columns" -> [["Product", "Revenue"], ["Widget A", 1500], ["Widget B", 2300]]
-- "list of employees with name and email" -> [{"name": "John Doe", "email": "john@example.com"}, {"name": "Jane Smith", "email": "jane@example.com"}]
-
-Return ONLY the JSON array - no explanations, no markdown, no extra text.`,
-        placeholder: 'Describe the data you want to write...',
-        generationType: 'json-object',
-      },
-    },
-    {
-      id: 'valueInputOption',
-      title: 'Value Input Option',
-      type: 'dropdown',
-      options: [
-        { label: 'User Entered (Parse formulas)', id: 'USER_ENTERED' },
-        { label: "Raw (Don't parse formulas)", id: 'RAW' },
-      ],
-      condition: { field: 'operation', value: 'write' },
-    },
-  ],
-  tools: {
-    access: ['microsoft_excel_read_v2', 'microsoft_excel_write_v2'],
-    config: {
-      tool: (params) => {
-        switch (params.operation) {
-          case 'read':
-            return 'microsoft_excel_read_v2'
-          case 'write':
-            return 'microsoft_excel_write_v2'
-          default:
-            throw new Error(`Invalid Microsoft Excel V2 operation: ${params.operation}`)
-        }
-      },
-      params: (params) => {
-        const {
-          credential,
-          values,
-          spreadsheetId,
-          manualSpreadsheetId,
-          sheetName,
-          manualSheetName,
-          cellRange,
-          ...rest
-        } = params
-
-        const parsedValues = values ? JSON.parse(values as string) : undefined
-
-        const effectiveSpreadsheetId = (spreadsheetId || manualSpreadsheetId || '').trim()
-        const effectiveSheetName = ((sheetName || manualSheetName || '') as string).trim()
-
-        if (!effectiveSpreadsheetId) {
-          throw new Error('Spreadsheet ID is required.')
-        }
-
-        if (!effectiveSheetName) {
-          throw new Error('Sheet name is required. Please select or enter a sheet name.')
-        }
-
-        return {
-          ...rest,
-          spreadsheetId: effectiveSpreadsheetId,
-          sheetName: effectiveSheetName,
-          cellRange: cellRange ? (cellRange as string).trim() : undefined,
-          values: parsedValues,
-          credential,
-        }
-      },
-    },
-  },
-  inputs: {
-    operation: { type: 'string', description: 'Operation to perform' },
-    credential: { type: 'string', description: 'Microsoft Excel access token' },
-    spreadsheetId: { type: 'string', description: 'Spreadsheet identifier' },
-    manualSpreadsheetId: { type: 'string', description: 'Manual spreadsheet identifier' },
-    sheetName: { type: 'string', description: 'Name of the sheet/tab' },
-    manualSheetName: { type: 'string', description: 'Manual sheet name entry' },
-    cellRange: { type: 'string', description: 'Cell range (e.g., A1:D10)' },
-    values: { type: 'string', description: 'Cell values data' },
-    valueInputOption: { type: 'string', description: 'Value input option' },
-  },
-  outputs: {
-    sheetName: {
-      type: 'string',
-      description: 'Name of the sheet',
-      condition: { field: 'operation', value: 'read' },
-    },
-    range: {
-      type: 'string',
-      description: 'Range that was read',
-      condition: { field: 'operation', value: 'read' },
-    },
-    values: {
-      type: 'json',
-      description: 'Cell values as 2D array',
-      condition: { field: 'operation', value: 'read' },
-    },
-    updatedRange: {
-      type: 'string',
-      description: 'Updated range',
-      condition: { field: 'operation', value: 'write' },
-    },
-    updatedRows: {
-      type: 'number',
-      description: 'Updated rows count',
-      condition: { field: 'operation', value: 'write' },
-    },
-    updatedColumns: {
-      type: 'number',
-      description: 'Updated columns count',
-      condition: { field: 'operation', value: 'write' },
-    },
-    updatedCells: {
-      type: 'number',
-      description: 'Updated cells count',
-      condition: { field: 'operation', value: 'write' },
-    },
-    metadata: { type: 'json', description: 'Spreadsheet metadata including ID and URL' },
-  },
-}
diff --git a/apps/sim/blocks/registry.ts b/apps/sim/blocks/registry.ts
index 916453eda2..544c294322 100644
--- a/apps/sim/blocks/registry.ts
+++ b/apps/sim/blocks/registry.ts
@@ -8,7 +8,6 @@ import { ApifyBlock } from '@/blocks/blocks/apify'
 import { ApolloBlock } from '@/blocks/blocks/apollo'
 import { ArxivBlock } from '@/blocks/blocks/arxiv'
 import { AsanaBlock } from '@/blocks/blocks/asana'
-// import { BoxBlock } from '@/blocks/blocks/box' // TODO: Box OAuth integration
 import { BrowserUseBlock } from '@/blocks/blocks/browser_use'
 import { CalendlyBlock } from '@/blocks/blocks/calendly'
 import { ChatTriggerBlock } from '@/blocks/blocks/chat_trigger'
@@ -38,10 +37,9 @@ import { GoogleSearchBlock } from '@/blocks/blocks/google'
 import { GoogleCalendarBlock, GoogleCalendarV2Block } from '@/blocks/blocks/google_calendar'
 import { GoogleDocsBlock } from '@/blocks/blocks/google_docs'
 import { GoogleDriveBlock } from '@/blocks/blocks/google_drive'
-import { GoogleFormsBlock } from '@/blocks/blocks/google_form'
+import { GoogleFormsBlock } from '@/blocks/blocks/google_forms'
 import { GoogleGroupsBlock } from '@/blocks/blocks/google_groups'
-import { GoogleSheetsBlock } from '@/blocks/blocks/google_sheets'
-import { GoogleSheetsV2Block } from '@/blocks/blocks/google_sheets_v2'
+import { GoogleSheetsBlock, GoogleSheetsV2Block } from '@/blocks/blocks/google_sheets'
 import { GoogleSlidesBlock } from '@/blocks/blocks/google_slides'
 import { GoogleVaultBlock } from '@/blocks/blocks/google_vault'
 import { GrafanaBlock } from '@/blocks/blocks/grafana'
@@ -73,8 +71,7 @@ import { ManualTriggerBlock } from '@/blocks/blocks/manual_trigger'
 import { McpBlock } from '@/blocks/blocks/mcp'
 import { Mem0Block } from '@/blocks/blocks/mem0'
 import { MemoryBlock } from '@/blocks/blocks/memory'
-import { MicrosoftExcelBlock } from '@/blocks/blocks/microsoft_excel'
-import { MicrosoftExcelV2Block } from '@/blocks/blocks/microsoft_excel_v2'
+import { MicrosoftExcelBlock, MicrosoftExcelV2Block } 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'
@@ -116,6 +113,7 @@ import { ShopifyBlock } from '@/blocks/blocks/shopify'
 import { SlackBlock } from '@/blocks/blocks/slack'
 import { SmtpBlock } from '@/blocks/blocks/smtp'
 import { SpotifyBlock } from '@/blocks/blocks/spotify'
+import { SQSBlock } from '@/blocks/blocks/sqs'
 import { SSHBlock } from '@/blocks/blocks/ssh'
 import { StagehandBlock } from '@/blocks/blocks/stagehand'
 import { StartTriggerBlock } from '@/blocks/blocks/start_trigger'
@@ -151,7 +149,6 @@ import { ZendeskBlock } from '@/blocks/blocks/zendesk'
 import { ZepBlock } from '@/blocks/blocks/zep'
 import { ZoomBlock } from '@/blocks/blocks/zoom'
 import type { BlockConfig } from '@/blocks/types'
-import { SQSBlock } from './blocks/sqs'
 
 // Registry of all available blocks, alphabetically sorted
 export const registry: Record<string, BlockConfig> = {
@@ -165,7 +162,6 @@ export const registry: Record<string, BlockConfig> = {
   apollo: ApolloBlock,
   arxiv: ArxivBlock,
   asana: AsanaBlock,
-  // box: BoxBlock, // TODO: Box OAuth integration
   browser_use: BrowserUseBlock,
   calendly: CalendlyBlock,
   chat_trigger: ChatTriggerBlock,
@@ -179,8 +175,9 @@ export const registry: Record<string, BlockConfig> = {
   discord: DiscordBlock,
   dropbox: DropboxBlock,
   duckduckgo: DuckDuckGoBlock,
-  elevenlabs: ElevenLabsBlock,
+  dynamodb: DynamoDBBlock,
   elasticsearch: ElasticsearchBlock,
+  elevenlabs: ElevenLabsBlock,
   evaluator: EvaluatorBlock,
   exa: ExaBlock,
   file: FileBlock,
@@ -193,21 +190,21 @@ export const registry: Record<string, BlockConfig> = {
   gitlab: GitLabBlock,
   gmail: GmailBlock,
   gmail_v2: GmailV2Block,
-  grain: GrainBlock,
-  grafana: GrafanaBlock,
-  greptile: GreptileBlock,
-  guardrails: GuardrailsBlock,
   google_calendar: GoogleCalendarBlock,
   google_calendar_v2: GoogleCalendarV2Block,
   google_docs: GoogleDocsBlock,
   google_drive: GoogleDriveBlock,
   google_forms: GoogleFormsBlock,
+  google_groups: GoogleGroupsBlock,
   google_search: GoogleSearchBlock,
   google_sheets: GoogleSheetsBlock,
   google_sheets_v2: GoogleSheetsV2Block,
   google_slides: GoogleSlidesBlock,
   google_vault: GoogleVaultBlock,
-  google_groups: GoogleGroupsBlock,
+  grafana: GrafanaBlock,
+  grain: GrainBlock,
+  greptile: GreptileBlock,
+  guardrails: GuardrailsBlock,
   hubspot: HubSpotBlock,
   huggingface: HuggingFaceBlock,
   human_in_the_loop: HumanInTheLoopBlock,
@@ -239,7 +236,6 @@ export const registry: Record<string, BlockConfig> = {
   microsoft_planner: MicrosoftPlannerBlock,
   microsoft_teams: MicrosoftTeamsBlock,
   mistral_parse: MistralParseBlock,
-  reducto: ReductoBlock,
   mongodb: MongoDBBlock,
   mysql: MySQLBlock,
   neo4j: Neo4jBlock,
@@ -259,35 +255,34 @@ export const registry: Record<string, BlockConfig> = {
   pulse: PulseBlock,
   qdrant: QdrantBlock,
   rds: RDSBlock,
-  sqs: SQSBlock,
-  dynamodb: DynamoDBBlock,
   reddit: RedditBlock,
+  reducto: ReductoBlock,
   resend: ResendBlock,
   response: ResponseBlock,
-  rss: RssBlock,
   router: RouterBlock,
   router_v2: RouterV2Block,
+  rss: RssBlock,
   s3: S3Block,
   salesforce: SalesforceBlock,
   schedule: ScheduleBlock,
   search: SearchBlock,
   sendgrid: SendGridBlock,
   sentry: SentryBlock,
-  servicenow: ServiceNowBlock,
   serper: SerperBlock,
+  servicenow: ServiceNowBlock,
+  sftp: SftpBlock,
   sharepoint: SharepointBlock,
   shopify: ShopifyBlock,
   slack: SlackBlock,
-  spotify: SpotifyBlock,
   smtp: SmtpBlock,
-  sftp: SftpBlock,
+  spotify: SpotifyBlock,
+  sqs: SQSBlock,
   ssh: SSHBlock,
   stagehand: StagehandBlock,
-  starter: StarterBlock,
   start_trigger: StartTriggerBlock,
-  stt: SttBlock,
-  tts: TtsBlock,
+  starter: StarterBlock,
   stripe: StripeBlock,
+  stt: SttBlock,
   supabase: SupabaseBlock,
   tavily: TavilyBlock,
   telegram: TelegramBlock,
@@ -295,6 +290,7 @@ export const registry: Record<string, BlockConfig> = {
   tinybird: TinybirdBlock,
   translate: TranslateBlock,
   trello: TrelloBlock,
+  tts: TtsBlock,
   twilio_sms: TwilioSMSBlock,
   twilio_voice: TwilioVoiceBlock,
   typeform: TypeformBlock,
@@ -312,8 +308,8 @@ export const registry: Record<string, BlockConfig> = {
   workflow_input: WorkflowInputBlock,
   x: XBlock,
   youtube: YouTubeBlock,
-  zep: ZepBlock,
   zendesk: ZendeskBlock,
+  zep: ZepBlock,
   zoom: ZoomBlock,
 }
 
diff --git a/apps/sim/blocks/types.ts b/apps/sim/blocks/types.ts
index ecd65c14d7..cbfd20ba3a 100644
--- a/apps/sim/blocks/types.ts
+++ b/apps/sim/blocks/types.ts
@@ -135,7 +135,13 @@ export interface OutputCondition {
   not?: boolean
   and?: {
     field: string
-    value: string | number | boolean | Array<string | number | boolean> | undefined
+    value:
+      | string
+      | number
+      | boolean
+      | Array<string | number | boolean | undefined | null>
+      | undefined
+      | null
     not?: boolean
   }
 }
diff --git a/apps/sim/components/emcn/components/combobox/combobox.tsx b/apps/sim/components/emcn/components/combobox/combobox.tsx
index 1d70fba53e..49f4646402 100644
--- a/apps/sim/components/emcn/components/combobox/combobox.tsx
+++ b/apps/sim/components/emcn/components/combobox/combobox.tsx
@@ -5,6 +5,7 @@ import {
   forwardRef,
   type HTMLAttributes,
   type KeyboardEvent,
+  memo,
   type ReactNode,
   useCallback,
   useEffect,
@@ -132,643 +133,652 @@ export interface ComboboxProps
  * Provides a dropdown selection interface with keyboard navigation support.
  * Supports both select-only and editable (free-text) modes.
  */
-const Combobox = forwardRef<HTMLDivElement, ComboboxProps>(
-  (
-    {
-      className,
-      variant,
-      size,
-      options,
-      value,
-      multiSelectValues,
-      onChange,
-      onMultiSelectChange,
-      placeholder = 'Select...',
-      disabled,
-      editable = false,
-      overlayContent,
-      inputProps = {},
-      inputRef: externalInputRef,
-      filterOptions = editable,
-      selectedValue,
-      multiSelect = false,
-      isLoading = false,
-      error = null,
-      onOpenChange,
-      searchable = false,
-      searchPlaceholder = 'Search...',
-      align = 'start',
-      dropdownWidth = 'trigger',
-      showAllOption = false,
-      allOptionLabel = 'All',
-      groups,
-      maxHeight = 192,
-      emptyMessage,
-      ...props
-    },
-    ref
-  ) => {
-    const [open, setOpen] = useState(false)
-    const [highlightedIndex, setHighlightedIndex] = useState(-1)
-    const [searchQuery, setSearchQuery] = useState('')
-    const searchInputRef = useRef<HTMLInputElement>(null)
-    const containerRef = useRef<HTMLDivElement>(null)
-    const dropdownRef = useRef<HTMLDivElement>(null)
-    const internalInputRef = useRef<HTMLInputElement>(null)
-    const inputRef = externalInputRef || internalInputRef
-
-    const effectiveSelectedValue = selectedValue ?? value
-
-    // Flatten groups into options if groups are provided
-    const allOptions = useMemo(() => {
-      if (groups) {
-        return groups.flatMap((group) => group.items)
-      }
-      return options
-    }, [groups, options])
-
-    const selectedOption = useMemo(
-      () => allOptions.find((opt) => opt.value === effectiveSelectedValue),
-      [allOptions, effectiveSelectedValue]
-    )
-
-    /**
-     * Filter options based on current value or search query
-     */
-    const filteredOptions = useMemo(() => {
-      let result = allOptions
-
-      // Filter by editable input value
-      if (filterOptions && value && open) {
-        const currentValue = value.toString().toLowerCase()
-        const exactMatch = allOptions.find(
-          (opt) => opt.value === value || opt.label.toLowerCase() === currentValue
-        )
-        if (!exactMatch) {
+const Combobox = memo(
+  forwardRef<HTMLDivElement, ComboboxProps>(
+    (
+      {
+        className,
+        variant,
+        size,
+        options,
+        value,
+        multiSelectValues,
+        onChange,
+        onMultiSelectChange,
+        placeholder = 'Select...',
+        disabled,
+        editable = false,
+        overlayContent,
+        inputProps = {},
+        inputRef: externalInputRef,
+        filterOptions = editable,
+        selectedValue,
+        multiSelect = false,
+        isLoading = false,
+        error = null,
+        onOpenChange,
+        searchable = false,
+        searchPlaceholder = 'Search...',
+        align = 'start',
+        dropdownWidth = 'trigger',
+        showAllOption = false,
+        allOptionLabel = 'All',
+        groups,
+        maxHeight = 192,
+        emptyMessage,
+        ...props
+      },
+      ref
+    ) => {
+      const [open, setOpen] = useState(false)
+      const [highlightedIndex, setHighlightedIndex] = useState(-1)
+      const [searchQuery, setSearchQuery] = useState('')
+      const searchInputRef = useRef<HTMLInputElement>(null)
+      const containerRef = useRef<HTMLDivElement>(null)
+      const dropdownRef = useRef<HTMLDivElement>(null)
+      const internalInputRef = useRef<HTMLInputElement>(null)
+      const inputRef = externalInputRef || internalInputRef
+
+      const effectiveSelectedValue = selectedValue ?? value
+
+      // Flatten groups into options if groups are provided
+      const allOptions = useMemo(() => {
+        if (groups) {
+          return groups.flatMap((group) => group.items)
+        }
+        return options
+      }, [groups, options])
+
+      const selectedOption = useMemo(
+        () => allOptions.find((opt) => opt.value === effectiveSelectedValue),
+        [allOptions, effectiveSelectedValue]
+      )
+
+      /**
+       * Filter options based on current value or search query
+       */
+      const filteredOptions = useMemo(() => {
+        let result = allOptions
+
+        // Filter by editable input value
+        if (filterOptions && value && open) {
+          const currentValue = value.toString().toLowerCase()
+          const exactMatch = allOptions.find(
+            (opt) => opt.value === value || opt.label.toLowerCase() === currentValue
+          )
+          if (!exactMatch) {
+            result = result.filter((option) => {
+              const label = option.label.toLowerCase()
+              const optionValue = option.value.toLowerCase()
+              return label.includes(currentValue) || optionValue.includes(currentValue)
+            })
+          }
+        }
+
+        // Filter by search query (for searchable mode)
+        if (searchable && searchQuery) {
+          const query = searchQuery.toLowerCase()
           result = result.filter((option) => {
             const label = option.label.toLowerCase()
             const optionValue = option.value.toLowerCase()
-            return label.includes(currentValue) || optionValue.includes(currentValue)
+            return label.includes(query) || optionValue.includes(query)
           })
         }
-      }
 
-      // Filter by search query (for searchable mode)
-      if (searchable && searchQuery) {
+        return result
+      }, [allOptions, value, open, filterOptions, searchable, searchQuery])
+
+      /**
+       * Filter groups based on search query (preserves group structure)
+       */
+      const filteredGroups = useMemo(() => {
+        if (!groups) return null
+        if (!searchable || !searchQuery) return groups
+
         const query = searchQuery.toLowerCase()
-        result = result.filter((option) => {
-          const label = option.label.toLowerCase()
-          const optionValue = option.value.toLowerCase()
-          return label.includes(query) || optionValue.includes(query)
-        })
-      }
-
-      return result
-    }, [allOptions, value, open, filterOptions, searchable, searchQuery])
-
-    /**
-     * Filter groups based on search query (preserves group structure)
-     */
-    const filteredGroups = useMemo(() => {
-      if (!groups) return null
-      if (!searchable || !searchQuery) return groups
-
-      const query = searchQuery.toLowerCase()
-      return groups
-        .map((group) => ({
-          ...group,
-          items: group.items.filter((option) => {
-            const label = option.label.toLowerCase()
-            const optionValue = option.value.toLowerCase()
-            return label.includes(query) || optionValue.includes(query)
-          }),
-        }))
-        .filter((group) => group.items.length > 0)
-    }, [groups, searchable, searchQuery])
-
-    /**
-     * Handles selection of an option
-     */
-    const handleSelect = useCallback(
-      (selectedValue: string, customOnSelect?: () => void) => {
-        // If option has custom onSelect, use it instead
-        if (customOnSelect) {
-          customOnSelect()
-          setOpen(false)
-          setHighlightedIndex(-1)
-          setSearchQuery('')
-          return
-        }
+        return groups
+          .map((group) => ({
+            ...group,
+            items: group.items.filter((option) => {
+              const label = option.label.toLowerCase()
+              const optionValue = option.value.toLowerCase()
+              return label.includes(query) || optionValue.includes(query)
+            }),
+          }))
+          .filter((group) => group.items.length > 0)
+      }, [groups, searchable, searchQuery])
+
+      /**
+       * Handles selection of an option
+       */
+      const handleSelect = useCallback(
+        (selectedValue: string, customOnSelect?: () => void) => {
+          // If option has custom onSelect, use it instead
+          if (customOnSelect) {
+            customOnSelect()
+            setOpen(false)
+            setHighlightedIndex(-1)
+            setSearchQuery('')
+            return
+          }
 
-        if (multiSelect && onMultiSelectChange) {
-          const currentValues = multiSelectValues || []
-          const newValues = currentValues.includes(selectedValue)
-            ? currentValues.filter((v) => v !== selectedValue)
-            : [...currentValues, selectedValue]
-          onMultiSelectChange(newValues)
-        } else {
-          onChange?.(selectedValue)
-          setOpen(false)
-          setHighlightedIndex(-1)
-          setSearchQuery('')
-          if (editable && inputRef.current) {
-            inputRef.current.blur()
+          if (multiSelect && onMultiSelectChange) {
+            const currentValues = multiSelectValues || []
+            const newValues = currentValues.includes(selectedValue)
+              ? currentValues.filter((v) => v !== selectedValue)
+              : [...currentValues, selectedValue]
+            onMultiSelectChange(newValues)
+          } else {
+            onChange?.(selectedValue)
+            setOpen(false)
+            setHighlightedIndex(-1)
+            setSearchQuery('')
+            if (editable && inputRef.current) {
+              inputRef.current.blur()
+            }
           }
-        }
-      },
-      [onChange, multiSelect, onMultiSelectChange, multiSelectValues, editable, inputRef]
-    )
-
-    /**
-     * Handles input change for editable mode
-     */
-    const handleInputChange = useCallback(
-      (e: ChangeEvent<HTMLInputElement>) => {
-        if (disabled || !editable) return
-        onChange?.(e.target.value)
-      },
-      [disabled, editable, onChange]
-    )
-
-    /**
-     * Handles focus for editable mode
-     */
-    const handleFocus = useCallback(() => {
-      if (!disabled) {
-        setOpen(true)
-        setHighlightedIndex(-1)
-      }
-    }, [disabled])
-
-    /**
-     * Handles blur for editable mode
-     */
-    const handleBlur = useCallback(() => {
-      // Delay to allow dropdown clicks
-      setTimeout(() => {
-        const activeElement = document.activeElement
-        // Check if focus is in the container, dropdown, or search input
-        const isInContainer = containerRef.current?.contains(activeElement)
-        const isInDropdown = dropdownRef.current?.contains(activeElement)
-        const isSearchInput = activeElement === searchInputRef.current
-        if (!activeElement || (!isInContainer && !isInDropdown && !isSearchInput)) {
-          setOpen(false)
+        },
+        [onChange, multiSelect, onMultiSelectChange, multiSelectValues, editable, inputRef]
+      )
+
+      /**
+       * Handles input change for editable mode
+       */
+      const handleInputChange = useCallback(
+        (e: ChangeEvent<HTMLInputElement>) => {
+          if (disabled || !editable) return
+          onChange?.(e.target.value)
+        },
+        [disabled, editable, onChange]
+      )
+
+      /**
+       * Handles focus for editable mode
+       */
+      const handleFocus = useCallback(() => {
+        if (!disabled) {
+          setOpen(true)
           setHighlightedIndex(-1)
-          setSearchQuery('')
         }
-      }, 150)
-    }, [])
-
-    /**
-     * Handles keyboard navigation
-     */
-    const handleKeyDown = useCallback(
-      (e: KeyboardEvent<HTMLDivElement | HTMLInputElement>) => {
-        if (disabled) return
-
-        if (e.key === 'Escape') {
-          setOpen(false)
-          setHighlightedIndex(-1)
-          setSearchQuery('')
-          if (editable && inputRef.current) {
-            inputRef.current.blur()
+      }, [disabled])
+
+      /**
+       * Handles blur for editable mode
+       */
+      const handleBlur = useCallback(() => {
+        // Delay to allow dropdown clicks
+        setTimeout(() => {
+          const activeElement = document.activeElement
+          // Check if focus is in the container, dropdown, or search input
+          const isInContainer = containerRef.current?.contains(activeElement)
+          const isInDropdown = dropdownRef.current?.contains(activeElement)
+          const isSearchInput = activeElement === searchInputRef.current
+          if (!activeElement || (!isInContainer && !isInDropdown && !isSearchInput)) {
+            setOpen(false)
+            setHighlightedIndex(-1)
+            setSearchQuery('')
+          }
+        }, 150)
+      }, [])
+
+      /**
+       * Handles keyboard navigation
+       */
+      const handleKeyDown = useCallback(
+        (e: KeyboardEvent<HTMLDivElement | HTMLInputElement>) => {
+          if (disabled) return
+
+          if (e.key === 'Escape') {
+            setOpen(false)
+            setHighlightedIndex(-1)
+            setSearchQuery('')
+            if (editable && inputRef.current) {
+              inputRef.current.blur()
+            }
+            return
           }
-          return
-        }
 
-        if (e.key === 'Enter') {
-          if (open && highlightedIndex >= 0) {
-            e.preventDefault()
-            const selectedOption = filteredOptions[highlightedIndex]
-            if (selectedOption && !selectedOption.disabled) {
-              handleSelect(selectedOption.value, selectedOption.onSelect)
+          if (e.key === 'Enter') {
+            if (open && highlightedIndex >= 0) {
+              e.preventDefault()
+              const selectedOption = filteredOptions[highlightedIndex]
+              if (selectedOption && !selectedOption.disabled) {
+                handleSelect(selectedOption.value, selectedOption.onSelect)
+              }
+            } else if (!editable) {
+              e.preventDefault()
+              setOpen(true)
+              setHighlightedIndex(0)
             }
-          } else if (!editable) {
+            return
+          }
+
+          if (e.key === ' ' && !editable) {
             e.preventDefault()
-            setOpen(true)
-            setHighlightedIndex(0)
+            if (!open) {
+              setOpen(true)
+              setHighlightedIndex(0)
+            }
+            return
           }
-          return
-        }
 
-        if (e.key === ' ' && !editable) {
-          e.preventDefault()
-          if (!open) {
-            setOpen(true)
-            setHighlightedIndex(0)
+          if (e.key === 'ArrowDown') {
+            e.preventDefault()
+            if (!open) {
+              setOpen(true)
+              setHighlightedIndex(0)
+            } else {
+              setHighlightedIndex((prev) => (prev < filteredOptions.length - 1 ? prev + 1 : 0))
+            }
           }
-          return
-        }
 
-        if (e.key === 'ArrowDown') {
-          e.preventDefault()
-          if (!open) {
-            setOpen(true)
-            setHighlightedIndex(0)
-          } else {
-            setHighlightedIndex((prev) => (prev < filteredOptions.length - 1 ? prev + 1 : 0))
+          if (e.key === 'ArrowUp') {
+            e.preventDefault()
+            if (open) {
+              setHighlightedIndex((prev) => (prev > 0 ? prev - 1 : filteredOptions.length - 1))
+            }
           }
+        },
+        [disabled, open, highlightedIndex, filteredOptions, handleSelect, editable, inputRef]
+      )
+
+      /**
+       * Handles toggle of dropdown (for select mode only)
+       */
+      const handleToggle = useCallback(() => {
+        if (!disabled && !editable) {
+          setOpen((prev) => !prev)
+          setHighlightedIndex(-1)
         }
+      }, [disabled, editable])
 
-        if (e.key === 'ArrowUp') {
+      /**
+       * Handles chevron click for editable mode
+       */
+      const handleChevronClick = useCallback(
+        (e: React.MouseEvent) => {
           e.preventDefault()
-          if (open) {
-            setHighlightedIndex((prev) => (prev > 0 ? prev - 1 : filteredOptions.length - 1))
+          e.stopPropagation()
+          if (!disabled) {
+            setOpen((prev) => {
+              const newOpen = !prev
+              if (newOpen && editable && inputRef.current) {
+                inputRef.current.focus()
+              }
+              return newOpen
+            })
+          }
+        },
+        [disabled, editable, inputRef]
+      )
+
+      /**
+       * Scroll highlighted option into view
+       */
+      useEffect(() => {
+        if (highlightedIndex >= 0 && dropdownRef.current) {
+          const highlightedElement = dropdownRef.current.querySelector(
+            `[data-option-index="${highlightedIndex}"]`
+          )
+          if (highlightedElement) {
+            highlightedElement.scrollIntoView({
+              behavior: 'smooth',
+              block: 'nearest',
+            })
           }
         }
-      },
-      [disabled, open, highlightedIndex, filteredOptions, handleSelect, editable, inputRef]
-    )
-
-    /**
-     * Handles toggle of dropdown (for select mode only)
-     */
-    const handleToggle = useCallback(() => {
-      if (!disabled && !editable) {
-        setOpen((prev) => !prev)
-        setHighlightedIndex(-1)
-      }
-    }, [disabled, editable])
-
-    /**
-     * Handles chevron click for editable mode
-     */
-    const handleChevronClick = useCallback(
-      (e: React.MouseEvent) => {
-        e.preventDefault()
-        e.stopPropagation()
-        if (!disabled) {
-          setOpen((prev) => {
-            const newOpen = !prev
-            if (newOpen && editable && inputRef.current) {
-              inputRef.current.focus()
-            }
-            return newOpen
-          })
-        }
-      },
-      [disabled, editable, inputRef]
-    )
-
-    /**
-     * Scroll highlighted option into view
-     */
-    useEffect(() => {
-      if (highlightedIndex >= 0 && dropdownRef.current) {
-        const highlightedElement = dropdownRef.current.querySelector(
-          `[data-option-index="${highlightedIndex}"]`
-        )
-        if (highlightedElement) {
-          highlightedElement.scrollIntoView({
-            behavior: 'smooth',
-            block: 'nearest',
-          })
-        }
-      }
-    }, [highlightedIndex])
-
-    /**
-     * Adjust highlighted index when filtered options change
-     */
-    useEffect(() => {
-      setHighlightedIndex((prev) => {
-        if (prev >= 0 && prev < filteredOptions.length) {
-          return prev
-        }
-        return -1
-      })
-    }, [filteredOptions])
-
-    const SelectedIcon = selectedOption?.icon
-
-    return (
-      <Popover
-        open={open}
-        onOpenChange={(next) => {
-          setOpen(next)
-          if (!next) setSearchQuery('')
-          onOpenChange?.(next)
-        }}
-      >
-        <div ref={containerRef} className='relative w-full' {...props}>
-          <PopoverAnchor asChild>
-            <div className='w-full'>
-              {editable ? (
-                <div className='group relative'>
-                  <Input
-                    ref={inputRef}
+      }, [highlightedIndex])
+
+      /**
+       * Adjust highlighted index when filtered options change
+       */
+      useEffect(() => {
+        setHighlightedIndex((prev) => {
+          if (prev >= 0 && prev < filteredOptions.length) {
+            return prev
+          }
+          return -1
+        })
+      }, [filteredOptions])
+
+      const SelectedIcon = selectedOption?.icon
+
+      return (
+        <Popover
+          open={open}
+          onOpenChange={(next) => {
+            setOpen(next)
+            if (!next) setSearchQuery('')
+            onOpenChange?.(next)
+          }}
+        >
+          <div ref={containerRef} className='relative w-full' {...props}>
+            <PopoverAnchor asChild>
+              <div className='w-full'>
+                {editable ? (
+                  <div className='group relative'>
+                    <Input
+                      ref={inputRef}
+                      className={cn(
+                        'w-full pr-[40px] font-medium transition-colors hover:bg-[var(--surface-7)] dark:hover:border-[var(--surface-7)] dark:hover:bg-[var(--border-1)]',
+                        (overlayContent || SelectedIcon) && 'text-transparent caret-foreground',
+                        SelectedIcon && !overlayContent && 'pl-[28px]',
+                        className
+                      )}
+                      placeholder={placeholder}
+                      value={value ?? ''}
+                      onChange={handleInputChange}
+                      onFocus={handleFocus}
+                      onBlur={handleBlur}
+                      onKeyDown={handleKeyDown}
+                      disabled={disabled}
+                      {...inputProps}
+                    />
+                    {(overlayContent || SelectedIcon) && (
+                      <div
+                        className={cn(
+                          'pointer-events-none absolute top-0 right-[42px] bottom-0 left-0 flex items-center bg-transparent px-[8px] py-[6px] font-medium font-sans text-sm',
+                          disabled && 'opacity-50'
+                        )}
+                      >
+                        {overlayContent ? (
+                          overlayContent
+                        ) : (
+                          <>
+                            {SelectedIcon && (
+                              <SelectedIcon className='mr-[8px] h-3 w-3 flex-shrink-0' />
+                            )}
+                            <span className='truncate text-[var(--text-primary)]'>
+                              {selectedOption?.label}
+                            </span>
+                          </>
+                        )}
+                      </div>
+                    )}
+                    <div
+                      className='-translate-y-1/2 absolute top-1/2 right-[4px] z-10 flex h-6 w-6 cursor-pointer items-center justify-center'
+                      onMouseDown={handleChevronClick}
+                    >
+                      <ChevronDown
+                        className={cn(
+                          'h-4 w-4 opacity-50 transition-transform',
+                          open && 'rotate-180'
+                        )}
+                      />
+                    </div>
+                  </div>
+                ) : (
+                  <div
+                    ref={ref}
+                    role='combobox'
+                    aria-expanded={open}
+                    aria-haspopup='listbox'
+                    aria-disabled={disabled}
+                    tabIndex={disabled ? -1 : 0}
                     className={cn(
-                      'w-full pr-[40px] font-medium transition-colors hover:bg-[var(--surface-7)] dark:hover:border-[var(--surface-7)] dark:hover:bg-[var(--border-1)]',
-                      (overlayContent || SelectedIcon) && 'text-transparent caret-foreground',
-                      SelectedIcon && !overlayContent && 'pl-[28px]',
+                      comboboxVariants({ variant, size }),
+                      'relative cursor-pointer items-center justify-between',
+                      disabled && 'cursor-not-allowed opacity-50',
                       className
                     )}
-                    placeholder={placeholder}
-                    value={value ?? ''}
-                    onChange={handleInputChange}
-                    onFocus={handleFocus}
-                    onBlur={handleBlur}
+                    onClick={handleToggle}
                     onKeyDown={handleKeyDown}
-                    disabled={disabled}
-                    {...inputProps}
-                  />
-                  {(overlayContent || SelectedIcon) && (
-                    <div
+                  >
+                    <span
                       className={cn(
-                        'pointer-events-none absolute top-0 right-[42px] bottom-0 left-0 flex items-center bg-transparent px-[8px] py-[6px] font-medium font-sans text-sm',
-                        disabled && 'opacity-50'
+                        'flex-1 truncate',
+                        !selectedOption && 'text-[var(--text-muted)]',
+                        overlayContent && 'text-transparent'
                       )}
                     >
-                      {overlayContent ? (
-                        overlayContent
-                      ) : (
-                        <>
-                          {SelectedIcon && (
-                            <SelectedIcon className='mr-[8px] h-3 w-3 flex-shrink-0' />
-                          )}
-                          <span className='truncate text-[var(--text-primary)]'>
-                            {selectedOption?.label}
-                          </span>
-                        </>
-                      )}
-                    </div>
-                  )}
-                  <div
-                    className='-translate-y-1/2 absolute top-1/2 right-[4px] z-10 flex h-6 w-6 cursor-pointer items-center justify-center'
-                    onMouseDown={handleChevronClick}
-                  >
+                      {selectedOption ? selectedOption.label : placeholder}
+                    </span>
                     <ChevronDown
                       className={cn(
-                        'h-4 w-4 opacity-50 transition-transform',
+                        'ml-[8px] h-4 w-4 flex-shrink-0 opacity-50 transition-transform',
                         open && 'rotate-180'
                       )}
                     />
-                  </div>
-                </div>
-              ) : (
-                <div
-                  ref={ref}
-                  role='combobox'
-                  aria-expanded={open}
-                  aria-haspopup='listbox'
-                  aria-disabled={disabled}
-                  tabIndex={disabled ? -1 : 0}
-                  className={cn(
-                    comboboxVariants({ variant, size }),
-                    'relative cursor-pointer items-center justify-between',
-                    disabled && 'cursor-not-allowed opacity-50',
-                    className
-                  )}
-                  onClick={handleToggle}
-                  onKeyDown={handleKeyDown}
-                >
-                  <span
-                    className={cn(
-                      'flex-1 truncate',
-                      !selectedOption && 'text-[var(--text-muted)]',
-                      overlayContent && 'text-transparent'
-                    )}
-                  >
-                    {selectedOption ? selectedOption.label : placeholder}
-                  </span>
-                  <ChevronDown
-                    className={cn(
-                      'ml-[8px] h-4 w-4 flex-shrink-0 opacity-50 transition-transform',
-                      open && 'rotate-180'
+                    {overlayContent && (
+                      <div className='pointer-events-none absolute inset-y-0 right-[24px] left-0 flex items-center px-[8px]'>
+                        <div className='w-full truncate'>{overlayContent}</div>
+                      </div>
                     )}
-                  />
-                  {overlayContent && (
-                    <div className='pointer-events-none absolute inset-y-0 right-[24px] left-0 flex items-center px-[8px]'>
-                      <div className='w-full truncate'>{overlayContent}</div>
-                    </div>
-                  )}
-                </div>
+                  </div>
+                )}
+              </div>
+            </PopoverAnchor>
+
+            <PopoverContent
+              side='bottom'
+              align={align}
+              sideOffset={4}
+              className={cn(
+                'rounded-[6px] border border-[var(--border-1)] p-0',
+                dropdownWidth === 'trigger' && 'w-[var(--radix-popover-trigger-width)]'
               )}
-            </div>
-          </PopoverAnchor>
-
-          <PopoverContent
-            side='bottom'
-            align={align}
-            sideOffset={4}
-            className={cn(
-              'rounded-[6px] border border-[var(--border-1)] p-0',
-              dropdownWidth === 'trigger' && 'w-[var(--radix-popover-trigger-width)]'
-            )}
-            style={typeof dropdownWidth === 'number' ? { width: `${dropdownWidth}px` } : undefined}
-            onOpenAutoFocus={(e) => {
-              e.preventDefault()
-              // Only auto-focus search input when not in editable mode
-              if (searchable && !editable) {
-                setTimeout(() => searchInputRef.current?.focus(), 0)
+              style={
+                typeof dropdownWidth === 'number' ? { width: `${dropdownWidth}px` } : undefined
               }
-            }}
-            onInteractOutside={(e) => {
-              // If the user clicks the anchor/trigger while the popover is open,
-              // prevent Radix from auto-closing on mousedown. Our own toggle handler
-              // on the anchor will close it explicitly, avoiding close→reopen races.
-              const target = e.target as Node
-              if (containerRef.current?.contains(target)) {
+              onOpenAutoFocus={(e) => {
                 e.preventDefault()
-              }
-            }}
-          >
-            {searchable && (
-              <div className='flex items-center px-[10px] pt-[8px] pb-[4px]'>
-                <Search className='mr-[7px] ml-[1px] h-[13px] w-[13px] shrink-0 text-[var(--text-muted)]' />
-                <input
-                  ref={searchInputRef}
-                  className='w-full bg-transparent font-base text-[13px] text-[var(--text-primary)] placeholder:text-[var(--text-muted)] focus:outline-none'
-                  placeholder={searchPlaceholder}
-                  value={searchQuery}
-                  onChange={(e) => setSearchQuery(e.target.value)}
-                  onKeyDown={(e) => {
-                    if (e.key === 'Escape') {
-                      setOpen(false)
-                      setSearchQuery('')
-                    }
-                  }}
-                />
-              </div>
-            )}
-            <PopoverScrollArea
-              className='!flex-none p-[4px]'
-              style={{ maxHeight: `${maxHeight}px` }}
-              onWheelCapture={(e) => {
-                const target = e.currentTarget
-                const { scrollTop, scrollHeight, clientHeight } = target
-                const delta = e.deltaY
-                const isScrollingDown = delta > 0
-                const isScrollingUp = delta < 0
-                const isAtTop = scrollTop === 0
-                const isAtBottom = scrollTop + clientHeight >= scrollHeight - 1
-                if ((isScrollingDown && !isAtBottom) || (isScrollingUp && !isAtTop)) {
-                  e.stopPropagation()
+                // Only auto-focus search input when not in editable mode
+                if (searchable && !editable) {
+                  setTimeout(() => searchInputRef.current?.focus(), 0)
+                }
+              }}
+              onInteractOutside={(e) => {
+                // If the user clicks the anchor/trigger while the popover is open,
+                // prevent Radix from auto-closing on mousedown. Our own toggle handler
+                // on the anchor will close it explicitly, avoiding close→reopen races.
+                const target = e.target as Node
+                if (containerRef.current?.contains(target)) {
+                  e.preventDefault()
                 }
               }}
             >
-              <div ref={dropdownRef} role='listbox'>
-                {isLoading ? (
-                  <div className='flex items-center justify-center py-[14px]'>
-                    <Loader2 className='h-[16px] w-[16px] animate-spin text-[var(--text-muted)]' />
-                    <span className='ml-[8px] font-base text-[12px] text-[var(--text-muted)]'>
-                      Loading options...
-                    </span>
-                  </div>
-                ) : error ? (
-                  <div className='px-[6px] py-[14px] text-center font-base text-[12px] text-red-500'>
-                    {error}
-                  </div>
-                ) : filteredOptions.length === 0 ? (
-                  <div className='py-[14px] text-center font-base text-[12px] text-[var(--text-muted)]'>
-                    {emptyMessage ||
-                      (searchQuery || (editable && value)
-                        ? 'No matching options found'
-                        : 'No options available')}
-                  </div>
-                ) : filteredGroups ? (
-                  // Render grouped options with section headers
-                  <div className='space-y-[2px]'>
-                    {filteredGroups.map((group, groupIndex) => (
-                      <div key={group.section || `group-${groupIndex}`}>
-                        {group.sectionElement
-                          ? group.sectionElement
-                          : group.section && (
-                              <div className='px-[6px] py-[4px] font-base text-[11px] text-[var(--text-tertiary)] first:pt-[4px]'>
-                                {group.section}
-                              </div>
-                            )}
-                        {group.items.map((option) => {
-                          const isSelected = multiSelect
-                            ? multiSelectValues?.includes(option.value)
-                            : effectiveSelectedValue === option.value
-                          const globalIndex = filteredOptions.findIndex(
-                            (o) => o.value === option.value
-                          )
-                          const isHighlighted = globalIndex === highlightedIndex
-                          const OptionIcon = option.icon
-
-                          return (
-                            <div
-                              key={option.value}
-                              role='option'
-                              aria-selected={isSelected}
-                              aria-disabled={option.disabled}
-                              data-option-index={globalIndex}
-                              onMouseDown={(e) => {
-                                e.preventDefault()
-                                e.stopPropagation()
-                                if (!option.disabled) {
-                                  handleSelect(option.value, option.onSelect)
-                                }
-                              }}
-                              onMouseEnter={() =>
-                                !option.disabled && setHighlightedIndex(globalIndex)
-                              }
-                              className={cn(
-                                'relative flex cursor-pointer select-none items-center gap-[8px] rounded-[4px] px-[6px] font-medium font-sans',
-                                size === 'sm' ? 'py-[5px] text-[12px]' : 'py-[6px] text-sm',
-                                'hover:bg-[var(--border-1)]',
-                                (isHighlighted || isSelected) && 'bg-[var(--border-1)]',
-                                option.disabled && 'cursor-not-allowed opacity-50'
-                              )}
-                            >
-                              {option.iconElement
-                                ? option.iconElement
-                                : OptionIcon && (
-                                    <OptionIcon className='h-[14px] w-[14px] flex-shrink-0' />
-                                  )}
-                              <span className='flex-1 truncate text-[var(--text-primary)]'>
-                                {option.label}
-                              </span>
-                              {multiSelect && isSelected && (
-                                <Check className='ml-[8px] h-[12px] w-[12px] flex-shrink-0 text-[var(--text-primary)]' />
+              {searchable && (
+                <div className='flex items-center px-[10px] pt-[8px] pb-[4px]'>
+                  <Search className='mr-[7px] ml-[1px] h-[13px] w-[13px] shrink-0 text-[var(--text-muted)]' />
+                  <input
+                    ref={searchInputRef}
+                    className='w-full bg-transparent font-base text-[13px] text-[var(--text-primary)] placeholder:text-[var(--text-muted)] focus:outline-none'
+                    placeholder={searchPlaceholder}
+                    value={searchQuery}
+                    onChange={(e) => setSearchQuery(e.target.value)}
+                    onKeyDown={(e) => {
+                      // Forward navigation keys to main handler
+                      if (
+                        e.key === 'ArrowDown' ||
+                        e.key === 'ArrowUp' ||
+                        e.key === 'Enter' ||
+                        e.key === 'Escape'
+                      ) {
+                        handleKeyDown(e as unknown as KeyboardEvent<HTMLDivElement>)
+                      }
+                    }}
+                  />
+                </div>
+              )}
+              <PopoverScrollArea
+                className='!flex-none p-[4px]'
+                style={{ maxHeight: `${maxHeight}px` }}
+                onWheelCapture={(e) => {
+                  const target = e.currentTarget
+                  const { scrollTop, scrollHeight, clientHeight } = target
+                  const delta = e.deltaY
+                  const isScrollingDown = delta > 0
+                  const isScrollingUp = delta < 0
+                  const isAtTop = scrollTop === 0
+                  const isAtBottom = scrollTop + clientHeight >= scrollHeight - 1
+                  if ((isScrollingDown && !isAtBottom) || (isScrollingUp && !isAtTop)) {
+                    e.stopPropagation()
+                  }
+                }}
+              >
+                <div ref={dropdownRef} role='listbox'>
+                  {isLoading ? (
+                    <div className='flex items-center justify-center py-[14px]'>
+                      <Loader2 className='h-[16px] w-[16px] animate-spin text-[var(--text-muted)]' />
+                      <span className='ml-[8px] font-base text-[12px] text-[var(--text-muted)]'>
+                        Loading options...
+                      </span>
+                    </div>
+                  ) : error ? (
+                    <div className='px-[6px] py-[14px] text-center font-base text-[12px] text-red-500'>
+                      {error}
+                    </div>
+                  ) : filteredOptions.length === 0 ? (
+                    <div className='py-[14px] text-center font-base text-[12px] text-[var(--text-muted)]'>
+                      {emptyMessage ||
+                        (searchQuery || (editable && value)
+                          ? 'No matching options found'
+                          : 'No options available')}
+                    </div>
+                  ) : filteredGroups ? (
+                    // Render grouped options with section headers
+                    <div className='space-y-[2px]'>
+                      {filteredGroups.map((group, groupIndex) => (
+                        <div key={group.section || `group-${groupIndex}`}>
+                          {group.sectionElement
+                            ? group.sectionElement
+                            : group.section && (
+                                <div className='px-[6px] py-[4px] font-base text-[11px] text-[var(--text-tertiary)] first:pt-[4px]'>
+                                  {group.section}
+                                </div>
                               )}
-                            </div>
-                          )
-                        })}
-                      </div>
-                    ))}
-                  </div>
-                ) : (
-                  // Render flat options (no groups)
-                  <div className='space-y-[2px]'>
-                    {showAllOption && multiSelect && (
-                      <div
-                        role='option'
-                        aria-selected={!multiSelectValues?.length}
-                        data-option-index={-1}
-                        onMouseDown={(e) => {
-                          e.preventDefault()
-                          e.stopPropagation()
-                          onMultiSelectChange?.([])
-                        }}
-                        onMouseEnter={() => setHighlightedIndex(-1)}
-                        className={cn(
-                          'relative flex cursor-pointer select-none items-center rounded-[4px] px-[6px] font-medium font-sans',
-                          size === 'sm' ? 'py-[5px] text-[12px]' : 'py-[6px] text-sm',
-                          'hover:bg-[var(--border-1)]',
-                          !multiSelectValues?.length && 'bg-[var(--border-1)]'
-                        )}
-                      >
-                        <span className='flex-1 truncate text-[var(--text-primary)]'>
-                          {allOptionLabel}
-                        </span>
-                      </div>
-                    )}
-                    {filteredOptions.map((option, index) => {
-                      const isSelected = multiSelect
-                        ? multiSelectValues?.includes(option.value)
-                        : effectiveSelectedValue === option.value
-                      const isHighlighted = index === highlightedIndex
-                      const OptionIcon = option.icon
-
-                      return (
+                          {group.items.map((option) => {
+                            const isSelected = multiSelect
+                              ? multiSelectValues?.includes(option.value)
+                              : effectiveSelectedValue === option.value
+                            const globalIndex = filteredOptions.findIndex(
+                              (o) => o.value === option.value
+                            )
+                            const isHighlighted = globalIndex === highlightedIndex
+                            const OptionIcon = option.icon
+
+                            return (
+                              <div
+                                key={option.value}
+                                role='option'
+                                aria-selected={isSelected}
+                                aria-disabled={option.disabled}
+                                data-option-index={globalIndex}
+                                onMouseDown={(e) => {
+                                  e.preventDefault()
+                                  e.stopPropagation()
+                                  if (!option.disabled) {
+                                    handleSelect(option.value, option.onSelect)
+                                  }
+                                }}
+                                onMouseEnter={() =>
+                                  !option.disabled && setHighlightedIndex(globalIndex)
+                                }
+                                className={cn(
+                                  'relative flex cursor-pointer select-none items-center gap-[8px] rounded-[4px] px-[6px] font-medium font-sans',
+                                  size === 'sm' ? 'py-[5px] text-[12px]' : 'py-[6px] text-sm',
+                                  'hover:bg-[var(--border-1)]',
+                                  (isHighlighted || isSelected) && 'bg-[var(--border-1)]',
+                                  option.disabled && 'cursor-not-allowed opacity-50'
+                                )}
+                              >
+                                {option.iconElement
+                                  ? option.iconElement
+                                  : OptionIcon && (
+                                      <OptionIcon className='h-[14px] w-[14px] flex-shrink-0' />
+                                    )}
+                                <span className='flex-1 truncate text-[var(--text-primary)]'>
+                                  {option.label}
+                                </span>
+                                {multiSelect && isSelected && (
+                                  <Check className='ml-[8px] h-[12px] w-[12px] flex-shrink-0 text-[var(--text-primary)]' />
+                                )}
+                              </div>
+                            )
+                          })}
+                        </div>
+                      ))}
+                    </div>
+                  ) : (
+                    // Render flat options (no groups)
+                    <div className='space-y-[2px]'>
+                      {showAllOption && multiSelect && (
                         <div
-                          key={option.value}
                           role='option'
-                          aria-selected={isSelected}
-                          aria-disabled={option.disabled}
-                          data-option-index={index}
+                          aria-selected={!multiSelectValues?.length}
+                          data-option-index={-1}
                           onMouseDown={(e) => {
                             e.preventDefault()
                             e.stopPropagation()
-                            if (!option.disabled) {
-                              handleSelect(option.value, option.onSelect)
-                            }
+                            onMultiSelectChange?.([])
                           }}
-                          onMouseEnter={() => !option.disabled && setHighlightedIndex(index)}
+                          onMouseEnter={() => setHighlightedIndex(-1)}
                           className={cn(
-                            'relative flex cursor-pointer select-none items-center gap-[8px] rounded-[4px] px-[6px] font-medium font-sans',
+                            'relative flex cursor-pointer select-none items-center rounded-[4px] px-[6px] font-medium font-sans',
                             size === 'sm' ? 'py-[5px] text-[12px]' : 'py-[6px] text-sm',
                             'hover:bg-[var(--border-1)]',
-                            (isHighlighted || isSelected) && 'bg-[var(--border-1)]',
-                            option.disabled && 'cursor-not-allowed opacity-50'
+                            !multiSelectValues?.length && 'bg-[var(--border-1)]'
                           )}
                         >
-                          {option.iconElement
-                            ? option.iconElement
-                            : OptionIcon && (
-                                <OptionIcon className='h-[14px] w-[14px] flex-shrink-0' />
-                              )}
                           <span className='flex-1 truncate text-[var(--text-primary)]'>
-                            {option.label}
+                            {allOptionLabel}
                           </span>
-                          {multiSelect && isSelected && (
-                            <Check className='ml-[8px] h-[12px] w-[12px] flex-shrink-0 text-[var(--text-primary)]' />
-                          )}
                         </div>
-                      )
-                    })}
-                  </div>
-                )}
-              </div>
-            </PopoverScrollArea>
-          </PopoverContent>
-        </div>
-      </Popover>
-    )
-  }
+                      )}
+                      {filteredOptions.map((option, index) => {
+                        const isSelected = multiSelect
+                          ? multiSelectValues?.includes(option.value)
+                          : effectiveSelectedValue === option.value
+                        const isHighlighted = index === highlightedIndex
+                        const OptionIcon = option.icon
+
+                        return (
+                          <div
+                            key={option.value}
+                            role='option'
+                            aria-selected={isSelected}
+                            aria-disabled={option.disabled}
+                            data-option-index={index}
+                            onMouseDown={(e) => {
+                              e.preventDefault()
+                              e.stopPropagation()
+                              if (!option.disabled) {
+                                handleSelect(option.value, option.onSelect)
+                              }
+                            }}
+                            onMouseEnter={() => !option.disabled && setHighlightedIndex(index)}
+                            className={cn(
+                              'relative flex cursor-pointer select-none items-center gap-[8px] rounded-[4px] px-[6px] font-medium font-sans',
+                              size === 'sm' ? 'py-[5px] text-[12px]' : 'py-[6px] text-sm',
+                              'hover:bg-[var(--border-1)]',
+                              (isHighlighted || isSelected) && 'bg-[var(--border-1)]',
+                              option.disabled && 'cursor-not-allowed opacity-50'
+                            )}
+                          >
+                            {option.iconElement
+                              ? option.iconElement
+                              : OptionIcon && (
+                                  <OptionIcon className='h-[14px] w-[14px] flex-shrink-0' />
+                                )}
+                            <span className='flex-1 truncate text-[var(--text-primary)]'>
+                              {option.label}
+                            </span>
+                            {multiSelect && isSelected && (
+                              <Check className='ml-[8px] h-[12px] w-[12px] flex-shrink-0 text-[var(--text-primary)]' />
+                            )}
+                          </div>
+                        )
+                      })}
+                    </div>
+                  )}
+                </div>
+              </PopoverScrollArea>
+            </PopoverContent>
+          </div>
+        </Popover>
+      )
+    }
+  )
 )
 
 Combobox.displayName = 'Combobox'
diff --git a/apps/sim/components/emcn/components/modal/modal.tsx b/apps/sim/components/emcn/components/modal/modal.tsx
index 32a62e71e3..a476a8b78e 100644
--- a/apps/sim/components/emcn/components/modal/modal.tsx
+++ b/apps/sim/components/emcn/components/modal/modal.tsx
@@ -200,7 +200,7 @@ const ModalHeader = React.forwardRef<HTMLDivElement, React.HTMLAttributes<HTMLDi
       )}
       {...props}
     >
-      <DialogPrimitive.Title className='min-w-0 truncate font-medium text-[16px] text-[var(--text-primary)]'>
+      <DialogPrimitive.Title className='min-w-0 font-medium text-[16px] text-[var(--text-primary)] leading-snug'>
         {children}
       </DialogPrimitive.Title>
       <DialogPrimitive.Close asChild>
diff --git a/apps/sim/components/emcn/components/popover/popover.tsx b/apps/sim/components/emcn/components/popover/popover.tsx
index d80841d677..764c1f5ae0 100644
--- a/apps/sim/components/emcn/components/popover/popover.tsx
+++ b/apps/sim/components/emcn/components/popover/popover.tsx
@@ -170,6 +170,18 @@ interface PopoverContextValue {
   /** ID of the last hovered item (for hover submenus) */
   lastHoveredItem: string | null
   setLastHoveredItem: (id: string | null) => void
+  /** Whether keyboard navigation is active. When true, hover styles are suppressed. */
+  isKeyboardNav: boolean
+  setKeyboardNav: (value: boolean) => void
+  /** Currently selected item index for keyboard navigation */
+  selectedIndex: number
+  setSelectedIndex: (index: number) => void
+  /** Register a menu item and get its index. Returns a cleanup function. */
+  registerItem: (id: string) => number
+  /** Unregister a menu item */
+  unregisterItem: (id: string) => void
+  /** Get the total number of registered items */
+  itemCount: number
 }
 
 const PopoverContext = React.createContext<PopoverContextValue | null>(null)
@@ -220,6 +232,23 @@ const Popover: React.FC<PopoverProps> = ({
   const [onFolderSelect, setOnFolderSelect] = React.useState<(() => void) | null>(null)
   const [searchQuery, setSearchQuery] = React.useState<string>('')
   const [lastHoveredItem, setLastHoveredItem] = React.useState<string | null>(null)
+  const [isKeyboardNav, setIsKeyboardNav] = React.useState(false)
+  const [selectedIndex, setSelectedIndex] = React.useState(-1)
+  const registeredItemsRef = React.useRef<string[]>([])
+
+  const registerItem = React.useCallback((id: string) => {
+    if (!registeredItemsRef.current.includes(id)) {
+      registeredItemsRef.current.push(id)
+    }
+    return registeredItemsRef.current.indexOf(id)
+  }, [])
+
+  const unregisterItem = React.useCallback((id: string) => {
+    const index = registeredItemsRef.current.indexOf(id)
+    if (index !== -1) {
+      registeredItemsRef.current.splice(index, 1)
+    }
+  }, [])
 
   React.useEffect(() => {
     if (open === false) {
@@ -228,6 +257,9 @@ const Popover: React.FC<PopoverProps> = ({
       setOnFolderSelect(null)
       setSearchQuery('')
       setLastHoveredItem(null)
+      setIsKeyboardNav(false)
+      setSelectedIndex(-1)
+      registeredItemsRef.current = []
     }
   }, [open])
 
@@ -249,6 +281,12 @@ const Popover: React.FC<PopoverProps> = ({
     setOnFolderSelect(null)
   }, [])
 
+  const setKeyboardNav = React.useCallback((value: boolean) => {
+    setIsKeyboardNav(value)
+  }, [])
+
+  const itemCount = registeredItemsRef.current.length
+
   const contextValue = React.useMemo<PopoverContextValue>(
     () => ({
       openFolder,
@@ -264,6 +302,13 @@ const Popover: React.FC<PopoverProps> = ({
       setSearchQuery,
       lastHoveredItem,
       setLastHoveredItem,
+      isKeyboardNav,
+      setKeyboardNav,
+      selectedIndex,
+      setSelectedIndex,
+      registerItem,
+      unregisterItem,
+      itemCount,
     }),
     [
       openFolder,
@@ -276,6 +321,12 @@ const Popover: React.FC<PopoverProps> = ({
       colorScheme,
       searchQuery,
       lastHoveredItem,
+      isKeyboardNav,
+      setKeyboardNav,
+      selectedIndex,
+      registerItem,
+      unregisterItem,
+      itemCount,
     ]
   )
 
@@ -382,6 +433,92 @@ const PopoverContent = React.forwardRef<
 
     const effectiveSideOffset = sideOffset ?? (side === 'top' ? 20 : 14)
 
+    const handleMouseMove = React.useCallback(() => {
+      if (context?.isKeyboardNav) {
+        context.setKeyboardNav(false)
+      }
+    }, [context])
+
+    const contentRef = React.useRef<HTMLDivElement>(null)
+
+    const mergedRef = React.useCallback(
+      (node: HTMLDivElement | null) => {
+        contentRef.current = node
+        if (typeof ref === 'function') {
+          ref(node)
+        } else if (ref) {
+          ref.current = node
+        }
+      },
+      [ref]
+    )
+
+    React.useEffect(() => {
+      if (!context) return
+
+      const handleKeyDown = (e: KeyboardEvent) => {
+        const content = contentRef.current
+        if (!content) return
+
+        const items = content.querySelectorAll<HTMLElement>(
+          '[role="menuitem"]:not([aria-disabled="true"])'
+        )
+        if (items.length === 0) return
+
+        const currentIndex = context.selectedIndex
+
+        switch (e.key) {
+          case 'ArrowDown':
+            e.preventDefault()
+            e.stopPropagation()
+            context.setKeyboardNav(true)
+            if (currentIndex < 0) {
+              context.setSelectedIndex(0)
+            } else {
+              context.setSelectedIndex(currentIndex < items.length - 1 ? currentIndex + 1 : 0)
+            }
+            break
+          case 'ArrowUp':
+            e.preventDefault()
+            e.stopPropagation()
+            context.setKeyboardNav(true)
+            if (currentIndex < 0) {
+              context.setSelectedIndex(items.length - 1)
+            } else {
+              context.setSelectedIndex(currentIndex > 0 ? currentIndex - 1 : items.length - 1)
+            }
+            break
+          case 'Enter':
+          case ' ':
+            if (currentIndex >= 0) {
+              e.preventDefault()
+              e.stopPropagation()
+              const selectedItem = items[currentIndex]
+              if (selectedItem) {
+                selectedItem.click()
+              }
+            }
+            break
+        }
+      }
+
+      window.addEventListener('keydown', handleKeyDown, true)
+      return () => window.removeEventListener('keydown', handleKeyDown, true)
+    }, [context])
+
+    React.useEffect(() => {
+      const content = contentRef.current
+      if (!content || !context?.isKeyboardNav || context.selectedIndex < 0) return
+
+      const items = content.querySelectorAll<HTMLElement>(
+        '[role="menuitem"]:not([aria-disabled="true"])'
+      )
+      const selectedItem = items[context.selectedIndex]
+      if (selectedItem) {
+        selectedItem.scrollIntoView({ block: 'nearest', behavior: 'smooth' })
+      }
+    }, [context?.selectedIndex, context?.isKeyboardNav])
+
     const hasUserWidthConstraint =
       maxWidth !== undefined ||
       minWidth !== undefined ||
@@ -425,7 +562,7 @@ const PopoverContent = React.forwardRef<
 
     const content = (
       <PopoverPrimitive.Content
-        ref={ref}
+        ref={mergedRef}
         side={side}
         align={align}
         sideOffset={effectiveSideOffset}
@@ -434,6 +571,7 @@ const PopoverContent = React.forwardRef<
         sticky='partial'
         hideWhenDetached={false}
         onWheel={handleWheel}
+        onMouseMove={handleMouseMove}
         onOpenAutoFocus={handleOpenAutoFocus}
         onCloseAutoFocus={handleCloseAutoFocus}
         {...restProps}
@@ -534,6 +672,29 @@ const PopoverItem = React.forwardRef<HTMLDivElement, PopoverItemProps>(
     const variant = context?.variant || 'default'
     const size = context?.size || 'md'
     const colorScheme = context?.colorScheme || 'default'
+    const itemRef = React.useRef<HTMLDivElement>(null)
+    const [itemIndex, setItemIndex] = React.useState(-1)
+
+    const mergedRef = React.useCallback(
+      (node: HTMLDivElement | null) => {
+        itemRef.current = node
+        if (typeof ref === 'function') {
+          ref(node)
+        } else if (ref) {
+          ref.current = node
+        }
+      },
+      [ref]
+    )
+
+    React.useEffect(() => {
+      if (!itemRef.current) return
+      const content = itemRef.current.closest('[data-radix-popper-content-wrapper]')
+      if (!content) return
+      const items = content.querySelectorAll('[role="menuitem"]:not([aria-disabled="true"])')
+      const index = Array.from(items).indexOf(itemRef.current)
+      setItemIndex(index)
+    }, [])
 
     if (rootOnly && context?.isInFolder) return null
 
@@ -546,24 +707,36 @@ const PopoverItem = React.forwardRef<HTMLDivElement, PopoverItemProps>(
     }
 
     const handleMouseEnter = (e: React.MouseEvent<HTMLDivElement>) => {
-      // Clear last hovered item to close any open hover submenus
       context?.setLastHoveredItem(null)
+      if (itemIndex >= 0 && context) {
+        context.setSelectedIndex(itemIndex)
+      }
       onMouseEnter?.(e)
     }
 
+    // Determine if this item is active:
+    // - Use explicit `active` prop if provided
+    // - Otherwise use context selectedIndex match
+    const isActive =
+      active !== undefined ? active : itemIndex >= 0 && context?.selectedIndex === itemIndex
+
+    // Suppress hover when in keyboard mode to prevent dual highlights
+    const suppressHover = context?.isKeyboardNav && !isActive
+
     return (
       <div
+        ref={mergedRef}
         className={cn(
           STYLES.itemBase,
           STYLES.colorScheme[colorScheme].text,
           STYLES.size[size].item,
-          getItemStateClasses(variant, colorScheme, !!active),
+          getItemStateClasses(variant, colorScheme, !!isActive),
+          suppressHover && 'hover:!bg-transparent',
           disabled && 'pointer-events-none cursor-not-allowed opacity-50',
           className
         )}
-        ref={ref}
         role='menuitem'
-        aria-selected={active}
+        aria-selected={isActive}
         aria-disabled={disabled}
         onClick={handleClick}
         onMouseEnter={handleMouseEnter}
@@ -666,17 +839,19 @@ const PopoverFolder = React.forwardRef<HTMLDivElement, PopoverFolderProps>(
       colorScheme,
       lastHoveredItem,
       setLastHoveredItem,
+      isKeyboardNav,
+      selectedIndex,
+      setSelectedIndex,
     } = usePopoverContext()
     const [submenuPosition, setSubmenuPosition] = React.useState<{ top: number; left: number }>({
       top: 0,
       left: 0,
     })
     const triggerRef = React.useRef<HTMLDivElement>(null)
+    const [itemIndex, setItemIndex] = React.useState(-1)
 
-    // Submenu is open when this folder is the last hovered item (for expandOnHover mode)
     const isHoverOpen = expandOnHover && lastHoveredItem === id
 
-    // Merge refs
     const mergedRef = React.useCallback(
       (node: HTMLDivElement | null) => {
         triggerRef.current = node
@@ -689,9 +864,16 @@ const PopoverFolder = React.forwardRef<HTMLDivElement, PopoverFolderProps>(
       [ref]
     )
 
-    // If we're in a folder and this isn't the current one, hide
+    React.useEffect(() => {
+      if (!triggerRef.current) return
+      const content = triggerRef.current.closest('[data-radix-popper-content-wrapper]')
+      if (!content) return
+      const items = content.querySelectorAll('[role="menuitem"]:not([aria-disabled="true"])')
+      const index = Array.from(items).indexOf(triggerRef.current)
+      setItemIndex(index)
+    }, [])
+
     if (isInFolder && currentFolder !== id) return null
-    // If this folder is open via click (inline mode), render children directly
     if (currentFolder === id) return <>{children}</>
 
     const handleClickOpen = () => {
@@ -701,22 +883,23 @@ const PopoverFolder = React.forwardRef<HTMLDivElement, PopoverFolderProps>(
     const handleClick = (e: React.MouseEvent) => {
       e.stopPropagation()
       if (expandOnHover) {
-        // In hover mode, clicking opens inline and clears hover state
         setLastHoveredItem(null)
       }
       handleClickOpen()
     }
 
     const handleMouseEnter = () => {
+      if (itemIndex >= 0) {
+        setSelectedIndex(itemIndex)
+      }
+
       if (!expandOnHover) return
 
-      // Calculate position for submenu
       if (triggerRef.current) {
         const rect = triggerRef.current.getBoundingClientRect()
         const parentPopover = triggerRef.current.closest('[data-radix-popper-content-wrapper]')
         const parentRect = parentPopover?.getBoundingClientRect()
 
-        // Position to the right of the parent popover with a small gap
         setSubmenuPosition({
           top: rect.top,
           left: parentRect ? parentRect.right + 4 : rect.right + 4,
@@ -727,6 +910,11 @@ const PopoverFolder = React.forwardRef<HTMLDivElement, PopoverFolderProps>(
       onOpen?.()
     }
 
+    const isActive = active !== undefined ? active : itemIndex >= 0 && selectedIndex === itemIndex
+
+    // Suppress hover when in keyboard mode to prevent dual highlights
+    const suppressHover = isKeyboardNav && !isActive && !isHoverOpen
+
     return (
       <>
         <div
@@ -735,12 +923,14 @@ const PopoverFolder = React.forwardRef<HTMLDivElement, PopoverFolderProps>(
             STYLES.itemBase,
             STYLES.colorScheme[colorScheme].text,
             STYLES.size[size].item,
-            getItemStateClasses(variant, colorScheme, !!active || isHoverOpen),
+            getItemStateClasses(variant, colorScheme, isActive || isHoverOpen),
+            suppressHover && 'hover:!bg-transparent',
             className
           )}
           role='menuitem'
           aria-haspopup='true'
           aria-expanded={isHoverOpen}
+          aria-selected={isActive}
           onClick={handleClick}
           onMouseEnter={handleMouseEnter}
           {...props}
diff --git a/apps/sim/executor/handlers/agent/agent-handler.ts b/apps/sim/executor/handlers/agent/agent-handler.ts
index 9f1f9e7d16..6775a43067 100644
--- a/apps/sim/executor/handlers/agent/agent-handler.ts
+++ b/apps/sim/executor/handlers/agent/agent-handler.ts
@@ -321,6 +321,7 @@ export class AgentBlockHandler implements BlockHandler {
             _context: {
               workflowId: ctx.workflowId,
               workspaceId: ctx.workspaceId,
+              isDeployedContext: ctx.isDeployedContext,
             },
           },
           false,
@@ -1074,6 +1075,7 @@ export class AgentBlockHandler implements BlockHandler {
       workflowVariables: ctx.workflowVariables || {},
       blockData,
       blockNameMapping,
+      isDeployedContext: ctx.isDeployedContext,
     })
 
     return this.processProviderResponse(response, block, responseFormat)
diff --git a/apps/sim/executor/handlers/api/api-handler.ts b/apps/sim/executor/handlers/api/api-handler.ts
index c8d1300d22..c8db117b88 100644
--- a/apps/sim/executor/handlers/api/api-handler.ts
+++ b/apps/sim/executor/handlers/api/api-handler.ts
@@ -78,6 +78,7 @@ export class ApiBlockHandler implements BlockHandler {
             workflowId: ctx.workflowId,
             workspaceId: ctx.workspaceId,
             executionId: ctx.executionId,
+            isDeployedContext: ctx.isDeployedContext,
           },
         },
         false,
diff --git a/apps/sim/executor/handlers/condition/condition-handler.ts b/apps/sim/executor/handlers/condition/condition-handler.ts
index c0e1d376fc..deac6c99a6 100644
--- a/apps/sim/executor/handlers/condition/condition-handler.ts
+++ b/apps/sim/executor/handlers/condition/condition-handler.ts
@@ -40,6 +40,7 @@ export async function evaluateConditionExpression(
         _context: {
           workflowId: ctx.workflowId,
           workspaceId: ctx.workspaceId,
+          isDeployedContext: ctx.isDeployedContext,
         },
       },
       false,
diff --git a/apps/sim/executor/handlers/function/function-handler.ts b/apps/sim/executor/handlers/function/function-handler.ts
index 2c240facdd..cc8603760d 100644
--- a/apps/sim/executor/handlers/function/function-handler.ts
+++ b/apps/sim/executor/handlers/function/function-handler.ts
@@ -38,6 +38,7 @@ export class FunctionBlockHandler implements BlockHandler {
         _context: {
           workflowId: ctx.workflowId,
           workspaceId: ctx.workspaceId,
+          isDeployedContext: ctx.isDeployedContext,
         },
       },
       false,
diff --git a/apps/sim/executor/handlers/generic/generic-handler.ts b/apps/sim/executor/handlers/generic/generic-handler.ts
index c61baf7959..fc910eafad 100644
--- a/apps/sim/executor/handlers/generic/generic-handler.ts
+++ b/apps/sim/executor/handlers/generic/generic-handler.ts
@@ -66,6 +66,7 @@ export class GenericBlockHandler implements BlockHandler {
             workflowId: ctx.workflowId,
             workspaceId: ctx.workspaceId,
             executionId: ctx.executionId,
+            isDeployedContext: ctx.isDeployedContext,
           },
         },
         false,
diff --git a/apps/sim/executor/handlers/human-in-the-loop/human-in-the-loop-handler.ts b/apps/sim/executor/handlers/human-in-the-loop/human-in-the-loop-handler.ts
index eea4c5d071..e1d31cc228 100644
--- a/apps/sim/executor/handlers/human-in-the-loop/human-in-the-loop-handler.ts
+++ b/apps/sim/executor/handlers/human-in-the-loop/human-in-the-loop-handler.ts
@@ -627,6 +627,7 @@ export class HumanInTheLoopBlockHandler implements BlockHandler {
           _context: {
             workflowId: ctx.workflowId,
             workspaceId: ctx.workspaceId,
+            isDeployedContext: ctx.isDeployedContext,
           },
           blockData: blockDataWithPause,
           blockNameMapping: blockNameMappingWithPause,
diff --git a/apps/sim/executor/variables/resolvers/block.test.ts b/apps/sim/executor/variables/resolvers/block.test.ts
index 83e6cf1a73..dac00ee0b0 100644
--- a/apps/sim/executor/variables/resolvers/block.test.ts
+++ b/apps/sim/executor/variables/resolvers/block.test.ts
@@ -6,10 +6,14 @@ import type { ResolutionContext } from './reference'
 
 vi.mock('@sim/logger', () => loggerMock)
 
-/**
- * Creates a minimal workflow for testing.
- */
-function createTestWorkflow(blocks: Array<{ id: string; name?: string; type?: string }> = []) {
+function createTestWorkflow(
+  blocks: Array<{
+    id: string
+    name?: string
+    type?: string
+    outputs?: Record<string, any>
+  }> = []
+) {
   return {
     version: '1.0',
     blocks: blocks.map((b) => ({
@@ -17,7 +21,7 @@ function createTestWorkflow(blocks: Array<{ id: string; name?: string; type?: st
       position: { x: 0, y: 0 },
       config: { tool: b.type ?? 'function', params: {} },
       inputs: {},
-      outputs: {},
+      outputs: b.outputs ?? {},
       metadata: { id: b.type ?? 'function', name: b.name ?? b.id },
       enabled: true,
     })),
@@ -126,7 +130,7 @@ describe('BlockResolver', () => {
       expect(resolver.resolve('<source.items.1.id>', ctx)).toBe(2)
     })
 
-    it.concurrent('should return undefined for non-existent path', () => {
+    it.concurrent('should return undefined for non-existent path when no schema defined', () => {
       const workflow = createTestWorkflow([{ id: 'source' }])
       const resolver = new BlockResolver(workflow)
       const ctx = createTestContext('current', {
@@ -136,6 +140,48 @@ describe('BlockResolver', () => {
       expect(resolver.resolve('<source.nonexistent>', ctx)).toBeUndefined()
     })
 
+    it.concurrent('should throw error for path not in output schema', () => {
+      const workflow = createTestWorkflow([
+        {
+          id: 'source',
+          outputs: {
+            validField: { type: 'string', description: 'A valid field' },
+            nested: {
+              child: { type: 'number', description: 'Nested child' },
+            },
+          },
+        },
+      ])
+      const resolver = new BlockResolver(workflow)
+      const ctx = createTestContext('current', {
+        source: { validField: 'value', nested: { child: 42 } },
+      })
+
+      expect(() => resolver.resolve('<source.invalidField>', ctx)).toThrow(
+        /"invalidField" doesn't exist on block "source"/
+      )
+      expect(() => resolver.resolve('<source.invalidField>', ctx)).toThrow(/Available fields:/)
+    })
+
+    it.concurrent('should return undefined for path in schema but missing in data', () => {
+      const workflow = createTestWorkflow([
+        {
+          id: 'source',
+          outputs: {
+            requiredField: { type: 'string', description: 'Always present' },
+            optionalField: { type: 'string', description: 'Sometimes missing' },
+          },
+        },
+      ])
+      const resolver = new BlockResolver(workflow)
+      const ctx = createTestContext('current', {
+        source: { requiredField: 'value' },
+      })
+
+      expect(resolver.resolve('<source.requiredField>', ctx)).toBe('value')
+      expect(resolver.resolve('<source.optionalField>', ctx)).toBeUndefined()
+    })
+
     it.concurrent('should return undefined for non-existent block', () => {
       const workflow = createTestWorkflow([{ id: 'existing' }])
       const resolver = new BlockResolver(workflow)
diff --git a/apps/sim/executor/variables/resolvers/block.ts b/apps/sim/executor/variables/resolvers/block.ts
index 4c46b0d299..7b6b783e66 100644
--- a/apps/sim/executor/variables/resolvers/block.ts
+++ b/apps/sim/executor/variables/resolvers/block.ts
@@ -9,14 +9,76 @@ import {
   type ResolutionContext,
   type Resolver,
 } from '@/executor/variables/resolvers/reference'
-import type { SerializedWorkflow } from '@/serializer/types'
+import type { SerializedBlock, SerializedWorkflow } from '@/serializer/types'
+import { getTool } from '@/tools/utils'
+
+function isPathInOutputSchema(
+  outputs: Record<string, any> | undefined,
+  pathParts: string[]
+): boolean {
+  if (!outputs || pathParts.length === 0) {
+    return true
+  }
+
+  let current: any = outputs
+  for (let i = 0; i < pathParts.length; i++) {
+    const part = pathParts[i]
+
+    if (/^\d+$/.test(part)) {
+      continue
+    }
+
+    if (current === null || current === undefined) {
+      return false
+    }
+
+    if (part in current) {
+      current = current[part]
+      continue
+    }
+
+    if (current.properties && part in current.properties) {
+      current = current.properties[part]
+      continue
+    }
+
+    if (current.type === 'array' && current.items) {
+      if (current.items.properties && part in current.items.properties) {
+        current = current.items.properties[part]
+        continue
+      }
+      if (part in current.items) {
+        current = current.items[part]
+        continue
+      }
+    }
+
+    if ('type' in current && typeof current.type === 'string') {
+      if (!current.properties && !current.items) {
+        return false
+      }
+    }
+
+    return false
+  }
+
+  return true
+}
+
+function getSchemaFieldNames(outputs: Record<string, any> | undefined): string[] {
+  if (!outputs) return []
+  return Object.keys(outputs)
+}
 
 export class BlockResolver implements Resolver {
   private nameToBlockId: Map<string, string>
+  private blockById: Map<string, SerializedBlock>
 
   constructor(private workflow: SerializedWorkflow) {
     this.nameToBlockId = new Map()
+    this.blockById = new Map()
     for (const block of workflow.blocks) {
+      this.blockById.set(block.id, block)
       if (block.metadata?.name) {
         this.nameToBlockId.set(normalizeName(block.metadata.name), block.id)
       }
@@ -47,7 +109,9 @@ export class BlockResolver implements Resolver {
       return undefined
     }
 
+    const block = this.blockById.get(blockId)
     const output = this.getBlockOutput(blockId, context)
+
     if (output === undefined) {
       return undefined
     }
@@ -63,9 +127,6 @@ export class BlockResolver implements Resolver {
       return result
     }
 
-    // If failed, check if we should try backwards compatibility fallback
-    const block = this.workflow.blocks.find((b) => b.id === blockId)
-
     // Response block backwards compatibility:
     // Old: <responseBlock.response.data> -> New: <responseBlock.data>
     // Only apply fallback if:
@@ -108,6 +169,17 @@ export class BlockResolver implements Resolver {
       }
     }
 
+    const toolId = block?.config?.tool
+    const toolConfig = toolId ? getTool(toolId) : undefined
+    const outputSchema = toolConfig?.outputs ?? block?.outputs
+    const schemaFields = getSchemaFieldNames(outputSchema)
+    if (schemaFields.length > 0 && !isPathInOutputSchema(outputSchema, pathParts)) {
+      throw new Error(
+        `"${pathParts.join('.')}" doesn't exist on block "${blockName}". ` +
+          `Available fields: ${schemaFields.join(', ')}`
+      )
+    }
+
     return undefined
   }
 
diff --git a/apps/sim/hooks/queries/general-settings.ts b/apps/sim/hooks/queries/general-settings.ts
index 1fc8a5fd01..f85df4a440 100644
--- a/apps/sim/hooks/queries/general-settings.ts
+++ b/apps/sim/hooks/queries/general-settings.ts
@@ -1,7 +1,6 @@
 import { createLogger } from '@sim/logger'
 import { keepPreviousData, useMutation, useQuery, useQueryClient } from '@tanstack/react-query'
 import { syncThemeToNextThemes } from '@/lib/core/utils/theme'
-import { useGeneralStore } from '@/stores/settings/general'
 
 const logger = createLogger('GeneralSettingsQuery')
 
@@ -53,48 +52,16 @@ async function fetchGeneralSettings(): Promise<GeneralSettings> {
   }
 }
 
-/**
- * Sync React Query cache to Zustand store and next-themes.
- * This ensures the rest of the app (which uses Zustand) stays in sync.
- * Uses shallow comparison to prevent unnecessary updates and flickering.
- * @param settings - The general settings to sync
- */
-function syncSettingsToZustand(settings: GeneralSettings) {
-  const store = useGeneralStore.getState()
-
-  const newSettings = {
-    isAutoConnectEnabled: settings.autoConnect,
-    showTrainingControls: settings.showTrainingControls,
-    superUserModeEnabled: settings.superUserModeEnabled,
-    theme: settings.theme,
-    telemetryEnabled: settings.telemetryEnabled,
-    isBillingUsageNotificationsEnabled: settings.billingUsageNotificationsEnabled,
-    isErrorNotificationsEnabled: settings.errorNotificationsEnabled,
-    snapToGridSize: settings.snapToGridSize,
-    showActionBar: settings.showActionBar,
-  }
-
-  const hasChanges = Object.entries(newSettings).some(
-    ([key, value]) => store[key as keyof typeof newSettings] !== value
-  )
-
-  if (hasChanges) {
-    store.setSettings(newSettings)
-  }
-
-  syncThemeToNextThemes(settings.theme)
-}
-
 /**
  * Hook to fetch general settings.
- * Syncs to Zustand store only on successful fetch (not on cache updates from mutations).
+ * TanStack Query is now the single source of truth for general settings.
  */
 export function useGeneralSettings() {
   return useQuery({
     queryKey: generalSettingsKeys.settings(),
     queryFn: async () => {
       const settings = await fetchGeneralSettings()
-      syncSettingsToZustand(settings)
+      syncThemeToNextThemes(settings.theme)
       return settings
     },
     staleTime: 60 * 60 * 1000,
@@ -102,6 +69,41 @@ export function useGeneralSettings() {
   })
 }
 
+/**
+ * Convenience selector hooks for individual settings.
+ * These provide a simple API for components that only need a single setting value.
+ */
+
+export function useAutoConnect(): boolean {
+  const { data } = useGeneralSettings()
+  return data?.autoConnect ?? true
+}
+
+export function useShowTrainingControls(): boolean {
+  const { data } = useGeneralSettings()
+  return data?.showTrainingControls ?? false
+}
+
+export function useSnapToGridSize(): number {
+  const { data } = useGeneralSettings()
+  return data?.snapToGridSize ?? 0
+}
+
+export function useShowActionBar(): boolean {
+  const { data } = useGeneralSettings()
+  return data?.showActionBar ?? true
+}
+
+export function useBillingUsageNotifications(): boolean {
+  const { data } = useGeneralSettings()
+  return data?.billingUsageNotificationsEnabled ?? true
+}
+
+export function useErrorNotificationsEnabled(): boolean {
+  const { data } = useGeneralSettings()
+  return data?.errorNotificationsEnabled ?? true
+}
+
 /**
  * Update general settings mutation
  */
@@ -141,7 +143,10 @@ export function useUpdateGeneralSetting() {
         }
 
         queryClient.setQueryData<GeneralSettings>(generalSettingsKeys.settings(), newSettings)
-        syncSettingsToZustand(newSettings)
+
+        if (key === 'theme') {
+          syncThemeToNextThemes(value as GeneralSettings['theme'])
+        }
       }
 
       return { previousSettings }
@@ -149,7 +154,7 @@ export function useUpdateGeneralSetting() {
     onError: (err, _variables, context) => {
       if (context?.previousSettings) {
         queryClient.setQueryData(generalSettingsKeys.settings(), context.previousSettings)
-        syncSettingsToZustand(context.previousSettings)
+        syncThemeToNextThemes(context.previousSettings.theme)
       }
       logger.error('Failed to update setting:', err)
     },
diff --git a/apps/sim/hooks/queries/workflows.ts b/apps/sim/hooks/queries/workflows.ts
index 9b6145a7a0..29327e7735 100644
--- a/apps/sim/hooks/queries/workflows.ts
+++ b/apps/sim/hooks/queries/workflows.ts
@@ -52,7 +52,8 @@ export function useWorkflowInputFields(workflowId: string | undefined) {
     queryKey: workflowKeys.inputFields(workflowId),
     queryFn: () => fetchWorkflowInputFields(workflowId!),
     enabled: Boolean(workflowId),
-    staleTime: 60 * 1000, // 1 minute cache
+    staleTime: 0,
+    refetchOnMount: 'always',
   })
 }
 
diff --git a/apps/sim/hooks/selectors/resolution.ts b/apps/sim/hooks/selectors/resolution.ts
index f018953e73..54837537cf 100644
--- a/apps/sim/hooks/selectors/resolution.ts
+++ b/apps/sim/hooks/selectors/resolution.ts
@@ -110,6 +110,8 @@ function resolveFileSelector(
       return { key: 'google.drive', context, allowSearch: true }
     case 'google-slides':
       return { key: 'google.drive', context, allowSearch: true }
+    case 'google-forms':
+      return { key: 'google.drive', context, allowSearch: true }
     case 'onedrive': {
       const key: SelectorKey = subBlock.mimeType === 'file' ? 'onedrive.files' : 'onedrive.folders'
       return { key, context, allowSearch: true }
diff --git a/apps/sim/hooks/use-collaborative-workflow.ts b/apps/sim/hooks/use-collaborative-workflow.ts
index f77b749c9d..28940428f7 100644
--- a/apps/sim/hooks/use-collaborative-workflow.ts
+++ b/apps/sim/hooks/use-collaborative-workflow.ts
@@ -1,6 +1,7 @@
 import { useCallback, useEffect, useRef } from 'react'
 import { createLogger } from '@sim/logger'
 import type { Edge } from 'reactflow'
+import { useShallow } from 'zustand/react/shallow'
 import { useSession } from '@/lib/auth/auth-client'
 import { useSocket } from '@/app/workspace/providers/socket-provider'
 import { getBlock } from '@/blocks'
@@ -128,12 +129,14 @@ export function useCollaborativeWorkflow() {
     onOperationFailed,
   } = useSocket()
 
-  const { activeWorkflowId } = useWorkflowRegistry()
-  const workflowStore = useWorkflowStore()
-  const subBlockStore = useSubBlockStore()
-  const variablesStore = useVariablesStore()
+  const activeWorkflowId = useWorkflowRegistry((state) => state.activeWorkflowId)
   const { data: session } = useSession()
-  const { hasActiveDiff, isShowingDiff } = useWorkflowDiffStore()
+  const { hasActiveDiff, isShowingDiff } = useWorkflowDiffStore(
+    useShallow((state) => ({
+      hasActiveDiff: state.hasActiveDiff,
+      isShowingDiff: state.isShowingDiff,
+    }))
+  )
   const isBaselineDiffView = hasActiveDiff && !isShowingDiff
 
   // Track if we're applying remote changes to avoid infinite loops
@@ -198,17 +201,15 @@ export function useCollaborativeWorkflow() {
         if (target === OPERATION_TARGETS.BLOCK) {
           switch (operation) {
             case BLOCK_OPERATIONS.UPDATE_NAME:
-              workflowStore.updateBlockName(payload.id, payload.name)
+              useWorkflowStore.getState().updateBlockName(payload.id, payload.name)
               break
             case BLOCK_OPERATIONS.UPDATE_ADVANCED_MODE:
-              workflowStore.setBlockAdvancedMode(payload.id, payload.advancedMode)
+              useWorkflowStore.getState().setBlockAdvancedMode(payload.id, payload.advancedMode)
               break
             case BLOCK_OPERATIONS.UPDATE_CANONICAL_MODE:
-              workflowStore.setBlockCanonicalMode(
-                payload.id,
-                payload.canonicalId,
-                payload.canonicalMode
-              )
+              useWorkflowStore
+                .getState()
+                .setBlockCanonicalMode(payload.id, payload.canonicalId, payload.canonicalMode)
               break
           }
         } else if (target === OPERATION_TARGETS.BLOCKS) {
@@ -216,7 +217,7 @@ export function useCollaborativeWorkflow() {
             case BLOCKS_OPERATIONS.BATCH_UPDATE_POSITIONS: {
               const { updates } = payload
               if (Array.isArray(updates)) {
-                workflowStore.batchUpdatePositions(updates)
+                useWorkflowStore.getState().batchUpdatePositions(updates)
               }
               break
             }
@@ -226,7 +227,7 @@ export function useCollaborativeWorkflow() {
             case EDGES_OPERATIONS.BATCH_REMOVE_EDGES: {
               const { ids } = payload
               if (Array.isArray(ids) && ids.length > 0) {
-                workflowStore.batchRemoveEdges(ids)
+                useWorkflowStore.getState().batchRemoveEdges(ids)
 
                 const updatedBlocks = useWorkflowStore.getState().blocks
                 const updatedEdges = useWorkflowStore.getState().edges
@@ -249,9 +250,9 @@ export function useCollaborativeWorkflow() {
             case EDGES_OPERATIONS.BATCH_ADD_EDGES: {
               const { edges } = payload
               if (Array.isArray(edges) && edges.length > 0) {
-                const newEdges = filterNewEdges(edges, workflowStore.edges)
+                const newEdges = filterNewEdges(edges, useWorkflowStore.getState().edges)
                 if (newEdges.length > 0) {
-                  workflowStore.batchAddEdges(newEdges)
+                  useWorkflowStore.getState().batchAddEdges(newEdges)
                 }
               }
               break
@@ -264,30 +265,36 @@ export function useCollaborativeWorkflow() {
               if (payload.type === 'loop') {
                 const { config } = payload
                 if (config.loopType !== undefined) {
-                  workflowStore.updateLoopType(payload.id, config.loopType)
+                  useWorkflowStore.getState().updateLoopType(payload.id, config.loopType)
                 }
                 if (config.iterations !== undefined) {
-                  workflowStore.updateLoopCount(payload.id, config.iterations)
+                  useWorkflowStore.getState().updateLoopCount(payload.id, config.iterations)
                 }
                 if (config.forEachItems !== undefined) {
-                  workflowStore.setLoopForEachItems(payload.id, config.forEachItems)
+                  useWorkflowStore.getState().setLoopForEachItems(payload.id, config.forEachItems)
                 }
                 if (config.whileCondition !== undefined) {
-                  workflowStore.setLoopWhileCondition(payload.id, config.whileCondition)
+                  useWorkflowStore
+                    .getState()
+                    .setLoopWhileCondition(payload.id, config.whileCondition)
                 }
                 if (config.doWhileCondition !== undefined) {
-                  workflowStore.setLoopDoWhileCondition(payload.id, config.doWhileCondition)
+                  useWorkflowStore
+                    .getState()
+                    .setLoopDoWhileCondition(payload.id, config.doWhileCondition)
                 }
               } else if (payload.type === 'parallel') {
                 const { config } = payload
                 if (config.parallelType !== undefined) {
-                  workflowStore.updateParallelType(payload.id, config.parallelType)
+                  useWorkflowStore.getState().updateParallelType(payload.id, config.parallelType)
                 }
                 if (config.count !== undefined) {
-                  workflowStore.updateParallelCount(payload.id, config.count)
+                  useWorkflowStore.getState().updateParallelCount(payload.id, config.count)
                 }
                 if (config.distribution !== undefined) {
-                  workflowStore.updateParallelCollection(payload.id, config.distribution)
+                  useWorkflowStore
+                    .getState()
+                    .updateParallelCollection(payload.id, config.distribution)
                 }
               }
               break
@@ -295,7 +302,7 @@ export function useCollaborativeWorkflow() {
         } else if (target === OPERATION_TARGETS.VARIABLE) {
           switch (operation) {
             case VARIABLE_OPERATIONS.ADD:
-              variablesStore.addVariable(
+              useVariablesStore.getState().addVariable(
                 {
                   workflowId: payload.workflowId,
                   name: payload.name,
@@ -307,15 +314,21 @@ export function useCollaborativeWorkflow() {
               break
             case VARIABLE_OPERATIONS.UPDATE:
               if (payload.field === 'name') {
-                variablesStore.updateVariable(payload.variableId, { name: payload.value })
+                useVariablesStore
+                  .getState()
+                  .updateVariable(payload.variableId, { name: payload.value })
               } else if (payload.field === 'value') {
-                variablesStore.updateVariable(payload.variableId, { value: payload.value })
+                useVariablesStore
+                  .getState()
+                  .updateVariable(payload.variableId, { value: payload.value })
               } else if (payload.field === 'type') {
-                variablesStore.updateVariable(payload.variableId, { type: payload.value })
+                useVariablesStore
+                  .getState()
+                  .updateVariable(payload.variableId, { type: payload.value })
               }
               break
             case VARIABLE_OPERATIONS.REMOVE:
-              variablesStore.deleteVariable(payload.variableId)
+              useVariablesStore.getState().deleteVariable(payload.variableId)
               break
           }
         } else if (target === OPERATION_TARGETS.WORKFLOW) {
@@ -329,7 +342,7 @@ export function useCollaborativeWorkflow() {
                   hasActiveDiff,
                   isShowingDiff,
                 })
-                workflowStore.replaceWorkflowState(payload.state)
+                useWorkflowStore.getState().replaceWorkflowState(payload.state)
 
                 // Extract and apply subblock values
                 const subBlockValues: Record<string, Record<string, any>> = {}
@@ -344,7 +357,7 @@ export function useCollaborativeWorkflow() {
                   }
                 )
                 if (activeWorkflowId) {
-                  subBlockStore.setWorkflowValues(activeWorkflowId, subBlockValues)
+                  useSubBlockStore.getState().setWorkflowValues(activeWorkflowId, subBlockValues)
                 }
 
                 logger.info('Successfully applied remote workflow state replacement')
@@ -364,7 +377,9 @@ export function useCollaborativeWorkflow() {
               })
 
               if (blocks && blocks.length > 0) {
-                workflowStore.batchAddBlocks(blocks, edges || [], addedSubBlockValues || {})
+                useWorkflowStore
+                  .getState()
+                  .batchAddBlocks(blocks, edges || [], addedSubBlockValues || {})
               }
 
               logger.info('Successfully applied batch-add-blocks from remote user')
@@ -378,7 +393,7 @@ export function useCollaborativeWorkflow() {
               })
 
               if (ids && ids.length > 0) {
-                workflowStore.batchRemoveBlocks(ids)
+                useWorkflowStore.getState().batchRemoveBlocks(ids)
               }
 
               logger.info('Successfully applied batch-remove-blocks from remote user')
@@ -392,7 +407,7 @@ export function useCollaborativeWorkflow() {
               })
 
               if (blockIds && blockIds.length > 0) {
-                workflowStore.batchToggleEnabled(blockIds)
+                useWorkflowStore.getState().batchToggleEnabled(blockIds)
               }
 
               logger.info('Successfully applied batch-toggle-enabled from remote user')
@@ -406,7 +421,7 @@ export function useCollaborativeWorkflow() {
               })
 
               if (blockIds && blockIds.length > 0) {
-                workflowStore.batchToggleHandles(blockIds)
+                useWorkflowStore.getState().batchToggleHandles(blockIds)
               }
 
               logger.info('Successfully applied batch-toggle-handles from remote user')
@@ -420,7 +435,7 @@ export function useCollaborativeWorkflow() {
               })
 
               if (updates && updates.length > 0) {
-                workflowStore.batchUpdateBlocksWithParent(
+                useWorkflowStore.getState().batchUpdateBlocksWithParent(
                   updates.map(
                     (u: { id: string; parentId: string; position: { x: number; y: number } }) => ({
                       id: u.id,
@@ -454,7 +469,7 @@ export function useCollaborativeWorkflow() {
 
       try {
         // The setValue function automatically uses the active workflow ID
-        subBlockStore.setValue(blockId, subblockId, value)
+        useSubBlockStore.getState().setValue(blockId, subblockId, value)
       } catch (error) {
         logger.error('Error applying remote subblock update:', error)
       } finally {
@@ -473,11 +488,11 @@ export function useCollaborativeWorkflow() {
 
       try {
         if (field === 'name') {
-          variablesStore.updateVariable(variableId, { name: value })
+          useVariablesStore.getState().updateVariable(variableId, { name: value })
         } else if (field === 'value') {
-          variablesStore.updateVariable(variableId, { value })
+          useVariablesStore.getState().updateVariable(variableId, { value })
         } else if (field === 'type') {
-          variablesStore.updateVariable(variableId, { type: value })
+          useVariablesStore.getState().updateVariable(variableId, { type: value })
         }
       } catch (error) {
         logger.error('Error applying remote variable update:', error)
@@ -626,14 +641,10 @@ export function useCollaborativeWorkflow() {
     onWorkflowReverted,
     onOperationConfirmed,
     onOperationFailed,
-    workflowStore,
-    subBlockStore,
-    variablesStore,
     activeWorkflowId,
     confirmOperation,
     failOperation,
     emitWorkflowOperation,
-    queue,
   ])
 
   const executeQueuedOperation = useCallback(
@@ -710,14 +721,14 @@ export function useCollaborativeWorkflow() {
         userId: session?.user?.id || 'unknown',
       })
 
-      workflowStore.batchUpdatePositions(updates)
+      useWorkflowStore.getState().batchUpdatePositions(updates)
 
       if (options?.previousPositions && options.previousPositions.size > 0) {
         const moves = updates
           .filter((u) => options.previousPositions!.has(u.id))
           .map((u) => {
             const prev = options.previousPositions!.get(u.id)!
-            const block = workflowStore.blocks[u.id]
+            const block = useWorkflowStore.getState().blocks[u.id]
             return {
               blockId: u.id,
               before: prev,
@@ -735,7 +746,7 @@ export function useCollaborativeWorkflow() {
         }
       }
     },
-    [addToQueue, activeWorkflowId, session?.user?.id, isInActiveRoom, workflowStore, undoRedo]
+    [addToQueue, activeWorkflowId, session?.user?.id, isInActiveRoom, undoRedo]
   )
 
   const collaborativeUpdateBlockName = useCallback(
@@ -753,7 +764,7 @@ export function useCollaborativeWorkflow() {
         return { success: false, error: 'Block name cannot be empty' }
       }
 
-      const currentBlocks = workflowStore.blocks
+      const currentBlocks = useWorkflowStore.getState().blocks
       const conflictingBlock = Object.entries(currentBlocks).find(
         ([blockId, block]) => blockId !== id && normalizeName(block.name) === normalizedNewName
       )
@@ -774,7 +785,7 @@ export function useCollaborativeWorkflow() {
         OPERATION_TARGETS.BLOCK,
         { id, name: trimmedName },
         () => {
-          const result = workflowStore.updateBlockName(id, trimmedName)
+          const result = useWorkflowStore.getState().updateBlockName(id, trimmedName)
 
           if (result.success && result.changedSubblocks.length > 0) {
             logger.info('Emitting cascaded subblock updates from block rename', {
@@ -812,7 +823,7 @@ export function useCollaborativeWorkflow() {
 
       return { success: true }
     },
-    [executeQueuedOperation, workflowStore, addToQueue, activeWorkflowId, session?.user?.id]
+    [executeQueuedOperation, addToQueue, activeWorkflowId, session?.user?.id]
   )
 
   const collaborativeBatchToggleBlockEnabled = useCallback(
@@ -823,7 +834,7 @@ export function useCollaborativeWorkflow() {
       const validIds: string[] = []
 
       for (const id of ids) {
-        const block = workflowStore.blocks[id]
+        const block = useWorkflowStore.getState().blocks[id]
         if (block) {
           previousStates[id] = block.enabled
           validIds.push(id)
@@ -845,11 +856,11 @@ export function useCollaborativeWorkflow() {
         userId: session?.user?.id || 'unknown',
       })
 
-      workflowStore.batchToggleEnabled(validIds)
+      useWorkflowStore.getState().batchToggleEnabled(validIds)
 
       undoRedo.recordBatchToggleEnabled(validIds, previousStates)
     },
-    [addToQueue, activeWorkflowId, session?.user?.id, workflowStore, undoRedo]
+    [addToQueue, activeWorkflowId, session?.user?.id, undoRedo]
   )
 
   const collaborativeBatchUpdateParent = useCallback(
@@ -869,7 +880,7 @@ export function useCollaborativeWorkflow() {
       if (updates.length === 0) return
 
       const batchUpdates = updates.map((u) => {
-        const block = workflowStore.blocks[u.blockId]
+        const block = useWorkflowStore.getState().blocks[u.blockId]
         const oldParentId = block?.data?.parentId
         const oldPosition = block?.position || { x: 0, y: 0 }
 
@@ -886,11 +897,11 @@ export function useCollaborativeWorkflow() {
       // Collect all edge IDs to remove
       const edgeIdsToRemove = updates.flatMap((u) => u.affectedEdges.map((e) => e.id))
       if (edgeIdsToRemove.length > 0) {
-        workflowStore.batchRemoveEdges(edgeIdsToRemove)
+        useWorkflowStore.getState().batchRemoveEdges(edgeIdsToRemove)
       }
 
       // Batch update positions and parents
-      workflowStore.batchUpdateBlocksWithParent(
+      useWorkflowStore.getState().batchUpdateBlocksWithParent(
         updates.map((u) => ({
           id: u.blockId,
           position: u.newPosition,
@@ -920,22 +931,22 @@ export function useCollaborativeWorkflow() {
 
       logger.debug('Batch updated parent for blocks', { updateCount: updates.length })
     },
-    [isInActiveRoom, workflowStore, undoRedo, addToQueue, activeWorkflowId, session?.user?.id]
+    [isInActiveRoom, undoRedo, addToQueue, activeWorkflowId, session?.user?.id]
   )
 
   const collaborativeToggleBlockAdvancedMode = useCallback(
     (id: string) => {
-      const block = workflowStore.blocks[id]
+      const block = useWorkflowStore.getState().blocks[id]
       if (!block) return
       const newAdvancedMode = !block.advancedMode
       executeQueuedOperation(
         BLOCK_OPERATIONS.UPDATE_ADVANCED_MODE,
         OPERATION_TARGETS.BLOCK,
         { id, advancedMode: newAdvancedMode },
-        () => workflowStore.setBlockAdvancedMode(id, newAdvancedMode)
+        () => useWorkflowStore.getState().setBlockAdvancedMode(id, newAdvancedMode)
       )
     },
-    [executeQueuedOperation, workflowStore]
+    [executeQueuedOperation]
   )
 
   const collaborativeSetBlockCanonicalMode = useCallback(
@@ -944,10 +955,10 @@ export function useCollaborativeWorkflow() {
         BLOCK_OPERATIONS.UPDATE_CANONICAL_MODE,
         OPERATION_TARGETS.BLOCK,
         { id, canonicalId, canonicalMode },
-        () => workflowStore.setBlockCanonicalMode(id, canonicalId, canonicalMode)
+        () => useWorkflowStore.getState().setBlockCanonicalMode(id, canonicalId, canonicalMode)
       )
     },
-    [executeQueuedOperation, workflowStore]
+    [executeQueuedOperation]
   )
 
   const collaborativeBatchToggleBlockHandles = useCallback(
@@ -958,7 +969,7 @@ export function useCollaborativeWorkflow() {
       const validIds: string[] = []
 
       for (const id of ids) {
-        const block = workflowStore.blocks[id]
+        const block = useWorkflowStore.getState().blocks[id]
         if (block) {
           previousStates[id] = block.horizontalHandles ?? false
           validIds.push(id)
@@ -980,11 +991,11 @@ export function useCollaborativeWorkflow() {
         userId: session?.user?.id || 'unknown',
       })
 
-      workflowStore.batchToggleHandles(validIds)
+      useWorkflowStore.getState().batchToggleHandles(validIds)
 
       undoRedo.recordBatchToggleHandles(validIds, previousStates)
     },
-    [addToQueue, activeWorkflowId, session?.user?.id, workflowStore, undoRedo]
+    [addToQueue, activeWorkflowId, session?.user?.id, undoRedo]
   )
 
   const collaborativeBatchAddEdges = useCallback(
@@ -996,7 +1007,7 @@ export function useCollaborativeWorkflow() {
 
       if (edges.length === 0) return false
 
-      const newEdges = filterNewEdges(edges, workflowStore.edges)
+      const newEdges = filterNewEdges(edges, useWorkflowStore.getState().edges)
       if (newEdges.length === 0) return false
 
       const operationId = crypto.randomUUID()
@@ -1012,7 +1023,7 @@ export function useCollaborativeWorkflow() {
         userId: session?.user?.id || 'unknown',
       })
 
-      workflowStore.batchAddEdges(newEdges)
+      useWorkflowStore.getState().batchAddEdges(newEdges)
 
       if (!options?.skipUndoRedo) {
         newEdges.forEach((edge) => undoRedo.recordAddEdge(edge.id))
@@ -1020,7 +1031,7 @@ export function useCollaborativeWorkflow() {
 
       return true
     },
-    [addToQueue, activeWorkflowId, session?.user?.id, isInActiveRoom, workflowStore, undoRedo]
+    [addToQueue, activeWorkflowId, session?.user?.id, isInActiveRoom, undoRedo]
   )
 
   const collaborativeBatchRemoveEdges = useCallback(
@@ -1036,10 +1047,10 @@ export function useCollaborativeWorkflow() {
       const validEdgeIds: string[] = []
 
       for (const edgeId of edgeIds) {
-        const edge = workflowStore.edges.find((e) => e.id === edgeId)
+        const edge = useWorkflowStore.getState().edges.find((e) => e.id === edgeId)
         if (edge) {
-          const sourceExists = workflowStore.blocks[edge.source]
-          const targetExists = workflowStore.blocks[edge.target]
+          const sourceExists = useWorkflowStore.getState().blocks[edge.source]
+          const targetExists = useWorkflowStore.getState().blocks[edge.target]
           if (sourceExists && targetExists) {
             edgeSnapshots.push(edge)
             validEdgeIds.push(edgeId)
@@ -1065,7 +1076,7 @@ export function useCollaborativeWorkflow() {
         userId: session?.user?.id || 'unknown',
       })
 
-      workflowStore.batchRemoveEdges(validEdgeIds)
+      useWorkflowStore.getState().batchRemoveEdges(validEdgeIds)
 
       if (!options?.skipUndoRedo && edgeSnapshots.length > 0) {
         undoRedo.recordBatchRemoveEdges(edgeSnapshots)
@@ -1074,7 +1085,7 @@ export function useCollaborativeWorkflow() {
       logger.info('Batch removed edges', { count: validEdgeIds.length })
       return true
     },
-    [isInActiveRoom, workflowStore, addToQueue, activeWorkflowId, session, undoRedo]
+    [isInActiveRoom, addToQueue, activeWorkflowId, session, undoRedo]
   )
 
   const collaborativeSetSubblockValue = useCallback(
@@ -1086,8 +1097,32 @@ export function useCollaborativeWorkflow() {
         return
       }
 
+      // ALWAYS update local store first for immediate UI feedback
+      useSubBlockStore.getState().setValue(blockId, subblockId, value)
+
+      // Handle dependent subblock clearing (recursive calls)
+      try {
+        const visited = options?._visited || new Set<string>()
+        if (visited.has(subblockId)) return
+        visited.add(subblockId)
+        const blockType = useWorkflowStore.getState().blocks?.[blockId]?.type
+        const blockConfig = blockType ? getBlock(blockType) : null
+        if (blockConfig?.subBlocks && Array.isArray(blockConfig.subBlocks)) {
+          const dependents = blockConfig.subBlocks.filter(
+            (sb: any) => Array.isArray(sb.dependsOn) && sb.dependsOn.includes(subblockId)
+          )
+          for (const dep of dependents) {
+            if (!dep?.id || dep.id === subblockId) continue
+            collaborativeSetSubblockValue(blockId, dep.id, '', { _visited: visited })
+          }
+        }
+      } catch {
+        // Best-effort; do not block on clearing
+      }
+
+      // Only emit to socket if in active room
       if (!isInActiveRoom()) {
-        logger.debug('Skipping subblock update - not in active workflow', {
+        logger.debug('Local update applied, skipping socket emit - not in active workflow', {
           currentWorkflowId,
           activeWorkflowId,
           blockId,
@@ -1110,30 +1145,8 @@ export function useCollaborativeWorkflow() {
         workflowId: currentActiveWorkflowId || '',
         userId: session?.user?.id || 'unknown',
       })
-
-      subBlockStore.setValue(blockId, subblockId, value)
-
-      try {
-        const visited = options?._visited || new Set<string>()
-        if (visited.has(subblockId)) return
-        visited.add(subblockId)
-        const blockType = useWorkflowStore.getState().blocks?.[blockId]?.type
-        const blockConfig = blockType ? getBlock(blockType) : null
-        if (blockConfig?.subBlocks && Array.isArray(blockConfig.subBlocks)) {
-          const dependents = blockConfig.subBlocks.filter(
-            (sb: any) => Array.isArray(sb.dependsOn) && sb.dependsOn.includes(subblockId)
-          )
-          for (const dep of dependents) {
-            if (!dep?.id || dep.id === subblockId) continue
-            collaborativeSetSubblockValue(blockId, dep.id, '', { _visited: visited })
-          }
-        }
-      } catch {
-        // Best-effort; do not block on clearing
-      }
     },
     [
-      subBlockStore,
       currentWorkflowId,
       activeWorkflowId,
       addToQueue,
@@ -1159,7 +1172,7 @@ export function useCollaborativeWorkflow() {
       }
 
       // Apply locally first (immediate UI feedback)
-      subBlockStore.setValue(blockId, subblockId, value)
+      useSubBlockStore.getState().setValue(blockId, subblockId, value)
 
       // Use the operation queue but with immediate processing (no debouncing)
       const operationId = crypto.randomUUID()
@@ -1175,29 +1188,22 @@ export function useCollaborativeWorkflow() {
         userId: session?.user?.id || 'unknown',
       })
     },
-    [
-      subBlockStore,
-      addToQueue,
-      currentWorkflowId,
-      activeWorkflowId,
-      session?.user?.id,
-      isInActiveRoom,
-    ]
+    [addToQueue, currentWorkflowId, activeWorkflowId, session?.user?.id, isInActiveRoom]
   )
 
   const collaborativeUpdateLoopType = useCallback(
     (loopId: string, loopType: 'for' | 'forEach' | 'while' | 'doWhile') => {
-      const currentBlock = workflowStore.blocks[loopId]
+      const currentBlock = useWorkflowStore.getState().blocks[loopId]
       if (!currentBlock || currentBlock.type !== 'loop') return
 
-      const childNodes = Object.values(workflowStore.blocks)
+      const childNodes = Object.values(useWorkflowStore.getState().blocks)
         .filter((b) => b.data?.parentId === loopId)
         .map((b) => b.id)
 
       const currentIterations = currentBlock.data?.count || 5
       const currentCollection = currentBlock.data?.collection || ''
 
-      const existingLoop = workflowStore.loops[loopId]
+      const existingLoop = useWorkflowStore.getState().loops[loopId]
       const existingForEachItems = existingLoop?.forEachItems ?? currentCollection ?? ''
       const existingWhileCondition =
         existingLoop?.whileCondition ?? currentBlock.data?.whileCondition ?? ''
@@ -1219,22 +1225,24 @@ export function useCollaborativeWorkflow() {
         OPERATION_TARGETS.SUBFLOW,
         { id: loopId, type: 'loop', config },
         () => {
-          workflowStore.updateLoopType(loopId, loopType)
-          workflowStore.setLoopForEachItems(loopId, existingForEachItems ?? '')
-          workflowStore.setLoopWhileCondition(loopId, existingWhileCondition ?? '')
-          workflowStore.setLoopDoWhileCondition(loopId, existingDoWhileCondition ?? '')
+          useWorkflowStore.getState().updateLoopType(loopId, loopType)
+          useWorkflowStore.getState().setLoopForEachItems(loopId, existingForEachItems ?? '')
+          useWorkflowStore.getState().setLoopWhileCondition(loopId, existingWhileCondition ?? '')
+          useWorkflowStore
+            .getState()
+            .setLoopDoWhileCondition(loopId, existingDoWhileCondition ?? '')
         }
       )
     },
-    [executeQueuedOperation, workflowStore]
+    [executeQueuedOperation]
   )
 
   const collaborativeUpdateParallelType = useCallback(
     (parallelId: string, parallelType: 'count' | 'collection') => {
-      const currentBlock = workflowStore.blocks[parallelId]
+      const currentBlock = useWorkflowStore.getState().blocks[parallelId]
       if (!currentBlock || currentBlock.type !== 'parallel') return
 
-      const childNodes = Object.values(workflowStore.blocks)
+      const childNodes = Object.values(useWorkflowStore.getState().blocks)
         .filter((b) => b.data?.parentId === parallelId)
         .map((b) => b.id)
 
@@ -1261,22 +1269,22 @@ export function useCollaborativeWorkflow() {
         OPERATION_TARGETS.SUBFLOW,
         { id: parallelId, type: 'parallel', config },
         () => {
-          workflowStore.updateParallelType(parallelId, parallelType)
-          workflowStore.updateParallelCount(parallelId, newCount)
-          workflowStore.updateParallelCollection(parallelId, newDistribution)
+          useWorkflowStore.getState().updateParallelType(parallelId, parallelType)
+          useWorkflowStore.getState().updateParallelCount(parallelId, newCount)
+          useWorkflowStore.getState().updateParallelCollection(parallelId, newDistribution)
         }
       )
     },
-    [executeQueuedOperation, workflowStore]
+    [executeQueuedOperation]
   )
 
   // Unified iteration management functions - count and collection only
   const collaborativeUpdateIterationCount = useCallback(
     (nodeId: string, iterationType: 'loop' | 'parallel', count: number) => {
-      const currentBlock = workflowStore.blocks[nodeId]
+      const currentBlock = useWorkflowStore.getState().blocks[nodeId]
       if (!currentBlock || currentBlock.type !== iterationType) return
 
-      const childNodes = Object.values(workflowStore.blocks)
+      const childNodes = Object.values(useWorkflowStore.getState().blocks)
         .filter((b) => b.data?.parentId === nodeId)
         .map((b) => b.id)
 
@@ -1296,7 +1304,7 @@ export function useCollaborativeWorkflow() {
           SUBFLOW_OPERATIONS.UPDATE,
           OPERATION_TARGETS.SUBFLOW,
           { id: nodeId, type: 'loop', config },
-          () => workflowStore.updateLoopCount(nodeId, count)
+          () => useWorkflowStore.getState().updateLoopCount(nodeId, count)
         )
       } else {
         const currentDistribution = currentBlock.data?.collection || ''
@@ -1314,19 +1322,19 @@ export function useCollaborativeWorkflow() {
           SUBFLOW_OPERATIONS.UPDATE,
           OPERATION_TARGETS.SUBFLOW,
           { id: nodeId, type: 'parallel', config },
-          () => workflowStore.updateParallelCount(nodeId, count)
+          () => useWorkflowStore.getState().updateParallelCount(nodeId, count)
         )
       }
     },
-    [executeQueuedOperation, workflowStore]
+    [executeQueuedOperation]
   )
 
   const collaborativeUpdateIterationCollection = useCallback(
     (nodeId: string, iterationType: 'loop' | 'parallel', collection: string) => {
-      const currentBlock = workflowStore.blocks[nodeId]
+      const currentBlock = useWorkflowStore.getState().blocks[nodeId]
       if (!currentBlock || currentBlock.type !== iterationType) return
 
-      const childNodes = Object.values(workflowStore.blocks)
+      const childNodes = Object.values(useWorkflowStore.getState().blocks)
         .filter((b) => b.data?.parentId === nodeId)
         .map((b) => b.id)
 
@@ -1334,7 +1342,7 @@ export function useCollaborativeWorkflow() {
         const currentIterations = currentBlock.data?.count || 5
         const currentLoopType = currentBlock.data?.loopType || 'for'
 
-        const existingLoop = workflowStore.loops[nodeId]
+        const existingLoop = useWorkflowStore.getState().loops[nodeId]
         let nextForEachItems = existingLoop?.forEachItems ?? currentBlock.data?.collection ?? ''
         let nextWhileCondition =
           existingLoop?.whileCondition ?? currentBlock.data?.whileCondition ?? ''
@@ -1364,9 +1372,9 @@ export function useCollaborativeWorkflow() {
           OPERATION_TARGETS.SUBFLOW,
           { id: nodeId, type: 'loop', config },
           () => {
-            workflowStore.setLoopForEachItems(nodeId, nextForEachItems ?? '')
-            workflowStore.setLoopWhileCondition(nodeId, nextWhileCondition ?? '')
-            workflowStore.setLoopDoWhileCondition(nodeId, nextDoWhileCondition ?? '')
+            useWorkflowStore.getState().setLoopForEachItems(nodeId, nextForEachItems ?? '')
+            useWorkflowStore.getState().setLoopWhileCondition(nodeId, nextWhileCondition ?? '')
+            useWorkflowStore.getState().setLoopDoWhileCondition(nodeId, nextDoWhileCondition ?? '')
           }
         )
       } else {
@@ -1385,11 +1393,11 @@ export function useCollaborativeWorkflow() {
           SUBFLOW_OPERATIONS.UPDATE,
           OPERATION_TARGETS.SUBFLOW,
           { id: nodeId, type: 'parallel', config },
-          () => workflowStore.updateParallelCollection(nodeId, collection)
+          () => useWorkflowStore.getState().updateParallelCollection(nodeId, collection)
         )
       }
     },
-    [executeQueuedOperation, workflowStore]
+    [executeQueuedOperation]
   )
 
   const collaborativeUpdateVariable = useCallback(
@@ -1400,16 +1408,16 @@ export function useCollaborativeWorkflow() {
         { variableId, field, value },
         () => {
           if (field === 'name') {
-            variablesStore.updateVariable(variableId, { name: value })
+            useVariablesStore.getState().updateVariable(variableId, { name: value })
           } else if (field === 'value') {
-            variablesStore.updateVariable(variableId, { value })
+            useVariablesStore.getState().updateVariable(variableId, { value })
           } else if (field === 'type') {
-            variablesStore.updateVariable(variableId, { type: value })
+            useVariablesStore.getState().updateVariable(variableId, { type: value })
           }
         }
       )
     },
-    [executeQueuedOperation, variablesStore]
+    [executeQueuedOperation]
   )
 
   const collaborativeAddVariable = useCallback(
@@ -1417,7 +1425,7 @@ export function useCollaborativeWorkflow() {
       const id = crypto.randomUUID()
 
       // Optimistically add to local store first
-      variablesStore.addVariable(variableData, id)
+      useVariablesStore.getState().addVariable(variableData, id)
       const processedVariable = useVariablesStore.getState().variables[id]
 
       if (processedVariable) {
@@ -1439,7 +1447,7 @@ export function useCollaborativeWorkflow() {
 
       return id
     },
-    [executeQueuedOperation, variablesStore]
+    [executeQueuedOperation]
   )
 
   const collaborativeDeleteVariable = useCallback(
@@ -1451,11 +1459,11 @@ export function useCollaborativeWorkflow() {
         OPERATION_TARGETS.VARIABLE,
         { variableId },
         () => {
-          variablesStore.deleteVariable(variableId)
+          useVariablesStore.getState().deleteVariable(variableId)
         }
       )
     },
-    [executeQueuedOperation, variablesStore, cancelOperationsForVariable]
+    [executeQueuedOperation, cancelOperationsForVariable]
   )
 
   const collaborativeBatchAddBlocks = useCallback(
@@ -1497,7 +1505,7 @@ export function useCollaborativeWorkflow() {
         userId: session?.user?.id || 'unknown',
       })
 
-      workflowStore.batchAddBlocks(blocks, edges, subBlockValues)
+      useWorkflowStore.getState().batchAddBlocks(blocks, edges, subBlockValues)
 
       if (!options?.skipUndoRedo) {
         undoRedo.recordBatchAddBlocks(blocks, edges, subBlockValues)
@@ -1505,16 +1513,7 @@ export function useCollaborativeWorkflow() {
 
       return true
     },
-    [
-      addToQueue,
-      activeWorkflowId,
-      session?.user?.id,
-      isBaselineDiffView,
-      isInActiveRoom,
-      workflowStore,
-      subBlockStore,
-      undoRedo,
-    ]
+    [addToQueue, activeWorkflowId, session?.user?.id, isBaselineDiffView, isInActiveRoom, undoRedo]
   )
 
   const collaborativeBatchRemoveBlocks = useCallback(
@@ -1530,7 +1529,7 @@ export function useCollaborativeWorkflow() {
 
       const allBlocksToRemove = new Set<string>(blockIds)
       const findAllDescendants = (parentId: string) => {
-        Object.entries(workflowStore.blocks).forEach(([blockId, block]) => {
+        Object.entries(useWorkflowStore.getState().blocks).forEach(([blockId, block]) => {
           if (block.data?.parentId === parentId) {
             allBlocksToRemove.add(blockId)
             findAllDescendants(blockId)
@@ -1544,7 +1543,10 @@ export function useCollaborativeWorkflow() {
         usePanelEditorStore.getState().clearCurrentBlock()
       }
 
-      const mergedBlocks = mergeSubblockState(workflowStore.blocks, activeWorkflowId || undefined)
+      const mergedBlocks = mergeSubblockState(
+        useWorkflowStore.getState().blocks,
+        activeWorkflowId || undefined
+      )
       const blockSnapshots: BlockState[] = []
       const subBlockValues: Record<string, Record<string, unknown>> = {}
 
@@ -1566,9 +1568,9 @@ export function useCollaborativeWorkflow() {
         }
       })
 
-      const edgeSnapshots = workflowStore.edges.filter(
-        (e) => allBlocksToRemove.has(e.source) || allBlocksToRemove.has(e.target)
-      )
+      const edgeSnapshots = useWorkflowStore
+        .getState()
+        .edges.filter((e) => allBlocksToRemove.has(e.source) || allBlocksToRemove.has(e.target))
 
       logger.info('Batch removing blocks collaboratively', {
         requestedCount: blockIds.length,
@@ -1588,7 +1590,7 @@ export function useCollaborativeWorkflow() {
         userId: session?.user?.id || 'unknown',
       })
 
-      workflowStore.batchRemoveBlocks(blockIds)
+      useWorkflowStore.getState().batchRemoveBlocks(blockIds)
 
       if (!options?.skipUndoRedo && blockSnapshots.length > 0) {
         undoRedo.recordBatchRemoveBlocks(blockSnapshots, edgeSnapshots, subBlockValues)
@@ -1601,7 +1603,6 @@ export function useCollaborativeWorkflow() {
       activeWorkflowId,
       session?.user?.id,
       isInActiveRoom,
-      workflowStore,
       cancelOperationsForBlock,
       undoRedo,
     ]
@@ -1646,10 +1647,6 @@ export function useCollaborativeWorkflow() {
     collaborativeUpdateIterationCount,
     collaborativeUpdateIterationCollection,
 
-    // Direct access to stores for non-collaborative operations
-    workflowStore,
-    subBlockStore,
-
     // Undo/Redo operations (wrapped to prevent recording moves during undo/redo)
     undo: useCallback(async () => {
       isUndoRedoInProgress.current = true
diff --git a/apps/sim/hooks/use-permission-config.ts b/apps/sim/hooks/use-permission-config.ts
index a0632d5657..994656fdca 100644
--- a/apps/sim/hooks/use-permission-config.ts
+++ b/apps/sim/hooks/use-permission-config.ts
@@ -40,7 +40,6 @@ export function usePermissionConfig(): PermissionConfigResult {
 
   const isBlockAllowed = useMemo(() => {
     return (blockType: string) => {
-      // start_trigger should always be allowed (it should never be disabled)
       if (blockType === 'start_trigger') return true
       if (config.allowedIntegrations === null) return true
       return config.allowedIntegrations.includes(blockType)
@@ -57,7 +56,6 @@ export function usePermissionConfig(): PermissionConfigResult {
   const filterBlocks = useMemo(() => {
     return <T extends { type: string }>(blocks: T[]): T[] => {
       if (config.allowedIntegrations === null) return blocks
-      // start_trigger should always be included (it should never be disabled)
       return blocks.filter(
         (block) =>
           block.type === 'start_trigger' || config.allowedIntegrations!.includes(block.type)
@@ -77,14 +75,26 @@ export function usePermissionConfig(): PermissionConfigResult {
     return featureFlagDisabled || config.disableInvitations
   }, [config.disableInvitations])
 
-  return {
-    config,
-    isLoading,
-    isInPermissionGroup,
-    filterBlocks,
-    filterProviders,
-    isBlockAllowed,
-    isProviderAllowed,
-    isInvitationsDisabled,
-  }
+  return useMemo(
+    () => ({
+      config,
+      isLoading,
+      isInPermissionGroup,
+      filterBlocks,
+      filterProviders,
+      isBlockAllowed,
+      isProviderAllowed,
+      isInvitationsDisabled,
+    }),
+    [
+      config,
+      isLoading,
+      isInPermissionGroup,
+      filterBlocks,
+      filterProviders,
+      isBlockAllowed,
+      isProviderAllowed,
+      isInvitationsDisabled,
+    ]
+  )
 }
diff --git a/apps/sim/hooks/use-undo-redo.ts b/apps/sim/hooks/use-undo-redo.ts
index 1bb6bf590c..6c91e46f73 100644
--- a/apps/sim/hooks/use-undo-redo.ts
+++ b/apps/sim/hooks/use-undo-redo.ts
@@ -36,9 +36,7 @@ const logger = createLogger('UndoRedo')
 
 export function useUndoRedo() {
   const { data: session } = useSession()
-  const { activeWorkflowId } = useWorkflowRegistry()
-  const workflowStore = useWorkflowStore()
-  const undoRedoStore = useUndoRedoStore()
+  const activeWorkflowId = useWorkflowRegistry((state) => state.activeWorkflowId)
   const { addToQueue } = useOperationQueue()
 
   const userId = session?.user?.id || 'unknown'
@@ -78,7 +76,7 @@ export function useUndoRedo() {
       }
 
       const entry = createOperationEntry(operation, inverse)
-      undoRedoStore.push(activeWorkflowId, userId, entry)
+      useUndoRedoStore.getState().push(activeWorkflowId, userId, entry)
 
       logger.debug('Recorded batch add blocks', {
         blockCount: blockSnapshots.length,
@@ -86,7 +84,7 @@ export function useUndoRedo() {
         workflowId: activeWorkflowId,
       })
     },
-    [activeWorkflowId, userId, undoRedoStore]
+    [activeWorkflowId, userId]
   )
 
   const recordBatchRemoveBlocks = useCallback(
@@ -124,7 +122,7 @@ export function useUndoRedo() {
       }
 
       const entry = createOperationEntry(operation, inverse)
-      undoRedoStore.push(activeWorkflowId, userId, entry)
+      useUndoRedoStore.getState().push(activeWorkflowId, userId, entry)
 
       logger.debug('Recorded batch remove blocks', {
         blockCount: blockSnapshots.length,
@@ -132,14 +130,14 @@ export function useUndoRedo() {
         workflowId: activeWorkflowId,
       })
     },
-    [activeWorkflowId, userId, undoRedoStore]
+    [activeWorkflowId, userId]
   )
 
   const recordAddEdge = useCallback(
     (edgeId: string) => {
       if (!activeWorkflowId) return
 
-      const edgeSnapshot = workflowStore.edges.find((e) => e.id === edgeId)
+      const edgeSnapshot = useWorkflowStore.getState().edges.find((e) => e.id === edgeId)
       if (!edgeSnapshot) {
         logger.warn('Edge not found when recording add edge', { edgeId })
         return
@@ -164,11 +162,11 @@ export function useUndoRedo() {
       }
 
       const entry = createOperationEntry(operation, inverse)
-      undoRedoStore.push(activeWorkflowId, userId, entry)
+      useUndoRedoStore.getState().push(activeWorkflowId, userId, entry)
 
       logger.debug('Recorded add edge', { edgeId, workflowId: activeWorkflowId })
     },
-    [activeWorkflowId, userId, workflowStore, undoRedoStore]
+    [activeWorkflowId, userId]
   )
 
   const recordBatchRemoveEdges = useCallback(
@@ -198,14 +196,14 @@ export function useUndoRedo() {
       }
 
       const entry = createOperationEntry(operation, inverse)
-      undoRedoStore.push(activeWorkflowId, userId, entry)
+      useUndoRedoStore.getState().push(activeWorkflowId, userId, entry)
 
       logger.debug('Recorded batch remove edges', {
         edgeCount: edgeSnapshots.length,
         workflowId: activeWorkflowId,
       })
     },
-    [activeWorkflowId, userId, undoRedoStore]
+    [activeWorkflowId, userId]
   )
 
   const recordBatchMoveBlocks = useCallback(
@@ -243,11 +241,11 @@ export function useUndoRedo() {
       }
 
       const entry = createOperationEntry(operation, inverse)
-      undoRedoStore.push(activeWorkflowId, userId, entry)
+      useUndoRedoStore.getState().push(activeWorkflowId, userId, entry)
 
       logger.debug('Recorded batch move', { blockCount: moves.length })
     },
-    [activeWorkflowId, userId, undoRedoStore]
+    [activeWorkflowId, userId]
   )
 
   const recordUpdateParent = useCallback(
@@ -294,7 +292,7 @@ export function useUndoRedo() {
       }
 
       const entry = createOperationEntry(operation, inverse)
-      undoRedoStore.push(activeWorkflowId, userId, entry)
+      useUndoRedoStore.getState().push(activeWorkflowId, userId, entry)
 
       logger.debug('Recorded update parent', {
         blockId,
@@ -303,7 +301,7 @@ export function useUndoRedo() {
         edgeCount: affectedEdges?.length || 0,
       })
     },
-    [activeWorkflowId, userId, undoRedoStore]
+    [activeWorkflowId, userId]
   )
 
   const recordBatchUpdateParent = useCallback(
@@ -347,14 +345,14 @@ export function useUndoRedo() {
       }
 
       const entry = createOperationEntry(operation, inverse)
-      undoRedoStore.push(activeWorkflowId, userId, entry)
+      useUndoRedoStore.getState().push(activeWorkflowId, userId, entry)
 
       logger.debug('Recorded batch update parent', {
         updateCount: updates.length,
         workflowId: activeWorkflowId,
       })
     },
-    [activeWorkflowId, userId, undoRedoStore]
+    [activeWorkflowId, userId]
   )
 
   const recordBatchToggleEnabled = useCallback(
@@ -380,11 +378,11 @@ export function useUndoRedo() {
       }
 
       const entry = createOperationEntry(operation, inverse)
-      undoRedoStore.push(activeWorkflowId, userId, entry)
+      useUndoRedoStore.getState().push(activeWorkflowId, userId, entry)
 
       logger.debug('Recorded batch toggle enabled', { blockIds, previousStates })
     },
-    [activeWorkflowId, userId, undoRedoStore]
+    [activeWorkflowId, userId]
   )
 
   const recordBatchToggleHandles = useCallback(
@@ -410,18 +408,18 @@ export function useUndoRedo() {
       }
 
       const entry = createOperationEntry(operation, inverse)
-      undoRedoStore.push(activeWorkflowId, userId, entry)
+      useUndoRedoStore.getState().push(activeWorkflowId, userId, entry)
 
       logger.debug('Recorded batch toggle handles', { blockIds, previousStates })
     },
-    [activeWorkflowId, userId, undoRedoStore]
+    [activeWorkflowId, userId]
   )
 
   const undo = useCallback(async () => {
     if (!activeWorkflowId) return
 
     await runWithUndoRedoRecordingSuspended(async () => {
-      const entry = undoRedoStore.undo(activeWorkflowId, userId)
+      const entry = useUndoRedoStore.getState().undo(activeWorkflowId, userId)
       if (!entry) {
         logger.debug('No operations to undo')
         return
@@ -441,20 +439,26 @@ export function useUndoRedo() {
           const { blockSnapshots } = batchRemoveOp.data
           const blockIds = blockSnapshots.map((b) => b.id)
 
-          const existingBlockIds = blockIds.filter((id) => workflowStore.blocks[id])
+          const existingBlockIds = blockIds.filter((id) => useWorkflowStore.getState().blocks[id])
           if (existingBlockIds.length === 0) {
             logger.debug('Undo batch-remove-blocks skipped; no blocks exist')
             break
           }
 
-          const latestEdges = workflowStore.edges.filter(
-            (e) => existingBlockIds.includes(e.source) || existingBlockIds.includes(e.target)
-          )
+          const latestEdges = useWorkflowStore
+            .getState()
+            .edges.filter(
+              (e) => existingBlockIds.includes(e.source) || existingBlockIds.includes(e.target)
+            )
           batchRemoveOp.data.edgeSnapshots = latestEdges
 
           const latestSubBlockValues: Record<string, Record<string, unknown>> = {}
           existingBlockIds.forEach((blockId) => {
-            const merged = mergeSubblockState(workflowStore.blocks, activeWorkflowId, blockId)
+            const merged = mergeSubblockState(
+              useWorkflowStore.getState().blocks,
+              activeWorkflowId,
+              blockId
+            )
             const block = merged[blockId]
             if (block?.subBlocks) {
               const values: Record<string, unknown> = {}
@@ -481,7 +485,7 @@ export function useUndoRedo() {
             userId,
           })
 
-          workflowStore.batchRemoveBlocks(existingBlockIds)
+          useWorkflowStore.getState().batchRemoveBlocks(existingBlockIds)
           break
         }
         case UNDO_REDO_OPERATIONS.BATCH_ADD_BLOCKS: {
@@ -489,7 +493,9 @@ export function useUndoRedo() {
           const batchAddOp = entry.inverse as BatchAddBlocksOperation
           const { blockSnapshots, edgeSnapshots, subBlockValues } = batchAddOp.data
 
-          const blocksToAdd = blockSnapshots.filter((b) => !workflowStore.blocks[b.id])
+          const blocksToAdd = blockSnapshots.filter(
+            (b) => !useWorkflowStore.getState().blocks[b.id]
+          )
           if (blocksToAdd.length === 0) {
             logger.debug('Undo batch-add-blocks skipped; all blocks exist')
             break
@@ -513,22 +519,24 @@ export function useUndoRedo() {
           })
 
           blocksToAdd.forEach((block) => {
-            workflowStore.addBlock(
-              block.id,
-              block.type,
-              block.name,
-              block.position,
-              block.data,
-              block.data?.parentId,
-              block.data?.extent,
-              {
-                enabled: block.enabled,
-                horizontalHandles: block.horizontalHandles,
-                advancedMode: block.advancedMode,
-                triggerMode: block.triggerMode,
-                height: block.height,
-              }
-            )
+            useWorkflowStore
+              .getState()
+              .addBlock(
+                block.id,
+                block.type,
+                block.name,
+                block.position,
+                block.data,
+                block.data?.parentId,
+                block.data?.extent,
+                {
+                  enabled: block.enabled,
+                  horizontalHandles: block.horizontalHandles,
+                  advancedMode: block.advancedMode,
+                  triggerMode: block.triggerMode,
+                  height: block.height,
+                }
+              )
           })
 
           if (subBlockValues && Object.keys(subBlockValues).length > 0) {
@@ -545,10 +553,10 @@ export function useUndoRedo() {
 
           if (edgeSnapshots && edgeSnapshots.length > 0) {
             const edgesToAdd = edgeSnapshots.filter(
-              (edge) => !workflowStore.edges.find((e) => e.id === edge.id)
+              (edge) => !useWorkflowStore.getState().edges.find((e) => e.id === edge.id)
             )
             if (edgesToAdd.length > 0) {
-              workflowStore.batchAddEdges(edgesToAdd)
+              useWorkflowStore.getState().batchAddEdges(edgesToAdd)
             }
           }
           break
@@ -559,7 +567,7 @@ export function useUndoRedo() {
           const { edgeSnapshots } = batchRemoveInverse.data
 
           const edgesToRemove = edgeSnapshots
-            .filter((e) => workflowStore.edges.find((edge) => edge.id === e.id))
+            .filter((e) => useWorkflowStore.getState().edges.find((edge) => edge.id === e.id))
             .map((e) => e.id)
 
           if (edgesToRemove.length > 0) {
@@ -573,7 +581,7 @@ export function useUndoRedo() {
               workflowId: activeWorkflowId,
               userId,
             })
-            workflowStore.batchRemoveEdges(edgesToRemove)
+            useWorkflowStore.getState().batchRemoveEdges(edgesToRemove)
           }
           logger.debug('Undid batch-add-edges', { edgeCount: edgesToRemove.length })
           break
@@ -584,7 +592,7 @@ export function useUndoRedo() {
           const { edgeSnapshots } = batchAddInverse.data
 
           const edgesToAdd = edgeSnapshots.filter(
-            (e) => !workflowStore.edges.find((edge) => edge.id === e.id)
+            (e) => !useWorkflowStore.getState().edges.find((edge) => edge.id === e.id)
           )
 
           if (edgesToAdd.length > 0) {
@@ -598,7 +606,7 @@ export function useUndoRedo() {
               workflowId: activeWorkflowId,
               userId,
             })
-            workflowStore.batchAddEdges(edgesToAdd)
+            useWorkflowStore.getState().batchAddEdges(edgesToAdd)
           }
           logger.debug('Undid batch-remove-edges', { edgeCount: edgesToAdd.length })
           break
@@ -618,7 +626,7 @@ export function useUndoRedo() {
           }
 
           if (positionUpdates.length > 0) {
-            workflowStore.batchUpdatePositions(positionUpdates)
+            useWorkflowStore.getState().batchUpdatePositions(positionUpdates)
             addToQueue({
               id: opId,
               operation: {
@@ -636,10 +644,10 @@ export function useUndoRedo() {
           const updateOp = entry.inverse as UpdateParentOperation
           const { blockId, newParentId, newPosition, affectedEdges } = updateOp.data
 
-          if (workflowStore.blocks[blockId]) {
+          if (useWorkflowStore.getState().blocks[blockId]) {
             if (newParentId && affectedEdges && affectedEdges.length > 0) {
               const edgesToAdd = affectedEdges.filter(
-                (e) => !workflowStore.edges.find((edge) => edge.id === e.id)
+                (e) => !useWorkflowStore.getState().edges.find((edge) => edge.id === e.id)
               )
               if (edgesToAdd.length > 0) {
                 addToQueue({
@@ -652,7 +660,7 @@ export function useUndoRedo() {
                   workflowId: activeWorkflowId,
                   userId,
                 })
-                workflowStore.batchAddEdges(edgesToAdd)
+                useWorkflowStore.getState().batchAddEdges(edgesToAdd)
               }
             }
 
@@ -692,7 +700,7 @@ export function useUndoRedo() {
             })
 
             // Update position and parent locally using batch method
-            workflowStore.batchUpdateBlocksWithParent([
+            useWorkflowStore.getState().batchUpdateBlocksWithParent([
               {
                 id: blockId,
                 position: newPosition,
@@ -703,10 +711,10 @@ export function useUndoRedo() {
             // If we're removing FROM a subflow (undo of add to subflow), remove edges after
             if (!newParentId && affectedEdges && affectedEdges.length > 0) {
               const edgeIdsToRemove = affectedEdges
-                .filter((edge) => workflowStore.edges.find((e) => e.id === edge.id))
+                .filter((edge) => useWorkflowStore.getState().edges.find((e) => e.id === edge.id))
                 .map((edge) => edge.id)
               if (edgeIdsToRemove.length > 0) {
-                workflowStore.batchRemoveEdges(edgeIdsToRemove)
+                useWorkflowStore.getState().batchRemoveEdges(edgeIdsToRemove)
                 edgeIdsToRemove.forEach((edgeId) => {
                   addToQueue({
                     id: crypto.randomUUID(),
@@ -730,7 +738,7 @@ export function useUndoRedo() {
           const batchUpdateOp = entry.inverse as BatchUpdateParentOperation
           const { updates } = batchUpdateOp.data
 
-          const validUpdates = updates.filter((u) => workflowStore.blocks[u.blockId])
+          const validUpdates = updates.filter((u) => useWorkflowStore.getState().blocks[u.blockId])
           if (validUpdates.length === 0) {
             logger.debug('Undo batch-update-parent skipped; no blocks exist')
             break
@@ -746,7 +754,7 @@ export function useUndoRedo() {
             // Moving OUT of subflow (undoing insert) → restore edges first
             if (!newParentId && affectedEdges && affectedEdges.length > 0) {
               const edgesToAdd = affectedEdges.filter(
-                (e) => !workflowStore.edges.find((edge) => edge.id === e.id)
+                (e) => !useWorkflowStore.getState().edges.find((edge) => edge.id === e.id)
               )
               allEdgesToAdd.push(...edgesToAdd)
             }
@@ -754,7 +762,7 @@ export function useUndoRedo() {
             // Moving INTO subflow (undoing removal) → remove edges first
             if (newParentId && affectedEdges && affectedEdges.length > 0) {
               const edgeIds = affectedEdges
-                .filter((edge) => workflowStore.edges.find((e) => e.id === edge.id))
+                .filter((edge) => useWorkflowStore.getState().edges.find((e) => e.id === edge.id))
                 .map((edge) => edge.id)
               allEdgeIdsToRemove.push(...edgeIds)
             }
@@ -772,11 +780,11 @@ export function useUndoRedo() {
               workflowId: activeWorkflowId,
               userId,
             })
-            workflowStore.batchAddEdges(allEdgesToAdd)
+            useWorkflowStore.getState().batchAddEdges(allEdgesToAdd)
           }
 
           if (allEdgeIdsToRemove.length > 0) {
-            workflowStore.batchRemoveEdges(allEdgeIdsToRemove)
+            useWorkflowStore.getState().batchRemoveEdges(allEdgeIdsToRemove)
             addToQueue({
               id: crypto.randomUUID(),
               operation: {
@@ -795,7 +803,7 @@ export function useUndoRedo() {
             position: update.newPosition,
             parentId: update.newParentId,
           }))
-          workflowStore.batchUpdateBlocksWithParent(blockUpdates)
+          useWorkflowStore.getState().batchUpdateBlocksWithParent(blockUpdates)
 
           // Send batch update to server
           addToQueue({
@@ -822,7 +830,7 @@ export function useUndoRedo() {
           const toggleOp = entry.inverse as BatchToggleEnabledOperation
           const { blockIds, previousStates } = toggleOp.data
 
-          const validBlockIds = blockIds.filter((id) => workflowStore.blocks[id])
+          const validBlockIds = blockIds.filter((id) => useWorkflowStore.getState().blocks[id])
           if (validBlockIds.length === 0) {
             logger.debug('Undo batch-toggle-enabled skipped; no blocks exist')
             break
@@ -842,7 +850,7 @@ export function useUndoRedo() {
           // Use setBlockEnabled to directly restore to previous state
           // This is more robust than conditional toggle in collaborative scenarios
           validBlockIds.forEach((blockId) => {
-            workflowStore.setBlockEnabled(blockId, previousStates[blockId])
+            useWorkflowStore.getState().setBlockEnabled(blockId, previousStates[blockId])
           })
           break
         }
@@ -850,7 +858,7 @@ export function useUndoRedo() {
           const toggleOp = entry.inverse as BatchToggleHandlesOperation
           const { blockIds, previousStates } = toggleOp.data
 
-          const validBlockIds = blockIds.filter((id) => workflowStore.blocks[id])
+          const validBlockIds = blockIds.filter((id) => useWorkflowStore.getState().blocks[id])
           if (validBlockIds.length === 0) {
             logger.debug('Undo batch-toggle-handles skipped; no blocks exist')
             break
@@ -870,7 +878,7 @@ export function useUndoRedo() {
           // Use setBlockHandles to directly restore to previous state
           // This is more robust than conditional toggle in collaborative scenarios
           validBlockIds.forEach((blockId) => {
-            workflowStore.setBlockHandles(blockId, previousStates[blockId])
+            useWorkflowStore.getState().setBlockHandles(blockId, previousStates[blockId])
           })
           break
         }
@@ -1047,13 +1055,13 @@ export function useUndoRedo() {
 
       logger.info('Undo operation', { type: entry.operation.type, workflowId: activeWorkflowId })
     })
-  }, [activeWorkflowId, userId, undoRedoStore, addToQueue, workflowStore])
+  }, [activeWorkflowId, userId, addToQueue])
 
   const redo = useCallback(async () => {
     if (!activeWorkflowId || !userId) return
 
     await runWithUndoRedoRecordingSuspended(async () => {
-      const entry = undoRedoStore.redo(activeWorkflowId, userId)
+      const entry = useUndoRedoStore.getState().redo(activeWorkflowId, userId)
       if (!entry) {
         logger.debug('No operations to redo')
         return
@@ -1066,7 +1074,9 @@ export function useUndoRedo() {
           const batchOp = entry.operation as BatchAddBlocksOperation
           const { blockSnapshots, edgeSnapshots, subBlockValues } = batchOp.data
 
-          const blocksToAdd = blockSnapshots.filter((b) => !workflowStore.blocks[b.id])
+          const blocksToAdd = blockSnapshots.filter(
+            (b) => !useWorkflowStore.getState().blocks[b.id]
+          )
           if (blocksToAdd.length === 0) {
             logger.debug('Redo batch-add-blocks skipped; all blocks exist')
             break
@@ -1090,22 +1100,24 @@ export function useUndoRedo() {
           })
 
           blocksToAdd.forEach((block) => {
-            workflowStore.addBlock(
-              block.id,
-              block.type,
-              block.name,
-              block.position,
-              block.data,
-              block.data?.parentId,
-              block.data?.extent,
-              {
-                enabled: block.enabled,
-                horizontalHandles: block.horizontalHandles,
-                advancedMode: block.advancedMode,
-                triggerMode: block.triggerMode,
-                height: block.height,
-              }
-            )
+            useWorkflowStore
+              .getState()
+              .addBlock(
+                block.id,
+                block.type,
+                block.name,
+                block.position,
+                block.data,
+                block.data?.parentId,
+                block.data?.extent,
+                {
+                  enabled: block.enabled,
+                  horizontalHandles: block.horizontalHandles,
+                  advancedMode: block.advancedMode,
+                  triggerMode: block.triggerMode,
+                  height: block.height,
+                }
+              )
           })
 
           if (subBlockValues && Object.keys(subBlockValues).length > 0) {
@@ -1122,10 +1134,10 @@ export function useUndoRedo() {
 
           if (edgeSnapshots && edgeSnapshots.length > 0) {
             const edgesToAdd = edgeSnapshots.filter(
-              (edge) => !workflowStore.edges.find((e) => e.id === edge.id)
+              (edge) => !useWorkflowStore.getState().edges.find((e) => e.id === edge.id)
             )
             if (edgesToAdd.length > 0) {
-              workflowStore.batchAddEdges(edgesToAdd)
+              useWorkflowStore.getState().batchAddEdges(edgesToAdd)
             }
           }
           break
@@ -1135,7 +1147,7 @@ export function useUndoRedo() {
           const { blockSnapshots } = batchOp.data
           const blockIds = blockSnapshots.map((b) => b.id)
 
-          const existingBlockIds = blockIds.filter((id) => workflowStore.blocks[id])
+          const existingBlockIds = blockIds.filter((id) => useWorkflowStore.getState().blocks[id])
           if (existingBlockIds.length === 0) {
             logger.debug('Redo batch-remove-blocks skipped; no blocks exist')
             break
@@ -1152,7 +1164,7 @@ export function useUndoRedo() {
             userId,
           })
 
-          workflowStore.batchRemoveBlocks(existingBlockIds)
+          useWorkflowStore.getState().batchRemoveBlocks(existingBlockIds)
           break
         }
         case UNDO_REDO_OPERATIONS.BATCH_REMOVE_EDGES: {
@@ -1161,7 +1173,7 @@ export function useUndoRedo() {
           const { edgeSnapshots } = batchRemoveOp.data
 
           const edgesToRemove = edgeSnapshots
-            .filter((e) => workflowStore.edges.find((edge) => edge.id === e.id))
+            .filter((e) => useWorkflowStore.getState().edges.find((edge) => edge.id === e.id))
             .map((e) => e.id)
 
           if (edgesToRemove.length > 0) {
@@ -1175,7 +1187,7 @@ export function useUndoRedo() {
               workflowId: activeWorkflowId,
               userId,
             })
-            workflowStore.batchRemoveEdges(edgesToRemove)
+            useWorkflowStore.getState().batchRemoveEdges(edgesToRemove)
           }
 
           logger.debug('Redid batch-remove-edges', { edgeCount: edgesToRemove.length })
@@ -1187,7 +1199,7 @@ export function useUndoRedo() {
           const { edgeSnapshots } = batchAddOp.data
 
           const edgesToAdd = edgeSnapshots.filter(
-            (e) => !workflowStore.edges.find((edge) => edge.id === e.id)
+            (e) => !useWorkflowStore.getState().edges.find((edge) => edge.id === e.id)
           )
 
           if (edgesToAdd.length > 0) {
@@ -1201,7 +1213,7 @@ export function useUndoRedo() {
               workflowId: activeWorkflowId,
               userId,
             })
-            workflowStore.batchAddEdges(edgesToAdd)
+            useWorkflowStore.getState().batchAddEdges(edgesToAdd)
           }
 
           logger.debug('Redid batch-add-edges', { edgeCount: edgesToAdd.length })
@@ -1222,7 +1234,7 @@ export function useUndoRedo() {
           }
 
           if (positionUpdates.length > 0) {
-            workflowStore.batchUpdatePositions(positionUpdates)
+            useWorkflowStore.getState().batchUpdatePositions(positionUpdates)
             addToQueue({
               id: opId,
               operation: {
@@ -1241,14 +1253,14 @@ export function useUndoRedo() {
           const updateOp = entry.operation as UpdateParentOperation
           const { blockId, newParentId, newPosition, affectedEdges } = updateOp.data
 
-          if (workflowStore.blocks[blockId]) {
+          if (useWorkflowStore.getState().blocks[blockId]) {
             // If we're removing FROM a subflow, remove edges first
             if (!newParentId && affectedEdges && affectedEdges.length > 0) {
               const edgeIdsToRemove = affectedEdges
-                .filter((edge) => workflowStore.edges.find((e) => e.id === edge.id))
+                .filter((edge) => useWorkflowStore.getState().edges.find((e) => e.id === edge.id))
                 .map((edge) => edge.id)
               if (edgeIdsToRemove.length > 0) {
-                workflowStore.batchRemoveEdges(edgeIdsToRemove)
+                useWorkflowStore.getState().batchRemoveEdges(edgeIdsToRemove)
                 edgeIdsToRemove.forEach((edgeId) => {
                   addToQueue({
                     id: crypto.randomUUID(),
@@ -1301,7 +1313,7 @@ export function useUndoRedo() {
             })
 
             // Update position and parent locally using batch method
-            workflowStore.batchUpdateBlocksWithParent([
+            useWorkflowStore.getState().batchUpdateBlocksWithParent([
               {
                 id: blockId,
                 position: newPosition,
@@ -1312,7 +1324,7 @@ export function useUndoRedo() {
             // If we're adding TO a subflow, restore edges after
             if (newParentId && affectedEdges && affectedEdges.length > 0) {
               const edgesToAdd = affectedEdges.filter(
-                (e) => !workflowStore.edges.find((edge) => edge.id === e.id)
+                (e) => !useWorkflowStore.getState().edges.find((edge) => edge.id === e.id)
               )
               if (edgesToAdd.length > 0) {
                 addToQueue({
@@ -1325,7 +1337,7 @@ export function useUndoRedo() {
                   workflowId: activeWorkflowId,
                   userId,
                 })
-                workflowStore.batchAddEdges(edgesToAdd)
+                useWorkflowStore.getState().batchAddEdges(edgesToAdd)
               }
             }
           } else {
@@ -1337,7 +1349,7 @@ export function useUndoRedo() {
           const batchUpdateOp = entry.operation as BatchUpdateParentOperation
           const { updates } = batchUpdateOp.data
 
-          const validUpdates = updates.filter((u) => workflowStore.blocks[u.blockId])
+          const validUpdates = updates.filter((u) => useWorkflowStore.getState().blocks[u.blockId])
           if (validUpdates.length === 0) {
             logger.debug('Redo batch-update-parent skipped; no blocks exist')
             break
@@ -1353,7 +1365,7 @@ export function useUndoRedo() {
             // Moving INTO subflow (redoing insert) → remove edges first
             if (newParentId && affectedEdges && affectedEdges.length > 0) {
               const edgeIds = affectedEdges
-                .filter((edge) => workflowStore.edges.find((e) => e.id === edge.id))
+                .filter((edge) => useWorkflowStore.getState().edges.find((e) => e.id === edge.id))
                 .map((edge) => edge.id)
               allEdgeIdsToRemove.push(...edgeIds)
             }
@@ -1361,7 +1373,7 @@ export function useUndoRedo() {
             // Moving OUT of subflow (redoing removal) → restore edges after
             if (!newParentId && affectedEdges && affectedEdges.length > 0) {
               const edgesToAdd = affectedEdges.filter(
-                (e) => !workflowStore.edges.find((edge) => edge.id === e.id)
+                (e) => !useWorkflowStore.getState().edges.find((edge) => edge.id === e.id)
               )
               allEdgesToAdd.push(...edgesToAdd)
             }
@@ -1369,7 +1381,7 @@ export function useUndoRedo() {
 
           // Apply edge removals in batch first
           if (allEdgeIdsToRemove.length > 0) {
-            workflowStore.batchRemoveEdges(allEdgeIdsToRemove)
+            useWorkflowStore.getState().batchRemoveEdges(allEdgeIdsToRemove)
             addToQueue({
               id: crypto.randomUUID(),
               operation: {
@@ -1388,7 +1400,7 @@ export function useUndoRedo() {
             position: update.newPosition,
             parentId: update.newParentId,
           }))
-          workflowStore.batchUpdateBlocksWithParent(blockUpdates)
+          useWorkflowStore.getState().batchUpdateBlocksWithParent(blockUpdates)
 
           // Apply edge additions in batch after
           if (allEdgesToAdd.length > 0) {
@@ -1402,7 +1414,7 @@ export function useUndoRedo() {
               workflowId: activeWorkflowId,
               userId,
             })
-            workflowStore.batchAddEdges(allEdgesToAdd)
+            useWorkflowStore.getState().batchAddEdges(allEdgesToAdd)
           }
 
           // Send batch update to server
@@ -1430,7 +1442,7 @@ export function useUndoRedo() {
           const toggleOp = entry.operation as BatchToggleEnabledOperation
           const { blockIds, previousStates } = toggleOp.data
 
-          const validBlockIds = blockIds.filter((id) => workflowStore.blocks[id])
+          const validBlockIds = blockIds.filter((id) => useWorkflowStore.getState().blocks[id])
           if (validBlockIds.length === 0) {
             logger.debug('Redo batch-toggle-enabled skipped; no blocks exist')
             break
@@ -1450,7 +1462,7 @@ export function useUndoRedo() {
           // Use setBlockEnabled to directly set to toggled state
           // Redo sets to !previousStates (the state after the original toggle)
           validBlockIds.forEach((blockId) => {
-            workflowStore.setBlockEnabled(blockId, !previousStates[blockId])
+            useWorkflowStore.getState().setBlockEnabled(blockId, !previousStates[blockId])
           })
           break
         }
@@ -1458,7 +1470,7 @@ export function useUndoRedo() {
           const toggleOp = entry.operation as BatchToggleHandlesOperation
           const { blockIds, previousStates } = toggleOp.data
 
-          const validBlockIds = blockIds.filter((id) => workflowStore.blocks[id])
+          const validBlockIds = blockIds.filter((id) => useWorkflowStore.getState().blocks[id])
           if (validBlockIds.length === 0) {
             logger.debug('Redo batch-toggle-handles skipped; no blocks exist')
             break
@@ -1478,7 +1490,7 @@ export function useUndoRedo() {
           // Use setBlockHandles to directly set to toggled state
           // Redo sets to !previousStates (the state after the original toggle)
           validBlockIds.forEach((blockId) => {
-            workflowStore.setBlockHandles(blockId, !previousStates[blockId])
+            useWorkflowStore.getState().setBlockHandles(blockId, !previousStates[blockId])
           })
           break
         }
@@ -1653,17 +1665,17 @@ export function useUndoRedo() {
         userId,
       })
     })
-  }, [activeWorkflowId, userId, undoRedoStore, addToQueue, workflowStore])
+  }, [activeWorkflowId, userId, addToQueue])
 
   const getStackSizes = useCallback(() => {
     if (!activeWorkflowId) return { undoSize: 0, redoSize: 0 }
-    return undoRedoStore.getStackSizes(activeWorkflowId, userId)
-  }, [activeWorkflowId, userId, undoRedoStore])
+    return useUndoRedoStore.getState().getStackSizes(activeWorkflowId, userId)
+  }, [activeWorkflowId, userId])
 
   const clearStacks = useCallback(() => {
     if (!activeWorkflowId) return
-    undoRedoStore.clear(activeWorkflowId, userId)
-  }, [activeWorkflowId, userId, undoRedoStore])
+    useUndoRedoStore.getState().clear(activeWorkflowId, userId)
+  }, [activeWorkflowId, userId])
 
   const recordApplyDiff = useCallback(
     (baselineSnapshot: any, proposedState: any, diffAnalysis: any) => {
@@ -1696,7 +1708,7 @@ export function useUndoRedo() {
       }
 
       const entry = createOperationEntry(operation, inverse)
-      undoRedoStore.push(activeWorkflowId, userId, entry)
+      useUndoRedoStore.getState().push(activeWorkflowId, userId, entry)
 
       logger.info('Recorded apply-diff operation', {
         workflowId: activeWorkflowId,
@@ -1706,7 +1718,7 @@ export function useUndoRedo() {
         proposedBlockCount: Object.keys(proposedState?.blocks || {}).length,
       })
     },
-    [activeWorkflowId, userId, undoRedoStore]
+    [activeWorkflowId, userId]
   )
 
   const recordAcceptDiff = useCallback(
@@ -1742,11 +1754,11 @@ export function useUndoRedo() {
       }
 
       const entry = createOperationEntry(operation, inverse)
-      undoRedoStore.push(activeWorkflowId, userId, entry)
+      useUndoRedoStore.getState().push(activeWorkflowId, userId, entry)
 
       logger.debug('Recorded accept-diff operation', { workflowId: activeWorkflowId })
     },
-    [activeWorkflowId, userId, undoRedoStore]
+    [activeWorkflowId, userId]
   )
 
   const recordRejectDiff = useCallback(
@@ -1782,7 +1794,7 @@ export function useUndoRedo() {
       }
 
       const entry = createOperationEntry(operation, inverse)
-      undoRedoStore.push(activeWorkflowId, userId, entry)
+      useUndoRedoStore.getState().push(activeWorkflowId, userId, entry)
 
       logger.info('Recorded reject-diff operation', {
         workflowId: activeWorkflowId,
@@ -1790,7 +1802,7 @@ export function useUndoRedo() {
         afterBlockCount: Object.keys(afterReject?.blocks || {}).length,
       })
     },
-    [activeWorkflowId, userId, undoRedoStore]
+    [activeWorkflowId, userId]
   )
 
   return {
diff --git a/apps/sim/hooks/use-workspace-permissions.ts b/apps/sim/hooks/use-workspace-permissions.ts
index 0a080a6684..ef55011a55 100644
--- a/apps/sim/hooks/use-workspace-permissions.ts
+++ b/apps/sim/hooks/use-workspace-permissions.ts
@@ -76,9 +76,9 @@ export function useWorkspacePermissions(workspaceId: string | null): UseWorkspac
     }
   }
 
-  const updatePermissions = (newPermissions: WorkspacePermissions): void => {
+  const updatePermissions = useCallback((newPermissions: WorkspacePermissions): void => {
     setPermissions(newPermissions)
-  }
+  }, [])
 
   useEffect(() => {
     if (workspaceId) {
diff --git a/apps/sim/lib/auth/auth.ts b/apps/sim/lib/auth/auth.ts
index 2ad93f88a6..0ff169a2fd 100644
--- a/apps/sim/lib/auth/auth.ts
+++ b/apps/sim/lib/auth/auth.ts
@@ -689,6 +689,31 @@ export const auth = betterAuth({
           ],
           prompt: 'consent',
           redirectURI: `${getBaseUrl()}/api/auth/oauth2/callback/google-email`,
+          getUserInfo: async (tokens) => {
+            try {
+              const response = await fetch('https://openidconnect.googleapis.com/v1/userinfo', {
+                headers: { Authorization: `Bearer ${tokens.accessToken}` },
+              })
+              if (!response.ok) {
+                logger.error('Failed to fetch Google user info', { status: response.status })
+                throw new Error(`Failed to fetch Google user info: ${response.statusText}`)
+              }
+              const profile = await response.json()
+              const now = new Date()
+              return {
+                id: `${profile.sub}-${crypto.randomUUID()}`,
+                name: profile.name || 'Google User',
+                email: profile.email,
+                image: profile.picture || undefined,
+                emailVerified: profile.email_verified || false,
+                createdAt: now,
+                updatedAt: now,
+              }
+            } catch (error) {
+              logger.error('Error in Google getUserInfo', { error })
+              throw error
+            }
+          },
         },
         {
           providerId: 'google-calendar',
@@ -703,6 +728,31 @@ export const auth = betterAuth({
           ],
           prompt: 'consent',
           redirectURI: `${getBaseUrl()}/api/auth/oauth2/callback/google-calendar`,
+          getUserInfo: async (tokens) => {
+            try {
+              const response = await fetch('https://openidconnect.googleapis.com/v1/userinfo', {
+                headers: { Authorization: `Bearer ${tokens.accessToken}` },
+              })
+              if (!response.ok) {
+                logger.error('Failed to fetch Google user info', { status: response.status })
+                throw new Error(`Failed to fetch Google user info: ${response.statusText}`)
+              }
+              const profile = await response.json()
+              const now = new Date()
+              return {
+                id: `${profile.sub}-${crypto.randomUUID()}`,
+                name: profile.name || 'Google User',
+                email: profile.email,
+                image: profile.picture || undefined,
+                emailVerified: profile.email_verified || false,
+                createdAt: now,
+                updatedAt: now,
+              }
+            } catch (error) {
+              logger.error('Error in Google getUserInfo', { error })
+              throw error
+            }
+          },
         },
         {
           providerId: 'google-drive',
@@ -718,6 +768,31 @@ export const auth = betterAuth({
           ],
           prompt: 'consent',
           redirectURI: `${getBaseUrl()}/api/auth/oauth2/callback/google-drive`,
+          getUserInfo: async (tokens) => {
+            try {
+              const response = await fetch('https://openidconnect.googleapis.com/v1/userinfo', {
+                headers: { Authorization: `Bearer ${tokens.accessToken}` },
+              })
+              if (!response.ok) {
+                logger.error('Failed to fetch Google user info', { status: response.status })
+                throw new Error(`Failed to fetch Google user info: ${response.statusText}`)
+              }
+              const profile = await response.json()
+              const now = new Date()
+              return {
+                id: `${profile.sub}-${crypto.randomUUID()}`,
+                name: profile.name || 'Google User',
+                email: profile.email,
+                image: profile.picture || undefined,
+                emailVerified: profile.email_verified || false,
+                createdAt: now,
+                updatedAt: now,
+              }
+            } catch (error) {
+              logger.error('Error in Google getUserInfo', { error })
+              throw error
+            }
+          },
         },
         {
           providerId: 'google-docs',
@@ -733,6 +808,31 @@ export const auth = betterAuth({
           ],
           prompt: 'consent',
           redirectURI: `${getBaseUrl()}/api/auth/oauth2/callback/google-docs`,
+          getUserInfo: async (tokens) => {
+            try {
+              const response = await fetch('https://openidconnect.googleapis.com/v1/userinfo', {
+                headers: { Authorization: `Bearer ${tokens.accessToken}` },
+              })
+              if (!response.ok) {
+                logger.error('Failed to fetch Google user info', { status: response.status })
+                throw new Error(`Failed to fetch Google user info: ${response.statusText}`)
+              }
+              const profile = await response.json()
+              const now = new Date()
+              return {
+                id: `${profile.sub}-${crypto.randomUUID()}`,
+                name: profile.name || 'Google User',
+                email: profile.email,
+                image: profile.picture || undefined,
+                emailVerified: profile.email_verified || false,
+                createdAt: now,
+                updatedAt: now,
+              }
+            } catch (error) {
+              logger.error('Error in Google getUserInfo', { error })
+              throw error
+            }
+          },
         },
         {
           providerId: 'google-sheets',
@@ -748,6 +848,31 @@ export const auth = betterAuth({
           ],
           prompt: 'consent',
           redirectURI: `${getBaseUrl()}/api/auth/oauth2/callback/google-sheets`,
+          getUserInfo: async (tokens) => {
+            try {
+              const response = await fetch('https://openidconnect.googleapis.com/v1/userinfo', {
+                headers: { Authorization: `Bearer ${tokens.accessToken}` },
+              })
+              if (!response.ok) {
+                logger.error('Failed to fetch Google user info', { status: response.status })
+                throw new Error(`Failed to fetch Google user info: ${response.statusText}`)
+              }
+              const profile = await response.json()
+              const now = new Date()
+              return {
+                id: `${profile.sub}-${crypto.randomUUID()}`,
+                name: profile.name || 'Google User',
+                email: profile.email,
+                image: profile.picture || undefined,
+                emailVerified: profile.email_verified || false,
+                createdAt: now,
+                updatedAt: now,
+              }
+            } catch (error) {
+              logger.error('Error in Google getUserInfo', { error })
+              throw error
+            }
+          },
         },
 
         {
@@ -759,10 +884,37 @@ export const auth = betterAuth({
           scopes: [
             'https://www.googleapis.com/auth/userinfo.email',
             'https://www.googleapis.com/auth/userinfo.profile',
+            'https://www.googleapis.com/auth/drive',
+            'https://www.googleapis.com/auth/forms.body',
             'https://www.googleapis.com/auth/forms.responses.readonly',
           ],
           prompt: 'consent',
           redirectURI: `${getBaseUrl()}/api/auth/oauth2/callback/google-forms`,
+          getUserInfo: async (tokens) => {
+            try {
+              const response = await fetch('https://openidconnect.googleapis.com/v1/userinfo', {
+                headers: { Authorization: `Bearer ${tokens.accessToken}` },
+              })
+              if (!response.ok) {
+                logger.error('Failed to fetch Google user info', { status: response.status })
+                throw new Error(`Failed to fetch Google user info: ${response.statusText}`)
+              }
+              const profile = await response.json()
+              const now = new Date()
+              return {
+                id: `${profile.sub}-${crypto.randomUUID()}`,
+                name: profile.name || 'Google User',
+                email: profile.email,
+                image: profile.picture || undefined,
+                emailVerified: profile.email_verified || false,
+                createdAt: now,
+                updatedAt: now,
+              }
+            } catch (error) {
+              logger.error('Error in Google getUserInfo', { error })
+              throw error
+            }
+          },
         },
         {
           providerId: 'google-vault',
@@ -778,6 +930,31 @@ export const auth = betterAuth({
           ],
           prompt: 'consent',
           redirectURI: `${getBaseUrl()}/api/auth/oauth2/callback/google-vault`,
+          getUserInfo: async (tokens) => {
+            try {
+              const response = await fetch('https://openidconnect.googleapis.com/v1/userinfo', {
+                headers: { Authorization: `Bearer ${tokens.accessToken}` },
+              })
+              if (!response.ok) {
+                logger.error('Failed to fetch Google user info', { status: response.status })
+                throw new Error(`Failed to fetch Google user info: ${response.statusText}`)
+              }
+              const profile = await response.json()
+              const now = new Date()
+              return {
+                id: `${profile.sub}-${crypto.randomUUID()}`,
+                name: profile.name || 'Google User',
+                email: profile.email,
+                image: profile.picture || undefined,
+                emailVerified: profile.email_verified || false,
+                createdAt: now,
+                updatedAt: now,
+              }
+            } catch (error) {
+              logger.error('Error in Google getUserInfo', { error })
+              throw error
+            }
+          },
         },
 
         {
@@ -794,6 +971,31 @@ export const auth = betterAuth({
           ],
           prompt: 'consent',
           redirectURI: `${getBaseUrl()}/api/auth/oauth2/callback/google-groups`,
+          getUserInfo: async (tokens) => {
+            try {
+              const response = await fetch('https://openidconnect.googleapis.com/v1/userinfo', {
+                headers: { Authorization: `Bearer ${tokens.accessToken}` },
+              })
+              if (!response.ok) {
+                logger.error('Failed to fetch Google user info', { status: response.status })
+                throw new Error(`Failed to fetch Google user info: ${response.statusText}`)
+              }
+              const profile = await response.json()
+              const now = new Date()
+              return {
+                id: `${profile.sub}-${crypto.randomUUID()}`,
+                name: profile.name || 'Google User',
+                email: profile.email,
+                image: profile.picture || undefined,
+                emailVerified: profile.email_verified || false,
+                createdAt: now,
+                updatedAt: now,
+              }
+            } catch (error) {
+              logger.error('Error in Google getUserInfo', { error })
+              throw error
+            }
+          },
         },
 
         {
@@ -809,6 +1011,31 @@ export const auth = betterAuth({
           ],
           prompt: 'consent',
           redirectURI: `${getBaseUrl()}/api/auth/oauth2/callback/vertex-ai`,
+          getUserInfo: async (tokens) => {
+            try {
+              const response = await fetch('https://openidconnect.googleapis.com/v1/userinfo', {
+                headers: { Authorization: `Bearer ${tokens.accessToken}` },
+              })
+              if (!response.ok) {
+                logger.error('Failed to fetch Google user info', { status: response.status })
+                throw new Error(`Failed to fetch Google user info: ${response.statusText}`)
+              }
+              const profile = await response.json()
+              const now = new Date()
+              return {
+                id: `${profile.sub}-${crypto.randomUUID()}`,
+                name: profile.name || 'Google User',
+                email: profile.email,
+                image: profile.picture || undefined,
+                emailVerified: profile.email_verified || false,
+                createdAt: now,
+                updatedAt: now,
+              }
+            } catch (error) {
+              logger.error('Error in Google getUserInfo', { error })
+              throw error
+            }
+          },
         },
 
         {
@@ -845,6 +1072,30 @@ export const auth = betterAuth({
           authentication: 'basic',
           pkce: true,
           redirectURI: `${getBaseUrl()}/api/auth/oauth2/callback/microsoft-teams`,
+          getUserInfo: async (tokens) => {
+            try {
+              const response = await fetch('https://graph.microsoft.com/v1.0/me', {
+                headers: { Authorization: `Bearer ${tokens.accessToken}` },
+              })
+              if (!response.ok) {
+                logger.error('Failed to fetch Microsoft user info', { status: response.status })
+                throw new Error(`Failed to fetch Microsoft user info: ${response.statusText}`)
+              }
+              const profile = await response.json()
+              const now = new Date()
+              return {
+                id: `${profile.id}-${crypto.randomUUID()}`,
+                name: profile.displayName || 'Microsoft User',
+                email: profile.mail || profile.userPrincipalName,
+                emailVerified: true,
+                createdAt: now,
+                updatedAt: now,
+              }
+            } catch (error) {
+              logger.error('Error in Microsoft getUserInfo', { error })
+              throw error
+            }
+          },
         },
 
         {
@@ -860,6 +1111,30 @@ export const auth = betterAuth({
           authentication: 'basic',
           pkce: true,
           redirectURI: `${getBaseUrl()}/api/auth/oauth2/callback/microsoft-excel`,
+          getUserInfo: async (tokens) => {
+            try {
+              const response = await fetch('https://graph.microsoft.com/v1.0/me', {
+                headers: { Authorization: `Bearer ${tokens.accessToken}` },
+              })
+              if (!response.ok) {
+                logger.error('Failed to fetch Microsoft user info', { status: response.status })
+                throw new Error(`Failed to fetch Microsoft user info: ${response.statusText}`)
+              }
+              const profile = await response.json()
+              const now = new Date()
+              return {
+                id: `${profile.id}-${crypto.randomUUID()}`,
+                name: profile.displayName || 'Microsoft User',
+                email: profile.mail || profile.userPrincipalName,
+                emailVerified: true,
+                createdAt: now,
+                updatedAt: now,
+              }
+            } catch (error) {
+              logger.error('Error in Microsoft getUserInfo', { error })
+              throw error
+            }
+          },
         },
         {
           providerId: 'microsoft-planner',
@@ -882,6 +1157,30 @@ export const auth = betterAuth({
           authentication: 'basic',
           pkce: true,
           redirectURI: `${getBaseUrl()}/api/auth/oauth2/callback/microsoft-planner`,
+          getUserInfo: async (tokens) => {
+            try {
+              const response = await fetch('https://graph.microsoft.com/v1.0/me', {
+                headers: { Authorization: `Bearer ${tokens.accessToken}` },
+              })
+              if (!response.ok) {
+                logger.error('Failed to fetch Microsoft user info', { status: response.status })
+                throw new Error(`Failed to fetch Microsoft user info: ${response.statusText}`)
+              }
+              const profile = await response.json()
+              const now = new Date()
+              return {
+                id: `${profile.id}-${crypto.randomUUID()}`,
+                name: profile.displayName || 'Microsoft User',
+                email: profile.mail || profile.userPrincipalName,
+                emailVerified: true,
+                createdAt: now,
+                updatedAt: now,
+              }
+            } catch (error) {
+              logger.error('Error in Microsoft getUserInfo', { error })
+              throw error
+            }
+          },
         },
 
         {
@@ -906,6 +1205,30 @@ export const auth = betterAuth({
           authentication: 'basic',
           pkce: true,
           redirectURI: `${getBaseUrl()}/api/auth/oauth2/callback/outlook`,
+          getUserInfo: async (tokens) => {
+            try {
+              const response = await fetch('https://graph.microsoft.com/v1.0/me', {
+                headers: { Authorization: `Bearer ${tokens.accessToken}` },
+              })
+              if (!response.ok) {
+                logger.error('Failed to fetch Microsoft user info', { status: response.status })
+                throw new Error(`Failed to fetch Microsoft user info: ${response.statusText}`)
+              }
+              const profile = await response.json()
+              const now = new Date()
+              return {
+                id: `${profile.id}-${crypto.randomUUID()}`,
+                name: profile.displayName || 'Microsoft User',
+                email: profile.mail || profile.userPrincipalName,
+                emailVerified: true,
+                createdAt: now,
+                updatedAt: now,
+              }
+            } catch (error) {
+              logger.error('Error in Microsoft getUserInfo', { error })
+              throw error
+            }
+          },
         },
 
         {
@@ -921,6 +1244,30 @@ export const auth = betterAuth({
           authentication: 'basic',
           pkce: true,
           redirectURI: `${getBaseUrl()}/api/auth/oauth2/callback/onedrive`,
+          getUserInfo: async (tokens) => {
+            try {
+              const response = await fetch('https://graph.microsoft.com/v1.0/me', {
+                headers: { Authorization: `Bearer ${tokens.accessToken}` },
+              })
+              if (!response.ok) {
+                logger.error('Failed to fetch Microsoft user info', { status: response.status })
+                throw new Error(`Failed to fetch Microsoft user info: ${response.statusText}`)
+              }
+              const profile = await response.json()
+              const now = new Date()
+              return {
+                id: `${profile.id}-${crypto.randomUUID()}`,
+                name: profile.displayName || 'Microsoft User',
+                email: profile.mail || profile.userPrincipalName,
+                emailVerified: true,
+                createdAt: now,
+                updatedAt: now,
+              }
+            } catch (error) {
+              logger.error('Error in Microsoft getUserInfo', { error })
+              throw error
+            }
+          },
         },
 
         {
@@ -944,6 +1291,30 @@ export const auth = betterAuth({
           authentication: 'basic',
           pkce: true,
           redirectURI: `${getBaseUrl()}/api/auth/oauth2/callback/sharepoint`,
+          getUserInfo: async (tokens) => {
+            try {
+              const response = await fetch('https://graph.microsoft.com/v1.0/me', {
+                headers: { Authorization: `Bearer ${tokens.accessToken}` },
+              })
+              if (!response.ok) {
+                logger.error('Failed to fetch Microsoft user info', { status: response.status })
+                throw new Error(`Failed to fetch Microsoft user info: ${response.statusText}`)
+              }
+              const profile = await response.json()
+              const now = new Date()
+              return {
+                id: `${profile.id}-${crypto.randomUUID()}`,
+                name: profile.displayName || 'Microsoft User',
+                email: profile.mail || profile.userPrincipalName,
+                emailVerified: true,
+                createdAt: now,
+                updatedAt: now,
+              }
+            } catch (error) {
+              logger.error('Error in Microsoft getUserInfo', { error })
+              throw error
+            }
+          },
         },
 
         {
diff --git a/apps/sim/lib/core/config/env.ts b/apps/sim/lib/core/config/env.ts
index ae0e5cbe01..fd6c391b5a 100644
--- a/apps/sim/lib/core/config/env.ts
+++ b/apps/sim/lib/core/config/env.ts
@@ -262,6 +262,7 @@ export const env = createEnv({
 
     // Development Tools
     REACT_GRAB_ENABLED:                    z.boolean().optional(),                 // Enable React Grab for UI element debugging in Cursor/AI agents (dev only)
+    REACT_SCAN_ENABLED:                    z.boolean().optional(),                 // Enable React Scan for performance debugging (dev only)
 
     // SSO Configuration (for script-based registration)
     SSO_ENABLED:                           z.boolean().optional(),                 // Enable SSO functionality
diff --git a/apps/sim/lib/core/config/feature-flags.ts b/apps/sim/lib/core/config/feature-flags.ts
index 108dca6f65..9f746c5b12 100644
--- a/apps/sim/lib/core/config/feature-flags.ts
+++ b/apps/sim/lib/core/config/feature-flags.ts
@@ -117,6 +117,12 @@ export const isInvitationsDisabled = isTruthy(env.DISABLE_INVITATIONS)
  */
 export const isReactGrabEnabled = isDev && isTruthy(env.REACT_GRAB_ENABLED)
 
+/**
+ * Is React Scan enabled for performance debugging
+ * When true and in development mode, enables React Scan for detecting render performance issues
+ */
+export const isReactScanEnabled = isDev && isTruthy(env.REACT_SCAN_ENABLED)
+
 /**
  * Get cost multiplier based on environment
  */
diff --git a/apps/sim/lib/oauth/oauth.ts b/apps/sim/lib/oauth/oauth.ts
index d00fea2e4e..2f812b13f4 100644
--- a/apps/sim/lib/oauth/oauth.ts
+++ b/apps/sim/lib/oauth/oauth.ts
@@ -96,13 +96,15 @@ export const OAUTH_PROVIDERS: Record<string, OAuthProviderConfig> = {
       },
       'google-forms': {
         name: 'Google Forms',
-        description: 'Retrieve Google Form responses.',
+        description: 'Create, modify, and read Google Forms.',
         providerId: 'google-forms',
         icon: GoogleFormsIcon,
         baseProviderIcon: GoogleIcon,
         scopes: [
           'https://www.googleapis.com/auth/userinfo.email',
           'https://www.googleapis.com/auth/userinfo.profile',
+          'https://www.googleapis.com/auth/drive',
+          'https://www.googleapis.com/auth/forms.body',
           'https://www.googleapis.com/auth/forms.responses.readonly',
         ],
       },
diff --git a/apps/sim/lib/workflows/blocks/block-outputs.ts b/apps/sim/lib/workflows/blocks/block-outputs.ts
index c953a11968..c914227ab5 100644
--- a/apps/sim/lib/workflows/blocks/block-outputs.ts
+++ b/apps/sim/lib/workflows/blocks/block-outputs.ts
@@ -62,8 +62,11 @@ function evaluateOutputCondition(
     let andMatches: boolean
 
     if (Array.isArray(condition.and.value)) {
-      andMatches =
+      const primitiveMatch =
         isConditionPrimitive(andFieldValue) && condition.and.value.includes(andFieldValue)
+      const undefinedMatch = andFieldValue === undefined && condition.and.value.includes(undefined)
+      const nullMatch = andFieldValue === null && condition.and.value.includes(null)
+      andMatches = primitiveMatch || undefinedMatch || nullMatch
     } else {
       andMatches = andFieldValue === condition.and.value
     }
@@ -95,7 +98,9 @@ function filterOutputsByCondition(
     }
 
     const condition = value.condition as OutputCondition | undefined
-    if (!condition || evaluateOutputCondition(condition, subBlocks)) {
+    const passes = !condition || evaluateOutputCondition(condition, subBlocks)
+
+    if (passes) {
       const { condition: _, ...rest } = value
       filtered[key] = rest
     }
@@ -565,11 +570,32 @@ export function getToolOutputs(blockConfig: BlockConfig, operation: string): Rec
  *
  * @param blockConfig - The block configuration containing tools config
  * @param operation - The selected operation for the tool
+ * @param subBlocks - Optional subBlock values for condition evaluation
  * @returns Array of output paths for the tool, or empty array on error
  */
-export function getToolOutputPaths(blockConfig: BlockConfig, operation: string): string[] {
+export function getToolOutputPaths(
+  blockConfig: BlockConfig,
+  operation: string,
+  subBlocks?: Record<string, SubBlockWithValue>
+): string[] {
   const outputs = getToolOutputs(blockConfig, operation)
+
   if (!outputs || Object.keys(outputs).length === 0) return []
+
+  if (subBlocks && blockConfig.outputs) {
+    const filteredBlockOutputs = filterOutputsByCondition(blockConfig.outputs, subBlocks)
+    const allowedKeys = new Set(Object.keys(filteredBlockOutputs))
+
+    const filteredOutputs: Record<string, any> = {}
+    for (const [key, value] of Object.entries(outputs)) {
+      if (allowedKeys.has(key)) {
+        filteredOutputs[key] = value
+      }
+    }
+
+    return generateOutputPaths(filteredOutputs)
+  }
+
   return generateOutputPaths(outputs)
 }
 
diff --git a/apps/sim/lib/workflows/executor/execution-core.ts b/apps/sim/lib/workflows/executor/execution-core.ts
index eaeed3084b..a98aa3227b 100644
--- a/apps/sim/lib/workflows/executor/execution-core.ts
+++ b/apps/sim/lib/workflows/executor/execution-core.ts
@@ -318,7 +318,7 @@ export async function executeWorkflowCore(
       executionId,
       workspaceId: providedWorkspaceId,
       userId,
-      isDeployedContext: triggerType !== 'manual',
+      isDeployedContext: !metadata.isClientSession,
       onBlockStart,
       onBlockComplete: wrappedOnBlockComplete,
       onStream,
diff --git a/apps/sim/providers/types.ts b/apps/sim/providers/types.ts
index 3522a6f026..54b4acbb76 100644
--- a/apps/sim/providers/types.ts
+++ b/apps/sim/providers/types.ts
@@ -167,6 +167,7 @@ export interface ProviderRequest {
   reasoningEffort?: string
   verbosity?: string
   thinkingLevel?: string
+  isDeployedContext?: boolean
 }
 
 export const providers: Record<string, ProviderConfig> = {}
diff --git a/apps/sim/providers/utils.ts b/apps/sim/providers/utils.ts
index 73d08735d1..493e64c2e8 100644
--- a/apps/sim/providers/utils.ts
+++ b/apps/sim/providers/utils.ts
@@ -30,7 +30,7 @@ import {
 import type { ProviderId, ProviderToolConfig } from '@/providers/types'
 import { useCustomToolsStore } from '@/stores/custom-tools/store'
 import { useProvidersStore } from '@/stores/providers/store'
-import { deepMergeInputMapping } from '@/tools/params'
+import { mergeToolParameters } from '@/tools/params'
 
 const logger = createLogger('ProviderUtils')
 
@@ -981,39 +981,14 @@ export function prepareToolExecution(
     workflowVariables?: Record<string, any>
     blockData?: Record<string, any>
     blockNameMapping?: Record<string, string>
+    isDeployedContext?: boolean
   }
 ): {
   toolParams: Record<string, any>
   executionParams: Record<string, any>
 } {
-  const filteredUserParams: Record<string, any> = {}
-  if (tool.params) {
-    for (const [key, value] of Object.entries(tool.params)) {
-      if (value !== undefined && value !== null && value !== '') {
-        filteredUserParams[key] = value
-      }
-    }
-  }
-
-  // Start with LLM params as base
-  const toolParams: Record<string, any> = { ...llmArgs }
-
-  // Apply user params with special handling for inputMapping
-  for (const [key, userValue] of Object.entries(filteredUserParams)) {
-    if (key === 'inputMapping') {
-      // Deep merge inputMapping so LLM values fill in empty user fields
-      const llmInputMapping = llmArgs.inputMapping as Record<string, any> | undefined
-      toolParams.inputMapping = deepMergeInputMapping(llmInputMapping, userValue)
-    } else {
-      // Normal override for other params
-      toolParams[key] = userValue
-    }
-  }
-
-  // If LLM provided inputMapping but user didn't, ensure it's included
-  if (llmArgs.inputMapping && !filteredUserParams.inputMapping) {
-    toolParams.inputMapping = llmArgs.inputMapping
-  }
+  // Use centralized merge logic from tools/params
+  const toolParams = mergeToolParameters(tool.params || {}, llmArgs) as Record<string, any>
 
   const executionParams = {
     ...toolParams,
@@ -1024,6 +999,9 @@ export function prepareToolExecution(
             ...(request.workspaceId ? { workspaceId: request.workspaceId } : {}),
             ...(request.chatId ? { chatId: request.chatId } : {}),
             ...(request.userId ? { userId: request.userId } : {}),
+            ...(request.isDeployedContext !== undefined
+              ? { isDeployedContext: request.isDeployedContext }
+              : {}),
           },
         }
       : {}),
diff --git a/apps/sim/stores/operation-queue/store.ts b/apps/sim/stores/operation-queue/store.ts
index b36eff4462..07e9381ced 100644
--- a/apps/sim/stores/operation-queue/store.ts
+++ b/apps/sim/stores/operation-queue/store.ts
@@ -37,8 +37,6 @@ export const useOperationQueueStore = create<OperationQueueState>((set, get) =>
   hasOperationError: false,
 
   addToQueue: (operation) => {
-    // Immediate coalescing without client-side debouncing:
-    // For subblock updates, keep only latest pending op for the same blockId+subblockId
     if (
       operation.operation.operation === 'subblock-update' &&
       operation.operation.target === 'subblock'
@@ -60,7 +58,6 @@ export const useOperationQueueStore = create<OperationQueueState>((set, get) =>
       }))
     }
 
-    // For variable updates, keep only latest pending op for same variableId+field
     if (
       operation.operation.operation === 'variable-update' &&
       operation.operation.target === 'variable'
@@ -82,10 +79,8 @@ export const useOperationQueueStore = create<OperationQueueState>((set, get) =>
       }))
     }
 
-    // Handle remaining logic
     const state = get()
 
-    // Check for duplicate operation ID
     const existingOp = state.operations.find((op) => op.id === operation.id)
     if (existingOp) {
       logger.debug('Skipping duplicate operation ID', {
@@ -95,16 +90,13 @@ export const useOperationQueueStore = create<OperationQueueState>((set, get) =>
       return
     }
 
-    // Enhanced duplicate content check - especially important for block operations
     const duplicateContent = state.operations.find(
       (op) =>
         op.operation.operation === operation.operation.operation &&
         op.operation.target === operation.operation.target &&
         op.workflowId === operation.workflowId &&
-        // For block operations, check the block ID specifically
         ((operation.operation.target === 'block' &&
           op.operation.payload?.id === operation.operation.payload?.id) ||
-          // For other operations, fall back to full payload comparison
           (operation.operation.target !== 'block' &&
             JSON.stringify(op.operation.payload) === JSON.stringify(operation.operation.payload)))
     )
@@ -143,7 +135,6 @@ export const useOperationQueueStore = create<OperationQueueState>((set, get) =>
       operations: [...state.operations, queuedOp],
     }))
 
-    // Start processing if not already processing
     get().processNextOperation()
   },
 
@@ -171,7 +162,6 @@ export const useOperationQueueStore = create<OperationQueueState>((set, get) =>
 
     set({ operations: newOperations, isProcessing: false })
 
-    // Process next operation in queue
     get().processNextOperation()
   },
 
@@ -201,7 +191,6 @@ export const useOperationQueueStore = create<OperationQueueState>((set, get) =>
       return
     }
 
-    // More aggressive retry for subblock/variable updates, less aggressive for structural ops
     const isSubblockOrVariable =
       (operation.operation.operation === 'subblock-update' &&
         operation.operation.target === 'subblock') ||
@@ -226,17 +215,15 @@ export const useOperationQueueStore = create<OperationQueueState>((set, get) =>
         }
       )
 
-      // Update retry count and mark as pending for retry
       set((state) => ({
         operations: state.operations.map((op) =>
           op.id === operationId
             ? { ...op, retryCount: newRetryCount, status: 'pending' as const }
             : op
         ),
-        isProcessing: false, // Allow processing to continue
+        isProcessing: false,
       }))
 
-      // Schedule retry
       const timeout = setTimeout(() => {
         retryTimeouts.delete(operationId)
         get().processNextOperation()
@@ -244,7 +231,6 @@ export const useOperationQueueStore = create<OperationQueueState>((set, get) =>
 
       retryTimeouts.set(operationId, timeout)
     } else {
-      // Always trigger offline mode when we can't persist - never silently drop data
       logger.error('Operation failed after max retries, triggering offline mode', {
         operationId,
         operation: operation.operation.operation,
@@ -272,7 +258,6 @@ export const useOperationQueueStore = create<OperationQueueState>((set, get) =>
   processNextOperation: () => {
     const state = get()
 
-    // Don't process if already processing
     if (state.isProcessing) {
       return
     }
@@ -290,7 +275,6 @@ export const useOperationQueueStore = create<OperationQueueState>((set, get) =>
       return
     }
 
-    // Mark as processing
     set((state) => ({
       operations: state.operations.map((op) =>
         op.id === nextOperation.id ? { ...op, status: 'processing' as const } : op
@@ -304,7 +288,6 @@ export const useOperationQueueStore = create<OperationQueueState>((set, get) =>
       retryCount: nextOperation.retryCount,
     })
 
-    // Emit the operation
     const { operation: op, target, payload } = nextOperation.operation
     if (op === 'subblock-update' && target === 'subblock') {
       if (emitSubblockUpdate) {
@@ -320,7 +303,6 @@ export const useOperationQueueStore = create<OperationQueueState>((set, get) =>
       }
     }
 
-    // Create operation timeout - longer for subblock/variable updates to handle reconnects
     const isSubblockOrVariable =
       (nextOperation.operation.operation === 'subblock-update' &&
         nextOperation.operation.target === 'subblock') ||
@@ -347,13 +329,10 @@ export const useOperationQueueStore = create<OperationQueueState>((set, get) =>
     const operationsToCancel = state.operations.filter((op) => {
       const { target, payload, operation } = op.operation
 
-      // Single block property updates (update-position, toggle-enabled, update-name, etc.)
       if (target === 'block' && payload?.id === blockId) return true
 
-      // Subblock updates for this block
       if (target === 'subblock' && payload?.blockId === blockId) return true
 
-      // Batch block operations
       if (target === 'blocks') {
         if (operation === 'batch-add-blocks' && Array.isArray(payload?.blocks)) {
           return payload.blocks.some((b: { id: string }) => b.id === blockId)
@@ -369,7 +348,6 @@ export const useOperationQueueStore = create<OperationQueueState>((set, get) =>
       return false
     })
 
-    // Cancel timeouts for these operations
     operationsToCancel.forEach((op) => {
       const operationTimeout = operationTimeouts.get(op.id)
       if (operationTimeout) {
@@ -384,17 +362,13 @@ export const useOperationQueueStore = create<OperationQueueState>((set, get) =>
       }
     })
 
-    // Remove all operations for this block (both pending and processing)
     const newOperations = state.operations.filter((op) => {
       const { target, payload, operation } = op.operation
 
-      // Single block property updates (update-position, toggle-enabled, update-name, etc.)
       if (target === 'block' && payload?.id === blockId) return false
 
-      // Subblock updates for this block
       if (target === 'subblock' && payload?.blockId === blockId) return false
 
-      // Batch block operations
       if (target === 'blocks') {
         if (operation === 'batch-add-blocks' && Array.isArray(payload?.blocks)) {
           if (payload.blocks.some((b: { id: string }) => b.id === blockId)) return false
@@ -412,7 +386,7 @@ export const useOperationQueueStore = create<OperationQueueState>((set, get) =>
 
     set({
       operations: newOperations,
-      isProcessing: false, // Reset processing state in case we removed the current operation
+      isProcessing: false,
     })
 
     logger.debug('Cancelled operations for block', {
@@ -420,16 +394,12 @@ export const useOperationQueueStore = create<OperationQueueState>((set, get) =>
       cancelledOperations: operationsToCancel.length,
     })
 
-    // Process next operation if there are any remaining
     get().processNextOperation()
   },
 
   cancelOperationsForVariable: (variableId: string) => {
     logger.debug('Canceling all operations for variable', { variableId })
 
-    // No debounced timeouts to cancel (moved to server-side)
-
-    // Find and cancel operation timeouts for operations related to this variable
     const state = get()
     const operationsToCancel = state.operations.filter(
       (op) =>
@@ -438,7 +408,6 @@ export const useOperationQueueStore = create<OperationQueueState>((set, get) =>
           op.operation.payload?.sourceVariableId === variableId)
     )
 
-    // Cancel timeouts for these operations
     operationsToCancel.forEach((op) => {
       const operationTimeout = operationTimeouts.get(op.id)
       if (operationTimeout) {
@@ -453,7 +422,6 @@ export const useOperationQueueStore = create<OperationQueueState>((set, get) =>
       }
     })
 
-    // Remove all operations for this variable (both pending and processing)
     const newOperations = state.operations.filter(
       (op) =>
         !(
@@ -465,7 +433,7 @@ export const useOperationQueueStore = create<OperationQueueState>((set, get) =>
 
     set({
       operations: newOperations,
-      isProcessing: false, // Reset processing state in case we removed the current operation
+      isProcessing: false,
     })
 
     logger.debug('Cancelled operations for variable', {
@@ -473,7 +441,6 @@ export const useOperationQueueStore = create<OperationQueueState>((set, get) =>
       cancelledOperations: operationsToCancel.length,
     })
 
-    // Process next operation if there are any remaining
     get().processNextOperation()
   },
 
@@ -519,20 +486,31 @@ export const useOperationQueueStore = create<OperationQueueState>((set, get) =>
   },
 }))
 
+/**
+ * Hook to access operation queue state and actions.
+ * Uses getState() for actions to avoid unnecessary re-renders.
+ * Only subscribes to the specific state values needed.
+ */
 export function useOperationQueue() {
-  const store = useOperationQueueStore()
+  const hasOperationError = useOperationQueueStore((state) => state.hasOperationError)
+
+  const actions = useOperationQueueStore.getState()
 
   return {
-    queue: store.operations,
-    isProcessing: store.isProcessing,
-    hasOperationError: store.hasOperationError,
-    addToQueue: store.addToQueue,
-    confirmOperation: store.confirmOperation,
-    failOperation: store.failOperation,
-    processNextOperation: store.processNextOperation,
-    cancelOperationsForBlock: store.cancelOperationsForBlock,
-    cancelOperationsForVariable: store.cancelOperationsForVariable,
-    triggerOfflineMode: store.triggerOfflineMode,
-    clearError: store.clearError,
+    get queue() {
+      return useOperationQueueStore.getState().operations
+    },
+    get isProcessing() {
+      return useOperationQueueStore.getState().isProcessing
+    },
+    hasOperationError,
+    addToQueue: actions.addToQueue,
+    confirmOperation: actions.confirmOperation,
+    failOperation: actions.failOperation,
+    processNextOperation: actions.processNextOperation,
+    cancelOperationsForBlock: actions.cancelOperationsForBlock,
+    cancelOperationsForVariable: actions.cancelOperationsForVariable,
+    triggerOfflineMode: actions.triggerOfflineMode,
+    clearError: actions.clearError,
   }
 }
diff --git a/apps/sim/stores/settings/general/index.ts b/apps/sim/stores/settings/general/index.ts
deleted file mode 100644
index 8c35af4736..0000000000
--- a/apps/sim/stores/settings/general/index.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-export { useGeneralStore } from './store'
-export type { General, GeneralStore, UserSettings } from './types'
diff --git a/apps/sim/stores/settings/general/store.ts b/apps/sim/stores/settings/general/store.ts
deleted file mode 100644
index f1bc3362b4..0000000000
--- a/apps/sim/stores/settings/general/store.ts
+++ /dev/null
@@ -1,37 +0,0 @@
-import { createLogger } from '@sim/logger'
-import { create } from 'zustand'
-import { devtools } from 'zustand/middleware'
-import type { General, GeneralStore } from './types'
-
-const logger = createLogger('GeneralStore')
-
-const initialState: General = {
-  isAutoConnectEnabled: true,
-  showTrainingControls: false,
-  superUserModeEnabled: true,
-  theme: 'dark',
-  telemetryEnabled: true,
-  isBillingUsageNotificationsEnabled: true,
-  isErrorNotificationsEnabled: true,
-  snapToGridSize: 0,
-  showActionBar: true,
-}
-
-export const useGeneralStore = create<GeneralStore>()(
-  devtools(
-    (set) => ({
-      ...initialState,
-      setSettings: (settings) => {
-        logger.debug('Updating general settings store', {
-          keys: Object.keys(settings),
-        })
-        set((state) => ({
-          ...state,
-          ...settings,
-        }))
-      },
-      reset: () => set(initialState),
-    }),
-    { name: 'general-store' }
-  )
-)
diff --git a/apps/sim/stores/settings/general/types.ts b/apps/sim/stores/settings/general/types.ts
deleted file mode 100644
index d4b11e4ae6..0000000000
--- a/apps/sim/stores/settings/general/types.ts
+++ /dev/null
@@ -1,28 +0,0 @@
-export interface General {
-  isAutoConnectEnabled: boolean
-  showTrainingControls: boolean
-  superUserModeEnabled: boolean
-  theme: 'system' | 'light' | 'dark'
-  telemetryEnabled: boolean
-  isBillingUsageNotificationsEnabled: boolean
-  isErrorNotificationsEnabled: boolean
-  snapToGridSize: number
-  showActionBar: boolean
-}
-
-export interface GeneralStore extends General {
-  setSettings: (settings: Partial<General>) => void
-  reset: () => void
-}
-
-export type UserSettings = {
-  theme: 'system' | 'light' | 'dark'
-  autoConnect: boolean
-  showTrainingControls: boolean
-  superUserModeEnabled: boolean
-  telemetryEnabled: boolean
-  isBillingUsageNotificationsEnabled: boolean
-  errorNotificationsEnabled: boolean
-  snapToGridSize: number
-  showActionBar: boolean
-}
diff --git a/apps/sim/stores/terminal/console/store.ts b/apps/sim/stores/terminal/console/store.ts
index d6becc4929..a2921881a8 100644
--- a/apps/sim/stores/terminal/console/store.ts
+++ b/apps/sim/stores/terminal/console/store.ts
@@ -2,10 +2,11 @@ import { createLogger } from '@sim/logger'
 import { create } from 'zustand'
 import { createJSONStorage, devtools, persist } from 'zustand/middleware'
 import { redactApiKeys } from '@/lib/core/security/redaction'
+import { getQueryClient } from '@/app/_shell/providers/query-provider'
 import type { NormalizedBlockOutput } from '@/executor/types'
+import { type GeneralSettings, generalSettingsKeys } from '@/hooks/queries/general-settings'
 import { useExecutionStore } from '@/stores/execution'
 import { useNotificationStore } from '@/stores/notifications'
-import { useGeneralStore } from '@/stores/settings/general'
 import { indexedDBStorage } from '@/stores/terminal/console/storage'
 import type { ConsoleEntry, ConsoleStore, ConsoleUpdate } from '@/stores/terminal/console/types'
 
@@ -153,7 +154,10 @@ export const useTerminalConsoleStore = create<ConsoleStore>()(
           const newEntry = get().entries[0]
 
           if (newEntry?.error) {
-            const { isErrorNotificationsEnabled } = useGeneralStore.getState()
+            const settings = getQueryClient().getQueryData<GeneralSettings>(
+              generalSettingsKeys.settings()
+            )
+            const isErrorNotificationsEnabled = settings?.errorNotificationsEnabled ?? true
 
             if (isErrorNotificationsEnabled) {
               try {
diff --git a/apps/sim/stores/workflows/registry/store.ts b/apps/sim/stores/workflows/registry/store.ts
index 49b7ba0ab7..b94b48b10a 100644
--- a/apps/sim/stores/workflows/registry/store.ts
+++ b/apps/sim/stores/workflows/registry/store.ts
@@ -57,7 +57,6 @@ function resetWorkflowStores() {
 function setWorkspaceTransitioning(isTransitioning: boolean): void {
   isWorkspaceTransitioning = isTransitioning
 
-  // Set a safety timeout to prevent permanently stuck in transition state
   if (isTransitioning) {
     setTimeout(() => {
       if (isWorkspaceTransitioning) {
@@ -77,6 +76,7 @@ export const useWorkflowRegistry = create<WorkflowRegistry>()(
       deploymentStatuses: {},
       hydration: initialHydration,
       clipboard: null,
+      pendingSelection: null,
 
       beginMetadataLoad: (workspaceId: string) => {
         set((state) => ({
@@ -98,7 +98,6 @@ export const useWorkflowRegistry = create<WorkflowRegistry>()(
         }, {})
 
         set((state) => {
-          // Preserve hydration if workflow is loading or already ready and still exists
           const shouldPreserveHydration =
             state.hydration.phase === 'state-loading' ||
             (state.hydration.phase === 'ready' &&
@@ -134,9 +133,7 @@ export const useWorkflowRegistry = create<WorkflowRegistry>()(
         }))
       },
 
-      // Switch to workspace - just clear state, let sidebar handle workflow loading
       switchToWorkspace: async (workspaceId: string) => {
-        // Prevent multiple simultaneous transitions
         if (isWorkspaceTransitioning) {
           logger.warn(
             `Ignoring workspace switch to ${workspaceId} - transition already in progress`
@@ -144,16 +141,13 @@ export const useWorkflowRegistry = create<WorkflowRegistry>()(
           return
         }
 
-        // Set transition flag
         setWorkspaceTransitioning(true)
 
         try {
           logger.info(`Switching to workspace: ${workspaceId}`)
 
-          // Clear current workspace state
           resetWorkflowStores()
 
-          // Update state - sidebar will load workflows when URL changes
           set({
             activeWorkflowId: null,
             workflows: {},
@@ -186,26 +180,21 @@ export const useWorkflowRegistry = create<WorkflowRegistry>()(
         }
       },
 
-      // Method to get deployment status for a specific workflow
       getWorkflowDeploymentStatus: (workflowId: string | null): DeploymentStatus | null => {
         if (!workflowId) {
-          // If no workflow ID provided, check the active workflow
           workflowId = get().activeWorkflowId
           if (!workflowId) return null
         }
 
         const { deploymentStatuses = {} } = get()
 
-        // Get from the workflow-specific deployment statuses in the registry
         if (deploymentStatuses[workflowId]) {
           return deploymentStatuses[workflowId]
         }
 
-        // No deployment status found
         return null
       },
 
-      // Method to set deployment status for a specific workflow
       setDeploymentStatus: (
         workflowId: string | null,
         isDeployed: boolean,
@@ -217,7 +206,6 @@ export const useWorkflowRegistry = create<WorkflowRegistry>()(
           if (!workflowId) return
         }
 
-        // Update the deployment statuses in the registry
         set((state) => ({
           deploymentStatuses: {
             ...state.deploymentStatuses,
@@ -225,7 +213,6 @@ export const useWorkflowRegistry = create<WorkflowRegistry>()(
               isDeployed,
               deployedAt: deployedAt || (isDeployed ? new Date() : undefined),
               apiKey,
-              // Preserve existing needsRedeployment flag if available, but reset if newly deployed
               needsRedeployment: isDeployed
                 ? false
                 : ((state.deploymentStatuses?.[workflowId as string] as any)?.needsRedeployment ??
@@ -235,14 +222,12 @@ export const useWorkflowRegistry = create<WorkflowRegistry>()(
         }))
       },
 
-      // Method to set the needsRedeployment flag for a specific workflow
       setWorkflowNeedsRedeployment: (workflowId: string | null, needsRedeployment: boolean) => {
         if (!workflowId) {
           workflowId = get().activeWorkflowId
           if (!workflowId) return
         }
 
-        // Update the registry's deployment status for this specific workflow
         set((state) => {
           const deploymentStatuses = state.deploymentStatuses || {}
           const currentStatus = deploymentStatuses[workflowId as string] || { isDeployed: false }
@@ -258,7 +243,6 @@ export const useWorkflowRegistry = create<WorkflowRegistry>()(
           }
         })
 
-        // Only update the global flag if this is the active workflow
         const { activeWorkflowId } = get()
         if (workflowId === activeWorkflowId) {
           useWorkflowStore.getState().setNeedsRedeploymentFlag(needsRedeployment)
@@ -402,7 +386,6 @@ export const useWorkflowRegistry = create<WorkflowRegistry>()(
         }
       },
 
-      // Modified setActiveWorkflow to work with clean DB-only architecture
       setActiveWorkflow: async (id: string) => {
         const { activeWorkflowId, hydration } = get()
 
@@ -473,7 +456,6 @@ export const useWorkflowRegistry = create<WorkflowRegistry>()(
           return null
         }
 
-        // Use the server-generated ID
         const id = duplicatedWorkflow.id
 
         const newWorkflow: WorkflowMetadata = {
@@ -843,6 +825,16 @@ export const useWorkflowRegistry = create<WorkflowRegistry>()(
       clearClipboard: () => {
         set({ clipboard: null })
       },
+
+      setPendingSelection: (blockIds: string[]) => {
+        set((state) => ({
+          pendingSelection: [...(state.pendingSelection ?? []), ...blockIds],
+        }))
+      },
+
+      clearPendingSelection: () => {
+        set({ pendingSelection: null })
+      },
     }),
     { name: 'workflow-registry' }
   )
diff --git a/apps/sim/stores/workflows/registry/types.ts b/apps/sim/stores/workflows/registry/types.ts
index 8ea62dde69..3c49bf2336 100644
--- a/apps/sim/stores/workflows/registry/types.ts
+++ b/apps/sim/stores/workflows/registry/types.ts
@@ -52,6 +52,7 @@ export interface WorkflowRegistryState {
   deploymentStatuses: Record<string, DeploymentStatus>
   hydration: HydrationState
   clipboard: ClipboardData | null
+  pendingSelection: string[] | null
 }
 
 export interface WorkflowRegistryActions {
@@ -82,6 +83,8 @@ export interface WorkflowRegistryActions {
   } | null
   hasClipboard: () => boolean
   clearClipboard: () => void
+  setPendingSelection: (blockIds: string[]) => void
+  clearPendingSelection: () => void
   logout: () => void
 }
 
diff --git a/apps/sim/tools/a2a/cancel_task.ts b/apps/sim/tools/a2a/cancel_task.ts
index 6ac1b78937..dd0c5cdc23 100644
--- a/apps/sim/tools/a2a/cancel_task.ts
+++ b/apps/sim/tools/a2a/cancel_task.ts
@@ -11,15 +11,18 @@ export const a2aCancelTaskTool: ToolConfig<A2ACancelTaskParams, A2ACancelTaskRes
     agentUrl: {
       type: 'string',
       required: true,
+      visibility: 'user-only',
       description: 'The A2A agent endpoint URL',
     },
     taskId: {
       type: 'string',
       required: true,
+      visibility: 'user-or-llm',
       description: 'Task ID to cancel',
     },
     apiKey: {
       type: 'string',
+      visibility: 'user-only',
       description: 'API key for authentication',
     },
   },
diff --git a/apps/sim/tools/a2a/delete_push_notification.ts b/apps/sim/tools/a2a/delete_push_notification.ts
index 89052e8cf1..7d5be6c882 100644
--- a/apps/sim/tools/a2a/delete_push_notification.ts
+++ b/apps/sim/tools/a2a/delete_push_notification.ts
@@ -14,20 +14,24 @@ export const a2aDeletePushNotificationTool: ToolConfig<
     agentUrl: {
       type: 'string',
       required: true,
+      visibility: 'user-only',
       description: 'The A2A agent endpoint URL',
     },
     taskId: {
       type: 'string',
       required: true,
+      visibility: 'user-or-llm',
       description: 'Task ID to delete notification config for',
     },
     pushNotificationConfigId: {
       type: 'string',
+      visibility: 'user-or-llm',
       description:
         'Push notification configuration ID to delete (optional - server can derive from taskId)',
     },
     apiKey: {
       type: 'string',
+      visibility: 'user-only',
       description: 'API key for authentication',
     },
   },
diff --git a/apps/sim/tools/a2a/get_agent_card.ts b/apps/sim/tools/a2a/get_agent_card.ts
index f0e07ff6c5..ddf94a5fab 100644
--- a/apps/sim/tools/a2a/get_agent_card.ts
+++ b/apps/sim/tools/a2a/get_agent_card.ts
@@ -11,10 +11,12 @@ export const a2aGetAgentCardTool: ToolConfig<A2AGetAgentCardParams, A2AGetAgentC
     agentUrl: {
       type: 'string',
       required: true,
+      visibility: 'user-only',
       description: 'The A2A agent endpoint URL',
     },
     apiKey: {
       type: 'string',
+      visibility: 'user-only',
       description: 'API key for authentication (if required)',
     },
   },
diff --git a/apps/sim/tools/a2a/get_push_notification.ts b/apps/sim/tools/a2a/get_push_notification.ts
index 3682476b32..813888de99 100644
--- a/apps/sim/tools/a2a/get_push_notification.ts
+++ b/apps/sim/tools/a2a/get_push_notification.ts
@@ -14,15 +14,18 @@ export const a2aGetPushNotificationTool: ToolConfig<
     agentUrl: {
       type: 'string',
       required: true,
+      visibility: 'user-only',
       description: 'The A2A agent endpoint URL',
     },
     taskId: {
       type: 'string',
       required: true,
+      visibility: 'user-or-llm',
       description: 'Task ID to get notification config for',
     },
     apiKey: {
       type: 'string',
+      visibility: 'user-only',
       description: 'API key for authentication',
     },
   },
diff --git a/apps/sim/tools/a2a/get_task.ts b/apps/sim/tools/a2a/get_task.ts
index 43e0059dac..d646ebe3d3 100644
--- a/apps/sim/tools/a2a/get_task.ts
+++ b/apps/sim/tools/a2a/get_task.ts
@@ -11,19 +11,23 @@ export const a2aGetTaskTool: ToolConfig<A2AGetTaskParams, A2AGetTaskResponse> =
     agentUrl: {
       type: 'string',
       required: true,
+      visibility: 'user-only',
       description: 'The A2A agent endpoint URL',
     },
     taskId: {
       type: 'string',
       required: true,
+      visibility: 'user-or-llm',
       description: 'Task ID to query',
     },
     apiKey: {
       type: 'string',
+      visibility: 'user-only',
       description: 'API key for authentication',
     },
     historyLength: {
       type: 'number',
+      visibility: 'user-or-llm',
       description: 'Number of history messages to include',
     },
   },
diff --git a/apps/sim/tools/a2a/resubscribe.ts b/apps/sim/tools/a2a/resubscribe.ts
index 99456b8b53..2aa1600824 100644
--- a/apps/sim/tools/a2a/resubscribe.ts
+++ b/apps/sim/tools/a2a/resubscribe.ts
@@ -11,15 +11,18 @@ export const a2aResubscribeTool: ToolConfig<A2AResubscribeParams, A2AResubscribe
     agentUrl: {
       type: 'string',
       required: true,
+      visibility: 'user-only',
       description: 'The A2A agent endpoint URL',
     },
     taskId: {
       type: 'string',
       required: true,
+      visibility: 'user-or-llm',
       description: 'Task ID to resubscribe to',
     },
     apiKey: {
       type: 'string',
+      visibility: 'user-only',
       description: 'API key for authentication',
     },
   },
diff --git a/apps/sim/tools/a2a/send_message.ts b/apps/sim/tools/a2a/send_message.ts
index 0b317a4413..4ce095d2fa 100644
--- a/apps/sim/tools/a2a/send_message.ts
+++ b/apps/sim/tools/a2a/send_message.ts
@@ -11,31 +11,38 @@ export const a2aSendMessageTool: ToolConfig<A2ASendMessageParams, A2ASendMessage
     agentUrl: {
       type: 'string',
       required: true,
+      visibility: 'user-only',
       description: 'The A2A agent endpoint URL',
     },
     message: {
       type: 'string',
       required: true,
+      visibility: 'user-or-llm',
       description: 'Message to send to the agent',
     },
     taskId: {
       type: 'string',
+      visibility: 'user-or-llm',
       description: 'Task ID for continuing an existing task',
     },
     contextId: {
       type: 'string',
+      visibility: 'user-or-llm',
       description: 'Context ID for conversation continuity',
     },
     data: {
       type: 'string',
+      visibility: 'user-or-llm',
       description: 'Structured data to include with the message (JSON string)',
     },
     files: {
       type: 'array',
+      visibility: 'user-only',
       description: 'Files to include with the message',
     },
     apiKey: {
       type: 'string',
+      visibility: 'user-only',
       description: 'API key for authentication',
     },
   },
diff --git a/apps/sim/tools/a2a/set_push_notification.ts b/apps/sim/tools/a2a/set_push_notification.ts
index e3dd25360b..50cb37bc2c 100644
--- a/apps/sim/tools/a2a/set_push_notification.ts
+++ b/apps/sim/tools/a2a/set_push_notification.ts
@@ -14,24 +14,29 @@ export const a2aSetPushNotificationTool: ToolConfig<
     agentUrl: {
       type: 'string',
       required: true,
+      visibility: 'user-only',
       description: 'The A2A agent endpoint URL',
     },
     taskId: {
       type: 'string',
       required: true,
+      visibility: 'user-or-llm',
       description: 'Task ID to configure notifications for',
     },
     webhookUrl: {
       type: 'string',
       required: true,
+      visibility: 'user-only',
       description: 'HTTPS webhook URL to receive notifications',
     },
     token: {
       type: 'string',
+      visibility: 'user-only',
       description: 'Token for webhook validation',
     },
     apiKey: {
       type: 'string',
+      visibility: 'user-only',
       description: 'API key for authentication',
     },
   },
diff --git a/apps/sim/tools/github/check_star.ts b/apps/sim/tools/github/check_star.ts
new file mode 100644
index 0000000000..b269d1e8f2
--- /dev/null
+++ b/apps/sim/tools/github/check_star.ts
@@ -0,0 +1,115 @@
+import type { ToolConfig } from '@/tools/types'
+
+interface CheckStarParams {
+  owner: string
+  repo: string
+  apiKey: string
+}
+
+interface CheckStarResponse {
+  success: boolean
+  output: {
+    content: string
+    metadata: {
+      starred: boolean
+      owner: string
+      repo: string
+    }
+  }
+}
+
+export const checkStarTool: ToolConfig<CheckStarParams, CheckStarResponse> = {
+  id: 'github_check_star',
+  name: 'GitHub Check Star',
+  description: 'Check if you have starred a repository',
+  version: '1.0.0',
+
+  params: {
+    owner: {
+      type: 'string',
+      required: true,
+      visibility: 'user-or-llm',
+      description: 'Repository owner',
+    },
+    repo: {
+      type: 'string',
+      required: true,
+      visibility: 'user-or-llm',
+      description: 'Repository name',
+    },
+    apiKey: {
+      type: 'string',
+      required: true,
+      visibility: 'user-only',
+      description: 'GitHub API token',
+    },
+  },
+
+  request: {
+    url: (params) => `https://api.github.com/user/starred/${params.owner}/${params.repo}`,
+    method: 'GET',
+    headers: (params) => ({
+      Accept: 'application/vnd.github.v3+json',
+      Authorization: `Bearer ${params.apiKey}`,
+      'X-GitHub-Api-Version': '2022-11-28',
+    }),
+  },
+
+  transformResponse: async (response, params) => {
+    const starred = response.status === 204
+
+    return {
+      success: true,
+      output: {
+        content: starred
+          ? `You have starred ${params?.owner}/${params?.repo}`
+          : `You have not starred ${params?.owner}/${params?.repo}`,
+        metadata: {
+          starred,
+          owner: params?.owner ?? '',
+          repo: params?.repo ?? '',
+        },
+      },
+    }
+  },
+
+  outputs: {
+    content: { type: 'string', description: 'Human-readable result' },
+    metadata: {
+      type: 'object',
+      description: 'Check star metadata',
+      properties: {
+        starred: { type: 'boolean', description: 'Whether you have starred the repo' },
+        owner: { type: 'string', description: 'Repository owner' },
+        repo: { type: 'string', description: 'Repository name' },
+      },
+    },
+  },
+}
+
+export const checkStarV2Tool: ToolConfig<CheckStarParams, any> = {
+  id: 'github_check_star_v2',
+  name: checkStarTool.name,
+  description: checkStarTool.description,
+  version: '2.0.0',
+  params: checkStarTool.params,
+  request: checkStarTool.request,
+
+  transformResponse: async (response: Response, params) => {
+    const starred = response.status === 204
+    return {
+      success: true,
+      output: {
+        starred,
+        owner: params?.owner ?? '',
+        repo: params?.repo ?? '',
+      },
+    }
+  },
+
+  outputs: {
+    starred: { type: 'boolean', description: 'Whether you have starred the repo' },
+    owner: { type: 'string', description: 'Repository owner' },
+    repo: { type: 'string', description: 'Repository name' },
+  },
+}
diff --git a/apps/sim/tools/github/compare_commits.ts b/apps/sim/tools/github/compare_commits.ts
new file mode 100644
index 0000000000..aa90903e31
--- /dev/null
+++ b/apps/sim/tools/github/compare_commits.ts
@@ -0,0 +1,334 @@
+import type { ToolConfig } from '@/tools/types'
+
+interface CompareCommitsParams {
+  owner: string
+  repo: string
+  base: string
+  head: string
+  per_page?: number
+  page?: number
+  apiKey: string
+}
+
+interface CompareCommitsResponse {
+  success: boolean
+  output: {
+    content: string
+    metadata: {
+      status: string
+      ahead_by: number
+      behind_by: number
+      total_commits: number
+      html_url: string
+      diff_url: string
+      patch_url: string
+      base_commit: { sha: string; html_url: string }
+      merge_base_commit: { sha: string; html_url: string }
+      commits: Array<{
+        sha: string
+        html_url: string
+        message: string
+        author: { login?: string; name: string }
+      }>
+      files: Array<{
+        filename: string
+        status: string
+        additions: number
+        deletions: number
+        changes: number
+      }>
+    }
+  }
+}
+
+export const compareCommitsTool: ToolConfig<CompareCommitsParams, CompareCommitsResponse> = {
+  id: 'github_compare_commits',
+  name: 'GitHub Compare Commits',
+  description:
+    'Compare two commits or branches to see the diff, commits between them, and changed files',
+  version: '1.0.0',
+
+  params: {
+    owner: {
+      type: 'string',
+      required: true,
+      visibility: 'user-or-llm',
+      description: 'Repository owner',
+    },
+    repo: {
+      type: 'string',
+      required: true,
+      visibility: 'user-or-llm',
+      description: 'Repository name',
+    },
+    base: {
+      type: 'string',
+      required: true,
+      visibility: 'user-or-llm',
+      description: 'Base branch/tag/SHA for comparison',
+    },
+    head: {
+      type: 'string',
+      required: true,
+      visibility: 'user-or-llm',
+      description: 'Head branch/tag/SHA for comparison',
+    },
+    per_page: {
+      type: 'number',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Results per page for files (max 100, default: 30)',
+      default: 30,
+    },
+    page: {
+      type: 'number',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Page number for files (default: 1)',
+      default: 1,
+    },
+    apiKey: {
+      type: 'string',
+      required: true,
+      visibility: 'user-only',
+      description: 'GitHub API token',
+    },
+  },
+
+  request: {
+    url: (params) => {
+      const url = new URL(
+        `https://api.github.com/repos/${params.owner}/${params.repo}/compare/${params.base}...${params.head}`
+      )
+      if (params.per_page) url.searchParams.append('per_page', String(params.per_page))
+      if (params.page) url.searchParams.append('page', String(params.page))
+      return url.toString()
+    },
+    method: 'GET',
+    headers: (params) => ({
+      Accept: 'application/vnd.github.v3+json',
+      Authorization: `Bearer ${params.apiKey}`,
+      'X-GitHub-Api-Version': '2022-11-28',
+    }),
+  },
+
+  transformResponse: async (response) => {
+    const data = await response.json()
+
+    const commits = (data.commits ?? []).map((c: any) => ({
+      sha: c.sha,
+      html_url: c.html_url,
+      message: c.commit.message,
+      author: {
+        login: c.author?.login,
+        name: c.commit.author.name,
+      },
+    }))
+
+    const files = (data.files ?? []).map((f: any) => ({
+      filename: f.filename,
+      status: f.status,
+      additions: f.additions,
+      deletions: f.deletions,
+      changes: f.changes,
+    }))
+
+    const metadata = {
+      status: data.status,
+      ahead_by: data.ahead_by,
+      behind_by: data.behind_by,
+      total_commits: data.total_commits,
+      html_url: data.html_url,
+      diff_url: data.diff_url,
+      patch_url: data.patch_url,
+      base_commit: {
+        sha: data.base_commit.sha,
+        html_url: data.base_commit.html_url,
+      },
+      merge_base_commit: {
+        sha: data.merge_base_commit.sha,
+        html_url: data.merge_base_commit.html_url,
+      },
+      commits,
+      files,
+    }
+
+    const content = `Comparing ${data.base_commit.sha.substring(0, 7)}...${data.commits?.length > 0 ? data.commits[data.commits.length - 1].sha.substring(0, 7) : 'HEAD'}
+Status: ${data.status} | Ahead: ${data.ahead_by} | Behind: ${data.behind_by}
+Total commits: ${data.total_commits} | Files changed: ${files.length}
+${data.html_url}
+
+Commits:
+${commits.map((c: any) => `  ${c.sha.substring(0, 7)} - ${c.message.split('\n')[0]}`).join('\n')}
+
+Files changed:
+${files.map((f: any) => `  ${f.status}: ${f.filename} (+${f.additions} -${f.deletions})`).join('\n')}`
+
+    return {
+      success: true,
+      output: {
+        content,
+        metadata,
+      },
+    }
+  },
+
+  outputs: {
+    content: { type: 'string', description: 'Human-readable comparison' },
+    metadata: {
+      type: 'object',
+      description: 'Comparison metadata',
+      properties: {
+        status: { type: 'string', description: 'ahead, behind, identical, or diverged' },
+        ahead_by: { type: 'number', description: 'Commits ahead' },
+        behind_by: { type: 'number', description: 'Commits behind' },
+        total_commits: { type: 'number', description: 'Total commits between' },
+        html_url: { type: 'string', description: 'GitHub web URL' },
+        diff_url: { type: 'string', description: 'Diff URL' },
+        patch_url: { type: 'string', description: 'Patch URL' },
+        base_commit: { type: 'object', description: 'Base commit info' },
+        merge_base_commit: { type: 'object', description: 'Merge base commit info' },
+        commits: {
+          type: 'array',
+          description: 'Commits between base and head',
+          items: {
+            type: 'object',
+            properties: {
+              sha: { type: 'string', description: 'Commit SHA' },
+              html_url: { type: 'string', description: 'Web URL' },
+              message: { type: 'string', description: 'Commit message' },
+              author: { type: 'object', description: 'Author info' },
+            },
+          },
+        },
+        files: {
+          type: 'array',
+          description: 'Changed files',
+          items: {
+            type: 'object',
+            properties: {
+              filename: { type: 'string', description: 'File path' },
+              status: { type: 'string', description: 'Change type' },
+              additions: { type: 'number', description: 'Lines added' },
+              deletions: { type: 'number', description: 'Lines deleted' },
+              changes: { type: 'number', description: 'Total changes' },
+            },
+          },
+        },
+      },
+    },
+  },
+}
+
+export const compareCommitsV2Tool: ToolConfig<CompareCommitsParams, any> = {
+  id: 'github_compare_commits_v2',
+  name: compareCommitsTool.name,
+  description: compareCommitsTool.description,
+  version: '2.0.0',
+  params: compareCommitsTool.params,
+  request: compareCommitsTool.request,
+
+  transformResponse: async (response: Response) => {
+    const data = await response.json()
+    return {
+      success: true,
+      output: {
+        ...data,
+        commits: data.commits ?? [],
+        files: data.files ?? [],
+      },
+    }
+  },
+
+  outputs: {
+    url: { type: 'string', description: 'API URL' },
+    html_url: { type: 'string', description: 'GitHub web URL' },
+    permalink_url: { type: 'string', description: 'Permanent link URL' },
+    diff_url: { type: 'string', description: 'Diff download URL' },
+    patch_url: { type: 'string', description: 'Patch download URL' },
+    status: {
+      type: 'string',
+      description: 'Comparison status (ahead, behind, identical, diverged)',
+    },
+    ahead_by: { type: 'number', description: 'Commits head is ahead of base' },
+    behind_by: { type: 'number', description: 'Commits head is behind base' },
+    total_commits: { type: 'number', description: 'Total commits in comparison' },
+    base_commit: {
+      type: 'object',
+      description: 'Base commit object',
+      properties: {
+        sha: { type: 'string', description: 'Commit SHA' },
+        html_url: { type: 'string', description: 'Web URL' },
+        commit: {
+          type: 'object',
+          description: 'Commit data',
+          properties: {
+            message: { type: 'string', description: 'Commit message' },
+            author: { type: 'object', description: 'Git author (name, email, date)' },
+            committer: { type: 'object', description: 'Git committer (name, email, date)' },
+          },
+        },
+        author: { type: 'object', description: 'GitHub user (author)', optional: true },
+        committer: { type: 'object', description: 'GitHub user (committer)', optional: true },
+      },
+    },
+    merge_base_commit: {
+      type: 'object',
+      description: 'Merge base commit object',
+      properties: {
+        sha: { type: 'string', description: 'Commit SHA' },
+        html_url: { type: 'string', description: 'Web URL' },
+      },
+    },
+    commits: {
+      type: 'array',
+      description: 'Commits between base and head',
+      items: {
+        type: 'object',
+        properties: {
+          sha: { type: 'string', description: 'Commit SHA' },
+          html_url: { type: 'string', description: 'Web URL' },
+          commit: {
+            type: 'object',
+            description: 'Commit data',
+            properties: {
+              message: { type: 'string', description: 'Commit message' },
+              author: { type: 'object', description: 'Git author (name, email, date)' },
+              committer: { type: 'object', description: 'Git committer (name, email, date)' },
+            },
+          },
+          author: { type: 'object', description: 'GitHub user', optional: true },
+          committer: { type: 'object', description: 'GitHub user', optional: true },
+        },
+      },
+    },
+    files: {
+      type: 'array',
+      description: 'Changed files (diff entries)',
+      items: {
+        type: 'object',
+        properties: {
+          sha: { type: 'string', description: 'Blob SHA', optional: true },
+          filename: { type: 'string', description: 'File path' },
+          status: {
+            type: 'string',
+            description:
+              'Change status (added, removed, modified, renamed, copied, changed, unchanged)',
+          },
+          additions: { type: 'number', description: 'Lines added' },
+          deletions: { type: 'number', description: 'Lines deleted' },
+          changes: { type: 'number', description: 'Total changes' },
+          blob_url: { type: 'string', description: 'Blob URL' },
+          raw_url: { type: 'string', description: 'Raw file URL' },
+          contents_url: { type: 'string', description: 'Contents API URL' },
+          patch: { type: 'string', description: 'Diff patch', optional: true },
+          previous_filename: {
+            type: 'string',
+            description: 'Previous filename (for renames)',
+            optional: true,
+          },
+        },
+      },
+    },
+  },
+}
diff --git a/apps/sim/tools/github/create_comment_reaction.ts b/apps/sim/tools/github/create_comment_reaction.ts
new file mode 100644
index 0000000000..718a43de64
--- /dev/null
+++ b/apps/sim/tools/github/create_comment_reaction.ts
@@ -0,0 +1,156 @@
+import type { ToolConfig } from '@/tools/types'
+
+interface CreateCommentReactionParams {
+  owner: string
+  repo: string
+  comment_id: number
+  content: '+1' | '-1' | 'laugh' | 'confused' | 'heart' | 'hooray' | 'rocket' | 'eyes'
+  apiKey: string
+}
+
+interface CreateCommentReactionResponse {
+  success: boolean
+  output: {
+    content: string
+    metadata: {
+      id: number
+      user: { login: string }
+      content: string
+      created_at: string
+    }
+  }
+}
+
+export const createCommentReactionTool: ToolConfig<
+  CreateCommentReactionParams,
+  CreateCommentReactionResponse
+> = {
+  id: 'github_create_comment_reaction',
+  name: 'GitHub Create Comment Reaction',
+  description: 'Add a reaction to an issue comment',
+  version: '1.0.0',
+
+  params: {
+    owner: {
+      type: 'string',
+      required: true,
+      visibility: 'user-or-llm',
+      description: 'Repository owner',
+    },
+    repo: {
+      type: 'string',
+      required: true,
+      visibility: 'user-or-llm',
+      description: 'Repository name',
+    },
+    comment_id: {
+      type: 'number',
+      required: true,
+      visibility: 'user-or-llm',
+      description: 'Comment ID',
+    },
+    content: {
+      type: 'string',
+      required: true,
+      visibility: 'user-or-llm',
+      description:
+        'Reaction type: +1 (thumbs up), -1 (thumbs down), laugh, confused, heart, hooray, rocket, eyes',
+    },
+    apiKey: {
+      type: 'string',
+      required: true,
+      visibility: 'user-only',
+      description: 'GitHub API token',
+    },
+  },
+
+  request: {
+    url: (params) =>
+      `https://api.github.com/repos/${params.owner}/${params.repo}/issues/comments/${params.comment_id}/reactions`,
+    method: 'POST',
+    headers: (params) => ({
+      Accept: 'application/vnd.github.squirrel-girl-preview+json',
+      Authorization: `Bearer ${params.apiKey}`,
+      'Content-Type': 'application/json',
+      'X-GitHub-Api-Version': '2022-11-28',
+    }),
+    body: (params) => ({
+      content: params.content,
+    }),
+  },
+
+  transformResponse: async (response) => {
+    const data = await response.json()
+
+    const content = `Added ${data.content} reaction to comment by ${data.user?.login ?? 'unknown'}`
+
+    return {
+      success: true,
+      output: {
+        content,
+        metadata: {
+          id: data.id,
+          user: { login: data.user?.login ?? 'unknown' },
+          content: data.content,
+          created_at: data.created_at,
+        },
+      },
+    }
+  },
+
+  outputs: {
+    content: { type: 'string', description: 'Human-readable result' },
+    metadata: {
+      type: 'object',
+      description: 'Reaction metadata',
+      properties: {
+        id: { type: 'number', description: 'Reaction ID' },
+        user: { type: 'object', description: 'User who reacted' },
+        content: { type: 'string', description: 'Reaction type' },
+        created_at: { type: 'string', description: 'Creation date' },
+      },
+    },
+  },
+}
+
+export const createCommentReactionV2Tool: ToolConfig<CreateCommentReactionParams, any> = {
+  id: 'github_create_comment_reaction_v2',
+  name: createCommentReactionTool.name,
+  description: createCommentReactionTool.description,
+  version: '2.0.0',
+  params: createCommentReactionTool.params,
+  request: createCommentReactionTool.request,
+
+  transformResponse: async (response: Response) => {
+    const data = await response.json()
+    return {
+      success: true,
+      output: data,
+    }
+  },
+
+  outputs: {
+    id: { type: 'number', description: 'Reaction ID' },
+    node_id: { type: 'string', description: 'GraphQL node ID' },
+    content: {
+      type: 'string',
+      description: 'Reaction type (+1, -1, laugh, confused, heart, hooray, rocket, eyes)',
+    },
+    created_at: { type: 'string', description: 'Creation timestamp' },
+    user: {
+      type: 'object',
+      description: 'User who reacted',
+      optional: true,
+      properties: {
+        login: { type: 'string', description: 'Username' },
+        id: { type: 'number', description: 'User ID' },
+        node_id: { type: 'string', description: 'GraphQL node ID' },
+        avatar_url: { type: 'string', description: 'Avatar image URL' },
+        url: { type: 'string', description: 'API URL' },
+        html_url: { type: 'string', description: 'Profile page URL' },
+        type: { type: 'string', description: 'User or Organization' },
+        site_admin: { type: 'boolean', description: 'GitHub staff indicator' },
+      },
+    },
+  },
+}
diff --git a/apps/sim/tools/github/create_gist.ts b/apps/sim/tools/github/create_gist.ts
new file mode 100644
index 0000000000..7bddd4d9fe
--- /dev/null
+++ b/apps/sim/tools/github/create_gist.ts
@@ -0,0 +1,208 @@
+import type { ToolConfig } from '@/tools/types'
+
+interface CreateGistParams {
+  description?: string
+  files: string
+  public?: boolean
+  apiKey: string
+}
+
+interface CreateGistResponse {
+  success: boolean
+  output: {
+    content: string
+    metadata: {
+      id: string
+      html_url: string
+      git_pull_url: string
+      git_push_url: string
+      description: string | null
+      public: boolean
+      created_at: string
+      updated_at: string
+      files: Record<
+        string,
+        { filename: string; type: string; language: string | null; size: number }
+      >
+      owner: { login: string }
+    }
+  }
+}
+
+export const createGistTool: ToolConfig<CreateGistParams, CreateGistResponse> = {
+  id: 'github_create_gist',
+  name: 'GitHub Create Gist',
+  description: 'Create a new gist with one or more files',
+  version: '1.0.0',
+
+  params: {
+    description: {
+      type: 'string',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Description of the gist',
+    },
+    files: {
+      type: 'json',
+      required: true,
+      visibility: 'user-or-llm',
+      description:
+        'JSON object with filenames as keys and content as values. Example: {"file.txt": {"content": "Hello"}}',
+    },
+    public: {
+      type: 'boolean',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Whether the gist is public (default: false)',
+      default: false,
+    },
+    apiKey: {
+      type: 'string',
+      required: true,
+      visibility: 'user-only',
+      description: 'GitHub API token',
+    },
+  },
+
+  request: {
+    url: () => 'https://api.github.com/gists',
+    method: 'POST',
+    headers: (params) => ({
+      Accept: 'application/vnd.github.v3+json',
+      Authorization: `Bearer ${params.apiKey}`,
+      'Content-Type': 'application/json',
+      'X-GitHub-Api-Version': '2022-11-28',
+    }),
+    body: (params) => {
+      const filesObj = typeof params.files === 'string' ? JSON.parse(params.files) : params.files
+      return {
+        description: params.description,
+        public: params.public ?? false,
+        files: filesObj,
+      }
+    },
+  },
+
+  transformResponse: async (response) => {
+    const data = await response.json()
+
+    const files: Record<
+      string,
+      { filename: string; type: string; language: string | null; size: number }
+    > = {}
+    for (const [key, value] of Object.entries(data.files ?? {})) {
+      const file = value as any
+      files[key] = {
+        filename: file.filename,
+        type: file.type,
+        language: file.language ?? null,
+        size: file.size,
+      }
+    }
+
+    const metadata = {
+      id: data.id,
+      html_url: data.html_url,
+      git_pull_url: data.git_pull_url,
+      git_push_url: data.git_push_url,
+      description: data.description ?? null,
+      public: data.public,
+      created_at: data.created_at,
+      updated_at: data.updated_at,
+      files,
+      owner: { login: data.owner?.login ?? 'unknown' },
+    }
+
+    const content = `Created gist: ${data.html_url}
+Description: ${data.description ?? 'No description'}
+Public: ${data.public}
+Files: ${Object.keys(files).join(', ')}`
+
+    return {
+      success: true,
+      output: {
+        content,
+        metadata,
+      },
+    }
+  },
+
+  outputs: {
+    content: { type: 'string', description: 'Human-readable result' },
+    metadata: {
+      type: 'object',
+      description: 'Gist metadata',
+      properties: {
+        id: { type: 'string', description: 'Gist ID' },
+        html_url: { type: 'string', description: 'Web URL' },
+        git_pull_url: { type: 'string', description: 'Git pull URL' },
+        git_push_url: { type: 'string', description: 'Git push URL' },
+        description: { type: 'string', description: 'Description', optional: true },
+        public: { type: 'boolean', description: 'Is public' },
+        created_at: { type: 'string', description: 'Creation date' },
+        updated_at: { type: 'string', description: 'Update date' },
+        files: { type: 'object', description: 'Files in gist' },
+        owner: { type: 'object', description: 'Owner info' },
+      },
+    },
+  },
+}
+
+export const createGistV2Tool: ToolConfig<CreateGistParams, any> = {
+  id: 'github_create_gist_v2',
+  name: createGistTool.name,
+  description: createGistTool.description,
+  version: '2.0.0',
+  params: createGistTool.params,
+  request: createGistTool.request,
+
+  transformResponse: async (response: Response) => {
+    const data = await response.json()
+    return {
+      success: true,
+      output: {
+        ...data,
+        description: data.description ?? null,
+        files: data.files ?? {},
+      },
+    }
+  },
+
+  outputs: {
+    id: { type: 'string', description: 'Gist ID' },
+    node_id: { type: 'string', description: 'GraphQL node ID' },
+    url: { type: 'string', description: 'API URL' },
+    html_url: { type: 'string', description: 'Web URL' },
+    forks_url: { type: 'string', description: 'Forks API URL' },
+    commits_url: { type: 'string', description: 'Commits API URL' },
+    git_pull_url: { type: 'string', description: 'Git pull URL' },
+    git_push_url: { type: 'string', description: 'Git push URL' },
+    description: { type: 'string', description: 'Gist description', optional: true },
+    public: { type: 'boolean', description: 'Whether gist is public' },
+    truncated: { type: 'boolean', description: 'Whether files are truncated' },
+    comments: { type: 'number', description: 'Number of comments' },
+    comments_url: { type: 'string', description: 'Comments API URL' },
+    created_at: { type: 'string', description: 'Creation timestamp' },
+    updated_at: { type: 'string', description: 'Last update timestamp' },
+    files: {
+      type: 'object',
+      description:
+        'Files in the gist (object with filenames as keys, each containing filename, type, language, raw_url, size, truncated, content)',
+    },
+    owner: {
+      type: 'object',
+      description: 'Gist owner',
+      optional: true,
+      properties: {
+        login: { type: 'string', description: 'Username' },
+        id: { type: 'number', description: 'User ID' },
+        node_id: { type: 'string', description: 'GraphQL node ID' },
+        avatar_url: { type: 'string', description: 'Avatar image URL' },
+        url: { type: 'string', description: 'API URL' },
+        html_url: { type: 'string', description: 'Profile page URL' },
+        type: { type: 'string', description: 'User or Organization' },
+        site_admin: { type: 'boolean', description: 'GitHub staff indicator' },
+      },
+    },
+  },
+}
diff --git a/apps/sim/tools/github/create_issue_reaction.ts b/apps/sim/tools/github/create_issue_reaction.ts
new file mode 100644
index 0000000000..7fc5d4d68d
--- /dev/null
+++ b/apps/sim/tools/github/create_issue_reaction.ts
@@ -0,0 +1,156 @@
+import type { ToolConfig } from '@/tools/types'
+
+interface CreateIssueReactionParams {
+  owner: string
+  repo: string
+  issue_number: number
+  content: '+1' | '-1' | 'laugh' | 'confused' | 'heart' | 'hooray' | 'rocket' | 'eyes'
+  apiKey: string
+}
+
+interface CreateIssueReactionResponse {
+  success: boolean
+  output: {
+    content: string
+    metadata: {
+      id: number
+      user: { login: string }
+      content: string
+      created_at: string
+    }
+  }
+}
+
+export const createIssueReactionTool: ToolConfig<
+  CreateIssueReactionParams,
+  CreateIssueReactionResponse
+> = {
+  id: 'github_create_issue_reaction',
+  name: 'GitHub Create Issue Reaction',
+  description: 'Add a reaction to an issue',
+  version: '1.0.0',
+
+  params: {
+    owner: {
+      type: 'string',
+      required: true,
+      visibility: 'user-or-llm',
+      description: 'Repository owner',
+    },
+    repo: {
+      type: 'string',
+      required: true,
+      visibility: 'user-or-llm',
+      description: 'Repository name',
+    },
+    issue_number: {
+      type: 'number',
+      required: true,
+      visibility: 'user-or-llm',
+      description: 'Issue number',
+    },
+    content: {
+      type: 'string',
+      required: true,
+      visibility: 'user-or-llm',
+      description:
+        'Reaction type: +1 (thumbs up), -1 (thumbs down), laugh, confused, heart, hooray, rocket, eyes',
+    },
+    apiKey: {
+      type: 'string',
+      required: true,
+      visibility: 'user-only',
+      description: 'GitHub API token',
+    },
+  },
+
+  request: {
+    url: (params) =>
+      `https://api.github.com/repos/${params.owner}/${params.repo}/issues/${params.issue_number}/reactions`,
+    method: 'POST',
+    headers: (params) => ({
+      Accept: 'application/vnd.github.squirrel-girl-preview+json',
+      Authorization: `Bearer ${params.apiKey}`,
+      'Content-Type': 'application/json',
+      'X-GitHub-Api-Version': '2022-11-28',
+    }),
+    body: (params) => ({
+      content: params.content,
+    }),
+  },
+
+  transformResponse: async (response) => {
+    const data = await response.json()
+
+    const content = `Added ${data.content} reaction to issue by ${data.user?.login ?? 'unknown'}`
+
+    return {
+      success: true,
+      output: {
+        content,
+        metadata: {
+          id: data.id,
+          user: { login: data.user?.login ?? 'unknown' },
+          content: data.content,
+          created_at: data.created_at,
+        },
+      },
+    }
+  },
+
+  outputs: {
+    content: { type: 'string', description: 'Human-readable result' },
+    metadata: {
+      type: 'object',
+      description: 'Reaction metadata',
+      properties: {
+        id: { type: 'number', description: 'Reaction ID' },
+        user: { type: 'object', description: 'User who reacted' },
+        content: { type: 'string', description: 'Reaction type' },
+        created_at: { type: 'string', description: 'Creation date' },
+      },
+    },
+  },
+}
+
+export const createIssueReactionV2Tool: ToolConfig<CreateIssueReactionParams, any> = {
+  id: 'github_create_issue_reaction_v2',
+  name: createIssueReactionTool.name,
+  description: createIssueReactionTool.description,
+  version: '2.0.0',
+  params: createIssueReactionTool.params,
+  request: createIssueReactionTool.request,
+
+  transformResponse: async (response: Response) => {
+    const data = await response.json()
+    return {
+      success: true,
+      output: data,
+    }
+  },
+
+  outputs: {
+    id: { type: 'number', description: 'Reaction ID' },
+    node_id: { type: 'string', description: 'GraphQL node ID' },
+    content: {
+      type: 'string',
+      description: 'Reaction type (+1, -1, laugh, confused, heart, hooray, rocket, eyes)',
+    },
+    created_at: { type: 'string', description: 'Creation timestamp' },
+    user: {
+      type: 'object',
+      description: 'User who reacted',
+      optional: true,
+      properties: {
+        login: { type: 'string', description: 'Username' },
+        id: { type: 'number', description: 'User ID' },
+        node_id: { type: 'string', description: 'GraphQL node ID' },
+        avatar_url: { type: 'string', description: 'Avatar image URL' },
+        url: { type: 'string', description: 'API URL' },
+        html_url: { type: 'string', description: 'Profile page URL' },
+        type: { type: 'string', description: 'User or Organization' },
+        site_admin: { type: 'boolean', description: 'GitHub staff indicator' },
+      },
+    },
+  },
+}
diff --git a/apps/sim/tools/github/create_milestone.ts b/apps/sim/tools/github/create_milestone.ts
new file mode 100644
index 0000000000..fe5b91c0bc
--- /dev/null
+++ b/apps/sim/tools/github/create_milestone.ts
@@ -0,0 +1,182 @@
+import type { ToolConfig } from '@/tools/types'
+
+interface CreateMilestoneParams {
+  owner: string
+  repo: string
+  title: string
+  state?: 'open' | 'closed'
+  description?: string
+  due_on?: string
+  apiKey: string
+}
+
+interface CreateMilestoneResponse {
+  success: boolean
+  output: {
+    content: string
+    metadata: {
+      number: number
+      title: string
+      description: string | null
+      state: string
+      html_url: string
+      due_on: string | null
+      open_issues: number
+      closed_issues: number
+      created_at: string
+      creator: { login: string }
+    }
+  }
+}
+
+export const createMilestoneTool: ToolConfig<CreateMilestoneParams, CreateMilestoneResponse> = {
+  id: 'github_create_milestone',
+  name: 'GitHub Create Milestone',
+  description: 'Create a milestone in a repository',
+  version: '1.0.0',
+
+  params: {
+    owner: {
+      type: 'string',
+      required: true,
+      visibility: 'user-or-llm',
+      description: 'Repository owner',
+    },
+    repo: {
+      type: 'string',
+      required: true,
+      visibility: 'user-or-llm',
+      description: 'Repository name',
+    },
+    title: {
+      type: 'string',
+      required: true,
+      visibility: 'user-or-llm',
+      description: 'Milestone title',
+    },
+    state: {
+      type: 'string',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'State: open or closed (default: open)',
+      default: 'open',
+    },
+    description: {
+      type: 'string',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Milestone description',
+    },
+    due_on: {
+      type: 'string',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Due date (ISO 8601 format, e.g., 2024-12-31T23:59:59Z)',
+    },
+    apiKey: {
+      type: 'string',
+      required: true,
+      visibility: 'user-only',
+      description: 'GitHub API token',
+    },
+  },
+
+  request: {
+    url: (params) => `https://api.github.com/repos/${params.owner}/${params.repo}/milestones`,
+    method: 'POST',
+    headers: (params) => ({
+      Accept: 'application/vnd.github.v3+json',
+      Authorization: `Bearer ${params.apiKey}`,
+      'Content-Type': 'application/json',
+      'X-GitHub-Api-Version': '2022-11-28',
+    }),
+    body: (params) => ({
+      title: params.title,
+      state: params.state ?? 'open',
+      description: params.description,
+      due_on: params.due_on,
+    }),
+  },
+
+  transformResponse: async (response) => {
+    const data = await response.json()
+
+    const content = `Created milestone: ${data.title}
+Number: ${data.number}
+State: ${data.state}
+Due: ${data.due_on ?? 'No due date'}
+${data.html_url}`
+
+    return {
+      success: true,
+      output: {
+        content,
+        metadata: {
+          number: data.number,
+          title: data.title,
+          description: data.description ?? null,
+          state: data.state,
+          html_url: data.html_url,
+          due_on: data.due_on ?? null,
+          open_issues: data.open_issues,
+          closed_issues: data.closed_issues,
+          created_at: data.created_at,
+          creator: { login: data.creator?.login ?? 'unknown' },
+        },
+      },
+    }
+  },
+
+  outputs: {
+    content: { type: 'string', description: 'Human-readable result' },
+    metadata: {
+      type: 'object',
+      description: 'Milestone metadata',
+      properties: {
+        number: { type: 'number', description: 'Milestone number' },
+        title: { type: 'string', description: 'Title' },
+        description: { type: 'string', description: 'Description', optional: true },
+        state: { type: 'string', description: 'State' },
+        html_url: { type: 'string', description: 'Web URL' },
+        due_on: { type: 'string', description: 'Due date', optional: true },
+        open_issues: { type: 'number', description: 'Open issues count' },
+        closed_issues: { type: 'number', description: 'Closed issues count' },
+        created_at: { type: 'string', description: 'Creation date' },
+        creator: { type: 'object', description: 'Creator info' },
+      },
+    },
+  },
+}
+
+export const createMilestoneV2Tool: ToolConfig<CreateMilestoneParams, any> = {
+  id: 'github_create_milestone_v2',
+  name: createMilestoneTool.name,
+  description: createMilestoneTool.description,
+  version: '2.0.0',
+  params: createMilestoneTool.params,
+  request: createMilestoneTool.request,
+
+  transformResponse: async (response: Response) => {
+    const data = await response.json()
+    return {
+      success: true,
+      output: {
+        ...data,
+        description: data.description ?? null,
+        due_on: data.due_on ?? null,
+      },
+    }
+  },
+
+  outputs: {
+    number: { type: 'number', description: 'Milestone number' },
+    title: { type: 'string', description: 'Title' },
+    description: { type: 'string', description: 'Description', optional: true },
+    state: { type: 'string', description: 'State' },
+    html_url: { type: 'string', description: 'Web URL' },
+    due_on: { type: 'string', description: 'Due date', optional: true },
+    open_issues: { type: 'number', description: 'Open issues' },
+    closed_issues: { type: 'number', description: 'Closed issues' },
+    creator: { type: 'object', description: 'Creator' },
+  },
+}
diff --git a/apps/sim/tools/github/delete_comment_reaction.ts b/apps/sim/tools/github/delete_comment_reaction.ts
new file mode 100644
index 0000000000..7708bfe3a1
--- /dev/null
+++ b/apps/sim/tools/github/delete_comment_reaction.ts
@@ -0,0 +1,128 @@
+import type { ToolConfig } from '@/tools/types'
+
+interface DeleteCommentReactionParams {
+  owner: string
+  repo: string
+  comment_id: number
+  reaction_id: number
+  apiKey: string
+}
+
+interface DeleteCommentReactionResponse {
+  success: boolean
+  output: {
+    content: string
+    metadata: {
+      deleted: boolean
+      reaction_id: number
+    }
+  }
+}
+
+export const deleteCommentReactionTool: ToolConfig<
+  DeleteCommentReactionParams,
+  DeleteCommentReactionResponse
+> = {
+  id: 'github_delete_comment_reaction',
+  name: 'GitHub Delete Comment Reaction',
+  description: 'Remove a reaction from an issue comment',
+  version: '1.0.0',
+
+  params: {
+    owner: {
+      type: 'string',
+      required: true,
+      visibility: 'user-or-llm',
+      description: 'Repository owner',
+    },
+    repo: {
+      type: 'string',
+      required: true,
+      visibility: 'user-or-llm',
+      description: 'Repository name',
+    },
+    comment_id: {
+      type: 'number',
+      required: true,
+      visibility: 'user-or-llm',
+      description: 'Comment ID',
+    },
+    reaction_id: {
+      type: 'number',
+      required: true,
+      visibility: 'user-or-llm',
+      description: 'Reaction ID to delete',
+    },
+    apiKey: {
+      type: 'string',
+      required: true,
+      visibility: 'user-only',
+      description: 'GitHub API token',
+    },
+  },
+
+  request: {
+    url: (params) =>
+      `https://api.github.com/repos/${params.owner}/${params.repo}/issues/comments/${params.comment_id}/reactions/${params.reaction_id}`,
+    method: 'DELETE',
+    headers: (params) => ({
+      Accept: 'application/vnd.github.squirrel-girl-preview+json',
+      Authorization: `Bearer ${params.apiKey}`,
+      'X-GitHub-Api-Version': '2022-11-28',
+    }),
+  },
+
+  transformResponse: async (response, params) => {
+    const deleted = response.status === 204
+
+    return {
+      success: deleted,
+      output: {
+        content: deleted
+          ? `Successfully deleted reaction ${params?.reaction_id}`
+          : `Failed to delete reaction ${params?.reaction_id}`,
+        metadata: {
+          deleted,
+          reaction_id: params?.reaction_id ?? 0,
+        },
+      },
+    }
+  },
+
+  outputs: {
+    content: { type: 'string', description: 'Human-readable result' },
+    metadata: {
+      type: 'object',
+      description: 'Delete operation metadata',
+      properties: {
+        deleted: { type: 'boolean', description: 'Whether deletion succeeded' },
+        reaction_id: { type: 'number', description: 'The deleted reaction ID' },
+      },
+    },
+  },
+}
+
+export const deleteCommentReactionV2Tool: ToolConfig<DeleteCommentReactionParams, any> = {
+  id: 'github_delete_comment_reaction_v2',
+  name: deleteCommentReactionTool.name,
+  description: deleteCommentReactionTool.description,
+  version: '2.0.0',
+  params: deleteCommentReactionTool.params,
+  request: deleteCommentReactionTool.request,
+
+  transformResponse: async (response: Response, params) => {
+    const deleted = response.status === 204
+    return {
+      success: deleted,
+      output: {
+        deleted,
+        reaction_id: params?.reaction_id ?? 0,
+      },
+    }
+  },
+
+  outputs: {
+    deleted: { type: 'boolean', description: 'Whether deletion succeeded' },
+    reaction_id: { type: 'number', description: 'The deleted reaction ID' },
+  },
+}
diff --git a/apps/sim/tools/github/delete_gist.ts b/apps/sim/tools/github/delete_gist.ts
new file mode 100644
index 0000000000..da9e884047
--- /dev/null
+++ b/apps/sim/tools/github/delete_gist.ts
@@ -0,0 +1,103 @@
+import type { ToolConfig } from '@/tools/types'
+
+interface DeleteGistParams {
+  gist_id: string
+  apiKey: string
+}
+
+interface DeleteGistResponse {
+  success: boolean
+  output: {
+    content: string
+    metadata: {
+      deleted: boolean
+      gist_id: string
+    }
+  }
+}
+
+export const deleteGistTool: ToolConfig<DeleteGistParams, DeleteGistResponse> = {
+  id: 'github_delete_gist',
+  name: 'GitHub Delete Gist',
+  description: 'Delete a gist by ID',
+  version: '1.0.0',
+
+  params: {
+    gist_id: {
+      type: 'string',
+      required: true,
+      visibility: 'user-or-llm',
+      description: 'The gist ID to delete',
+    },
+    apiKey: {
+      type: 'string',
+      required: true,
+      visibility: 'user-only',
+      description: 'GitHub API token',
+    },
+  },
+
+  request: {
+    url: (params) => `https://api.github.com/gists/${params.gist_id?.trim()}`,
+    method: 'DELETE',
+    headers: (params) => ({
+      Accept: 'application/vnd.github.v3+json',
+      Authorization: `Bearer ${params.apiKey}`,
+      'X-GitHub-Api-Version': '2022-11-28',
+    }),
+  },
+
+  transformResponse: async (response, params) => {
+    const deleted = response.status === 204
+
+    return {
+      success: deleted,
+      output: {
+        content: deleted
+          ? `Successfully deleted gist ${params?.gist_id}`
+          : `Failed to delete gist ${params?.gist_id}`,
+        metadata: {
+          deleted,
+          gist_id: params?.gist_id ?? '',
+        },
+      },
+    }
+  },
+
+  outputs: {
+    content: { type: 'string', description: 'Human-readable result' },
+    metadata: {
+      type: 'object',
+      description: 'Delete operation metadata',
+      properties: {
+        deleted: { type: 'boolean', description: 'Whether deletion succeeded' },
+        gist_id: { type: 'string', description: 'The deleted gist ID' },
+      },
+    },
+  },
+}
+
+export const deleteGistV2Tool: ToolConfig<DeleteGistParams, any> = {
+  id: 'github_delete_gist_v2',
+  name: deleteGistTool.name,
+  description: deleteGistTool.description,
+  version: '2.0.0',
+  params: deleteGistTool.params,
+  request: deleteGistTool.request,
+
+  transformResponse: async (response: Response, params) => {
+    const deleted = response.status === 204
+    return {
+      success: deleted,
+      output: {
+        deleted,
+        gist_id: params?.gist_id ?? '',
+      },
+    }
+  },
+
+  outputs: {
+    deleted: { type: 'boolean', description: 'Whether deletion succeeded' },
+    gist_id: { type: 'string', description: 'The deleted gist ID' },
+  },
+}
diff --git a/apps/sim/tools/github/delete_issue_reaction.ts b/apps/sim/tools/github/delete_issue_reaction.ts
new file mode 100644
index 0000000000..410d398026
--- /dev/null
+++ b/apps/sim/tools/github/delete_issue_reaction.ts
@@ -0,0 +1,128 @@
+import type { ToolConfig } from '@/tools/types'
+
+interface DeleteIssueReactionParams {
+  owner: string
+  repo: string
+  issue_number: number
+  reaction_id: number
+  apiKey: string
+}
+
+interface DeleteIssueReactionResponse {
+  success: boolean
+  output: {
+    content: string
+    metadata: {
+      deleted: boolean
+      reaction_id: number
+    }
+  }
+}
+
+export const deleteIssueReactionTool: ToolConfig<
+  DeleteIssueReactionParams,
+  DeleteIssueReactionResponse
+> = {
+  id: 'github_delete_issue_reaction',
+  name: 'GitHub Delete Issue Reaction',
+  description: 'Remove a reaction from an issue',
+  version: '1.0.0',
+
+  params: {
+    owner: {
+      type: 'string',
+      required: true,
+      visibility: 'user-or-llm',
+      description: 'Repository owner',
+    },
+    repo: {
+      type: 'string',
+      required: true,
+      visibility: 'user-or-llm',
+      description: 'Repository name',
+    },
+    issue_number: {
+      type: 'number',
+      required: true,
+      visibility: 'user-or-llm',
+      description: 'Issue number',
+    },
+    reaction_id: {
+      type: 'number',
+      required: true,
+      visibility: 'user-or-llm',
+      description: 'Reaction ID to delete',
+    },
+    apiKey: {
+      type: 'string',
+      required: true,
+      visibility: 'user-only',
+      description: 'GitHub API token',
+    },
+  },
+
+  request: {
+    url: (params) =>
+      `https://api.github.com/repos/${params.owner}/${params.repo}/issues/${params.issue_number}/reactions/${params.reaction_id}`,
+    method: 'DELETE',
+    headers: (params) => ({
+      Accept: 'application/vnd.github.squirrel-girl-preview+json',
+      Authorization: `Bearer ${params.apiKey}`,
+      'X-GitHub-Api-Version': '2022-11-28',
+    }),
+  },
+
+  transformResponse: async (response, params) => {
+    const deleted = response.status === 204
+
+    return {
+      success: deleted,
+      output: {
+        content: deleted
+          ? `Successfully deleted reaction ${params?.reaction_id}`
+          : `Failed to delete reaction ${params?.reaction_id}`,
+        metadata: {
+          deleted,
+          reaction_id: params?.reaction_id ?? 0,
+        },
+      },
+    }
+  },
+
+  outputs: {
+    content: { type: 'string', description: 'Human-readable result' },
+    metadata: {
+      type: 'object',
+      description: 'Delete operation metadata',
+      properties: {
+        deleted: { type: 'boolean', description: 'Whether deletion succeeded' },
+        reaction_id: { type: 'number', description: 'The deleted reaction ID' },
+      },
+    },
+  },
+}
+
+export const deleteIssueReactionV2Tool: ToolConfig<DeleteIssueReactionParams, any> = {
+  id: 'github_delete_issue_reaction_v2',
+  name: deleteIssueReactionTool.name,
+  description: deleteIssueReactionTool.description,
+  version: '2.0.0',
+  params: deleteIssueReactionTool.params,
+  request: deleteIssueReactionTool.request,
+
+  transformResponse: async (response: Response, params) => {
+    const deleted = response.status === 204
+    return {
+      success: deleted,
+      output: {
+        deleted,
+        reaction_id: params?.reaction_id ?? 0,
+      },
+    }
+  },
+
+  outputs: {
+    deleted: { type: 'boolean', description: 'Whether deletion succeeded' },
+    reaction_id: { type: 'number', description: 'The deleted reaction ID' },
+  },
+}
diff --git a/apps/sim/tools/github/delete_milestone.ts b/apps/sim/tools/github/delete_milestone.ts
new file mode 100644
index 0000000000..cbe44f634d
--- /dev/null
+++ b/apps/sim/tools/github/delete_milestone.ts
@@ -0,0 +1,118 @@
+import type { ToolConfig } from '@/tools/types'
+
+interface DeleteMilestoneParams {
+  owner: string
+  repo: string
+  milestone_number: number
+  apiKey: string
+}
+
+interface DeleteMilestoneResponse {
+  success: boolean
+  output: {
+    content: string
+    metadata: {
+      deleted: boolean
+      milestone_number: number
+    }
+  }
+}
+
+export const deleteMilestoneTool: ToolConfig<DeleteMilestoneParams, DeleteMilestoneResponse> = {
+  id: 'github_delete_milestone',
+  name: 'GitHub Delete Milestone',
+  description: 'Delete a milestone from a repository',
+  version: '1.0.0',
+
+  params: {
+    owner: {
+      type: 'string',
+      required: true,
+      visibility: 'user-or-llm',
+      description: 'Repository owner',
+    },
+    repo: {
+      type: 'string',
+      required: true,
+      visibility: 'user-or-llm',
+      description: 'Repository name',
+    },
+    milestone_number: {
+      type: 'number',
+      required: true,
+      visibility: 'user-or-llm',
+      description: 'Milestone number to delete',
+    },
+    apiKey: {
+      type: 'string',
+      required: true,
+      visibility: 'user-only',
+      description: 'GitHub API token',
+    },
+  },
+
+  request: {
+    url: (params) =>
+      `https://api.github.com/repos/${params.owner}/${params.repo}/milestones/${params.milestone_number}`,
+    method: 'DELETE',
+    headers: (params) => ({
+      Accept: 'application/vnd.github.v3+json',
+      Authorization: `Bearer ${params.apiKey}`,
+      'X-GitHub-Api-Version': '2022-11-28',
+    }),
+  },
+
+  transformResponse: async (response, params) => {
+    const deleted = response.status === 204
+
+    return {
+      success: deleted,
+      output: {
+        content: deleted
+          ? `Successfully deleted milestone #${params?.milestone_number}`
+          : `Failed to delete milestone #${params?.milestone_number}`,
+        metadata: {
+          deleted,
+          milestone_number: params?.milestone_number ?? 0,
+        },
+      },
+    }
+  },
+
+  outputs: {
+    content: { type: 'string', description: 'Human-readable result' },
+    metadata: {
+      type: 'object',
+      description: 'Delete operation metadata',
+      properties: {
+        deleted: { type: 'boolean', description: 'Whether deletion succeeded' },
+        milestone_number: { type: 'number', description: 'The deleted milestone number' },
+      },
+    },
+  },
+}
+
+export const deleteMilestoneV2Tool: ToolConfig<DeleteMilestoneParams, any> = {
+  id: 'github_delete_milestone_v2',
+  name: deleteMilestoneTool.name,
+  description: deleteMilestoneTool.description,
+  version: '2.0.0',
+  params: deleteMilestoneTool.params,
+  request: deleteMilestoneTool.request,
+
+  transformResponse: async (response: Response, params) => {
+    const deleted = response.status === 204
+    return {
+      success: deleted,
+      output: {
+        deleted,
+        milestone_number: params?.milestone_number ?? 0,
+      },
+    }
+  },
+
+  outputs: {
+    deleted: { type: 'boolean', description: 'Whether deletion succeeded' },
+    milestone_number: { type: 'number', description: 'The deleted milestone number' },
+  },
+}
diff --git a/apps/sim/tools/github/fork_gist.ts b/apps/sim/tools/github/fork_gist.ts
new file mode 100644
index 0000000000..8ecafafb28
--- /dev/null
+++ b/apps/sim/tools/github/fork_gist.ts
@@ -0,0 +1,131 @@
+import type { ToolConfig } from '@/tools/types'
+
+interface ForkGistParams {
+  gist_id: string
+  apiKey: string
+}
+
+interface ForkGistResponse {
+  success: boolean
+  output: {
+    content: string
+    metadata: {
+      id: string
+      html_url: string
+      git_pull_url: string
+      description: string | null
+      public: boolean
+      created_at: string
+      owner: { login: string }
+      files: string[]
+    }
+  }
+}
+
+export const forkGistTool: ToolConfig<ForkGistParams, ForkGistResponse> = {
+  id: 'github_fork_gist',
+  name: 'GitHub Fork Gist',
+  description: 'Fork a gist to create your own copy',
+  version: '1.0.0',
+
+  params: {
+    gist_id: {
+      type: 'string',
+      required: true,
+      visibility: 'user-or-llm',
+      description: 'The gist ID to fork',
+    },
+    apiKey: {
+      type: 'string',
+      required: true,
+      visibility: 'user-only',
+      description: 'GitHub API token',
+    },
+  },
+
+  request: {
+    url: (params) => `https://api.github.com/gists/${params.gist_id?.trim()}/forks`,
+    method: 'POST',
+    headers: (params) => ({
+      Accept: 'application/vnd.github.v3+json',
+      Authorization: `Bearer ${params.apiKey}`,
+      'X-GitHub-Api-Version': '2022-11-28',
+    }),
+  },
+
+  transformResponse: async (response) => {
+    const data = await response.json()
+
+    const files = Object.keys(data.files ?? {})
+
+    const content = `Forked gist: ${data.html_url}
+Description: ${data.description ?? 'No description'}
+Files: ${files.join(', ')}`
+
+    return {
+      success: true,
+      output: {
+        content,
+        metadata: {
+          id: data.id,
+          html_url: data.html_url,
+          git_pull_url: data.git_pull_url,
+          description: data.description ?? null,
+          public: data.public,
+          created_at: data.created_at,
+          owner: { login: data.owner?.login ?? 'unknown' },
+          files,
+        },
+      },
+    }
+  },
+
+  outputs: {
+    content: { type: 'string', description: 'Human-readable result' },
+    metadata: {
+      type: 'object',
+      description: 'Forked gist metadata',
+      properties: {
+        id: { type: 'string', description: 'New gist ID' },
+        html_url: { type: 'string', description: 'Web URL' },
+        git_pull_url: { type: 'string', description: 'Git pull URL' },
+        description: { type: 'string', description: 'Description', optional: true },
+        public: { type: 'boolean', description: 'Is public' },
+        created_at: { type: 'string', description: 'Creation date' },
+        owner: { type: 'object', description: 'Owner info' },
+        files: { type: 'array', description: 'File names' },
+      },
+    },
+  },
+}
+
+export const forkGistV2Tool: ToolConfig<ForkGistParams, any> = {
+  id: 'github_fork_gist_v2',
+  name: forkGistTool.name,
+  description: forkGistTool.description,
+  version: '2.0.0',
+  params: forkGistTool.params,
+  request: forkGistTool.request,
+
+  transformResponse: async (response: Response) => {
+    const data = await response.json()
+    return {
+      success: true,
+      output: {
+        ...data,
+        description: data.description ?? null,
+        files: data.files ?? {},
+      },
+    }
+  },
+
+  outputs: {
+    id: { type: 'string', description: 'New gist ID' },
+    html_url: { type: 'string', description: 'Web URL' },
+    description: { type: 'string', description: 'Description', optional: true },
+    public: { type: 'boolean', description: 'Is public' },
+    created_at: { type: 'string', description: 'Creation date' },
+    owner: { type: 'object', description: 'Owner info' },
+    files: { type: 'object', description: 'Files' },
+  },
+}
diff --git a/apps/sim/tools/github/fork_repo.ts b/apps/sim/tools/github/fork_repo.ts
new file mode 100644
index 0000000000..ef37490b83
--- /dev/null
+++ b/apps/sim/tools/github/fork_repo.ts
@@ -0,0 +1,229 @@
+import type { ToolConfig } from '@/tools/types'
+
+interface ForkRepoParams {
+  owner: string
+  repo: string
+  organization?: string
+  name?: string
+  default_branch_only?: boolean
+  apiKey: string
+}
+
+interface ForkRepoResponse {
+  success: boolean
+  output: {
+    content: string
+    metadata: {
+      id: number
+      full_name: string
+      html_url: string
+      clone_url: string
+      ssh_url: string
+      default_branch: string
+      fork: boolean
+      parent: { full_name: string; html_url: string }
+      owner: { login: string }
+      created_at: string
+    }
+  }
+}
+
+export const forkRepoTool: ToolConfig<ForkRepoParams, ForkRepoResponse> = {
+  id: 'github_fork_repo',
+  name: 'GitHub Fork Repository',
+  description: 'Fork a repository to your account or an organization',
+  version: '1.0.0',
+
+  params: {
+    owner: {
+      type: 'string',
+      required: true,
+      visibility: 'user-or-llm',
+      description: 'Repository owner to fork from',
+    },
+    repo: {
+      type: 'string',
+      required: true,
+      visibility: 'user-or-llm',
+      description: 'Repository name to fork',
+    },
+    organization: {
+      type: 'string',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Organization to fork into (omit to fork to your account)',
+    },
+    name: {
+      type: 'string',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Custom name for the forked repository',
+    },
+    default_branch_only: {
+      type: 'boolean',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Only fork the default branch (default: false)',
+      default: false,
+    },
+    apiKey: {
+      type: 'string',
+      required: true,
+      visibility: 'user-only',
+      description: 'GitHub API token',
+    },
+  },
+
+  request: {
+    url: (params) => `https://api.github.com/repos/${params.owner}/${params.repo}/forks`,
+    method: 'POST',
+    headers: (params) => ({
+      Accept: 'application/vnd.github.v3+json',
+      Authorization: `Bearer ${params.apiKey}`,
+      'Content-Type': 'application/json',
+      'X-GitHub-Api-Version': '2022-11-28',
+    }),
+    body: (params) => {
+      const body: Record<string, any> = {}
+      if (params.organization) body.organization = params.organization
+      if (params.name) body.name = params.name
+      if (params.default_branch_only !== undefined)
+        body.default_branch_only = params.default_branch_only
+      return body
+    },
+  },
+
+  transformResponse: async (response) => {
+    const data = await response.json()
+
+    const content = `Forked repository: ${data.html_url}
+Forked from: ${data.parent?.full_name ?? 'unknown'}
+Clone URL: ${data.clone_url}
+Default branch: ${data.default_branch}`
+
+    return {
+      success: true,
+      output: {
+        content,
+        metadata: {
+          id: data.id,
+          full_name: data.full_name,
+          html_url: data.html_url,
+          clone_url: data.clone_url,
+          ssh_url: data.ssh_url,
+          default_branch: data.default_branch,
+          fork: data.fork,
+          parent: {
+            full_name: data.parent?.full_name ?? '',
+            html_url: data.parent?.html_url ?? '',
+          },
+          owner: { login: data.owner?.login ?? 'unknown' },
+          created_at: data.created_at,
+        },
+      },
+    }
+  },
+
+  outputs: {
+    content: { type: 'string', description: 'Human-readable result' },
+    metadata: {
+      type: 'object',
+      description: 'Forked repository metadata',
+      properties: {
+        id: { type: 'number', description: 'Repository ID' },
+        full_name: { type: 'string', description: 'Full name (owner/repo)' },
+        html_url: { type: 'string', description: 'Web URL' },
+        clone_url: { type: 'string', description: 'HTTPS clone URL' },
+        ssh_url: { type: 'string', description: 'SSH clone URL' },
+        default_branch: { type: 'string', description: 'Default branch' },
+        fork: { type: 'boolean', description: 'Is a fork' },
+        parent: { type: 'object', description: 'Parent repository' },
+        owner: { type: 'object', description: 'Owner info' },
+        created_at: { type: 'string', description: 'Creation date' },
+      },
+    },
+  },
+}
+
+export const forkRepoV2Tool: ToolConfig<ForkRepoParams, any> = {
+  id: 'github_fork_repo_v2',
+  name: forkRepoTool.name,
+  description: forkRepoTool.description,
+  version: '2.0.0',
+  params: forkRepoTool.params,
+  request: forkRepoTool.request,
+
+  transformResponse: async (response: Response) => {
+    const data = await response.json()
+    return {
+      success: true,
+      output: {
+        ...data,
+        parent: data.parent ?? null,
+        source: data.source ?? null,
+      },
+    }
+  },
+
+  outputs: {
+    id: { type: 'number', description: 'Repository ID' },
+    node_id: { type: 'string', description: 'GraphQL node ID' },
+    name: { type: 'string', description: 'Repository name' },
+    full_name: { type: 'string', description: 'Full name (owner/repo)' },
+    private: { type: 'boolean', description: 'Whether repository is private' },
+    description: { type: 'string', description: 'Repository description', optional: true },
+    html_url: { type: 'string', description: 'GitHub web URL' },
+    url: { type: 'string', description: 'API URL' },
+    clone_url: { type: 'string', description: 'HTTPS clone URL' },
+    ssh_url: { type: 'string', description: 'SSH clone URL' },
+    git_url: { type: 'string', description: 'Git protocol URL' },
+    default_branch: { type: 'string', description: 'Default branch name' },
+    fork: { type: 'boolean', description: 'Whether this is a fork' },
+    created_at: { type: 'string', description: 'Creation timestamp' },
+    updated_at: { type: 'string', description: 'Last update timestamp' },
+    pushed_at: { type: 'string', description: 'Last push timestamp', optional: true },
+    owner: {
+      type: 'object',
+      description: 'Fork owner',
+      properties: {
+        login: { type: 'string', description: 'Username' },
+        id: { type: 'number', description: 'User ID' },
+        node_id: { type: 'string', description: 'GraphQL node ID' },
+        avatar_url: { type: 'string', description: 'Avatar image URL' },
+        url: { type: 'string', description: 'API URL' },
+        html_url: { type: 'string', description: 'Profile page URL' },
+        type: { type: 'string', description: 'User or Organization' },
+        site_admin: { type: 'boolean', description: 'GitHub staff indicator' },
+      },
+    },
+    parent: {
+      type: 'object',
+      description: 'Parent repository (source of the fork)',
+      optional: true,
+      properties: {
+        id: { type: 'number', description: 'Repository ID' },
+        full_name: { type: 'string', description: 'Full name' },
+        html_url: { type: 'string', description: 'Web URL' },
+        description: { type: 'string', description: 'Description', optional: true },
+        owner: {
+          type: 'object',
+          description: 'Parent owner',
+          properties: {
+            login: { type: 'string', description: 'Username' },
+            id: { type: 'number', description: 'User ID' },
+          },
+        },
+      },
+    },
+    source: {
+      type: 'object',
+      description: 'Source repository (ultimate origin)',
+      optional: true,
+      properties: {
+        id: { type: 'number', description: 'Repository ID' },
+        full_name: { type: 'string', description: 'Full name' },
+        html_url: { type: 'string', description: 'Web URL' },
+      },
+    },
+  },
+}
diff --git a/apps/sim/tools/github/get_commit.ts b/apps/sim/tools/github/get_commit.ts
new file mode 100644
index 0000000000..1ea0431806
--- /dev/null
+++ b/apps/sim/tools/github/get_commit.ts
@@ -0,0 +1,318 @@
+import type { ToolConfig } from '@/tools/types'
+
+interface GetCommitParams {
+  owner: string
+  repo: string
+  ref: string
+  apiKey: string
+}
+
+interface GetCommitResponse {
+  success: boolean
+  output: {
+    content: string
+    metadata: {
+      sha: string
+      html_url: string
+      message: string
+      author: { name: string; email: string; date: string; login?: string }
+      committer: { name: string; email: string; date: string; login?: string }
+      stats: { additions: number; deletions: number; total: number }
+      files: Array<{
+        filename: string
+        status: string
+        additions: number
+        deletions: number
+        changes: number
+        patch?: string
+      }>
+      parents: Array<{ sha: string; html_url: string }>
+    }
+  }
+}
+
+export const getCommitTool: ToolConfig<GetCommitParams, GetCommitResponse> = {
+  id: 'github_get_commit',
+  name: 'GitHub Get Commit',
+  description: 'Get detailed information about a specific commit including files changed and stats',
+  version: '1.0.0',
+
+  params: {
+    owner: {
+      type: 'string',
+      required: true,
+      visibility: 'user-or-llm',
+      description: 'Repository owner',
+    },
+    repo: {
+      type: 'string',
+      required: true,
+      visibility: 'user-or-llm',
+      description: 'Repository name',
+    },
+    ref: {
+      type: 'string',
+      required: true,
+      visibility: 'user-or-llm',
+      description: 'Commit SHA, branch name, or tag name',
+    },
+    apiKey: {
+      type: 'string',
+      required: true,
+      visibility: 'user-only',
+      description: 'GitHub API token',
+    },
+  },
+
+  request: {
+    url: (params) =>
+      `https://api.github.com/repos/${params.owner}/${params.repo}/commits/${params.ref}`,
+    method: 'GET',
+    headers: (params) => ({
+      Accept: 'application/vnd.github.v3+json',
+      Authorization: `Bearer ${params.apiKey}`,
+      'X-GitHub-Api-Version': '2022-11-28',
+    }),
+  },
+
+  transformResponse: async (response) => {
+    const data = await response.json()
+
+    const files = (data.files ?? []).map((f: any) => ({
+      filename: f.filename,
+      status: f.status,
+      additions: f.additions,
+      deletions: f.deletions,
+      changes: f.changes,
+      patch: f.patch,
+    }))
+
+    const metadata = {
+      sha: data.sha,
+      html_url: data.html_url,
+      message: data.commit.message,
+      author: {
+        name: data.commit.author.name,
+        email: data.commit.author.email,
+        date: data.commit.author.date,
+        login: data.author?.login,
+      },
+      committer: {
+        name: data.commit.committer.name,
+        email: data.commit.committer.email,
+        date: data.commit.committer.date,
+        login: data.committer?.login,
+      },
+      stats: data.stats ?? { additions: 0, deletions: 0, total: 0 },
+      files,
+      parents: data.parents.map((p: any) => ({ sha: p.sha, html_url: p.html_url })),
+    }
+
+    const content = `Commit ${data.sha.substring(0, 7)}
+Message: ${data.commit.message.split('\n')[0]}
+Author: ${metadata.author.login ?? metadata.author.name} (${metadata.author.date})
+Stats: +${metadata.stats.additions} -${metadata.stats.deletions} (${files.length} files)
+${data.html_url}
+
+Files changed:
+${files.map((f: any) => `  ${f.status}: ${f.filename} (+${f.additions} -${f.deletions})`).join('\n')}`
+
+    return {
+      success: true,
+      output: {
+        content,
+        metadata,
+      },
+    }
+  },
+
+  outputs: {
+    content: { type: 'string', description: 'Human-readable commit details' },
+    metadata: {
+      type: 'object',
+      description: 'Commit metadata',
+      properties: {
+        sha: { type: 'string', description: 'Full commit SHA' },
+        html_url: { type: 'string', description: 'GitHub web URL' },
+        message: { type: 'string', description: 'Commit message' },
+        author: { type: 'object', description: 'Author info' },
+        committer: { type: 'object', description: 'Committer info' },
+        stats: {
+          type: 'object',
+          description: 'Change stats',
+          properties: {
+            additions: { type: 'number', description: 'Lines added' },
+            deletions: { type: 'number', description: 'Lines deleted' },
+            total: { type: 'number', description: 'Total changes' },
+          },
+        },
+        files: {
+          type: 'array',
+          description: 'Changed files',
+          items: {
+            type: 'object',
+            properties: {
+              filename: { type: 'string', description: 'File path' },
+              status: { type: 'string', description: 'Change type' },
+              additions: { type: 'number', description: 'Lines added' },
+              deletions: { type: 'number', description: 'Lines deleted' },
+              changes: { type: 'number', description: 'Total changes' },
+              patch: { type: 'string', description: 'Diff patch', optional: true },
+            },
+          },
+        },
+        parents: { type: 'array', description: 'Parent commits' },
+      },
+    },
+  },
+}
+
+export const getCommitV2Tool: ToolConfig<GetCommitParams, any> = {
+  id: 'github_get_commit_v2',
+  name: getCommitTool.name,
+  description: getCommitTool.description,
+  version: '2.0.0',
+  params: getCommitTool.params,
+  request: getCommitTool.request,
+
+  transformResponse: async (response: Response) => {
+    const data = await response.json()
+    return {
+      success: true,
+      output: {
+        ...data,
+        author: data.author ?? null,
+        committer: data.committer ?? null,
+        stats: data.stats ?? null,
+        files: data.files ?? [],
+      },
+    }
+  },
+
+  outputs: {
+    sha: { type: 'string', description: 'Commit SHA' },
+    node_id: { type: 'string', description: 'GraphQL node ID' },
+    html_url: { type: 'string', description: 'GitHub web URL' },
+    url: { type: 'string', description: 'API URL' },
+    comments_url: { type: 'string', description: 'Comments API URL' },
+    commit: {
+      type: 'object',
+      description: 'Core commit data',
+      properties: {
+        url: { type: 'string', description: 'Commit API URL' },
+        message: { type: 'string', description: 'Commit message' },
+        comment_count: { type: 'number', description: 'Number of comments' },
+        author: {
+          type: 'object',
+          description: 'Git author',
+          properties: {
+            name: { type: 'string', description: 'Author name' },
+            email: { type: 'string', description: 'Author email' },
+            date: { type: 'string', description: 'Author date (ISO 8601)' },
+          },
+        },
+        committer: {
+          type: 'object',
+          description: 'Git committer',
+          properties: {
+            name: { type: 'string', description: 'Committer name' },
+            email: { type: 'string', description: 'Committer email' },
+            date: { type: 'string', description: 'Commit date (ISO 8601)' },
+          },
+        },
+        tree: {
+          type: 'object',
+          description: 'Tree object',
+          properties: {
+            sha: { type: 'string', description: 'Tree SHA' },
+            url: { type: 'string', description: 'Tree API URL' },
+          },
+        },
+        verification: {
+          type: 'object',
+          description: 'Signature verification',
+          properties: {
+            verified: { type: 'boolean', description: 'Whether signature is verified' },
+            reason: { type: 'string', description: 'Verification reason' },
+            signature: { type: 'string', description: 'GPG signature', optional: true },
+            payload: { type: 'string', description: 'Signed payload', optional: true },
+          },
+        },
+      },
+    },
+    author: {
+      type: 'object',
+      description: 'GitHub user (author)',
+      optional: true,
+      properties: {
+        login: { type: 'string', description: 'Username' },
+        id: { type: 'number', description: 'User ID' },
+        avatar_url: { type: 'string', description: 'Avatar URL' },
+        html_url: { type: 'string', description: 'Profile URL' },
+        type: { type: 'string', description: 'User or Organization' },
+      },
+    },
+    committer: {
+      type: 'object',
+      description: 'GitHub user (committer)',
+      optional: true,
+      properties: {
+        login: { type: 'string', description: 'Username' },
+        id: { type: 'number', description: 'User ID' },
+        avatar_url: { type: 'string', description: 'Avatar URL' },
+        html_url: { type: 'string', description: 'Profile URL' },
+        type: { type: 'string', description: 'User or Organization' },
+      },
+    },
+    stats: {
+      type: 'object',
+      description: 'Change statistics',
+      optional: true,
+      properties: {
+        additions: { type: 'number', description: 'Lines added' },
+        deletions: { type: 'number', description: 'Lines deleted' },
+        total: { type: 'number', description: 'Total changes' },
+      },
+    },
+    files: {
+      type: 'array',
+      description: 'Changed files (diff entries)',
+      items: {
+        type: 'object',
+        properties: {
+          sha: { type: 'string', description: 'Blob SHA', optional: true },
+          filename: { type: 'string', description: 'File path' },
+          status: {
+            type: 'string',
+            description:
+              'Change status (added, removed, modified, renamed, copied, changed, unchanged)',
+          },
+          additions: { type: 'number', description: 'Lines added' },
+          deletions: { type: 'number', description: 'Lines deleted' },
+          changes: { type: 'number', description: 'Total changes' },
+          blob_url: { type: 'string', description: 'Blob URL' },
+          raw_url: { type: 'string', description: 'Raw file URL' },
+          contents_url: { type: 'string', description: 'Contents API URL' },
+          patch: { type: 'string', description: 'Diff patch', optional: true },
+          previous_filename: {
+            type: 'string',
+            description: 'Previous filename (for renames)',
+            optional: true,
+          },
+        },
+      },
+    },
+    parents: {
+      type: 'array',
+      description: 'Parent commits',
+      items: {
+        type: 'object',
+        properties: {
+          sha: { type: 'string', description: 'Parent SHA' },
+          url: { type: 'string', description: 'Parent API URL' },
+          html_url: { type: 'string', description: 'Parent web URL' },
+        },
+      },
+    },
+  },
+}
diff --git a/apps/sim/tools/github/get_gist.ts b/apps/sim/tools/github/get_gist.ts
new file mode 100644
index 0000000000..8f7d10b421
--- /dev/null
+++ b/apps/sim/tools/github/get_gist.ts
@@ -0,0 +1,216 @@
+import type { ToolConfig } from '@/tools/types'
+
+interface GetGistParams {
+  gist_id: string
+  apiKey: string
+}
+
+interface GetGistResponse {
+  success: boolean
+  output: {
+    content: string
+    metadata: {
+      id: string
+      html_url: string
+      git_pull_url: string
+      git_push_url: string
+      description: string | null
+      public: boolean
+      created_at: string
+      updated_at: string
+      files: Record<
+        string,
+        { filename: string; type: string; language: string | null; size: number; content: string }
+      >
+      owner: { login: string }
+      comments: number
+      forks_url: string
+      commits_url: string
+    }
+  }
+}
+
+export const getGistTool: ToolConfig<GetGistParams, GetGistResponse> = {
+  id: 'github_get_gist',
+  name: 'GitHub Get Gist',
+  description: 'Get a gist by ID including its file contents',
+  version: '1.0.0',
+
+  params: {
+    gist_id: {
+      type: 'string',
+      required: true,
+      visibility: 'user-or-llm',
+      description: 'The gist ID',
+    },
+    apiKey: {
+      type: 'string',
+      required: true,
+      visibility: 'user-only',
+      description: 'GitHub API token',
+    },
+  },
+
+  request: {
+    url: (params) => `https://api.github.com/gists/${params.gist_id?.trim()}`,
+    method: 'GET',
+    headers: (params) => ({
+      Accept: 'application/vnd.github.v3+json',
+      Authorization: `Bearer ${params.apiKey}`,
+      'X-GitHub-Api-Version': '2022-11-28',
+    }),
+  },
+
+  transformResponse: async (response) => {
+    const data = await response.json()
+
+    const files: Record<
+      string,
+      { filename: string; type: string; language: string | null; size: number; content: string }
+    > = {}
+    for (const [key, value] of Object.entries(data.files ?? {})) {
+      const file = value as any
+      files[key] = {
+        filename: file.filename,
+        type: file.type,
+        language: file.language ?? null,
+        size: file.size,
+        content: file.content ?? '',
+      }
+    }
+
+    const metadata = {
+      id: data.id,
+      html_url: data.html_url,
+      git_pull_url: data.git_pull_url,
+      git_push_url: data.git_push_url,
+      description: data.description ?? null,
+      public: data.public,
+      created_at: data.created_at,
+      updated_at: data.updated_at,
+      files,
+      owner: { login: data.owner?.login ?? 'unknown' },
+      comments: data.comments ?? 0,
+      forks_url: data.forks_url,
+      commits_url: data.commits_url,
+    }
+
+    const fileList = Object.entries(files)
+      .map(([name, f]) => `${name} (${f.language ?? 'unknown'}, ${f.size} bytes)`)
+      .join(', ')
+
+    const content = `Gist: ${data.html_url}
+Description: ${data.description ?? 'No description'}
+Public: ${data.public} | Comments: ${data.comments ?? 0}
+Owner: ${data.owner?.login ?? 'unknown'}
+Files: ${fileList}
+
+${Object.entries(files)
+  .map(([name, f]) => `--- ${name} ---\n${f.content}`)
+  .join('\n\n')}`
+
+    return {
+      success: true,
+      output: {
+        content,
+        metadata,
+      },
+    }
+  },
+
+  outputs: {
+    content: { type: 'string', description: 'Human-readable gist with file contents' },
+    metadata: {
+      type: 'object',
+      description: 'Gist metadata',
+      properties: {
+        id: { type: 'string', description: 'Gist ID' },
+        html_url: { type: 'string', description: 'Web URL' },
+        git_pull_url: { type: 'string', description: 'Git pull URL' },
+        git_push_url: { type: 'string', description: 'Git push URL' },
+        description: { type: 'string', description: 'Description', optional: true },
+        public: { type: 'boolean', description: 'Is public' },
+        created_at: { type: 'string', description: 'Creation date' },
+        updated_at: { type: 'string', description: 'Update date' },
+        files: { type: 'object', description: 'Files with content' },
+        owner: { type: 'object', description: 'Owner info' },
+        comments: { type: 'number', description: 'Comment count' },
+        forks_url: { type: 'string', description: 'Forks URL' },
+        commits_url: { type: 'string', description: 'Commits URL' },
+      },
+    },
+  },
+}
+
+export const getGistV2Tool: ToolConfig<GetGistParams, any> = {
+  id: 'github_get_gist_v2',
+  name: getGistTool.name,
+  description: getGistTool.description,
+  version: '2.0.0',
+  params: getGistTool.params,
+  request: getGistTool.request,
+
+  transformResponse: async (response: Response) => {
+    const data = await response.json()
+    return {
+      success: true,
+      output: {
+        ...data,
+        description: data.description ?? null,
+        files: data.files ?? {},
+        comments: data.comments ?? 0,
+      },
+    }
+  },
+
+  outputs: {
+    id: { type: 'string', description: 'Gist ID' },
+    node_id: { type: 'string', description: 'GraphQL node ID' },
+    html_url: { type: 'string', description: 'GitHub web URL' },
+    url: { type: 'string', description: 'API URL' },
+    forks_url: { type: 'string', description: 'Forks API URL' },
+    commits_url: { type: 'string', description: 'Commits API URL' },
+    git_pull_url: { type: 'string', description: 'Git clone URL' },
+    git_push_url: { type: 'string', description: 'Git push URL' },
+    description: { type: 'string', description: 'Gist description', optional: true },
+    public: { type: 'boolean', description: 'Whether gist is public' },
+    created_at: { type: 'string', description: 'Creation timestamp' },
+    updated_at: { type: 'string', description: 'Last update timestamp' },
+    comments: { type: 'number', description: 'Number of comments' },
+    comments_url: { type: 'string', description: 'Comments API URL' },
+    truncated: { type: 'boolean', description: 'Whether content is truncated' },
+    files: {
+      type: 'object',
+      description: 'Files in the gist (keyed by filename)',
+      properties: {
+        '[filename]': {
+          type: 'object',
+          description: 'File object',
+          properties: {
+            filename: { type: 'string', description: 'File name' },
+            type: { type: 'string', description: 'MIME type' },
+            language: { type: 'string', description: 'Programming language', optional: true },
+            raw_url: { type: 'string', description: 'Raw file URL' },
+            size: { type: 'number', description: 'File size in bytes' },
+            truncated: { type: 'boolean', description: 'Whether content is truncated' },
+            content: { type: 'string', description: 'File content' },
+          },
+        },
+      },
+    },
+    owner: {
+      type: 'object',
+      description: 'Gist owner',
+      properties: {
+        login: { type: 'string', description: 'Username' },
+        id: { type: 'number', description: 'User ID' },
+        node_id: { type: 'string', description: 'GraphQL node ID' },
+        avatar_url: { type: 'string', description: 'Avatar image URL' },
+        url: { type: 'string', description: 'API URL' },
+        html_url: { type: 'string', description: 'Profile page URL' },
+        type: { type: 'string', description: 'User or Organization' },
+        site_admin: { type: 'boolean', description: 'GitHub staff indicator' },
+      },
+    },
+  },
+}
diff --git a/apps/sim/tools/github/get_milestone.ts b/apps/sim/tools/github/get_milestone.ts
new file mode 100644
index 0000000000..1beb4ede5e
--- /dev/null
+++ b/apps/sim/tools/github/get_milestone.ts
@@ -0,0 +1,187 @@
+import type { ToolConfig } from '@/tools/types'
+
+interface GetMilestoneParams {
+  owner: string
+  repo: string
+  milestone_number: number
+  apiKey: string
+}
+
+interface GetMilestoneResponse {
+  success: boolean
+  output: {
+    content: string
+    metadata: {
+      number: number
+      title: string
+      description: string | null
+      state: string
+      html_url: string
+      due_on: string | null
+      open_issues: number
+      closed_issues: number
+      created_at: string
+      updated_at: string
+      closed_at: string | null
+      creator: { login: string }
+    }
+  }
+}
+
+export const getMilestoneTool: ToolConfig<GetMilestoneParams, GetMilestoneResponse> = {
+  id: 'github_get_milestone',
+  name: 'GitHub Get Milestone',
+  description: 'Get a specific milestone by number',
+  version: '1.0.0',
+
+  params: {
+    owner: {
+      type: 'string',
+      required: true,
+      visibility: 'user-or-llm',
+      description: 'Repository owner',
+    },
+    repo: {
+      type: 'string',
+      required: true,
+      visibility: 'user-or-llm',
+      description: 'Repository name',
+    },
+    milestone_number: {
+      type: 'number',
+      required: true,
+      visibility: 'user-or-llm',
+      description: 'Milestone number',
+    },
+    apiKey: {
+      type: 'string',
+      required: true,
+      visibility: 'user-only',
+      description: 'GitHub API token',
+    },
+  },
+
+  request: {
+    url: (params) =>
+      `https://api.github.com/repos/${params.owner}/${params.repo}/milestones/${params.milestone_number}`,
+    method: 'GET',
+    headers: (params) => ({
+      Accept: 'application/vnd.github.v3+json',
+      Authorization: `Bearer ${params.apiKey}`,
+      'X-GitHub-Api-Version': '2022-11-28',
+    }),
+  },
+
+  transformResponse: async (response) => {
+    const data = await response.json()
+
+    const progress =
+      data.open_issues + data.closed_issues > 0
+        ? Math.round((data.closed_issues / (data.open_issues + data.closed_issues)) * 100)
+        : 0
+
+    const content = `Milestone: ${data.title} (#${data.number})
+State: ${data.state} | Progress: ${progress}% (${data.closed_issues}/${data.open_issues + data.closed_issues} issues)
+Due: ${data.due_on ?? 'No due date'}
+Description: ${data.description ?? 'No description'}
+${data.html_url}`
+
+    return {
+      success: true,
+      output: {
+        content,
+        metadata: {
+          number: data.number,
+          title: data.title,
+          description: data.description ?? null,
+          state: data.state,
+          html_url: data.html_url,
+          due_on: data.due_on ?? null,
+          open_issues: data.open_issues,
+          closed_issues: data.closed_issues,
+          created_at: data.created_at,
+          updated_at: data.updated_at,
+          closed_at: data.closed_at ?? null,
+          creator: { login: data.creator?.login ?? 'unknown' },
+        },
+      },
+    }
+  },
+
+  outputs: {
+    content: { type: 'string', description: 'Human-readable milestone details' },
+    metadata: {
+      type: 'object',
+      description: 'Milestone metadata',
+      properties: {
+        number: { type: 'number', description: 'Milestone number' },
+        title: { type: 'string', description: 'Title' },
+        description: { type: 'string', description: 'Description', optional: true },
+        state: { type: 'string', description: 'State' },
+        html_url: { type: 'string', description: 'Web URL' },
+        due_on: { type: 'string', description: 'Due date', optional: true },
+        open_issues: { type: 'number', description: 'Open issues count' },
+        closed_issues: { type: 'number', description: 'Closed issues count' },
+        created_at: { type: 'string', description: 'Creation date' },
+        updated_at: { type: 'string', description: 'Update date' },
+        closed_at: { type: 'string', description: 'Close date', optional: true },
+        creator: { type: 'object', description: 'Creator info' },
+      },
+    },
+  },
+}
+
+export const getMilestoneV2Tool: ToolConfig<GetMilestoneParams, any> = {
+  id: 'github_get_milestone_v2',
+  name: getMilestoneTool.name,
+  description: getMilestoneTool.description,
+  version: '2.0.0',
+  params: getMilestoneTool.params,
+  request: getMilestoneTool.request,
+
+  transformResponse: async (response: Response) => {
+    const data = await response.json()
+    return {
+      success: true,
+      output: {
+        ...data,
+        description: data.description ?? null,
+        due_on: data.due_on ?? null,
+        closed_at: data.closed_at ?? null,
+      },
+    }
+  },
+
+  outputs: {
+    id: { type: 'number', description: 'Milestone ID' },
+    node_id: { type: 'string', description: 'GraphQL node ID' },
+    number: { type: 'number', description: 'Milestone number' },
+    title: { type: 'string', description: 'Milestone title' },
+    description: { type: 'string', description: 'Milestone description', optional: true },
+    state: { type: 'string', description: 'State (open or closed)' },
+    url: { type: 'string', description: 'API URL' },
+    html_url: { type: 'string', description: 'GitHub web URL' },
+    labels_url: { type: 'string', description: 'Labels API URL' },
+    due_on: { type: 'string', description: 'Due date (ISO 8601)', optional: true },
+    open_issues: { type: 'number', description: 'Number of open issues' },
+    closed_issues: { type: 'number', description: 'Number of closed issues' },
+    created_at: { type: 'string', description: 'Creation timestamp' },
+    updated_at: { type: 'string', description: 'Last update timestamp' },
+    closed_at: { type: 'string', description: 'Close timestamp', optional: true },
+    creator: {
+      type: 'object',
+      description: 'Milestone creator',
+      optional: true,
+      properties: {
+        login: { type: 'string', description: 'Username' },
+        id: { type: 'number', description: 'User ID' },
+        node_id: { type: 'string', description: 'GraphQL node ID' },
+        avatar_url: { type: 'string', description: 'Avatar image URL' },
+        url: { type: 'string', description: 'API URL' },
+        html_url: { type: 'string', description: 'Profile page URL' },
+        type: { type: 'string', description: 'User or Organization' },
+        site_admin: { type: 'boolean', description: 'GitHub staff indicator' },
+      },
+    },
+  },
+}
diff --git a/apps/sim/tools/github/index.ts b/apps/sim/tools/github/index.ts
index bd3ff3df89..1623fa79af 100644
--- a/apps/sim/tools/github/index.ts
+++ b/apps/sim/tools/github/index.ts
@@ -1,27 +1,54 @@
 import { addAssigneesTool, addAssigneesV2Tool } from '@/tools/github/add_assignees'
 import { addLabelsTool, addLabelsV2Tool } from '@/tools/github/add_labels'
 import { cancelWorkflowRunTool, cancelWorkflowRunV2Tool } from '@/tools/github/cancel_workflow_run'
+import { checkStarTool, checkStarV2Tool } from '@/tools/github/check_star'
 import { closeIssueTool, closeIssueV2Tool } from '@/tools/github/close_issue'
 import { closePRTool, closePRV2Tool } from '@/tools/github/close_pr'
 import { commentTool, commentV2Tool } from '@/tools/github/comment'
+import { compareCommitsTool, compareCommitsV2Tool } from '@/tools/github/compare_commits'
 import { createBranchTool, createBranchV2Tool } from '@/tools/github/create_branch'
+import {
+  createCommentReactionTool,
+  createCommentReactionV2Tool,
+} from '@/tools/github/create_comment_reaction'
 import { createFileTool, createFileV2Tool } from '@/tools/github/create_file'
+import { createGistTool, createGistV2Tool } from '@/tools/github/create_gist'
 import { createIssueTool, createIssueV2Tool } from '@/tools/github/create_issue'
+import {
+  createIssueReactionTool,
+  createIssueReactionV2Tool,
+} from '@/tools/github/create_issue_reaction'
+import { createMilestoneTool, createMilestoneV2Tool } from '@/tools/github/create_milestone'
 import { createPRTool, createPRV2Tool } from '@/tools/github/create_pr'
 import { createProjectTool, createProjectV2Tool } from '@/tools/github/create_project'
 import { createReleaseTool, createReleaseV2Tool } from '@/tools/github/create_release'
 import { deleteBranchTool, deleteBranchV2Tool } from '@/tools/github/delete_branch'
 import { deleteCommentTool, deleteCommentV2Tool } from '@/tools/github/delete_comment'
+import {
+  deleteCommentReactionTool,
+  deleteCommentReactionV2Tool,
+} from '@/tools/github/delete_comment_reaction'
 import { deleteFileTool, deleteFileV2Tool } from '@/tools/github/delete_file'
+import { deleteGistTool, deleteGistV2Tool } from '@/tools/github/delete_gist'
+import {
+  deleteIssueReactionTool,
+  deleteIssueReactionV2Tool,
+} from '@/tools/github/delete_issue_reaction'
+import { deleteMilestoneTool, deleteMilestoneV2Tool } from '@/tools/github/delete_milestone'
 import { deleteProjectTool, deleteProjectV2Tool } from '@/tools/github/delete_project'
 import { deleteReleaseTool, deleteReleaseV2Tool } from '@/tools/github/delete_release'
+import { forkGistTool, forkGistV2Tool } from '@/tools/github/fork_gist'
+import { forkRepoTool, forkRepoV2Tool } from '@/tools/github/fork_repo'
 import { getBranchTool, getBranchV2Tool } from '@/tools/github/get_branch'
 import {
   getBranchProtectionTool,
   getBranchProtectionV2Tool,
 } from '@/tools/github/get_branch_protection'
+import { getCommitTool, getCommitV2Tool } from '@/tools/github/get_commit'
 import { getFileContentTool, getFileContentV2Tool } from '@/tools/github/get_file_content'
+import { getGistTool, getGistV2Tool } from '@/tools/github/get_gist'
 import { getIssueTool, getIssueV2Tool } from '@/tools/github/get_issue'
+import { getMilestoneTool, getMilestoneV2Tool } from '@/tools/github/get_milestone'
 import { getPRFilesTool, getPRFilesV2Tool } from '@/tools/github/get_pr_files'
 import { getProjectTool, getProjectV2Tool } from '@/tools/github/get_project'
 import { getReleaseTool, getReleaseV2Tool } from '@/tools/github/get_release'
@@ -31,12 +58,17 @@ import { getWorkflowRunTool, getWorkflowRunV2Tool } from '@/tools/github/get_wor
 import { issueCommentTool, issueCommentV2Tool } from '@/tools/github/issue_comment'
 import { latestCommitTool, latestCommitV2Tool } from '@/tools/github/latest_commit'
 import { listBranchesTool, listBranchesV2Tool } from '@/tools/github/list_branches'
+import { listCommitsTool, listCommitsV2Tool } from '@/tools/github/list_commits'
+import { listForksTool, listForksV2Tool } from '@/tools/github/list_forks'
+import { listGistsTool, listGistsV2Tool } from '@/tools/github/list_gists'
 import { listIssueCommentsTool, listIssueCommentsV2Tool } from '@/tools/github/list_issue_comments'
 import { listIssuesTool, listIssuesV2Tool } from '@/tools/github/list_issues'
+import { listMilestonesTool, listMilestonesV2Tool } from '@/tools/github/list_milestones'
 import { listPRCommentsTool, listPRCommentsV2Tool } from '@/tools/github/list_pr_comments'
 import { listProjectsTool, listProjectsV2Tool } from '@/tools/github/list_projects'
 import { listPRsTool, listPRsV2Tool } from '@/tools/github/list_prs'
 import { listReleasesTool, listReleasesV2Tool } from '@/tools/github/list_releases'
+import { listStargazersTool, listStargazersV2Tool } from '@/tools/github/list_stargazers'
 import { listWorkflowRunsTool, listWorkflowRunsV2Tool } from '@/tools/github/list_workflow_runs'
 import { listWorkflowsTool, listWorkflowsV2Tool } from '@/tools/github/list_workflows'
 import { mergePRTool, mergePRV2Tool } from '@/tools/github/merge_pr'
@@ -45,20 +77,38 @@ import { removeLabelTool, removeLabelV2Tool } from '@/tools/github/remove_label'
 import { repoInfoTool, repoInfoV2Tool } from '@/tools/github/repo_info'
 import { requestReviewersTool, requestReviewersV2Tool } from '@/tools/github/request_reviewers'
 import { rerunWorkflowTool, rerunWorkflowV2Tool } from '@/tools/github/rerun_workflow'
+import { searchCodeTool, searchCodeV2Tool } from '@/tools/github/search_code'
+import { searchCommitsTool, searchCommitsV2Tool } from '@/tools/github/search_commits'
+import { searchIssuesTool, searchIssuesV2Tool } from '@/tools/github/search_issues'
+import { searchReposTool, searchReposV2Tool } from '@/tools/github/search_repos'
+import { searchUsersTool, searchUsersV2Tool } from '@/tools/github/search_users'
+import { starGistTool, starGistV2Tool } from '@/tools/github/star_gist'
+import { starRepoTool, starRepoV2Tool } from '@/tools/github/star_repo'
 import { triggerWorkflowTool, triggerWorkflowV2Tool } from '@/tools/github/trigger_workflow'
+import { unstarGistTool, unstarGistV2Tool } from '@/tools/github/unstar_gist'
+import { unstarRepoTool, unstarRepoV2Tool } from '@/tools/github/unstar_repo'
 import {
   updateBranchProtectionTool,
   updateBranchProtectionV2Tool,
 } from '@/tools/github/update_branch_protection'
 import { updateCommentTool, updateCommentV2Tool } from '@/tools/github/update_comment'
 import { updateFileTool, updateFileV2Tool } from '@/tools/github/update_file'
+import { updateGistTool, updateGistV2Tool } from '@/tools/github/update_gist'
 import { updateIssueTool, updateIssueV2Tool } from '@/tools/github/update_issue'
+import { updateMilestoneTool, updateMilestoneV2Tool } from '@/tools/github/update_milestone'
 import { updatePRTool, updatePRV2Tool } from '@/tools/github/update_pr'
 import { updateProjectTool, updateProjectV2Tool } from '@/tools/github/update_project'
 import { updateReleaseTool, updateReleaseV2Tool } from '@/tools/github/update_release'
 
+// Existing exports
+export const githubAddAssigneesTool = addAssigneesTool
+export const githubAddAssigneesV2Tool = addAssigneesV2Tool
+export const githubAddLabelsTool = addLabelsTool
+export const githubAddLabelsV2Tool = addLabelsV2Tool
 export const githubCancelWorkflowRunTool = cancelWorkflowRunTool
 export const githubCancelWorkflowRunV2Tool = cancelWorkflowRunV2Tool
+export const githubCloseIssueTool = closeIssueTool
+export const githubCloseIssueV2Tool = closeIssueV2Tool
 export const githubClosePRTool = closePRTool
 export const githubClosePRV2Tool = closePRV2Tool
 export const githubCommentTool = commentTool
@@ -67,6 +117,8 @@ export const githubCreateBranchTool = createBranchTool
 export const githubCreateBranchV2Tool = createBranchV2Tool
 export const githubCreateFileTool = createFileTool
 export const githubCreateFileV2Tool = createFileV2Tool
+export const githubCreateIssueTool = createIssueTool
+export const githubCreateIssueV2Tool = createIssueV2Tool
 export const githubCreatePRTool = createPRTool
 export const githubCreatePRV2Tool = createPRV2Tool
 export const githubCreateProjectTool = createProjectTool
@@ -89,6 +141,8 @@ export const githubGetBranchProtectionTool = getBranchProtectionTool
 export const githubGetBranchProtectionV2Tool = getBranchProtectionV2Tool
 export const githubGetFileContentTool = getFileContentTool
 export const githubGetFileContentV2Tool = getFileContentV2Tool
+export const githubGetIssueTool = getIssueTool
+export const githubGetIssueV2Tool = getIssueV2Tool
 export const githubGetPRFilesTool = getPRFilesTool
 export const githubGetPRFilesV2Tool = getPRFilesV2Tool
 export const githubGetProjectTool = getProjectTool
@@ -109,6 +163,8 @@ export const githubListBranchesTool = listBranchesTool
 export const githubListBranchesV2Tool = listBranchesV2Tool
 export const githubListIssueCommentsTool = listIssueCommentsTool
 export const githubListIssueCommentsV2Tool = listIssueCommentsV2Tool
+export const githubListIssuesTool = listIssuesTool
+export const githubListIssuesV2Tool = listIssuesV2Tool
 export const githubListPRCommentsTool = listPRCommentsTool
 export const githubListPRCommentsV2Tool = listPRCommentsV2Tool
 export const githubListPRsTool = listPRsTool
@@ -125,6 +181,8 @@ export const githubMergePRTool = mergePRTool
 export const githubMergePRV2Tool = mergePRV2Tool
 export const githubPrTool = prTool
 export const githubPrV2Tool = prV2Tool
+export const githubRemoveLabelTool = removeLabelTool
+export const githubRemoveLabelV2Tool = removeLabelV2Tool
 export const githubRepoInfoTool = repoInfoTool
 export const githubRepoInfoV2Tool = repoInfoV2Tool
 export const githubRequestReviewersTool = requestReviewersTool
@@ -139,25 +197,87 @@ export const githubUpdateCommentTool = updateCommentTool
 export const githubUpdateCommentV2Tool = updateCommentV2Tool
 export const githubUpdateFileTool = updateFileTool
 export const githubUpdateFileV2Tool = updateFileV2Tool
+export const githubUpdateIssueTool = updateIssueTool
+export const githubUpdateIssueV2Tool = updateIssueV2Tool
 export const githubUpdatePRTool = updatePRTool
 export const githubUpdatePRV2Tool = updatePRV2Tool
 export const githubUpdateProjectTool = updateProjectTool
 export const githubUpdateProjectV2Tool = updateProjectV2Tool
 export const githubUpdateReleaseTool = updateReleaseTool
 export const githubUpdateReleaseV2Tool = updateReleaseV2Tool
-export const githubAddAssigneesTool = addAssigneesTool
-export const githubAddAssigneesV2Tool = addAssigneesV2Tool
-export const githubAddLabelsTool = addLabelsTool
-export const githubAddLabelsV2Tool = addLabelsV2Tool
-export const githubCloseIssueTool = closeIssueTool
-export const githubCloseIssueV2Tool = closeIssueV2Tool
-export const githubCreateIssueTool = createIssueTool
-export const githubCreateIssueV2Tool = createIssueV2Tool
-export const githubGetIssueTool = getIssueTool
-export const githubGetIssueV2Tool = getIssueV2Tool
-export const githubListIssuesTool = listIssuesTool
-export const githubListIssuesV2Tool = listIssuesV2Tool
-export const githubRemoveLabelTool = removeLabelTool
-export const githubRemoveLabelV2Tool = removeLabelV2Tool
-export const githubUpdateIssueTool = updateIssueTool
-export const githubUpdateIssueV2Tool = updateIssueV2Tool
+
+// New exports - Search tools
+export const githubSearchCodeTool = searchCodeTool
+export const githubSearchCodeV2Tool = searchCodeV2Tool
+export const githubSearchCommitsTool = searchCommitsTool
+export const githubSearchCommitsV2Tool = searchCommitsV2Tool
+export const githubSearchIssuesTool = searchIssuesTool
+export const githubSearchIssuesV2Tool = searchIssuesV2Tool
+export const githubSearchReposTool = searchReposTool
+export const githubSearchReposV2Tool = searchReposV2Tool
+export const githubSearchUsersTool = searchUsersTool
+export const githubSearchUsersV2Tool = searchUsersV2Tool
+
+// New exports - Commit tools
+export const githubListCommitsTool = listCommitsTool
+export const githubListCommitsV2Tool = listCommitsV2Tool
+export const githubGetCommitTool = getCommitTool
+export const githubGetCommitV2Tool = getCommitV2Tool
+export const githubCompareCommitsTool = compareCommitsTool
+export const githubCompareCommitsV2Tool = compareCommitsV2Tool
+
+// New exports - Gist tools
+export const githubCreateGistTool = createGistTool
+export const githubCreateGistV2Tool = createGistV2Tool
+export const githubGetGistTool = getGistTool
+export const githubGetGistV2Tool = getGistV2Tool
+export const githubListGistsTool = listGistsTool
+export const githubListGistsV2Tool = listGistsV2Tool
+export const githubUpdateGistTool = updateGistTool
+export const githubUpdateGistV2Tool = updateGistV2Tool
+export const githubDeleteGistTool = deleteGistTool
+export const githubDeleteGistV2Tool = deleteGistV2Tool
+export const githubForkGistTool = forkGistTool
+export const githubForkGistV2Tool = forkGistV2Tool
+export const githubStarGistTool = starGistTool
+export const githubStarGistV2Tool = starGistV2Tool
+export const githubUnstarGistTool = unstarGistTool
+export const githubUnstarGistV2Tool = unstarGistV2Tool
+
+// New exports - Fork tools
+export const githubForkRepoTool = forkRepoTool
+export const githubForkRepoV2Tool = forkRepoV2Tool
+export const githubListForksTool = listForksTool
+export const githubListForksV2Tool = listForksV2Tool
+
+// New exports - Milestone tools
+export const githubCreateMilestoneTool = createMilestoneTool
+export const githubCreateMilestoneV2Tool = createMilestoneV2Tool
+export const githubGetMilestoneTool = getMilestoneTool
+export const githubGetMilestoneV2Tool = getMilestoneV2Tool
+export const githubListMilestonesTool = listMilestonesTool
+export const githubListMilestonesV2Tool = listMilestonesV2Tool
+export const githubUpdateMilestoneTool = updateMilestoneTool
+export const githubUpdateMilestoneV2Tool = updateMilestoneV2Tool
+export const githubDeleteMilestoneTool = deleteMilestoneTool
+export const githubDeleteMilestoneV2Tool = deleteMilestoneV2Tool
+
+// New exports - Reaction tools
+export const githubCreateIssueReactionTool = createIssueReactionTool
+export const githubCreateIssueReactionV2Tool = createIssueReactionV2Tool
+export const githubDeleteIssueReactionTool = deleteIssueReactionTool
+export const githubDeleteIssueReactionV2Tool = deleteIssueReactionV2Tool
+export const githubCreateCommentReactionTool = createCommentReactionTool
+export const githubCreateCommentReactionV2Tool = createCommentReactionV2Tool
+export const githubDeleteCommentReactionTool = deleteCommentReactionTool
+export const githubDeleteCommentReactionV2Tool = deleteCommentReactionV2Tool
+
+// New exports - Star tools
+export const githubStarRepoTool = starRepoTool
+export const githubStarRepoV2Tool = starRepoV2Tool
+export const githubUnstarRepoTool = unstarRepoTool
+export const githubUnstarRepoV2Tool = unstarRepoV2Tool
+export const githubCheckStarTool = checkStarTool
+export const githubCheckStarV2Tool = checkStarV2Tool
+export const githubListStargazersTool = listStargazersTool
+export const githubListStargazersV2Tool = listStargazersV2Tool
diff --git a/apps/sim/tools/github/list_commits.ts b/apps/sim/tools/github/list_commits.ts
new file mode 100644
index 0000000000..443ac7d3b9
--- /dev/null
+++ b/apps/sim/tools/github/list_commits.ts
@@ -0,0 +1,329 @@
+import type { ToolConfig } from '@/tools/types'
+
+interface ListCommitsParams {
+  owner: string
+  repo: string
+  sha?: string
+  path?: string
+  author?: string
+  committer?: string
+  since?: string
+  until?: string
+  per_page?: number
+  page?: number
+  apiKey: string
+}
+
+interface ListCommitsResponse {
+  success: boolean
+  output: {
+    content: string
+    metadata: {
+      commits: Array<{
+        sha: string
+        html_url: string
+        message: string
+        author: { name: string; email: string; date: string; login?: string }
+        committer: { name: string; email: string; date: string; login?: string }
+      }>
+      count: number
+    }
+  }
+}
+
+export const listCommitsTool: ToolConfig<ListCommitsParams, ListCommitsResponse> = {
+  id: 'github_list_commits',
+  name: 'GitHub List Commits',
+  description:
+    'List commits in a repository with optional filtering by SHA, path, author, committer, or date range',
+  version: '1.0.0',
+
+  params: {
+    owner: {
+      type: 'string',
+      required: true,
+      visibility: 'user-or-llm',
+      description: 'Repository owner',
+    },
+    repo: {
+      type: 'string',
+      required: true,
+      visibility: 'user-or-llm',
+      description: 'Repository name',
+    },
+    sha: {
+      type: 'string',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'SHA or branch to start listing commits from',
+    },
+    path: {
+      type: 'string',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Only commits containing this file path',
+    },
+    author: {
+      type: 'string',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'GitHub login or email address to filter by author',
+    },
+    committer: {
+      type: 'string',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'GitHub login or email address to filter by committer',
+    },
+    since: {
+      type: 'string',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Only commits after this date (ISO 8601 format)',
+    },
+    until: {
+      type: 'string',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Only commits before this date (ISO 8601 format)',
+    },
+    per_page: {
+      type: 'number',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Results per page (max 100, default: 30)',
+      default: 30,
+    },
+    page: {
+      type: 'number',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Page number (default: 1)',
+      default: 1,
+    },
+    apiKey: {
+      type: 'string',
+      required: true,
+      visibility: 'user-only',
+      description: 'GitHub API token',
+    },
+  },
+
+  request: {
+    url: (params) => {
+      const url = new URL(`https://api.github.com/repos/${params.owner}/${params.repo}/commits`)
+      if (params.sha) url.searchParams.append('sha', params.sha)
+      if (params.path) url.searchParams.append('path', params.path)
+      if (params.author) url.searchParams.append('author', params.author)
+      if (params.committer) url.searchParams.append('committer', params.committer)
+      if (params.since) url.searchParams.append('since', params.since)
+      if (params.until) url.searchParams.append('until', params.until)
+      if (params.per_page) url.searchParams.append('per_page', String(params.per_page))
+      if (params.page) url.searchParams.append('page', String(params.page))
+      return url.toString()
+    },
+    method: 'GET',
+    headers: (params) => ({
+      Accept: 'application/vnd.github.v3+json',
+      Authorization: `Bearer ${params.apiKey}`,
+      'X-GitHub-Api-Version': '2022-11-28',
+    }),
+  },
+
+  transformResponse: async (response) => {
+    const data = await response.json()
+
+    const commits = data.map((item: any) => ({
+      sha: item.sha,
+      html_url: item.html_url,
+      message: item.commit.message,
+      author: {
+        name: item.commit.author.name,
+        email: item.commit.author.email,
+        date: item.commit.author.date,
+        login: item.author?.login,
+      },
+      committer: {
+        name: item.commit.committer.name,
+        email: item.commit.committer.email,
+        date: item.commit.committer.date,
+        login: item.committer?.login,
+      },
+    }))
+
+    const content = `Found ${commits.length} commit(s):
+${commits
+  .map(
+    (c: any) =>
+      `${c.sha.substring(0, 7)} - ${c.message.split('\n')[0]}
+  Author: ${c.author.login ?? c.author.name} (${c.author.date})
+  ${c.html_url}`
+  )
+  .join('\n\n')}`
+
+    return {
+      success: true,
+      output: {
+        content,
+        metadata: {
+          commits,
+          count: commits.length,
+        },
+      },
+    }
+  },
+
+  outputs: {
+    content: { type: 'string', description: 'Human-readable commit list' },
+    metadata: {
+      type: 'object',
+      description: 'Commits metadata',
+      properties: {
+        commits: {
+          type: 'array',
+          description: 'Array of commits',
+          items: {
+            type: 'object',
+            properties: {
+              sha: { type: 'string', description: 'Commit SHA' },
+              html_url: { type: 'string', description: 'GitHub web URL' },
+              message: { type: 'string', description: 'Commit message' },
+              author: { type: 'object', description: 'Author info' },
+              committer: { type: 'object', description: 'Committer info' },
+            },
+          },
+        },
+        count: { type: 'number', description: 'Number of commits returned' },
+      },
+    },
+  },
+}
+
+export const listCommitsV2Tool: ToolConfig<ListCommitsParams, any> = {
+  id: 'github_list_commits_v2',
+  name: listCommitsTool.name,
+  description: listCommitsTool.description,
+  version: '2.0.0',
+  params: listCommitsTool.params,
+  request: listCommitsTool.request,
+
+  transformResponse: async (response: Response) => {
+    const data = await response.json()
+    return {
+      success: true,
+      output: {
+        items: data.map((item: any) => ({
+          ...item,
+          author: item.author ?? null,
+          committer: item.committer ?? null,
+        })),
+        count: data.length,
+      },
+    }
+  },
+
+  outputs: {
+    items: {
+      type: 'array',
+      description: 'Array of commit objects from GitHub API',
+      items: {
+        type: 'object',
+        properties: {
+          sha: { type: 'string', description: 'Commit SHA' },
+          node_id: { type: 'string', description: 'GraphQL node ID' },
+          html_url: { type: 'string', description: 'Web URL' },
+          url: { type: 'string', description: 'API URL' },
+          comments_url: { type: 'string', description: 'Comments API URL' },
+          commit: {
+            type: 'object',
+            description: 'Core commit data',
+            properties: {
+              url: { type: 'string', description: 'Commit API URL' },
+              message: { type: 'string', description: 'Commit message' },
+              comment_count: { type: 'number', description: 'Number of comments' },
+              author: {
+                type: 'object',
+                description: 'Git author',
+                properties: {
+                  name: { type: 'string', description: 'Author name' },
+                  email: { type: 'string', description: 'Author email' },
+                  date: { type: 'string', description: 'Author date (ISO 8601)' },
+                },
+              },
+              committer: {
+                type: 'object',
+                description: 'Git committer',
+                properties: {
+                  name: { type: 'string', description: 'Committer name' },
+                  email: { type: 'string', description: 'Committer email' },
+                  date: { type: 'string', description: 'Commit date (ISO 8601)' },
+                },
+              },
+              tree: {
+                type: 'object',
+                description: 'Tree object',
+                properties: {
+                  sha: { type: 'string', description: 'Tree SHA' },
+                  url: { type: 'string', description: 'Tree API URL' },
+                },
+              },
+              verification: {
+                type: 'object',
+                description: 'Signature verification',
+                properties: {
+                  verified: { type: 'boolean', description: 'Whether signature is verified' },
+                  reason: { type: 'string', description: 'Verification reason' },
+                  signature: { type: 'string', description: 'GPG signature', optional: true },
+                  payload: { type: 'string', description: 'Signed payload', optional: true },
+                },
+              },
+            },
+          },
+          author: {
+            type: 'object',
+            description: 'GitHub user (author)',
+            optional: true,
+            properties: {
+              login: { type: 'string', description: 'Username' },
+              id: { type: 'number', description: 'User ID' },
+              node_id: { type: 'string', description: 'GraphQL node ID' },
+              avatar_url: { type: 'string', description: 'Avatar URL' },
+              url: { type: 'string', description: 'API URL' },
+              html_url: { type: 'string', description: 'Profile URL' },
+              type: { type: 'string', description: 'User or Organization' },
+              site_admin: { type: 'boolean', description: 'GitHub staff indicator' },
+            },
+          },
+          committer: {
+            type: 'object',
+            description: 'GitHub user (committer)',
+            optional: true,
+            properties: {
+              login: { type: 'string', description: 'Username' },
+              id: { type: 'number', description: 'User ID' },
+              node_id: { type: 'string', description: 'GraphQL node ID' },
+              avatar_url: { type: 'string', description: 'Avatar URL' },
+              url: { type: 'string', description: 'API URL' },
+              html_url: { type: 'string', description: 'Profile URL' },
+              type: { type: 'string', description: 'User or Organization' },
+              site_admin: { type: 'boolean', description: 'GitHub staff indicator' },
+            },
+          },
+          parents: {
+            type: 'array',
+            description: 'Parent commits',
+            items: {
+              type: 'object',
+              properties: {
+                sha: { type: 'string', description: 'Parent SHA' },
+                url: { type: 'string', description: 'Parent API URL' },
+                html_url: { type: 'string', description: 'Parent web URL' },
+              },
+            },
+          },
+        },
+      },
+    },
+    count: { type: 'number', description: 'Number of commits returned' },
+  },
+}
diff --git a/apps/sim/tools/github/list_forks.ts b/apps/sim/tools/github/list_forks.ts
new file mode 100644
index 0000000000..c7bcddbcb0
--- /dev/null
+++ b/apps/sim/tools/github/list_forks.ts
@@ -0,0 +1,231 @@
+import type { ToolConfig } from '@/tools/types'
+
+interface ListForksParams {
+  owner: string
+  repo: string
+  sort?: 'newest' | 'oldest' | 'stargazers' | 'watchers'
+  per_page?: number
+  page?: number
+  apiKey: string
+}
+
+interface ListForksResponse {
+  success: boolean
+  output: {
+    content: string
+    metadata: {
+      forks: Array<{
+        id: number
+        full_name: string
+        html_url: string
+        owner: { login: string }
+        stargazers_count: number
+        forks_count: number
+        created_at: string
+        updated_at: string
+        default_branch: string
+      }>
+      count: number
+    }
+  }
+}
+
+export const listForksTool: ToolConfig<ListForksParams, ListForksResponse> = {
+  id: 'github_list_forks',
+  name: 'GitHub List Forks',
+  description: 'List forks of a repository',
+  version: '1.0.0',
+
+  params: {
+    owner: {
+      type: 'string',
+      required: true,
+      visibility: 'user-or-llm',
+      description: 'Repository owner',
+    },
+    repo: {
+      type: 'string',
+      required: true,
+      visibility: 'user-or-llm',
+      description: 'Repository name',
+    },
+    sort: {
+      type: 'string',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Sort by: newest, oldest, stargazers, watchers (default: newest)',
+      default: 'newest',
+    },
+    per_page: {
+      type: 'number',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Results per page (max 100, default: 30)',
+      default: 30,
+    },
+    page: {
+      type: 'number',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Page number (default: 1)',
+      default: 1,
+    },
+    apiKey: {
+      type: 'string',
+      required: true,
+      visibility: 'user-only',
+      description: 'GitHub API token',
+    },
+  },
+
+  request: {
+    url: (params) => {
+      const url = new URL(`https://api.github.com/repos/${params.owner}/${params.repo}/forks`)
+      if (params.sort) url.searchParams.append('sort', params.sort)
+      if (params.per_page) url.searchParams.append('per_page', String(params.per_page))
+      if (params.page) url.searchParams.append('page', String(params.page))
+      return url.toString()
+    },
+    method: 'GET',
+    headers: (params) => ({
+      Accept: 'application/vnd.github.v3+json',
+      Authorization: `Bearer ${params.apiKey}`,
+      'X-GitHub-Api-Version': '2022-11-28',
+    }),
+  },
+
+  transformResponse: async (response) => {
+    const data = await response.json()
+
+    const forks = data.map((f: any) => ({
+      id: f.id,
+      full_name: f.full_name,
+      html_url: f.html_url,
+      owner: { login: f.owner?.login ?? 'unknown' },
+      stargazers_count: f.stargazers_count,
+      forks_count: f.forks_count,
+      created_at: f.created_at,
+      updated_at: f.updated_at,
+      default_branch: f.default_branch,
+    }))
+
+    const content = `Found ${forks.length} fork(s):
+${forks
+  .map(
+    (f: any) =>
+      `${f.full_name} ⭐ ${f.stargazers_count}
+  Owner: ${f.owner.login}
+  ${f.html_url}`
+  )
+  .join('\n\n')}`
+
+    return {
+      success: true,
+      output: {
+        content,
+        metadata: {
+          forks,
+          count: forks.length,
+        },
+      },
+    }
+  },
+
+  outputs: {
+    content: { type: 'string', description: 'Human-readable fork list' },
+    metadata: {
+      type: 'object',
+      description: 'Forks metadata',
+      properties: {
+        forks: {
+          type: 'array',
+          description: 'Array of forks',
+          items: {
+            type: 'object',
+            properties: {
+              id: { type: 'number', description: 'Repository ID' },
+              full_name: { type: 'string', description: 'Full name' },
+              html_url: { type: 'string', description: 'Web URL' },
+              owner: { type: 'object', description: 'Owner info' },
+              stargazers_count: { type: 'number', description: 'Star count' },
+              forks_count: { type: 'number', description: 'Fork count' },
+              created_at: { type: 'string', description: 'Creation date' },
+              updated_at: { type: 'string', description: 'Update date' },
+              default_branch: { type: 'string', description: 'Default branch' },
+            },
+          },
+        },
+        count: { type: 'number', description: 'Number of forks returned' },
+      },
+    },
+  },
+}
+
+export const listForksV2Tool: ToolConfig<ListForksParams, any> = {
+  id: 'github_list_forks_v2',
+  name: listForksTool.name,
+  description: listForksTool.description,
+  version: '2.0.0',
+  params: listForksTool.params,
+  request: listForksTool.request,
+
+  transformResponse: async (response: Response) => {
+    const data = await response.json()
+    return {
+      success: true,
+      output: {
+        items: data,
+        count: data.length,
+      },
+    }
+  },
+
+  outputs: {
+    items: {
+      type: 'array',
+      description: 'Array of fork repository objects from GitHub API',
+      items: {
+        type: 'object',
+        properties: {
+          id: { type: 'number', description: 'Repository ID' },
+          node_id: { type: 'string', description: 'GraphQL node ID' },
+          name: { type: 'string', description: 'Repository name' },
+          full_name: { type: 'string', description: 'Full name (owner/repo)' },
+          private: { type: 'boolean', description: 'Whether repository is private' },
+          description: { type: 'string', description: 'Repository description', optional: true },
+          html_url: { type: 'string', description: 'GitHub web URL' },
+          url: { type: 'string', description: 'API URL' },
+          fork: { type: 'boolean', description: 'Whether this is a fork' },
+          created_at: { type: 'string', description: 'Creation timestamp' },
+          updated_at: { type: 'string', description: 'Last update timestamp' },
+          pushed_at: { type: 'string', description: 'Last push timestamp', optional: true },
+          size: { type: 'number', description: 'Repository size in KB' },
+          stargazers_count: { type: 'number', description: 'Number of stars' },
+          watchers_count: { type: 'number', description: 'Number of watchers' },
+          forks_count: { type: 'number', description: 'Number of forks' },
+          open_issues_count: { type: 'number', description: 'Number of open issues' },
+          language: { type: 'string', description: 'Primary programming language', optional: true },
+          default_branch: { type: 'string', description: 'Default branch name' },
+          visibility: { type: 'string', description: 'Repository visibility' },
+          archived: { type: 'boolean', description: 'Whether repository is archived' },
+          disabled: { type: 'boolean', description: 'Whether repository is disabled' },
+          owner: {
+            type: 'object',
+            description: 'Fork owner',
+            properties: {
+              login: { type: 'string', description: 'Username' },
+              id: { type: 'number', description: 'User ID' },
+              node_id: { type: 'string', description: 'GraphQL node ID' },
+              avatar_url: { type: 'string', description: 'Avatar image URL' },
+              url: { type: 'string', description: 'API URL' },
+              html_url: { type: 'string', description: 'Profile page URL' },
+              type: { type: 'string', description: 'User or Organization' },
+              site_admin: { type: 'boolean', description: 'GitHub staff indicator' },
+            },
+          },
+        },
+      },
+    },
+    count: { type: 'number', description: 'Number of forks returned' },
+  },
+}
diff --git a/apps/sim/tools/github/list_gists.ts b/apps/sim/tools/github/list_gists.ts
new file mode 100644
index 0000000000..50d16db40b
--- /dev/null
+++ b/apps/sim/tools/github/list_gists.ts
@@ -0,0 +1,230 @@
+import type { ToolConfig } from '@/tools/types'
+
+interface ListGistsParams {
+  username?: string
+  since?: string
+  per_page?: number
+  page?: number
+  apiKey: string
+}
+
+interface ListGistsResponse {
+  success: boolean
+  output: {
+    content: string
+    metadata: {
+      gists: Array<{
+        id: string
+        html_url: string
+        description: string | null
+        public: boolean
+        created_at: string
+        updated_at: string
+        files: string[]
+        owner: { login: string }
+        comments: number
+      }>
+      count: number
+    }
+  }
+}
+
+export const listGistsTool: ToolConfig<ListGistsParams, ListGistsResponse> = {
+  id: 'github_list_gists',
+  name: 'GitHub List Gists',
+  description: 'List gists for a user or the authenticated user',
+  version: '1.0.0',
+
+  params: {
+    username: {
+      type: 'string',
+      required: false,
+      visibility: 'user-or-llm',
+      description: "GitHub username (omit for authenticated user's gists)",
+    },
+    since: {
+      type: 'string',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Only gists updated after this time (ISO 8601)',
+    },
+    per_page: {
+      type: 'number',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Results per page (max 100, default: 30)',
+      default: 30,
+    },
+    page: {
+      type: 'number',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Page number (default: 1)',
+      default: 1,
+    },
+    apiKey: {
+      type: 'string',
+      required: true,
+      visibility: 'user-only',
+      description: 'GitHub API token',
+    },
+  },
+
+  request: {
+    url: (params) => {
+      const baseUrl = params.username
+        ? `https://api.github.com/users/${params.username}/gists`
+        : 'https://api.github.com/gists'
+      const url = new URL(baseUrl)
+      if (params.since) url.searchParams.append('since', params.since)
+      if (params.per_page) url.searchParams.append('per_page', String(params.per_page))
+      if (params.page) url.searchParams.append('page', String(params.page))
+      return url.toString()
+    },
+    method: 'GET',
+    headers: (params) => ({
+      Accept: 'application/vnd.github.v3+json',
+      Authorization: `Bearer ${params.apiKey}`,
+      'X-GitHub-Api-Version': '2022-11-28',
+    }),
+  },
+
+  transformResponse: async (response) => {
+    const data = await response.json()
+
+    const gists = data.map((g: any) => ({
+      id: g.id,
+      html_url: g.html_url,
+      description: g.description ?? null,
+      public: g.public,
+      created_at: g.created_at,
+      updated_at: g.updated_at,
+      files: Object.keys(g.files ?? {}),
+      owner: { login: g.owner?.login ?? 'unknown' },
+      comments: g.comments ?? 0,
+    }))
+
+    const content = `Found ${gists.length} gist(s):
+${gists
+  .map(
+    (g: any) =>
+      `${g.id} - ${g.description ?? 'No description'} (${g.public ? 'public' : 'secret'})
+  Files: ${g.files.join(', ')}
+  ${g.html_url}`
+  )
+  .join('\n\n')}`
+
+    return {
+      success: true,
+      output: {
+        content,
+        metadata: {
+          gists,
+          count: gists.length,
+        },
+      },
+    }
+  },
+
+  outputs: {
+    content: { type: 'string', description: 'Human-readable gist list' },
+    metadata: {
+      type: 'object',
+      description: 'Gists metadata',
+      properties: {
+        gists: {
+          type: 'array',
+          description: 'Array of gists',
+          items: {
+            type: 'object',
+            properties: {
+              id: { type: 'string', description: 'Gist ID' },
+              html_url: { type: 'string', description: 'Web URL' },
+              description: { type: 'string', description: 'Description', optional: true },
+              public: { type: 'boolean', description: 'Is public' },
+              created_at: { type: 'string', description: 'Creation date' },
+              updated_at: { type: 'string', description: 'Update date' },
+              files: { type: 'array', description: 'File names' },
+              owner: { type: 'object', description: 'Owner info' },
+              comments: { type: 'number', description: 'Comment count' },
+            },
+          },
+        },
+        count: { type: 'number', description: 'Number of gists returned' },
+      },
+    },
+  },
+}
+
+export const listGistsV2Tool: ToolConfig<ListGistsParams, any> = {
+  id: 'github_list_gists_v2',
+  name: listGistsTool.name,
+  description: listGistsTool.description,
+  version: '2.0.0',
+  params: listGistsTool.params,
+  request: listGistsTool.request,
+
+  transformResponse: async (response: Response) => {
+    const data = await response.json()
+    return {
+      success: true,
+      output: {
+        items: data.map((g: any) => ({
+          ...g,
+          description: g.description ?? null,
+          files: g.files ?? {},
+          comments: g.comments ?? 0,
+        })),
+        count: data.length,
+      },
+    }
+  },
+
+  outputs: {
+    items: {
+      type: 'array',
+      description: 'Array of gist objects from GitHub API',
+      items: {
+        type: 'object',
+        properties: {
+          id: { type: 'string', description: 'Gist ID' },
+          node_id: { type: 'string', description: 'GraphQL node ID' },
+          url: { type: 'string', description: 'API URL' },
+          html_url: { type: 'string', description: 'Web URL' },
+          forks_url: { type: 'string', description: 'Forks API URL' },
+          commits_url: { type: 'string', description: 'Commits API URL' },
+          git_pull_url: { type: 'string', description: 'Git pull URL' },
+          git_push_url: { type: 'string', description: 'Git push URL' },
+          description: { type: 'string', description: 'Gist description', optional: true },
+          public: { type: 'boolean', description: 'Whether gist is public' },
+          truncated: { type: 'boolean', description: 'Whether files are truncated' },
+          comments: { type: 'number', description: 'Number of comments' },
+          comments_url: { type: 'string', description: 'Comments API URL' },
+          created_at: { type: 'string', description: 'Creation timestamp' },
+          updated_at: { type: 'string', description: 'Last update timestamp' },
+          files: {
+            type: 'object',
+            description:
+              'Files in the gist (object with filenames as keys, each containing filename, type, language, raw_url, size)',
+          },
+          owner: {
+            type: 'object',
+            description: 'Gist owner',
+            optional: true,
+            properties: {
+              login: { type: 'string', description: 'Username' },
+              id: { type: 'number', description: 'User ID' },
+              node_id: { type: 'string', description: 'GraphQL node ID' },
+              avatar_url: { type: 'string', description: 'Avatar image URL' },
+              url: { type: 'string', description: 'API URL' },
+              html_url: { type: 'string', description: 'Profile page URL' },
+              type: { type: 'string', description: 'User or Organization' },
+              site_admin: { type: 'boolean', description: 'GitHub staff indicator' },
+            },
+          },
+        },
+      },
+    },
+    count: { type: 'number', description: 'Number of gists returned' },
+  },
+}
diff --git a/apps/sim/tools/github/list_milestones.ts b/apps/sim/tools/github/list_milestones.ts
new file mode 100644
index 0000000000..2e49c663b1
--- /dev/null
+++ b/apps/sim/tools/github/list_milestones.ts
@@ -0,0 +1,250 @@
+import type { ToolConfig } from '@/tools/types'
+
+interface ListMilestonesParams {
+  owner: string
+  repo: string
+  state?: 'open' | 'closed' | 'all'
+  sort?: 'due_on' | 'completeness'
+  direction?: 'asc' | 'desc'
+  per_page?: number
+  page?: number
+  apiKey: string
+}
+
+interface ListMilestonesResponse {
+  success: boolean
+  output: {
+    content: string
+    metadata: {
+      milestones: Array<{
+        number: number
+        title: string
+        description: string | null
+        state: string
+        html_url: string
+        due_on: string | null
+        open_issues: number
+        closed_issues: number
+      }>
+      count: number
+    }
+  }
+}
+
+export const listMilestonesTool: ToolConfig<ListMilestonesParams, ListMilestonesResponse> = {
+  id: 'github_list_milestones',
+  name: 'GitHub List Milestones',
+  description: 'List milestones in a repository',
+  version: '1.0.0',
+
+  params: {
+    owner: {
+      type: 'string',
+      required: true,
+      visibility: 'user-or-llm',
+      description: 'Repository owner',
+    },
+    repo: {
+      type: 'string',
+      required: true,
+      visibility: 'user-or-llm',
+      description: 'Repository name',
+    },
+    state: {
+      type: 'string',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Filter by state: open, closed, all (default: open)',
+      default: 'open',
+    },
+    sort: {
+      type: 'string',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Sort by: due_on or completeness (default: due_on)',
+      default: 'due_on',
+    },
+    direction: {
+      type: 'string',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Sort direction: asc or desc (default: asc)',
+      default: 'asc',
+    },
+    per_page: {
+      type: 'number',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Results per page (max 100, default: 30)',
+      default: 30,
+    },
+    page: {
+      type: 'number',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Page number (default: 1)',
+      default: 1,
+    },
+    apiKey: {
+      type: 'string',
+      required: true,
+      visibility: 'user-only',
+      description: 'GitHub API token',
+    },
+  },
+
+  request: {
+    url: (params) => {
+      const url = new URL(`https://api.github.com/repos/${params.owner}/${params.repo}/milestones`)
+      if (params.state) url.searchParams.append('state', params.state)
+      if (params.sort) url.searchParams.append('sort', params.sort)
+      if (params.direction) url.searchParams.append('direction', params.direction)
+      if (params.per_page) url.searchParams.append('per_page', String(params.per_page))
+      if (params.page) url.searchParams.append('page', String(params.page))
+      return url.toString()
+    },
+    method: 'GET',
+    headers: (params) => ({
+      Accept: 'application/vnd.github.v3+json',
+      Authorization: `Bearer ${params.apiKey}`,
+      'X-GitHub-Api-Version': '2022-11-28',
+    }),
+  },
+
+  transformResponse: async (response) => {
+    const data = await response.json()
+
+    const milestones = data.map((m: any) => {
+      const total = m.open_issues + m.closed_issues
+      const progress = total > 0 ? Math.round((m.closed_issues / total) * 100) : 0
+      return {
+        number: m.number,
+        title: m.title,
+        description: m.description ?? null,
+        state: m.state,
+        html_url: m.html_url,
+        due_on: m.due_on ?? null,
+        open_issues: m.open_issues,
+        closed_issues: m.closed_issues,
+        progress,
+      }
+    })
+
+    const content = `Found ${milestones.length} milestone(s):
+${milestones
+  .map(
+    (m: any) =>
+      `#${m.number}: ${m.title} (${m.state})
+  Progress: ${m.progress}% (${m.closed_issues}/${m.open_issues + m.closed_issues} issues)
+  Due: ${m.due_on ?? 'No due date'}
+  ${m.html_url}`
+  )
+  .join('\n\n')}`
+
+    return {
+      success: true,
+      output: {
+        content,
+        metadata: {
+          milestones,
+          count: milestones.length,
+        },
+      },
+    }
+  },
+
+  outputs: {
+    content: { type: 'string', description: 'Human-readable milestone list' },
+    metadata: {
+      type: 'object',
+      description: 'Milestones metadata',
+      properties: {
+        milestones: {
+          type: 'array',
+          description: 'Array of milestones',
+          items: {
+            type: 'object',
+            properties: {
+              number: { type: 'number', description: 'Milestone number' },
+              title: { type: 'string', description: 'Title' },
+              description: { type: 'string', description: 'Description', optional: true },
+              state: { type: 'string', description: 'State' },
+              html_url: { type: 'string', description: 'Web URL' },
+              due_on: { type: 'string', description: 'Due date', optional: true },
+              open_issues: { type: 'number', description: 'Open issues' },
+              closed_issues: { type: 'number', description: 'Closed issues' },
+            },
+          },
+        },
+        count: { type: 'number', description: 'Number of milestones returned' },
+      },
+    },
+  },
+}
+
+export const listMilestonesV2Tool: ToolConfig<ListMilestonesParams, any> = {
+  id: 'github_list_milestones_v2',
+  name: listMilestonesTool.name,
+  description: listMilestonesTool.description,
+  version: '2.0.0',
+  params: listMilestonesTool.params,
+  request: listMilestonesTool.request,
+
+  transformResponse: async (response: Response) => {
+    const data = await response.json()
+    return {
+      success: true,
+      output: {
+        items: data.map((m: any) => ({
+          ...m,
+          description: m.description ?? null,
+          due_on: m.due_on ?? null,
+        })),
+        count: data.length,
+      },
+    }
+  },
+
+  outputs: {
+    items: {
+      type: 'array',
+      description: 'Array of milestone objects from GitHub API',
+      items: {
+        type: 'object',
+        properties: {
+          id: { type: 'number', description: 'Milestone ID' },
+          node_id: { type: 'string', description: 'GraphQL node ID' },
+          number: { type: 'number', description: 'Milestone number' },
+          title: { type: 'string', description: 'Milestone title' },
+          description: { type: 'string', description: 'Milestone description', optional: true },
+          state: { type: 'string', description: 'State (open or closed)' },
+          url: { type: 'string', description: 'API URL' },
+          html_url: { type: 'string', description: 'GitHub web URL' },
+          labels_url: { type: 'string', description: 'Labels API URL' },
+          due_on: { type: 'string', description: 'Due date (ISO 8601)', optional: true },
+          open_issues: { type: 'number', description: 'Number of open issues' },
+          closed_issues: { type: 'number', description: 'Number of closed issues' },
+          created_at: { type: 'string', description: 'Creation timestamp' },
+          updated_at: { type: 'string', description: 'Last update timestamp' },
+          closed_at: { type: 'string', description: 'Close timestamp', optional: true },
+          creator: {
+            type: 'object',
+            description: 'Milestone creator',
+            optional: true,
+            properties: {
+              login: { type: 'string', description: 'Username' },
+              id: { type: 'number', description: 'User ID' },
+              node_id: { type: 'string', description: 'GraphQL node ID' },
+              avatar_url: { type: 'string', description: 'Avatar image URL' },
+              url: { type: 'string', description: 'API URL' },
+              html_url: { type: 'string', description: 'Profile page URL' },
+              type: { type: 'string', description: 'User or Organization' },
+              site_admin: { type: 'boolean', description: 'GitHub staff indicator' },
+            },
+          },
+        },
+      },
+    },
+    count: { type: 'number', description: 'Number of milestones returned' },
+  },
+}
diff --git a/apps/sim/tools/github/list_stargazers.ts b/apps/sim/tools/github/list_stargazers.ts
new file mode 100644
index 0000000000..dc2ff5f1d5
--- /dev/null
+++ b/apps/sim/tools/github/list_stargazers.ts
@@ -0,0 +1,181 @@
+import type { ToolConfig } from '@/tools/types'
+
+interface ListStargazersParams {
+  owner: string
+  repo: string
+  per_page?: number
+  page?: number
+  apiKey: string
+}
+
+interface ListStargazersResponse {
+  success: boolean
+  output: {
+    content: string
+    metadata: {
+      stargazers: Array<{
+        login: string
+        id: number
+        avatar_url: string
+        html_url: string
+        type: string
+      }>
+      count: number
+    }
+  }
+}
+
+export const listStargazersTool: ToolConfig<ListStargazersParams, ListStargazersResponse> = {
+  id: 'github_list_stargazers',
+  name: 'GitHub List Stargazers',
+  description: 'List users who have starred a repository',
+  version: '1.0.0',
+
+  params: {
+    owner: {
+      type: 'string',
+      required: true,
+      visibility: 'user-or-llm',
+      description: 'Repository owner',
+    },
+    repo: {
+      type: 'string',
+      required: true,
+      visibility: 'user-or-llm',
+      description: 'Repository name',
+    },
+    per_page: {
+      type: 'number',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Results per page (max 100, default: 30)',
+      default: 30,
+    },
+    page: {
+      type: 'number',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Page number (default: 1)',
+      default: 1,
+    },
+    apiKey: {
+      type: 'string',
+      required: true,
+      visibility: 'user-only',
+      description: 'GitHub API token',
+    },
+  },
+
+  request: {
+    url: (params) => {
+      const url = new URL(`https://api.github.com/repos/${params.owner}/${params.repo}/stargazers`)
+      if (params.per_page) url.searchParams.append('per_page', String(params.per_page))
+      if (params.page) url.searchParams.append('page', String(params.page))
+      return url.toString()
+    },
+    method: 'GET',
+    headers: (params) => ({
+      Accept: 'application/vnd.github.v3+json',
+      Authorization: `Bearer ${params.apiKey}`,
+      'X-GitHub-Api-Version': '2022-11-28',
+    }),
+  },
+
+  transformResponse: async (response) => {
+    const data = await response.json()
+
+    const stargazers = data.map((u: any) => ({
+      login: u.login,
+      id: u.id,
+      avatar_url: u.avatar_url,
+      html_url: u.html_url,
+      type: u.type,
+    }))
+
+    const content = `Found ${stargazers.length} stargazer(s):
+${stargazers.map((u: any) => `@${u.login} (${u.type}) - ${u.html_url}`).join('\n')}`
+
+    return {
+      success: true,
+      output: {
+        content,
+        metadata: {
+          stargazers,
+          count: stargazers.length,
+        },
+      },
+    }
+  },
+
+  outputs: {
+    content: { type: 'string', description: 'Human-readable stargazer list' },
+    metadata: {
+      type: 'object',
+      description: 'Stargazers metadata',
+      properties: {
+        stargazers: {
+          type: 'array',
+          description: 'Array of stargazers',
+          items: {
+            type: 'object',
+            properties: {
+              login: { type: 'string', description: 'Username' },
+              id: { type: 'number', description: 'User ID' },
+              avatar_url: { type: 'string', description: 'Avatar URL' },
+              html_url: { type: 'string', description: 'Profile URL' },
+              type: { type: 'string', description: 'User or Organization' },
+            },
+          },
+        },
+        count: { type: 'number', description: 'Number of stargazers returned' },
+      },
+    },
+  },
+}
+
+export const listStargazersV2Tool: ToolConfig<ListStargazersParams, any> = {
+  id: 'github_list_stargazers_v2',
+  name: listStargazersTool.name,
+  description: listStargazersTool.description,
+  version: '2.0.0',
+  params: listStargazersTool.params,
+  request: listStargazersTool.request,
+
+  transformResponse: async (response: Response) => {
+    const data = await response.json()
+    return {
+      success: true,
+      output: {
+        items: data,
+        count: data.length,
+      },
+    }
+  },
+
+  outputs: {
+    items: {
+      type: 'array',
+      description: 'Array of user objects from GitHub API',
+      items: {
+        type: 'object',
+        properties: {
+          login: { type: 'string', description: 'Username' },
+          id: { type: 'number', description: 'User ID' },
+          node_id: { type: 'string', description: 'GraphQL node ID' },
+          avatar_url: { type: 'string', description: 'Avatar image URL' },
+          gravatar_id: { type: 'string', description: 'Gravatar ID' },
+          url: { type: 'string', description: 'API URL' },
+          html_url: { type: 'string', description: 'Profile page URL' },
+          followers_url: { type: 'string', description: 'Followers API URL' },
+          following_url: { type: 'string', description: 'Following API URL' },
+          gists_url: { type: 'string', description: 'Gists API URL' },
+          starred_url: { type: 'string', description: 'Starred API URL' },
+          repos_url: { type: 'string', description: 'Repos API URL' },
+          type: { type: 'string', description: 'User or Organization' },
+          site_admin: { type: 'boolean', description: 'GitHub staff indicator' },
+        },
+      },
+    },
+    count: { type: 'number', description: 'Number of stargazers returned' },
+  },
+}
diff --git a/apps/sim/tools/github/search_code.ts b/apps/sim/tools/github/search_code.ts
new file mode 100644
index 0000000000..f74594067b
--- /dev/null
+++ b/apps/sim/tools/github/search_code.ts
@@ -0,0 +1,270 @@
+import type { ToolConfig } from '@/tools/types'
+
+interface SearchCodeParams {
+  q: string
+  sort?: 'indexed'
+  order?: 'asc' | 'desc'
+  per_page?: number
+  page?: number
+  apiKey: string
+}
+
+interface SearchCodeResponse {
+  success: boolean
+  output: {
+    content: string
+    metadata: {
+      total_count: number
+      incomplete_results: boolean
+      items: Array<{
+        name: string
+        path: string
+        sha: string
+        html_url: string
+        repository: {
+          full_name: string
+          html_url: string
+        }
+      }>
+    }
+  }
+}
+
+export const searchCodeTool: ToolConfig<SearchCodeParams, SearchCodeResponse> = {
+  id: 'github_search_code',
+  name: 'GitHub Search Code',
+  description:
+    'Search for code across GitHub repositories. Use qualifiers like repo:owner/name, language:js, path:src, extension:py',
+  version: '1.0.0',
+
+  params: {
+    q: {
+      type: 'string',
+      required: true,
+      visibility: 'user-or-llm',
+      description:
+        'Search query with optional qualifiers (repo:, language:, path:, extension:, user:, org:)',
+    },
+    sort: {
+      type: 'string',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Sort by indexed date (default: best match)',
+    },
+    order: {
+      type: 'string',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Sort order: asc or desc (default: desc)',
+    },
+    per_page: {
+      type: 'number',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Results per page (max 100, default: 30)',
+      default: 30,
+    },
+    page: {
+      type: 'number',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Page number (default: 1)',
+      default: 1,
+    },
+    apiKey: {
+      type: 'string',
+      required: true,
+      visibility: 'user-only',
+      description: 'GitHub API token',
+    },
+  },
+
+  request: {
+    url: (params) => {
+      const url = new URL('https://api.github.com/search/code')
+      url.searchParams.append('q', params.q)
+      if (params.sort) url.searchParams.append('sort', params.sort)
+      if (params.order) url.searchParams.append('order', params.order)
+      if (params.per_page) url.searchParams.append('per_page', String(params.per_page))
+      if (params.page) url.searchParams.append('page', String(params.page))
+      return url.toString()
+    },
+    method: 'GET',
+    headers: (params) => ({
+      Accept: 'application/vnd.github.v3+json',
+      Authorization: `Bearer ${params.apiKey}`,
+      'X-GitHub-Api-Version': '2022-11-28',
+    }),
+  },
+
+  transformResponse: async (response) => {
+    const data = await response.json()
+
+    const items = data.items.map((item: any) => ({
+      name: item.name,
+      path: item.path,
+      sha: item.sha,
+      html_url: item.html_url,
+      repository: {
+        full_name: item.repository.full_name,
+        html_url: item.repository.html_url,
+      },
+    }))
+
+    const content = `Found ${data.total_count} code result(s)${data.incomplete_results ? ' (incomplete)' : ''}:
+${items
+  .map(
+    (item: any) =>
+      `- ${item.repository.full_name}/${item.path}
+  ${item.html_url}`
+  )
+  .join('\n')}`
+
+    return {
+      success: true,
+      output: {
+        content,
+        metadata: {
+          total_count: data.total_count,
+          incomplete_results: data.incomplete_results,
+          items,
+        },
+      },
+    }
+  },
+
+  outputs: {
+    content: { type: 'string', description: 'Human-readable search results' },
+    metadata: {
+      type: 'object',
+      description: 'Search results metadata',
+      properties: {
+        total_count: { type: 'number', description: 'Total matching results' },
+        incomplete_results: { type: 'boolean', description: 'Whether results are incomplete' },
+        items: {
+          type: 'array',
+          description: 'Array of code matches',
+          items: {
+            type: 'object',
+            properties: {
+              name: { type: 'string', description: 'File name' },
+              path: { type: 'string', description: 'File path' },
+              sha: { type: 'string', description: 'Blob SHA' },
+              html_url: { type: 'string', description: 'GitHub web URL' },
+              repository: {
+                type: 'object',
+                description: 'Repository info',
+                properties: {
+                  full_name: { type: 'string', description: 'Repository full name' },
+                  html_url: { type: 'string', description: 'Repository URL' },
+                },
+              },
+            },
+          },
+        },
+      },
+    },
+  },
+}
+
+export const searchCodeV2Tool: ToolConfig<SearchCodeParams, any> = {
+  id: 'github_search_code_v2',
+  name: searchCodeTool.name,
+  description: searchCodeTool.description,
+  version: '2.0.0',
+  params: searchCodeTool.params,
+  request: searchCodeTool.request,
+
+  transformResponse: async (response: Response) => {
+    const data = await response.json()
+    return {
+      success: true,
+      output: {
+        total_count: data.total_count,
+        incomplete_results: data.incomplete_results,
+        items: data.items.map((item: any) => ({
+          ...item,
+          text_matches: item.text_matches ?? [],
+        })),
+      },
+    }
+  },
+
+  outputs: {
+    total_count: { type: 'number', description: 'Total matching results' },
+    incomplete_results: { type: 'boolean', description: 'Whether results are incomplete' },
+    items: {
+      type: 'array',
+      description: 'Array of code matches from GitHub API',
+      items: {
+        type: 'object',
+        properties: {
+          name: { type: 'string', description: 'File name' },
+          path: { type: 'string', description: 'File path' },
+          sha: { type: 'string', description: 'Blob SHA' },
+          url: { type: 'string', description: 'API URL' },
+          git_url: { type: 'string', description: 'Git blob URL' },
+          html_url: { type: 'string', description: 'GitHub web URL' },
+          score: { type: 'number', description: 'Search relevance score' },
+          repository: {
+            type: 'object',
+            description: 'Repository containing the code',
+            properties: {
+              id: { type: 'number', description: 'Repository ID' },
+              node_id: { type: 'string', description: 'GraphQL node ID' },
+              name: { type: 'string', description: 'Repository name' },
+              full_name: { type: 'string', description: 'Full name (owner/repo)' },
+              private: { type: 'boolean', description: 'Whether repository is private' },
+              html_url: { type: 'string', description: 'GitHub web URL' },
+              description: {
+                type: 'string',
+                description: 'Repository description',
+                optional: true,
+              },
+              fork: { type: 'boolean', description: 'Whether this is a fork' },
+              url: { type: 'string', description: 'API URL' },
+              owner: {
+                type: 'object',
+                description: 'Repository owner',
+                properties: {
+                  login: { type: 'string', description: 'Username' },
+                  id: { type: 'number', description: 'User ID' },
+                  node_id: { type: 'string', description: 'GraphQL node ID' },
+                  avatar_url: { type: 'string', description: 'Avatar image URL' },
+                  url: { type: 'string', description: 'API URL' },
+                  html_url: { type: 'string', description: 'Profile page URL' },
+                  type: { type: 'string', description: 'User or Organization' },
+                  site_admin: { type: 'boolean', description: 'GitHub staff indicator' },
+                },
+              },
+            },
+          },
+          text_matches: {
+            type: 'array',
+            description: 'Text matches showing context',
+            items: {
+              type: 'object',
+              properties: {
+                object_url: { type: 'string', description: 'Object URL' },
+                object_type: { type: 'string', description: 'Object type', optional: true },
+                property: { type: 'string', description: 'Property matched' },
+                fragment: { type: 'string', description: 'Text fragment with match' },
+                matches: {
+                  type: 'array',
+                  description: 'Match indices',
+                  items: {
+                    type: 'object',
+                    properties: {
+                      text: { type: 'string', description: 'Matched text' },
+                      indices: { type: 'array', description: 'Start and end indices' },
+                    },
+                  },
+                },
+              },
+            },
+          },
+        },
+      },
+    },
+  },
+}
diff --git a/apps/sim/tools/github/search_commits.ts b/apps/sim/tools/github/search_commits.ts
new file mode 100644
index 0000000000..ea29484019
--- /dev/null
+++ b/apps/sim/tools/github/search_commits.ts
@@ -0,0 +1,332 @@
+import type { ToolConfig } from '@/tools/types'
+
+interface SearchCommitsParams {
+  q: string
+  sort?: 'author-date' | 'committer-date'
+  order?: 'asc' | 'desc'
+  per_page?: number
+  page?: number
+  apiKey: string
+}
+
+interface SearchCommitsResponse {
+  success: boolean
+  output: {
+    content: string
+    metadata: {
+      total_count: number
+      incomplete_results: boolean
+      items: Array<{
+        sha: string
+        html_url: string
+        commit: {
+          message: string
+          author: { name: string; email: string; date: string }
+          committer: { name: string; email: string; date: string }
+        }
+        author: { login: string } | null
+        committer: { login: string } | null
+        repository: { full_name: string; html_url: string }
+      }>
+    }
+  }
+}
+
+export const searchCommitsTool: ToolConfig<SearchCommitsParams, SearchCommitsResponse> = {
+  id: 'github_search_commits',
+  name: 'GitHub Search Commits',
+  description:
+    'Search for commits across GitHub. Use qualifiers like repo:owner/name, author:user, committer:user, author-date:>2023-01-01',
+  version: '1.0.0',
+
+  params: {
+    q: {
+      type: 'string',
+      required: true,
+      visibility: 'user-or-llm',
+      description:
+        'Search query with optional qualifiers (repo:, author:, committer:, author-date:, committer-date:, merge:true/false)',
+    },
+    sort: {
+      type: 'string',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Sort by: author-date or committer-date (default: best match)',
+    },
+    order: {
+      type: 'string',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Sort order: asc or desc (default: desc)',
+    },
+    per_page: {
+      type: 'number',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Results per page (max 100, default: 30)',
+      default: 30,
+    },
+    page: {
+      type: 'number',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Page number (default: 1)',
+      default: 1,
+    },
+    apiKey: {
+      type: 'string',
+      required: true,
+      visibility: 'user-only',
+      description: 'GitHub API token',
+    },
+  },
+
+  request: {
+    url: (params) => {
+      const url = new URL('https://api.github.com/search/commits')
+      url.searchParams.append('q', params.q)
+      if (params.sort) url.searchParams.append('sort', params.sort)
+      if (params.order) url.searchParams.append('order', params.order)
+      if (params.per_page) url.searchParams.append('per_page', String(params.per_page))
+      if (params.page) url.searchParams.append('page', String(params.page))
+      return url.toString()
+    },
+    method: 'GET',
+    headers: (params) => ({
+      Accept: 'application/vnd.github.cloak-preview+json',
+      Authorization: `Bearer ${params.apiKey}`,
+      'X-GitHub-Api-Version': '2022-11-28',
+    }),
+  },
+
+  transformResponse: async (response) => {
+    const data = await response.json()
+
+    const items = data.items.map((item: any) => ({
+      sha: item.sha,
+      html_url: item.html_url,
+      commit: {
+        message: item.commit.message,
+        author: item.commit.author,
+        committer: item.commit.committer,
+      },
+      author: item.author ? { login: item.author.login } : null,
+      committer: item.committer ? { login: item.committer.login } : null,
+      repository: {
+        full_name: item.repository.full_name,
+        html_url: item.repository.html_url,
+      },
+    }))
+
+    const content = `Found ${data.total_count} commit(s)${data.incomplete_results ? ' (incomplete)' : ''}:
+${items
+  .map(
+    (item: any) =>
+      `${item.sha.substring(0, 7)} - ${item.commit.message.split('\n')[0]}
+  Repository: ${item.repository.full_name}
+  Author: ${item.author?.login ?? item.commit.author.name} (${item.commit.author.date})
+  ${item.html_url}`
+  )
+  .join('\n\n')}`
+
+    return {
+      success: true,
+      output: {
+        content,
+        metadata: {
+          total_count: data.total_count,
+          incomplete_results: data.incomplete_results,
+          items,
+        },
+      },
+    }
+  },
+
+  outputs: {
+    content: { type: 'string', description: 'Human-readable search results' },
+    metadata: {
+      type: 'object',
+      description: 'Search results metadata',
+      properties: {
+        total_count: { type: 'number', description: 'Total matching results' },
+        incomplete_results: { type: 'boolean', description: 'Whether results are incomplete' },
+        items: {
+          type: 'array',
+          description: 'Array of commits',
+          items: {
+            type: 'object',
+            properties: {
+              sha: { type: 'string', description: 'Commit SHA' },
+              html_url: { type: 'string', description: 'GitHub web URL' },
+              commit: {
+                type: 'object',
+                description: 'Commit details',
+                properties: {
+                  message: { type: 'string', description: 'Commit message' },
+                  author: { type: 'object', description: 'Author info' },
+                  committer: { type: 'object', description: 'Committer info' },
+                },
+              },
+              author: { type: 'object', description: 'GitHub user (author)', optional: true },
+              committer: { type: 'object', description: 'GitHub user (committer)', optional: true },
+              repository: { type: 'object', description: 'Repository info' },
+            },
+          },
+        },
+      },
+    },
+  },
+}
+
+export const searchCommitsV2Tool: ToolConfig<SearchCommitsParams, any> = {
+  id: 'github_search_commits_v2',
+  name: searchCommitsTool.name,
+  description: searchCommitsTool.description,
+  version: '2.0.0',
+  params: searchCommitsTool.params,
+  request: searchCommitsTool.request,
+
+  transformResponse: async (response: Response) => {
+    const data = await response.json()
+    return {
+      success: true,
+      output: {
+        total_count: data.total_count,
+        incomplete_results: data.incomplete_results,
+        items: data.items.map((item: any) => ({
+          ...item,
+          author: item.author ?? null,
+          committer: item.committer ?? null,
+        })),
+      },
+    }
+  },
+
+  outputs: {
+    total_count: { type: 'number', description: 'Total matching results' },
+    incomplete_results: { type: 'boolean', description: 'Whether results are incomplete' },
+    items: {
+      type: 'array',
+      description: 'Array of commit objects from GitHub API',
+      items: {
+        type: 'object',
+        properties: {
+          sha: { type: 'string', description: 'Commit SHA' },
+          node_id: { type: 'string', description: 'GraphQL node ID' },
+          html_url: { type: 'string', description: 'Web URL' },
+          url: { type: 'string', description: 'API URL' },
+          comments_url: { type: 'string', description: 'Comments API URL' },
+          score: { type: 'number', description: 'Search relevance score' },
+          commit: {
+            type: 'object',
+            description: 'Core commit data',
+            properties: {
+              url: { type: 'string', description: 'Commit API URL' },
+              message: { type: 'string', description: 'Commit message' },
+              comment_count: { type: 'number', description: 'Number of comments' },
+              author: {
+                type: 'object',
+                description: 'Git author',
+                properties: {
+                  name: { type: 'string', description: 'Author name' },
+                  email: { type: 'string', description: 'Author email' },
+                  date: { type: 'string', description: 'Author date (ISO 8601)' },
+                },
+              },
+              committer: {
+                type: 'object',
+                description: 'Git committer',
+                properties: {
+                  name: { type: 'string', description: 'Committer name' },
+                  email: { type: 'string', description: 'Committer email' },
+                  date: { type: 'string', description: 'Commit date (ISO 8601)' },
+                },
+              },
+              tree: {
+                type: 'object',
+                description: 'Tree object',
+                properties: {
+                  sha: { type: 'string', description: 'Tree SHA' },
+                  url: { type: 'string', description: 'Tree API URL' },
+                },
+              },
+            },
+          },
+          author: {
+            type: 'object',
+            description: 'GitHub user (author)',
+            optional: true,
+            properties: {
+              login: { type: 'string', description: 'Username' },
+              id: { type: 'number', description: 'User ID' },
+              node_id: { type: 'string', description: 'GraphQL node ID' },
+              avatar_url: { type: 'string', description: 'Avatar URL' },
+              url: { type: 'string', description: 'API URL' },
+              html_url: { type: 'string', description: 'Profile URL' },
+              type: { type: 'string', description: 'User or Organization' },
+              site_admin: { type: 'boolean', description: 'GitHub staff indicator' },
+            },
+          },
+          committer: {
+            type: 'object',
+            description: 'GitHub user (committer)',
+            optional: true,
+            properties: {
+              login: { type: 'string', description: 'Username' },
+              id: { type: 'number', description: 'User ID' },
+              node_id: { type: 'string', description: 'GraphQL node ID' },
+              avatar_url: { type: 'string', description: 'Avatar URL' },
+              url: { type: 'string', description: 'API URL' },
+              html_url: { type: 'string', description: 'Profile URL' },
+              type: { type: 'string', description: 'User or Organization' },
+              site_admin: { type: 'boolean', description: 'GitHub staff indicator' },
+            },
+          },
+          repository: {
+            type: 'object',
+            description: 'Repository containing the commit',
+            properties: {
+              id: { type: 'number', description: 'Repository ID' },
+              node_id: { type: 'string', description: 'GraphQL node ID' },
+              name: { type: 'string', description: 'Repository name' },
+              full_name: { type: 'string', description: 'Full name (owner/repo)' },
+              private: { type: 'boolean', description: 'Whether repository is private' },
+              html_url: { type: 'string', description: 'GitHub web URL' },
+              description: {
+                type: 'string',
+                description: 'Repository description',
+                optional: true,
+              },
+              owner: {
+                type: 'object',
+                description: 'Repository owner',
+                properties: {
+                  login: { type: 'string', description: 'Username' },
+                  id: { type: 'number', description: 'User ID' },
+                  node_id: { type: 'string', description: 'GraphQL node ID' },
+                  avatar_url: { type: 'string', description: 'Avatar image URL' },
+                  url: { type: 'string', description: 'API URL' },
+                  html_url: { type: 'string', description: 'Profile page URL' },
+                  type: { type: 'string', description: 'User or Organization' },
+                  site_admin: { type: 'boolean', description: 'GitHub staff indicator' },
+                },
+              },
+            },
+          },
+          parents: {
+            type: 'array',
+            description: 'Parent commits',
+            items: {
+              type: 'object',
+              properties: {
+                sha: { type: 'string', description: 'Parent SHA' },
+                url: { type: 'string', description: 'Parent API URL' },
+                html_url: { type: 'string', description: 'Parent web URL' },
+              },
+            },
+          },
+        },
+      },
+    },
+  },
+}
diff --git a/apps/sim/tools/github/search_issues.ts b/apps/sim/tools/github/search_issues.ts
new file mode 100644
index 0000000000..19f716f035
--- /dev/null
+++ b/apps/sim/tools/github/search_issues.ts
@@ -0,0 +1,333 @@
+import type { ToolConfig } from '@/tools/types'
+
+interface SearchIssuesParams {
+  q: string
+  sort?:
+    | 'comments'
+    | 'reactions'
+    | 'reactions-+1'
+    | 'reactions--1'
+    | 'reactions-smile'
+    | 'reactions-thinking_face'
+    | 'reactions-heart'
+    | 'reactions-tada'
+    | 'interactions'
+    | 'created'
+    | 'updated'
+  order?: 'asc' | 'desc'
+  per_page?: number
+  page?: number
+  apiKey: string
+}
+
+interface SearchIssuesResponse {
+  success: boolean
+  output: {
+    content: string
+    metadata: {
+      total_count: number
+      incomplete_results: boolean
+      items: Array<{
+        number: number
+        title: string
+        state: string
+        html_url: string
+        user: { login: string }
+        labels: string[]
+        created_at: string
+        updated_at: string
+        comments: number
+        is_pull_request: boolean
+        repository_url: string
+      }>
+    }
+  }
+}
+
+export const searchIssuesTool: ToolConfig<SearchIssuesParams, SearchIssuesResponse> = {
+  id: 'github_search_issues',
+  name: 'GitHub Search Issues',
+  description:
+    'Search for issues and pull requests across GitHub. Use qualifiers like repo:owner/name, is:issue, is:pr, state:open, label:bug, author:user',
+  version: '1.0.0',
+
+  params: {
+    q: {
+      type: 'string',
+      required: true,
+      visibility: 'user-or-llm',
+      description:
+        'Search query with optional qualifiers (repo:, is:issue, is:pr, state:, label:, author:, assignee:)',
+    },
+    sort: {
+      type: 'string',
+      required: false,
+      visibility: 'user-or-llm',
+      description:
+        'Sort by: comments, reactions, created, updated, interactions (default: best match)',
+    },
+    order: {
+      type: 'string',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Sort order: asc or desc (default: desc)',
+    },
+    per_page: {
+      type: 'number',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Results per page (max 100, default: 30)',
+      default: 30,
+    },
+    page: {
+      type: 'number',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Page number (default: 1)',
+      default: 1,
+    },
+    apiKey: {
+      type: 'string',
+      required: true,
+      visibility: 'user-only',
+      description: 'GitHub API token',
+    },
+  },
+
+  request: {
+    url: (params) => {
+      const url = new URL('https://api.github.com/search/issues')
+      url.searchParams.append('q', params.q)
+      if (params.sort) url.searchParams.append('sort', params.sort)
+      if (params.order) url.searchParams.append('order', params.order)
+      if (params.per_page) url.searchParams.append('per_page', String(params.per_page))
+      if (params.page) url.searchParams.append('page', String(params.page))
+      return url.toString()
+    },
+    method: 'GET',
+    headers: (params) => ({
+      Accept: 'application/vnd.github.v3+json',
+      Authorization: `Bearer ${params.apiKey}`,
+      'X-GitHub-Api-Version': '2022-11-28',
+    }),
+  },
+
+  transformResponse: async (response) => {
+    const data = await response.json()
+
+    const items = data.items.map((item: any) => ({
+      number: item.number,
+      title: item.title,
+      state: item.state,
+      html_url: item.html_url,
+      user: { login: item.user?.login ?? 'unknown' },
+      labels: item.labels?.map((l: any) => l.name) ?? [],
+      created_at: item.created_at,
+      updated_at: item.updated_at,
+      comments: item.comments ?? 0,
+      is_pull_request: !!item.pull_request,
+      repository_url: item.repository_url,
+    }))
+
+    const content = `Found ${data.total_count} result(s)${data.incomplete_results ? ' (incomplete)' : ''}:
+${items
+  .map(
+    (item: any) =>
+      `#${item.number}: "${item.title}" (${item.state}) [${item.is_pull_request ? 'PR' : 'Issue'}]
+  ${item.html_url}
+  Labels: ${item.labels.length > 0 ? item.labels.join(', ') : 'none'} | Comments: ${item.comments}`
+  )
+  .join('\n\n')}`
+
+    return {
+      success: true,
+      output: {
+        content,
+        metadata: {
+          total_count: data.total_count,
+          incomplete_results: data.incomplete_results,
+          items,
+        },
+      },
+    }
+  },
+
+  outputs: {
+    content: { type: 'string', description: 'Human-readable search results' },
+    metadata: {
+      type: 'object',
+      description: 'Search results metadata',
+      properties: {
+        total_count: { type: 'number', description: 'Total matching results' },
+        incomplete_results: { type: 'boolean', description: 'Whether results are incomplete' },
+        items: {
+          type: 'array',
+          description: 'Array of issues/PRs',
+          items: {
+            type: 'object',
+            properties: {
+              number: { type: 'number', description: 'Issue/PR number' },
+              title: { type: 'string', description: 'Title' },
+              state: { type: 'string', description: 'State (open/closed)' },
+              html_url: { type: 'string', description: 'GitHub web URL' },
+              user: { type: 'object', description: 'Author info' },
+              labels: { type: 'array', description: 'Label names' },
+              created_at: { type: 'string', description: 'Creation date' },
+              updated_at: { type: 'string', description: 'Last update date' },
+              comments: { type: 'number', description: 'Comment count' },
+              is_pull_request: { type: 'boolean', description: 'Whether this is a PR' },
+              repository_url: { type: 'string', description: 'Repository API URL' },
+            },
+          },
+        },
+      },
+    },
+  },
+}
+
+export const searchIssuesV2Tool: ToolConfig<SearchIssuesParams, any> = {
+  id: 'github_search_issues_v2',
+  name: searchIssuesTool.name,
+  description: searchIssuesTool.description,
+  version: '2.0.0',
+  params: searchIssuesTool.params,
+  request: searchIssuesTool.request,
+
+  transformResponse: async (response: Response) => {
+    const data = await response.json()
+    return {
+      success: true,
+      output: {
+        total_count: data.total_count,
+        incomplete_results: data.incomplete_results,
+        items: data.items.map((item: any) => ({
+          ...item,
+          body: item.body ?? null,
+          closed_at: item.closed_at ?? null,
+          milestone: item.milestone ?? null,
+          labels: item.labels ?? [],
+          assignees: item.assignees ?? [],
+        })),
+      },
+    }
+  },
+
+  outputs: {
+    total_count: { type: 'number', description: 'Total matching results' },
+    incomplete_results: { type: 'boolean', description: 'Whether results are incomplete' },
+    items: {
+      type: 'array',
+      description: 'Array of issue/PR objects from GitHub API',
+      items: {
+        type: 'object',
+        properties: {
+          id: { type: 'number', description: 'Issue ID' },
+          node_id: { type: 'string', description: 'GraphQL node ID' },
+          number: { type: 'number', description: 'Issue number' },
+          title: { type: 'string', description: 'Title' },
+          state: { type: 'string', description: 'State (open or closed)' },
+          locked: { type: 'boolean', description: 'Whether issue is locked' },
+          html_url: { type: 'string', description: 'Web URL' },
+          url: { type: 'string', description: 'API URL' },
+          repository_url: { type: 'string', description: 'Repository API URL' },
+          comments_url: { type: 'string', description: 'Comments API URL' },
+          body: { type: 'string', description: 'Body text', optional: true },
+          comments: { type: 'number', description: 'Number of comments' },
+          score: { type: 'number', description: 'Search relevance score' },
+          created_at: { type: 'string', description: 'Creation timestamp' },
+          updated_at: { type: 'string', description: 'Last update timestamp' },
+          closed_at: { type: 'string', description: 'Close timestamp', optional: true },
+          user: {
+            type: 'object',
+            description: 'Issue author',
+            optional: true,
+            properties: {
+              login: { type: 'string', description: 'Username' },
+              id: { type: 'number', description: 'User ID' },
+              node_id: { type: 'string', description: 'GraphQL node ID' },
+              avatar_url: { type: 'string', description: 'Avatar image URL' },
+              url: { type: 'string', description: 'API URL' },
+              html_url: { type: 'string', description: 'Profile page URL' },
+              type: { type: 'string', description: 'User or Organization' },
+              site_admin: { type: 'boolean', description: 'GitHub staff indicator' },
+            },
+          },
+          labels: {
+            type: 'array',
+            description: 'Issue labels',
+            items: {
+              type: 'object',
+              properties: {
+                id: { type: 'number', description: 'Label ID' },
+                node_id: { type: 'string', description: 'GraphQL node ID' },
+                url: { type: 'string', description: 'API URL' },
+                name: { type: 'string', description: 'Label name' },
+                description: { type: 'string', description: 'Label description', optional: true },
+                color: { type: 'string', description: 'Hex color code' },
+                default: { type: 'boolean', description: 'Whether this is a default label' },
+              },
+            },
+          },
+          assignee: {
+            type: 'object',
+            description: 'Primary assignee',
+            optional: true,
+            properties: {
+              login: { type: 'string', description: 'Username' },
+              id: { type: 'number', description: 'User ID' },
+              node_id: { type: 'string', description: 'GraphQL node ID' },
+              avatar_url: { type: 'string', description: 'Avatar image URL' },
+              url: { type: 'string', description: 'API URL' },
+              html_url: { type: 'string', description: 'Profile page URL' },
+              type: { type: 'string', description: 'User or Organization' },
+              site_admin: { type: 'boolean', description: 'GitHub staff indicator' },
+            },
+          },
+          assignees: {
+            type: 'array',
+            description: 'All assignees',
+            items: {
+              type: 'object',
+              properties: {
+                login: { type: 'string', description: 'Username' },
+                id: { type: 'number', description: 'User ID' },
+                node_id: { type: 'string', description: 'GraphQL node ID' },
+                avatar_url: { type: 'string', description: 'Avatar image URL' },
+                url: { type: 'string', description: 'API URL' },
+                html_url: { type: 'string', description: 'Profile page URL' },
+                type: { type: 'string', description: 'User or Organization' },
+                site_admin: { type: 'boolean', description: 'GitHub staff indicator' },
+              },
+            },
+          },
+          milestone: {
+            type: 'object',
+            description: 'Associated milestone',
+            optional: true,
+            properties: {
+              id: { type: 'number', description: 'Milestone ID' },
+              node_id: { type: 'string', description: 'GraphQL node ID' },
+              number: { type: 'number', description: 'Milestone number' },
+              title: { type: 'string', description: 'Milestone title' },
+              description: { type: 'string', description: 'Milestone description', optional: true },
+              state: { type: 'string', description: 'State (open or closed)' },
+              html_url: { type: 'string', description: 'Web URL' },
+              due_on: { type: 'string', description: 'Due date', optional: true },
+            },
+          },
+          pull_request: {
+            type: 'object',
+            description: 'Pull request details (if this is a PR)',
+            optional: true,
+            properties: {
+              url: { type: 'string', description: 'API URL' },
+              html_url: { type: 'string', description: 'Web URL' },
+              diff_url: { type: 'string', description: 'Diff URL' },
+              patch_url: { type: 'string', description: 'Patch URL' },
+            },
+          },
+        },
+      },
+    },
+  },
+}
diff --git a/apps/sim/tools/github/search_repos.ts b/apps/sim/tools/github/search_repos.ts
new file mode 100644
index 0000000000..933f7fcfb1
--- /dev/null
+++ b/apps/sim/tools/github/search_repos.ts
@@ -0,0 +1,261 @@
+import type { ToolConfig } from '@/tools/types'
+
+interface SearchReposParams {
+  q: string
+  sort?: 'stars' | 'forks' | 'help-wanted-issues' | 'updated'
+  order?: 'asc' | 'desc'
+  per_page?: number
+  page?: number
+  apiKey: string
+}
+
+interface SearchReposResponse {
+  success: boolean
+  output: {
+    content: string
+    metadata: {
+      total_count: number
+      incomplete_results: boolean
+      items: Array<{
+        id: number
+        full_name: string
+        description: string | null
+        html_url: string
+        stargazers_count: number
+        forks_count: number
+        language: string | null
+        topics: string[]
+        created_at: string
+        updated_at: string
+        owner: { login: string }
+      }>
+    }
+  }
+}
+
+export const searchReposTool: ToolConfig<SearchReposParams, SearchReposResponse> = {
+  id: 'github_search_repos',
+  name: 'GitHub Search Repositories',
+  description:
+    'Search for repositories across GitHub. Use qualifiers like language:python, stars:>1000, topic:react, user:owner, org:name',
+  version: '1.0.0',
+
+  params: {
+    q: {
+      type: 'string',
+      required: true,
+      visibility: 'user-or-llm',
+      description:
+        'Search query with optional qualifiers (language:, stars:, forks:, topic:, user:, org:, in:name,description,readme)',
+    },
+    sort: {
+      type: 'string',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Sort by: stars, forks, help-wanted-issues, updated (default: best match)',
+    },
+    order: {
+      type: 'string',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Sort order: asc or desc (default: desc)',
+    },
+    per_page: {
+      type: 'number',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Results per page (max 100, default: 30)',
+      default: 30,
+    },
+    page: {
+      type: 'number',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Page number (default: 1)',
+      default: 1,
+    },
+    apiKey: {
+      type: 'string',
+      required: true,
+      visibility: 'user-only',
+      description: 'GitHub API token',
+    },
+  },
+
+  request: {
+    url: (params) => {
+      const url = new URL('https://api.github.com/search/repositories')
+      url.searchParams.append('q', params.q)
+      if (params.sort) url.searchParams.append('sort', params.sort)
+      if (params.order) url.searchParams.append('order', params.order)
+      if (params.per_page) url.searchParams.append('per_page', String(params.per_page))
+      if (params.page) url.searchParams.append('page', String(params.page))
+      return url.toString()
+    },
+    method: 'GET',
+    headers: (params) => ({
+      Accept: 'application/vnd.github.v3+json',
+      Authorization: `Bearer ${params.apiKey}`,
+      'X-GitHub-Api-Version': '2022-11-28',
+    }),
+  },
+
+  transformResponse: async (response) => {
+    const data = await response.json()
+
+    const items = data.items.map((item: any) => ({
+      id: item.id,
+      full_name: item.full_name,
+      description: item.description ?? null,
+      html_url: item.html_url,
+      stargazers_count: item.stargazers_count,
+      forks_count: item.forks_count,
+      language: item.language ?? null,
+      topics: item.topics ?? [],
+      created_at: item.created_at,
+      updated_at: item.updated_at,
+      owner: { login: item.owner?.login ?? 'unknown' },
+    }))
+
+    const content = `Found ${data.total_count} repository(s)${data.incomplete_results ? ' (incomplete)' : ''}:
+${items
+  .map(
+    (item: any) =>
+      `${item.full_name} ⭐ ${item.stargazers_count} | 🍴 ${item.forks_count}
+  ${item.description ?? 'No description'}
+  ${item.html_url}
+  Language: ${item.language ?? 'N/A'} | Topics: ${item.topics.length > 0 ? item.topics.join(', ') : 'none'}`
+  )
+  .join('\n\n')}`
+
+    return {
+      success: true,
+      output: {
+        content,
+        metadata: {
+          total_count: data.total_count,
+          incomplete_results: data.incomplete_results,
+          items,
+        },
+      },
+    }
+  },
+
+  outputs: {
+    content: { type: 'string', description: 'Human-readable search results' },
+    metadata: {
+      type: 'object',
+      description: 'Search results metadata',
+      properties: {
+        total_count: { type: 'number', description: 'Total matching results' },
+        incomplete_results: { type: 'boolean', description: 'Whether results are incomplete' },
+        items: {
+          type: 'array',
+          description: 'Array of repositories',
+          items: {
+            type: 'object',
+            properties: {
+              id: { type: 'number', description: 'Repository ID' },
+              full_name: { type: 'string', description: 'Full name (owner/repo)' },
+              description: { type: 'string', description: 'Description', optional: true },
+              html_url: { type: 'string', description: 'GitHub web URL' },
+              stargazers_count: { type: 'number', description: 'Star count' },
+              forks_count: { type: 'number', description: 'Fork count' },
+              language: { type: 'string', description: 'Primary language', optional: true },
+              topics: { type: 'array', description: 'Repository topics' },
+              created_at: { type: 'string', description: 'Creation date' },
+              updated_at: { type: 'string', description: 'Last update date' },
+              owner: { type: 'object', description: 'Owner info' },
+            },
+          },
+        },
+      },
+    },
+  },
+}
+
+export const searchReposV2Tool: ToolConfig<SearchReposParams, any> = {
+  id: 'github_search_repos_v2',
+  name: searchReposTool.name,
+  description: searchReposTool.description,
+  version: '2.0.0',
+  params: searchReposTool.params,
+  request: searchReposTool.request,
+
+  transformResponse: async (response: Response) => {
+    const data = await response.json()
+    return {
+      success: true,
+      output: {
+        total_count: data.total_count,
+        incomplete_results: data.incomplete_results,
+        items: data.items.map((item: any) => ({
+          ...item,
+          description: item.description ?? null,
+          language: item.language ?? null,
+          topics: item.topics ?? [],
+          license: item.license ?? null,
+        })),
+      },
+    }
+  },
+
+  outputs: {
+    total_count: { type: 'number', description: 'Total matching results' },
+    incomplete_results: { type: 'boolean', description: 'Whether results are incomplete' },
+    items: {
+      type: 'array',
+      description: 'Array of repository objects from GitHub API',
+      items: {
+        type: 'object',
+        properties: {
+          id: { type: 'number', description: 'Repository ID' },
+          node_id: { type: 'string', description: 'GraphQL node ID' },
+          name: { type: 'string', description: 'Repository name' },
+          full_name: { type: 'string', description: 'Full name (owner/repo)' },
+          private: { type: 'boolean', description: 'Whether repository is private' },
+          description: { type: 'string', description: 'Repository description', optional: true },
+          html_url: { type: 'string', description: 'GitHub web URL' },
+          url: { type: 'string', description: 'API URL' },
+          fork: { type: 'boolean', description: 'Whether this is a fork' },
+          created_at: { type: 'string', description: 'Creation timestamp' },
+          updated_at: { type: 'string', description: 'Last update timestamp' },
+          pushed_at: { type: 'string', description: 'Last push timestamp', optional: true },
+          size: { type: 'number', description: 'Repository size in KB' },
+          stargazers_count: { type: 'number', description: 'Number of stars' },
+          watchers_count: { type: 'number', description: 'Number of watchers' },
+          forks_count: { type: 'number', description: 'Number of forks' },
+          open_issues_count: { type: 'number', description: 'Number of open issues' },
+          language: { type: 'string', description: 'Primary programming language', optional: true },
+          default_branch: { type: 'string', description: 'Default branch name' },
+          score: { type: 'number', description: 'Search relevance score' },
+          topics: { type: 'array', description: 'Repository topics' },
+          license: {
+            type: 'object',
+            description: 'License information',
+            optional: true,
+            properties: {
+              key: { type: 'string', description: 'License key (e.g., mit)' },
+              name: { type: 'string', description: 'License name' },
+              spdx_id: { type: 'string', description: 'SPDX identifier' },
+            },
+          },
+          owner: {
+            type: 'object',
+            description: 'Repository owner',
+            properties: {
+              login: { type: 'string', description: 'Username' },
+              id: { type: 'number', description: 'User ID' },
+              node_id: { type: 'string', description: 'GraphQL node ID' },
+              avatar_url: { type: 'string', description: 'Avatar image URL' },
+              url: { type: 'string', description: 'API URL' },
+              html_url: { type: 'string', description: 'Profile page URL' },
+              type: { type: 'string', description: 'User or Organization' },
+              site_admin: { type: 'boolean', description: 'GitHub staff indicator' },
+            },
+          },
+        },
+      },
+    },
+  },
+}
diff --git a/apps/sim/tools/github/search_users.ts b/apps/sim/tools/github/search_users.ts
new file mode 100644
index 0000000000..9be9fa2916
--- /dev/null
+++ b/apps/sim/tools/github/search_users.ts
@@ -0,0 +1,203 @@
+import type { ToolConfig } from '@/tools/types'
+
+interface SearchUsersParams {
+  q: string
+  sort?: 'followers' | 'repositories' | 'joined'
+  order?: 'asc' | 'desc'
+  per_page?: number
+  page?: number
+  apiKey: string
+}
+
+interface SearchUsersResponse {
+  success: boolean
+  output: {
+    content: string
+    metadata: {
+      total_count: number
+      incomplete_results: boolean
+      items: Array<{
+        id: number
+        login: string
+        html_url: string
+        avatar_url: string
+        type: string
+        score: number
+      }>
+    }
+  }
+}
+
+export const searchUsersTool: ToolConfig<SearchUsersParams, SearchUsersResponse> = {
+  id: 'github_search_users',
+  name: 'GitHub Search Users',
+  description:
+    'Search for users and organizations on GitHub. Use qualifiers like type:user, type:org, followers:>1000, repos:>10, location:city',
+  version: '1.0.0',
+
+  params: {
+    q: {
+      type: 'string',
+      required: true,
+      visibility: 'user-or-llm',
+      description:
+        'Search query with optional qualifiers (type:user/org, followers:, repos:, location:, language:, created:)',
+    },
+    sort: {
+      type: 'string',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Sort by: followers, repositories, joined (default: best match)',
+    },
+    order: {
+      type: 'string',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Sort order: asc or desc (default: desc)',
+    },
+    per_page: {
+      type: 'number',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Results per page (max 100, default: 30)',
+      default: 30,
+    },
+    page: {
+      type: 'number',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Page number (default: 1)',
+      default: 1,
+    },
+    apiKey: {
+      type: 'string',
+      required: true,
+      visibility: 'user-only',
+      description: 'GitHub API token',
+    },
+  },
+
+  request: {
+    url: (params) => {
+      const url = new URL('https://api.github.com/search/users')
+      url.searchParams.append('q', params.q)
+      if (params.sort) url.searchParams.append('sort', params.sort)
+      if (params.order) url.searchParams.append('order', params.order)
+      if (params.per_page) url.searchParams.append('per_page', String(params.per_page))
+      if (params.page) url.searchParams.append('page', String(params.page))
+      return url.toString()
+    },
+    method: 'GET',
+    headers: (params) => ({
+      Accept: 'application/vnd.github.v3+json',
+      Authorization: `Bearer ${params.apiKey}`,
+      'X-GitHub-Api-Version': '2022-11-28',
+    }),
+  },
+
+  transformResponse: async (response) => {
+    const data = await response.json()
+
+    const items = data.items.map((item: any) => ({
+      id: item.id,
+      login: item.login,
+      html_url: item.html_url,
+      avatar_url: item.avatar_url,
+      type: item.type,
+      score: item.score,
+    }))
+
+    const content = `Found ${data.total_count} user(s)/organization(s)${data.incomplete_results ? ' (incomplete)' : ''}:
+${items.map((item: any) => `@${item.login} (${item.type}) - ${item.html_url}`).join('\n')}`
+
+    return {
+      success: true,
+      output: {
+        content,
+        metadata: {
+          total_count: data.total_count,
+          incomplete_results: data.incomplete_results,
+          items,
+        },
+      },
+    }
+  },
+
+  outputs: {
+    content: { type: 'string', description: 'Human-readable search results' },
+    metadata: {
+      type: 'object',
+      description: 'Search results metadata',
+      properties: {
+        total_count: { type: 'number', description: 'Total matching results' },
+        incomplete_results: { type: 'boolean', description: 'Whether results are incomplete' },
+        items: {
+          type: 'array',
+          description: 'Array of users/orgs',
+          items: {
+            type: 'object',
+            properties: {
+              id: { type: 'number', description: 'User ID' },
+              login: { type: 'string', description: 'Username' },
+              html_url: { type: 'string', description: 'Profile URL' },
+              avatar_url: { type: 'string', description: 'Avatar URL' },
+              type: { type: 'string', description: 'User or Organization' },
+              score: { type: 'number', description: 'Search relevance score' },
+            },
+          },
+        },
+      },
+    },
+  },
+}
+
+export const searchUsersV2Tool: ToolConfig<SearchUsersParams, any> = {
+  id: 'github_search_users_v2',
+  name: searchUsersTool.name,
+  description: searchUsersTool.description,
+  version: '2.0.0',
+  params: searchUsersTool.params,
+  request: searchUsersTool.request,
+
+  transformResponse: async (response: Response) => {
+    const data = await response.json()
+    return {
+      success: true,
+      output: {
+        total_count: data.total_count,
+        incomplete_results: data.incomplete_results,
+        items: data.items,
+      },
+    }
+  },
+
+  outputs: {
+    total_count: { type: 'number', description: 'Total matching results' },
+    incomplete_results: { type: 'boolean', description: 'Whether results are incomplete' },
+    items: {
+      type: 'array',
+      description: 'Array of user objects from GitHub API',
+      items: {
+        type: 'object',
+        properties: {
+          id: { type: 'number', description: 'User ID' },
+          node_id: { type: 'string', description: 'GraphQL node ID' },
+          login: { type: 'string', description: 'Username' },
+          avatar_url: { type: 'string', description: 'Avatar image URL' },
+          gravatar_id: { type: 'string', description: 'Gravatar ID' },
+          url: { type: 'string', description: 'API URL' },
+          html_url: { type: 'string', description: 'Profile page URL' },
+          followers_url: { type: 'string', description: 'Followers API URL' },
+          following_url: { type: 'string', description: 'Following API URL' },
+          gists_url: { type: 'string', description: 'Gists API URL' },
+          starred_url: { type: 'string', description: 'Starred API URL' },
+          repos_url: { type: 'string', description: 'Repos API URL' },
+          organizations_url: { type: 'string', description: 'Organizations API URL' },
+          type: { type: 'string', description: 'User or Organization' },
+          site_admin: { type: 'boolean', description: 'GitHub staff indicator' },
+          score: { type: 'number', description: 'Search relevance score' },
+        },
+      },
+    },
+  },
+}
diff --git a/apps/sim/tools/github/star_gist.ts b/apps/sim/tools/github/star_gist.ts
new file mode 100644
index 0000000000..0d654cd0ef
--- /dev/null
+++ b/apps/sim/tools/github/star_gist.ts
@@ -0,0 +1,104 @@
+import type { ToolConfig } from '@/tools/types'
+
+interface StarGistParams {
+  gist_id: string
+  apiKey: string
+}
+
+interface StarGistResponse {
+  success: boolean
+  output: {
+    content: string
+    metadata: {
+      starred: boolean
+      gist_id: string
+    }
+  }
+}
+
+export const starGistTool: ToolConfig<StarGistParams, StarGistResponse> = {
+  id: 'github_star_gist',
+  name: 'GitHub Star Gist',
+  description: 'Star a gist',
+  version: '1.0.0',
+
+  params: {
+    gist_id: {
+      type: 'string',
+      required: true,
+      visibility: 'user-or-llm',
+      description: 'The gist ID to star',
+    },
+    apiKey: {
+      type: 'string',
+      required: true,
+      visibility: 'user-only',
+      description: 'GitHub API token',
+    },
+  },
+
+  request: {
+    url: (params) => `https://api.github.com/gists/${params.gist_id?.trim()}/star`,
+    method: 'PUT',
+    headers: (params) => ({
+      Accept: 'application/vnd.github.v3+json',
+      Authorization: `Bearer ${params.apiKey}`,
+      'Content-Length': '0',
+      'X-GitHub-Api-Version': '2022-11-28',
+    }),
+  },
+
+  transformResponse: async (response, params) => {
+    const starred = response.status === 204
+
+    return {
+      success: starred,
+      output: {
+        content: starred
+          ? `Successfully starred gist ${params?.gist_id}`
+          : `Failed to star gist ${params?.gist_id}`,
+        metadata: {
+          starred,
+          gist_id: params?.gist_id ?? '',
+        },
+      },
+    }
+  },
+
+  outputs: {
+    content: { type: 'string', description: 'Human-readable result' },
+    metadata: {
+      type: 'object',
+      description: 'Star operation metadata',
+      properties: {
+        starred: { type: 'boolean', description: 'Whether starring succeeded' },
+        gist_id: { type: 'string', description: 'The gist ID' },
+      },
+    },
+  },
+}
+
+export const starGistV2Tool: ToolConfig<StarGistParams, any> = {
+  id: 'github_star_gist_v2',
+  name: starGistTool.name,
+  description: starGistTool.description,
+  version: '2.0.0',
+  params: starGistTool.params,
+  request: starGistTool.request,
+
+  transformResponse: async (response: Response, params) => {
+    const starred = response.status === 204
+    return {
+      success: starred,
+      output: {
+        starred,
+        gist_id: params?.gist_id ?? '',
+      },
+    }
+  },
+
+  outputs: {
+    starred: { type: 'boolean', description: 'Whether starring succeeded' },
+    gist_id: { type: 'string', description: 'The gist ID' },
+  },
+}
diff --git a/apps/sim/tools/github/star_repo.ts b/apps/sim/tools/github/star_repo.ts
new file mode 100644
index 0000000000..1bd65ac103
--- /dev/null
+++ b/apps/sim/tools/github/star_repo.ts
@@ -0,0 +1,116 @@
+import type { ToolConfig } from '@/tools/types'
+
+interface StarRepoParams {
+  owner: string
+  repo: string
+  apiKey: string
+}
+
+interface StarRepoResponse {
+  success: boolean
+  output: {
+    content: string
+    metadata: {
+      starred: boolean
+      owner: string
+      repo: string
+    }
+  }
+}
+
+export const starRepoTool: ToolConfig<StarRepoParams, StarRepoResponse> = {
+  id: 'github_star_repo',
+  name: 'GitHub Star Repository',
+  description: 'Star a repository',
+  version: '1.0.0',
+
+  params: {
+    owner: {
+      type: 'string',
+      required: true,
+      visibility: 'user-or-llm',
+      description: 'Repository owner',
+    },
+    repo: {
+      type: 'string',
+      required: true,
+      visibility: 'user-or-llm',
+      description: 'Repository name',
+    },
+    apiKey: {
+      type: 'string',
+      required: true,
+      visibility: 'user-only',
+      description: 'GitHub API token',
+    },
+  },
+
+  request: {
+    url: (params) => `https://api.github.com/user/starred/${params.owner}/${params.repo}`,
+    method: 'PUT',
+    headers: (params) => ({
+      Accept: 'application/vnd.github.v3+json',
+      Authorization: `Bearer ${params.apiKey}`,
+      'Content-Length': '0',
+      'X-GitHub-Api-Version': '2022-11-28',
+    }),
+  },
+
+  transformResponse: async (response, params) => {
+    const starred = response.status === 204
+
+    return {
+      success: starred,
+      output: {
+        content: starred
+          ? `Successfully starred ${params?.owner}/${params?.repo}`
+          : `Failed to star ${params?.owner}/${params?.repo}`,
+        metadata: {
+          starred,
+          owner: params?.owner ?? '',
+          repo: params?.repo ?? '',
+        },
+      },
+    }
+  },
+
+  outputs: {
+    content: { type: 'string', description: 'Human-readable result' },
+    metadata: {
+      type: 'object',
+      description: 'Star operation metadata',
+      properties: {
+        starred: { type: 'boolean', description: 'Whether starring succeeded' },
+        owner: { type: 'string', description: 'Repository owner' },
+        repo: { type: 'string', description: 'Repository name' },
+      },
+    },
+  },
+}
+
+export const starRepoV2Tool: ToolConfig<StarRepoParams, any> = {
+  id: 'github_star_repo_v2',
+  name: starRepoTool.name,
+  description: starRepoTool.description,
+  version: '2.0.0',
+  params: starRepoTool.params,
+  request: starRepoTool.request,
+
+  transformResponse: async (response: Response, params) => {
+    const starred = response.status === 204
+    return {
+      success: starred,
+      output: {
+        starred,
+        owner: params?.owner ?? '',
+        repo: params?.repo ?? '',
+      },
+    }
+  },
+
+  outputs: {
+    starred: { type: 'boolean', description: 'Whether starring succeeded' },
+    owner: { type: 'string', description: 'Repository owner' },
+    repo: { type: 'string', description: 'Repository name' },
+  },
+}
diff --git a/apps/sim/tools/github/unstar_gist.ts b/apps/sim/tools/github/unstar_gist.ts
new file mode 100644
index 0000000000..b57fa4e968
--- /dev/null
+++ b/apps/sim/tools/github/unstar_gist.ts
@@ -0,0 +1,103 @@
+import type { ToolConfig } from '@/tools/types'
+
+interface UnstarGistParams {
+  gist_id: string
+  apiKey: string
+}
+
+interface UnstarGistResponse {
+  success: boolean
+  output: {
+    content: string
+    metadata: {
+      unstarred: boolean
+      gist_id: string
+    }
+  }
+}
+
+export const unstarGistTool: ToolConfig<UnstarGistParams, UnstarGistResponse> = {
+  id: 'github_unstar_gist',
+  name: 'GitHub Unstar Gist',
+  description: 'Unstar a gist',
+  version: '1.0.0',
+
+  params: {
+    gist_id: {
+      type: 'string',
+      required: true,
+      visibility: 'user-or-llm',
+      description: 'The gist ID to unstar',
+    },
+    apiKey: {
+      type: 'string',
+      required: true,
+      visibility: 'user-only',
+      description: 'GitHub API token',
+    },
+  },
+
+  request: {
+    url: (params) => `https://api.github.com/gists/${params.gist_id?.trim()}/star`,
+    method: 'DELETE',
+    headers: (params) => ({
+      Accept: 'application/vnd.github.v3+json',
+      Authorization: `Bearer ${params.apiKey}`,
+      'X-GitHub-Api-Version': '2022-11-28',
+    }),
+  },
+
+  transformResponse: async (response, params) => {
+    const unstarred = response.status === 204
+
+    return {
+      success: unstarred,
+      output: {
+        content: unstarred
+          ? `Successfully unstarred gist ${params?.gist_id}`
+          : `Failed to unstar gist ${params?.gist_id}`,
+        metadata: {
+          unstarred,
+          gist_id: params?.gist_id ?? '',
+        },
+      },
+    }
+  },
+
+  outputs: {
+    content: { type: 'string', description: 'Human-readable result' },
+    metadata: {
+      type: 'object',
+      description: 'Unstar operation metadata',
+      properties: {
+        unstarred: { type: 'boolean', description: 'Whether unstarring succeeded' },
+        gist_id: { type: 'string', description: 'The gist ID' },
+      },
+    },
+  },
+}
+
+export const unstarGistV2Tool: ToolConfig<UnstarGistParams, any> = {
+  id: 'github_unstar_gist_v2',
+  name: unstarGistTool.name,
+  description: unstarGistTool.description,
+  version: '2.0.0',
+  params: unstarGistTool.params,
+  request: unstarGistTool.request,
+
+  transformResponse: async (response: Response, params) => {
+    const unstarred = response.status === 204
+    return {
+      success: unstarred,
+      output: {
+        unstarred,
+        gist_id: params?.gist_id ?? '',
+      },
+    }
+  },
+
+  outputs: {
+    unstarred: { type: 'boolean', description: 'Whether unstarring succeeded' },
+    gist_id: { type: 'string', description: 'The gist ID' },
+  },
+}
diff --git a/apps/sim/tools/github/unstar_repo.ts b/apps/sim/tools/github/unstar_repo.ts
new file mode 100644
index 0000000000..5ae47d7b60
--- /dev/null
+++ b/apps/sim/tools/github/unstar_repo.ts
@@ -0,0 +1,115 @@
+import type { ToolConfig } from '@/tools/types'
+
+interface UnstarRepoParams {
+  owner: string
+  repo: string
+  apiKey: string
+}
+
+interface UnstarRepoResponse {
+  success: boolean
+  output: {
+    content: string
+    metadata: {
+      unstarred: boolean
+      owner: string
+      repo: string
+    }
+  }
+}
+
+export const unstarRepoTool: ToolConfig<UnstarRepoParams, UnstarRepoResponse> = {
+  id: 'github_unstar_repo',
+  name: 'GitHub Unstar Repository',
+  description: 'Remove star from a repository',
+  version: '1.0.0',
+
+  params: {
+    owner: {
+      type: 'string',
+      required: true,
+      visibility: 'user-or-llm',
+      description: 'Repository owner',
+    },
+    repo: {
+      type: 'string',
+      required: true,
+      visibility: 'user-or-llm',
+      description: 'Repository name',
+    },
+    apiKey: {
+      type: 'string',
+      required: true,
+      visibility: 'user-only',
+      description: 'GitHub API token',
+    },
+  },
+
+  request: {
+    url: (params) => `https://api.github.com/user/starred/${params.owner}/${params.repo}`,
+    method: 'DELETE',
+    headers: (params) => ({
+      Accept: 'application/vnd.github.v3+json',
+      Authorization: `Bearer ${params.apiKey}`,
+      'X-GitHub-Api-Version': '2022-11-28',
+    }),
+  },
+
+  transformResponse: async (response, params) => {
+    const unstarred = response.status === 204
+
+    return {
+      success: unstarred,
+      output: {
+        content: unstarred
+          ? `Successfully unstarred ${params?.owner}/${params?.repo}`
+          : `Failed to unstar ${params?.owner}/${params?.repo}`,
+        metadata: {
+          unstarred,
+          owner: params?.owner ?? '',
+          repo: params?.repo ?? '',
+        },
+      },
+    }
+  },
+
+  outputs: {
+    content: { type: 'string', description: 'Human-readable result' },
+    metadata: {
+      type: 'object',
+      description: 'Unstar operation metadata',
+      properties: {
+        unstarred: { type: 'boolean', description: 'Whether unstarring succeeded' },
+        owner: { type: 'string', description: 'Repository owner' },
+        repo: { type: 'string', description: 'Repository name' },
+      },
+    },
+  },
+}
+
+export const unstarRepoV2Tool: ToolConfig<UnstarRepoParams, any> = {
+  id: 'github_unstar_repo_v2',
+  name: unstarRepoTool.name,
+  description: unstarRepoTool.description,
+  version: '2.0.0',
+  params: unstarRepoTool.params,
+  request: unstarRepoTool.request,
+
+  transformResponse: async (response: Response, params) => {
+    const unstarred = response.status === 204
+    return {
+      success: unstarred,
+      output: {
+        unstarred,
+        owner: params?.owner ?? '',
+        repo: params?.repo ?? '',
+      },
+    }
+  },
+
+  outputs: {
+    unstarred: { type: 'boolean', description: 'Whether unstarring succeeded' },
+    owner: { type: 'string', description: 'Repository owner' },
+    repo: { type: 'string', description: 'Repository name' },
+  },
+}
diff --git a/apps/sim/tools/github/update_gist.ts b/apps/sim/tools/github/update_gist.ts
new file mode 100644
index 0000000000..0bc4f82dfd
--- /dev/null
+++ b/apps/sim/tools/github/update_gist.ts
@@ -0,0 +1,193 @@
+import type { ToolConfig } from '@/tools/types'
+
+interface UpdateGistParams {
+  gist_id: string
+  description?: string
+  files?: string
+  apiKey: string
+}
+
+interface UpdateGistResponse {
+  success: boolean
+  output: {
+    content: string
+    metadata: {
+      id: string
+      html_url: string
+      description: string | null
+      public: boolean
+      updated_at: string
+      files: Record<
+        string,
+        { filename: string; type: string; language: string | null; size: number }
+      >
+    }
+  }
+}
+
+export const updateGistTool: ToolConfig<UpdateGistParams, UpdateGistResponse> = {
+  id: 'github_update_gist',
+  name: 'GitHub Update Gist',
+  description:
+    'Update a gist description or files. To delete a file, set its value to null in files object',
+  version: '1.0.0',
+
+  params: {
+    gist_id: {
+      type: 'string',
+      required: true,
+      visibility: 'user-or-llm',
+      description: 'The gist ID to update',
+    },
+    description: {
+      type: 'string',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'New description for the gist',
+    },
+    files: {
+      type: 'json',
+      required: false,
+      visibility: 'user-or-llm',
+      description:
+        'JSON object with filenames as keys. Set to null to delete, or provide content to update/add',
+    },
+    apiKey: {
+      type: 'string',
+      required: true,
+      visibility: 'user-only',
+      description: 'GitHub API token',
+    },
+  },
+
+  request: {
+    url: (params) => `https://api.github.com/gists/${params.gist_id?.trim()}`,
+    method: 'PATCH',
+    headers: (params) => ({
+      Accept: 'application/vnd.github.v3+json',
+      Authorization: `Bearer ${params.apiKey}`,
+      'Content-Type': 'application/json',
+      'X-GitHub-Api-Version': '2022-11-28',
+    }),
+    body: (params) => {
+      const body: Record<string, any> = {}
+      if (params.description !== undefined) body.description = params.description
+      if (params.files) {
+        body.files = typeof params.files === 'string' ? JSON.parse(params.files) : params.files
+      }
+      return body
+    },
+  },
+
+  transformResponse: async (response) => {
+    const data = await response.json()
+
+    const files: Record<
+      string,
+      { filename: string; type: string; language: string | null; size: number }
+    > = {}
+    for (const [key, value] of Object.entries(data.files ?? {})) {
+      const file = value as any
+      files[key] = {
+        filename: file.filename,
+        type: file.type,
+        language: file.language ?? null,
+        size: file.size,
+      }
+    }
+
+    const content = `Updated gist: ${data.html_url}
+Description: ${data.description ?? 'No description'}
+Files: ${Object.keys(files).join(', ')}`
+
+    return {
+      success: true,
+      output: {
+        content,
+        metadata: {
+          id: data.id,
+          html_url: data.html_url,
+          description: data.description ?? null,
+          public: data.public,
+          updated_at: data.updated_at,
+          files,
+        },
+      },
+    }
+  },
+
+  outputs: {
+    content: { type: 'string', description: 'Human-readable result' },
+    metadata: {
+      type: 'object',
+      description: 'Updated gist metadata',
+      properties: {
+        id: { type: 'string', description: 'Gist ID' },
+        html_url: { type: 'string', description: 'Web URL' },
+        description: { type: 'string', description: 'Description', optional: true },
+        public: { type: 'boolean', description: 'Is public' },
+        updated_at: { type: 'string', description: 'Update date' },
+        files: { type: 'object', description: 'Current files' },
+      },
+    },
+  },
+}
+
+export const updateGistV2Tool: ToolConfig<UpdateGistParams, any> = {
+  id: 'github_update_gist_v2',
+  name: updateGistTool.name,
+  description: updateGistTool.description,
+  version: '2.0.0',
+  params: updateGistTool.params,
+  request: updateGistTool.request,
+
+  transformResponse: async (response: Response) => {
+    const data = await response.json()
+    return {
+      success: true,
+      output: {
+        ...data,
+        description: data.description ?? null,
+        files: data.files ?? {},
+      },
+    }
+  },
+
+  outputs: {
+    id: { type: 'string', description: 'Gist ID' },
+    node_id: { type: 'string', description: 'GraphQL node ID' },
+    url: { type: 'string', description: 'API URL' },
+    html_url: { type: 'string', description: 'Web URL' },
+    forks_url: { type: 'string', description: 'Forks API URL' },
+    commits_url: { type: 'string', description: 'Commits API URL' },
+    git_pull_url: { type: 'string', description: 'Git pull URL' },
+    git_push_url: { type: 'string', description: 'Git push URL' },
+    description: { type: 'string', description: 'Gist description', optional: true },
+    public: { type: 'boolean', description: 'Whether gist is public' },
+    truncated: { type: 'boolean', description: 'Whether files are truncated' },
+    comments: { type: 'number', description: 'Number of comments' },
+    comments_url: { type: 'string', description: 'Comments API URL' },
+    created_at: { type: 'string', description: 'Creation timestamp' },
+    updated_at: { type: 'string', description: 'Last update timestamp' },
+    files: {
+      type: 'object',
+      description:
+        'Files in the gist (object with filenames as keys, each containing filename, type, language, raw_url, size, truncated, content)',
+    },
+    owner: {
+      type: 'object',
+      description: 'Gist owner',
+      optional: true,
+      properties: {
+        login: { type: 'string', description: 'Username' },
+        id: { type: 'number', description: 'User ID' },
+        node_id: { type: 'string', description: 'GraphQL node ID' },
+        avatar_url: { type: 'string', description: 'Avatar image URL' },
+        url: { type: 'string', description: 'API URL' },
+        html_url: { type: 'string', description: 'Profile page URL' },
+        type: { type: 'string', description: 'User or Organization' },
+        site_admin: { type: 'boolean', description: 'GitHub staff indicator' },
+      },
+    },
+  },
+}
diff --git a/apps/sim/tools/github/update_milestone.ts b/apps/sim/tools/github/update_milestone.ts
new file mode 100644
index 0000000000..8b45a30905
--- /dev/null
+++ b/apps/sim/tools/github/update_milestone.ts
@@ -0,0 +1,208 @@
+import type { ToolConfig } from '@/tools/types'
+
+interface UpdateMilestoneParams {
+  owner: string
+  repo: string
+  milestone_number: number
+  title?: string
+  state?: 'open' | 'closed'
+  description?: string
+  due_on?: string
+  apiKey: string
+}
+
+interface UpdateMilestoneResponse {
+  success: boolean
+  output: {
+    content: string
+    metadata: {
+      number: number
+      title: string
+      description: string | null
+      state: string
+      html_url: string
+      due_on: string | null
+      open_issues: number
+      closed_issues: number
+      updated_at: string
+    }
+  }
+}
+
+export const updateMilestoneTool: ToolConfig<UpdateMilestoneParams, UpdateMilestoneResponse> = {
+  id: 'github_update_milestone',
+  name: 'GitHub Update Milestone',
+  description: 'Update a milestone in a repository',
+  version: '1.0.0',
+
+  params: {
+    owner: {
+      type: 'string',
+      required: true,
+      visibility: 'user-or-llm',
+      description: 'Repository owner',
+    },
+    repo: {
+      type: 'string',
+      required: true,
+      visibility: 'user-or-llm',
+      description: 'Repository name',
+    },
+    milestone_number: {
+      type: 'number',
+      required: true,
+      visibility: 'user-or-llm',
+      description: 'Milestone number to update',
+    },
+    title: {
+      type: 'string',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'New milestone title',
+    },
+    state: {
+      type: 'string',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'New state: open or closed',
+    },
+    description: {
+      type: 'string',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'New description',
+    },
+    due_on: {
+      type: 'string',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'New due date (ISO 8601 format)',
+    },
+    apiKey: {
+      type: 'string',
+      required: true,
+      visibility: 'user-only',
+      description: 'GitHub API token',
+    },
+  },
+
+  request: {
+    url: (params) =>
+      `https://api.github.com/repos/${params.owner}/${params.repo}/milestones/${params.milestone_number}`,
+    method: 'PATCH',
+    headers: (params) => ({
+      Accept: 'application/vnd.github.v3+json',
+      Authorization: `Bearer ${params.apiKey}`,
+      'Content-Type': 'application/json',
+      'X-GitHub-Api-Version': '2022-11-28',
+    }),
+    body: (params) => {
+      const body: Record<string, any> = {}
+      if (params.title !== undefined) body.title = params.title
+      if (params.state !== undefined) body.state = params.state
+      if (params.description !== undefined) body.description = params.description
+      if (params.due_on !== undefined) body.due_on = params.due_on
+      return body
+    },
+  },
+
+  transformResponse: async (response) => {
+    const data = await response.json()
+
+    const content = `Updated milestone: ${data.title} (#${data.number})
+State: ${data.state}
+Due: ${data.due_on ?? 'No due date'}
+${data.html_url}`
+
+    return {
+      success: true,
+      output: {
+        content,
+        metadata: {
+          number: data.number,
+          title: data.title,
+          description: data.description ?? null,
+          state: data.state,
+          html_url: data.html_url,
+          due_on: data.due_on ?? null,
+          open_issues: data.open_issues,
+          closed_issues: data.closed_issues,
+          updated_at: data.updated_at,
+        },
+      },
+    }
+  },
+
+  outputs: {
+    content: { type: 'string', description: 'Human-readable result' },
+    metadata: {
+      type: 'object',
+      description: 'Updated milestone metadata',
+      properties: {
+        number: { type: 'number', description: 'Milestone number' },
+        title: { type: 'string', description: 'Title' },
+        description: { type: 'string', description: 'Description', optional: true },
+        state: { type: 'string', description: 'State' },
+        html_url: { type: 'string', description: 'Web URL' },
+        due_on: { type: 'string', description: 'Due date', optional: true },
+        open_issues: { type: 'number', description: 'Open issues' },
+        closed_issues: { type: 'number', description: 'Closed issues' },
+        updated_at: { type: 'string', description: 'Update date' },
+      },
+    },
+  },
+}
+
+export const updateMilestoneV2Tool: ToolConfig<UpdateMilestoneParams, any> = {
+  id: 'github_update_milestone_v2',
+  name: updateMilestoneTool.name,
+  description: updateMilestoneTool.description,
+  version: '2.0.0',
+  params: updateMilestoneTool.params,
+  request: updateMilestoneTool.request,
+
+  transformResponse: async (response: Response) => {
+    const data = await response.json()
+    return {
+      success: true,
+      output: {
+        ...data,
+        description: data.description ?? null,
+        due_on: data.due_on ?? null,
+      },
+    }
+  },
+
+  outputs: {
+    id: { type: 'number', description: 'Milestone ID' },
+    node_id: { type: 'string', description: 'GraphQL node ID' },
+    number: { type: 'number', description: 'Milestone number' },
+    title: { type: 'string', description: 'Milestone title' },
+    description: { type: 'string', description: 'Milestone description', optional: true },
+    state: { type: 'string', description: 'State (open or closed)' },
+    url: { type: 'string', description: 'API URL' },
+    html_url: { type: 'string', description: 'GitHub web URL' },
+    labels_url: { type: 'string', description: 'Labels API URL' },
+    due_on: { type: 'string', description: 'Due date (ISO 8601)', optional: true },
+    open_issues: { type: 'number', description: 'Number of open issues' },
+    closed_issues: { type: 'number', description: 'Number of closed issues' },
+    created_at: { type: 'string', description: 'Creation timestamp' },
+    updated_at: { type: 'string', description: 'Last update timestamp' },
+    closed_at: { type: 'string', description: 'Close timestamp', optional: true },
+    creator: {
+      type: 'object',
+      description: 'Milestone creator',
+      optional: true,
+      properties: {
+        login: { type: 'string', description: 'Username' },
+        id: { type: 'number', description: 'User ID' },
+        node_id: { type: 'string', description: 'GraphQL node ID' },
+        avatar_url: { type: 'string', description: 'Avatar image URL' },
+        url: { type: 'string', description: 'API URL' },
+        html_url: { type: 'string', description: 'Profile page URL' },
+        type: { type: 'string', description: 'User or Organization' },
+        site_admin: { type: 'boolean', description: 'GitHub staff indicator' },
+      },
+    },
+  },
+}
diff --git a/apps/sim/tools/gitlab/cancel_pipeline.ts b/apps/sim/tools/gitlab/cancel_pipeline.ts
index ef48a5bb7d..62b9e096b9 100644
--- a/apps/sim/tools/gitlab/cancel_pipeline.ts
+++ b/apps/sim/tools/gitlab/cancel_pipeline.ts
@@ -14,16 +14,19 @@ export const gitlabCancelPipelineTool: ToolConfig<
     accessToken: {
       type: 'string',
       required: true,
+      visibility: 'user-only',
       description: 'GitLab Personal Access Token',
     },
     projectId: {
       type: 'string',
       required: true,
+      visibility: 'user-or-llm',
       description: 'Project ID or URL-encoded path',
     },
     pipelineId: {
       type: 'number',
       required: true,
+      visibility: 'user-or-llm',
       description: 'Pipeline ID',
     },
   },
diff --git a/apps/sim/tools/gitlab/create_issue.ts b/apps/sim/tools/gitlab/create_issue.ts
index 417f614bfd..6a03e9ff97 100644
--- a/apps/sim/tools/gitlab/create_issue.ts
+++ b/apps/sim/tools/gitlab/create_issue.ts
@@ -12,46 +12,55 @@ export const gitlabCreateIssueTool: ToolConfig<GitLabCreateIssueParams, GitLabCr
       accessToken: {
         type: 'string',
         required: true,
+        visibility: 'user-only',
         description: 'GitLab Personal Access Token',
       },
       projectId: {
         type: 'string',
         required: true,
+        visibility: 'user-or-llm',
         description: 'Project ID or URL-encoded path',
       },
       title: {
         type: 'string',
         required: true,
+        visibility: 'user-or-llm',
         description: 'Issue title',
       },
       description: {
         type: 'string',
         required: false,
+        visibility: 'user-or-llm',
         description: 'Issue description (Markdown supported)',
       },
       labels: {
         type: 'string',
         required: false,
+        visibility: 'user-or-llm',
         description: 'Comma-separated list of label names',
       },
       assigneeIds: {
         type: 'array',
         required: false,
+        visibility: 'user-or-llm',
         description: 'Array of user IDs to assign',
       },
       milestoneId: {
         type: 'number',
         required: false,
+        visibility: 'user-or-llm',
         description: 'Milestone ID to assign',
       },
       dueDate: {
         type: 'string',
         required: false,
+        visibility: 'user-or-llm',
         description: 'Due date in YYYY-MM-DD format',
       },
       confidential: {
         type: 'boolean',
         required: false,
+        visibility: 'user-or-llm',
         description: 'Whether the issue is confidential',
       },
     },
diff --git a/apps/sim/tools/gitlab/create_issue_note.ts b/apps/sim/tools/gitlab/create_issue_note.ts
index 10a1620e48..150bf729d7 100644
--- a/apps/sim/tools/gitlab/create_issue_note.ts
+++ b/apps/sim/tools/gitlab/create_issue_note.ts
@@ -14,21 +14,25 @@ export const gitlabCreateIssueNoteTool: ToolConfig<
     accessToken: {
       type: 'string',
       required: true,
+      visibility: 'user-only',
       description: 'GitLab Personal Access Token',
     },
     projectId: {
       type: 'string',
       required: true,
+      visibility: 'user-or-llm',
       description: 'Project ID or URL-encoded path',
     },
     issueIid: {
       type: 'number',
       required: true,
+      visibility: 'user-or-llm',
       description: 'Issue internal ID (IID)',
     },
     body: {
       type: 'string',
       required: true,
+      visibility: 'user-or-llm',
       description: 'Comment body (Markdown supported)',
     },
   },
diff --git a/apps/sim/tools/gitlab/create_merge_request.ts b/apps/sim/tools/gitlab/create_merge_request.ts
index 45e45d30e8..fdaebbf842 100644
--- a/apps/sim/tools/gitlab/create_merge_request.ts
+++ b/apps/sim/tools/gitlab/create_merge_request.ts
@@ -17,61 +17,73 @@ export const gitlabCreateMergeRequestTool: ToolConfig<
     accessToken: {
       type: 'string',
       required: true,
+      visibility: 'user-only',
       description: 'GitLab Personal Access Token',
     },
     projectId: {
       type: 'string',
       required: true,
+      visibility: 'user-or-llm',
       description: 'Project ID or URL-encoded path',
     },
     sourceBranch: {
       type: 'string',
       required: true,
+      visibility: 'user-or-llm',
       description: 'Source branch name',
     },
     targetBranch: {
       type: 'string',
       required: true,
+      visibility: 'user-or-llm',
       description: 'Target branch name',
     },
     title: {
       type: 'string',
       required: true,
+      visibility: 'user-or-llm',
       description: 'Merge request title',
     },
     description: {
       type: 'string',
       required: false,
+      visibility: 'user-or-llm',
       description: 'Merge request description (Markdown supported)',
     },
     labels: {
       type: 'string',
       required: false,
+      visibility: 'user-or-llm',
       description: 'Comma-separated list of label names',
     },
     assigneeIds: {
       type: 'array',
       required: false,
+      visibility: 'user-or-llm',
       description: 'Array of user IDs to assign',
     },
     milestoneId: {
       type: 'number',
       required: false,
+      visibility: 'user-or-llm',
       description: 'Milestone ID to assign',
     },
     removeSourceBranch: {
       type: 'boolean',
       required: false,
+      visibility: 'user-or-llm',
       description: 'Delete source branch after merge',
     },
     squash: {
       type: 'boolean',
       required: false,
+      visibility: 'user-or-llm',
       description: 'Squash commits on merge',
     },
     draft: {
       type: 'boolean',
       required: false,
+      visibility: 'user-or-llm',
       description: 'Mark as draft (work in progress)',
     },
   },
diff --git a/apps/sim/tools/gitlab/create_merge_request_note.ts b/apps/sim/tools/gitlab/create_merge_request_note.ts
index 6938807737..599ec56971 100644
--- a/apps/sim/tools/gitlab/create_merge_request_note.ts
+++ b/apps/sim/tools/gitlab/create_merge_request_note.ts
@@ -17,21 +17,25 @@ export const gitlabCreateMergeRequestNoteTool: ToolConfig<
     accessToken: {
       type: 'string',
       required: true,
+      visibility: 'user-only',
       description: 'GitLab Personal Access Token',
     },
     projectId: {
       type: 'string',
       required: true,
+      visibility: 'user-or-llm',
       description: 'Project ID or URL-encoded path',
     },
     mergeRequestIid: {
       type: 'number',
       required: true,
+      visibility: 'user-or-llm',
       description: 'Merge request internal ID (IID)',
     },
     body: {
       type: 'string',
       required: true,
+      visibility: 'user-or-llm',
       description: 'Comment body (Markdown supported)',
     },
   },
diff --git a/apps/sim/tools/gitlab/create_pipeline.ts b/apps/sim/tools/gitlab/create_pipeline.ts
index 3213e976ff..38a15df006 100644
--- a/apps/sim/tools/gitlab/create_pipeline.ts
+++ b/apps/sim/tools/gitlab/create_pipeline.ts
@@ -14,21 +14,25 @@ export const gitlabCreatePipelineTool: ToolConfig<
     accessToken: {
       type: 'string',
       required: true,
+      visibility: 'user-only',
       description: 'GitLab Personal Access Token',
     },
     projectId: {
       type: 'string',
       required: true,
+      visibility: 'user-or-llm',
       description: 'Project ID or URL-encoded path',
     },
     ref: {
       type: 'string',
       required: true,
+      visibility: 'user-or-llm',
       description: 'Branch or tag to run the pipeline on',
     },
     variables: {
       type: 'array',
       required: false,
+      visibility: 'user-or-llm',
       description:
         'Array of variables for the pipeline (each with key, value, and optional variable_type)',
     },
diff --git a/apps/sim/tools/gitlab/delete_issue.ts b/apps/sim/tools/gitlab/delete_issue.ts
index 0787321c4d..64fbe881e5 100644
--- a/apps/sim/tools/gitlab/delete_issue.ts
+++ b/apps/sim/tools/gitlab/delete_issue.ts
@@ -12,16 +12,19 @@ export const gitlabDeleteIssueTool: ToolConfig<GitLabDeleteIssueParams, GitLabDe
       accessToken: {
         type: 'string',
         required: true,
+        visibility: 'user-only',
         description: 'GitLab Personal Access Token',
       },
       projectId: {
         type: 'string',
         required: true,
+        visibility: 'user-or-llm',
         description: 'Project ID or URL-encoded path',
       },
       issueIid: {
         type: 'number',
         required: true,
+        visibility: 'user-or-llm',
         description: 'Issue internal ID (IID)',
       },
     },
diff --git a/apps/sim/tools/gitlab/get_issue.ts b/apps/sim/tools/gitlab/get_issue.ts
index acbe21e38e..9a3c5821ed 100644
--- a/apps/sim/tools/gitlab/get_issue.ts
+++ b/apps/sim/tools/gitlab/get_issue.ts
@@ -11,16 +11,19 @@ export const gitlabGetIssueTool: ToolConfig<GitLabGetIssueParams, GitLabGetIssue
     accessToken: {
       type: 'string',
       required: true,
+      visibility: 'user-only',
       description: 'GitLab Personal Access Token',
     },
     projectId: {
       type: 'string',
       required: true,
+      visibility: 'user-or-llm',
       description: 'Project ID or URL-encoded path',
     },
     issueIid: {
       type: 'number',
       required: true,
+      visibility: 'user-or-llm',
       description: 'Issue number within the project (the # shown in GitLab UI)',
     },
   },
diff --git a/apps/sim/tools/gitlab/get_merge_request.ts b/apps/sim/tools/gitlab/get_merge_request.ts
index 7b136961bb..6e99d3cfbd 100644
--- a/apps/sim/tools/gitlab/get_merge_request.ts
+++ b/apps/sim/tools/gitlab/get_merge_request.ts
@@ -17,16 +17,19 @@ export const gitlabGetMergeRequestTool: ToolConfig<
     accessToken: {
       type: 'string',
       required: true,
+      visibility: 'user-only',
       description: 'GitLab Personal Access Token',
     },
     projectId: {
       type: 'string',
       required: true,
+      visibility: 'user-or-llm',
       description: 'Project ID or URL-encoded path',
     },
     mergeRequestIid: {
       type: 'number',
       required: true,
+      visibility: 'user-or-llm',
       description: 'Merge request internal ID (IID)',
     },
   },
diff --git a/apps/sim/tools/gitlab/get_pipeline.ts b/apps/sim/tools/gitlab/get_pipeline.ts
index e1ae7a69fa..5f4f25a0ea 100644
--- a/apps/sim/tools/gitlab/get_pipeline.ts
+++ b/apps/sim/tools/gitlab/get_pipeline.ts
@@ -12,16 +12,19 @@ export const gitlabGetPipelineTool: ToolConfig<GitLabGetPipelineParams, GitLabGe
       accessToken: {
         type: 'string',
         required: true,
+        visibility: 'user-only',
         description: 'GitLab Personal Access Token',
       },
       projectId: {
         type: 'string',
         required: true,
+        visibility: 'user-or-llm',
         description: 'Project ID or URL-encoded path',
       },
       pipelineId: {
         type: 'number',
         required: true,
+        visibility: 'user-or-llm',
         description: 'Pipeline ID',
       },
     },
diff --git a/apps/sim/tools/gitlab/get_project.ts b/apps/sim/tools/gitlab/get_project.ts
index cabfcefd8e..c49369084f 100644
--- a/apps/sim/tools/gitlab/get_project.ts
+++ b/apps/sim/tools/gitlab/get_project.ts
@@ -11,11 +11,13 @@ export const gitlabGetProjectTool: ToolConfig<GitLabGetProjectParams, GitLabGetP
     accessToken: {
       type: 'string',
       required: true,
+      visibility: 'user-only',
       description: 'GitLab Personal Access Token',
     },
     projectId: {
       type: 'string',
       required: true,
+      visibility: 'user-or-llm',
       description: 'Project ID or URL-encoded path (e.g., "namespace/project")',
     },
   },
diff --git a/apps/sim/tools/gitlab/list_issues.ts b/apps/sim/tools/gitlab/list_issues.ts
index 8376019711..1607920571 100644
--- a/apps/sim/tools/gitlab/list_issues.ts
+++ b/apps/sim/tools/gitlab/list_issues.ts
@@ -11,56 +11,67 @@ export const gitlabListIssuesTool: ToolConfig<GitLabListIssuesParams, GitLabList
     accessToken: {
       type: 'string',
       required: true,
+      visibility: 'user-only',
       description: 'GitLab Personal Access Token',
     },
     projectId: {
       type: 'string',
       required: true,
+      visibility: 'user-or-llm',
       description: 'Project ID or URL-encoded path',
     },
     state: {
       type: 'string',
       required: false,
+      visibility: 'user-or-llm',
       description: 'Filter by state (opened, closed, all)',
     },
     labels: {
       type: 'string',
       required: false,
+      visibility: 'user-or-llm',
       description: 'Comma-separated list of label names',
     },
     assigneeId: {
       type: 'number',
       required: false,
+      visibility: 'user-or-llm',
       description: 'Filter by assignee user ID',
     },
     milestoneTitle: {
       type: 'string',
       required: false,
+      visibility: 'user-or-llm',
       description: 'Filter by milestone title',
     },
     search: {
       type: 'string',
       required: false,
+      visibility: 'user-or-llm',
       description: 'Search issues by title and description',
     },
     orderBy: {
       type: 'string',
       required: false,
+      visibility: 'user-or-llm',
       description: 'Order by field (created_at, updated_at)',
     },
     sort: {
       type: 'string',
       required: false,
+      visibility: 'user-or-llm',
       description: 'Sort direction (asc, desc)',
     },
     perPage: {
       type: 'number',
       required: false,
+      visibility: 'user-or-llm',
       description: 'Number of results per page (default 20, max 100)',
     },
     page: {
       type: 'number',
       required: false,
+      visibility: 'user-or-llm',
       description: 'Page number for pagination',
     },
   },
diff --git a/apps/sim/tools/gitlab/list_merge_requests.ts b/apps/sim/tools/gitlab/list_merge_requests.ts
index d40dbb1566..0296bc3a24 100644
--- a/apps/sim/tools/gitlab/list_merge_requests.ts
+++ b/apps/sim/tools/gitlab/list_merge_requests.ts
@@ -17,51 +17,61 @@ export const gitlabListMergeRequestsTool: ToolConfig<
     accessToken: {
       type: 'string',
       required: true,
+      visibility: 'user-only',
       description: 'GitLab Personal Access Token',
     },
     projectId: {
       type: 'string',
       required: true,
+      visibility: 'user-or-llm',
       description: 'Project ID or URL-encoded path',
     },
     state: {
       type: 'string',
       required: false,
+      visibility: 'user-or-llm',
       description: 'Filter by state (opened, closed, merged, all)',
     },
     labels: {
       type: 'string',
       required: false,
+      visibility: 'user-or-llm',
       description: 'Comma-separated list of label names',
     },
     sourceBranch: {
       type: 'string',
       required: false,
+      visibility: 'user-or-llm',
       description: 'Filter by source branch',
     },
     targetBranch: {
       type: 'string',
       required: false,
+      visibility: 'user-or-llm',
       description: 'Filter by target branch',
     },
     orderBy: {
       type: 'string',
       required: false,
+      visibility: 'user-or-llm',
       description: 'Order by field (created_at, updated_at)',
     },
     sort: {
       type: 'string',
       required: false,
+      visibility: 'user-or-llm',
       description: 'Sort direction (asc, desc)',
     },
     perPage: {
       type: 'number',
       required: false,
+      visibility: 'user-or-llm',
       description: 'Number of results per page (default 20, max 100)',
     },
     page: {
       type: 'number',
       required: false,
+      visibility: 'user-or-llm',
       description: 'Page number for pagination',
     },
   },
diff --git a/apps/sim/tools/gitlab/list_pipelines.ts b/apps/sim/tools/gitlab/list_pipelines.ts
index 71c5071255..d4aed46473 100644
--- a/apps/sim/tools/gitlab/list_pipelines.ts
+++ b/apps/sim/tools/gitlab/list_pipelines.ts
@@ -14,42 +14,50 @@ export const gitlabListPipelinesTool: ToolConfig<
     accessToken: {
       type: 'string',
       required: true,
+      visibility: 'user-only',
       description: 'GitLab Personal Access Token',
     },
     projectId: {
       type: 'string',
       required: true,
+      visibility: 'user-or-llm',
       description: 'Project ID or URL-encoded path',
     },
     ref: {
       type: 'string',
       required: false,
+      visibility: 'user-or-llm',
       description: 'Filter by ref (branch or tag)',
     },
     status: {
       type: 'string',
       required: false,
+      visibility: 'user-or-llm',
       description:
         'Filter by status (created, waiting_for_resource, preparing, pending, running, success, failed, canceled, skipped, manual, scheduled)',
     },
     orderBy: {
       type: 'string',
       required: false,
+      visibility: 'user-or-llm',
       description: 'Order by field (id, status, ref, updated_at, user_id)',
     },
     sort: {
       type: 'string',
       required: false,
+      visibility: 'user-or-llm',
       description: 'Sort direction (asc, desc)',
     },
     perPage: {
       type: 'number',
       required: false,
+      visibility: 'user-or-llm',
       description: 'Number of results per page (default 20, max 100)',
     },
     page: {
       type: 'number',
       required: false,
+      visibility: 'user-or-llm',
       description: 'Page number for pagination',
     },
   },
diff --git a/apps/sim/tools/gitlab/list_projects.ts b/apps/sim/tools/gitlab/list_projects.ts
index 0840ba3b28..ec8018215a 100644
--- a/apps/sim/tools/gitlab/list_projects.ts
+++ b/apps/sim/tools/gitlab/list_projects.ts
@@ -14,46 +14,55 @@ export const gitlabListProjectsTool: ToolConfig<
     accessToken: {
       type: 'string',
       required: true,
+      visibility: 'user-only',
       description: 'GitLab Personal Access Token',
     },
     owned: {
       type: 'boolean',
       required: false,
+      visibility: 'user-or-llm',
       description: 'Limit to projects owned by the current user',
     },
     membership: {
       type: 'boolean',
       required: false,
+      visibility: 'user-or-llm',
       description: 'Limit to projects the current user is a member of',
     },
     search: {
       type: 'string',
       required: false,
+      visibility: 'user-or-llm',
       description: 'Search projects by name',
     },
     visibility: {
       type: 'string',
       required: false,
+      visibility: 'user-or-llm',
       description: 'Filter by visibility (public, internal, private)',
     },
     orderBy: {
       type: 'string',
       required: false,
+      visibility: 'user-or-llm',
       description: 'Order by field (id, name, path, created_at, updated_at, last_activity_at)',
     },
     sort: {
       type: 'string',
       required: false,
+      visibility: 'user-or-llm',
       description: 'Sort direction (asc, desc)',
     },
     perPage: {
       type: 'number',
       required: false,
+      visibility: 'user-or-llm',
       description: 'Number of results per page (default 20, max 100)',
     },
     page: {
       type: 'number',
       required: false,
+      visibility: 'user-or-llm',
       description: 'Page number for pagination',
     },
   },
diff --git a/apps/sim/tools/gitlab/merge_merge_request.ts b/apps/sim/tools/gitlab/merge_merge_request.ts
index f16e013610..d63686a16f 100644
--- a/apps/sim/tools/gitlab/merge_merge_request.ts
+++ b/apps/sim/tools/gitlab/merge_merge_request.ts
@@ -17,41 +17,49 @@ export const gitlabMergeMergeRequestTool: ToolConfig<
     accessToken: {
       type: 'string',
       required: true,
+      visibility: 'user-only',
       description: 'GitLab Personal Access Token',
     },
     projectId: {
       type: 'string',
       required: true,
+      visibility: 'user-or-llm',
       description: 'Project ID or URL-encoded path',
     },
     mergeRequestIid: {
       type: 'number',
       required: true,
+      visibility: 'user-or-llm',
       description: 'Merge request internal ID (IID)',
     },
     mergeCommitMessage: {
       type: 'string',
       required: false,
+      visibility: 'user-or-llm',
       description: 'Custom merge commit message',
     },
     squashCommitMessage: {
       type: 'string',
       required: false,
+      visibility: 'user-or-llm',
       description: 'Custom squash commit message',
     },
     squash: {
       type: 'boolean',
       required: false,
+      visibility: 'user-or-llm',
       description: 'Squash commits before merging',
     },
     shouldRemoveSourceBranch: {
       type: 'boolean',
       required: false,
+      visibility: 'user-or-llm',
       description: 'Delete source branch after merge',
     },
     mergeWhenPipelineSucceeds: {
       type: 'boolean',
       required: false,
+      visibility: 'user-or-llm',
       description: 'Merge when pipeline succeeds',
     },
   },
diff --git a/apps/sim/tools/gitlab/retry_pipeline.ts b/apps/sim/tools/gitlab/retry_pipeline.ts
index bc24688b08..3c0fe6f2b4 100644
--- a/apps/sim/tools/gitlab/retry_pipeline.ts
+++ b/apps/sim/tools/gitlab/retry_pipeline.ts
@@ -14,16 +14,19 @@ export const gitlabRetryPipelineTool: ToolConfig<
     accessToken: {
       type: 'string',
       required: true,
+      visibility: 'user-only',
       description: 'GitLab Personal Access Token',
     },
     projectId: {
       type: 'string',
       required: true,
+      visibility: 'user-or-llm',
       description: 'Project ID or URL-encoded path',
     },
     pipelineId: {
       type: 'number',
       required: true,
+      visibility: 'user-or-llm',
       description: 'Pipeline ID',
     },
   },
diff --git a/apps/sim/tools/gitlab/update_issue.ts b/apps/sim/tools/gitlab/update_issue.ts
index 699664077e..27c1fb7016 100644
--- a/apps/sim/tools/gitlab/update_issue.ts
+++ b/apps/sim/tools/gitlab/update_issue.ts
@@ -12,56 +12,67 @@ export const gitlabUpdateIssueTool: ToolConfig<GitLabUpdateIssueParams, GitLabUp
       accessToken: {
         type: 'string',
         required: true,
+        visibility: 'user-only',
         description: 'GitLab Personal Access Token',
       },
       projectId: {
         type: 'string',
         required: true,
+        visibility: 'user-or-llm',
         description: 'Project ID or URL-encoded path',
       },
       issueIid: {
         type: 'number',
         required: true,
+        visibility: 'user-or-llm',
         description: 'Issue internal ID (IID)',
       },
       title: {
         type: 'string',
         required: false,
+        visibility: 'user-or-llm',
         description: 'New issue title',
       },
       description: {
         type: 'string',
         required: false,
+        visibility: 'user-or-llm',
         description: 'New issue description (Markdown supported)',
       },
       stateEvent: {
         type: 'string',
         required: false,
+        visibility: 'user-or-llm',
         description: 'State event (close or reopen)',
       },
       labels: {
         type: 'string',
         required: false,
+        visibility: 'user-or-llm',
         description: 'Comma-separated list of label names',
       },
       assigneeIds: {
         type: 'array',
         required: false,
+        visibility: 'user-or-llm',
         description: 'Array of user IDs to assign',
       },
       milestoneId: {
         type: 'number',
         required: false,
+        visibility: 'user-or-llm',
         description: 'Milestone ID to assign',
       },
       dueDate: {
         type: 'string',
         required: false,
+        visibility: 'user-or-llm',
         description: 'Due date in YYYY-MM-DD format',
       },
       confidential: {
         type: 'boolean',
         required: false,
+        visibility: 'user-or-llm',
         description: 'Whether the issue is confidential',
       },
     },
diff --git a/apps/sim/tools/gitlab/update_merge_request.ts b/apps/sim/tools/gitlab/update_merge_request.ts
index 9fd3a028ae..c02d4f13b0 100644
--- a/apps/sim/tools/gitlab/update_merge_request.ts
+++ b/apps/sim/tools/gitlab/update_merge_request.ts
@@ -17,66 +17,79 @@ export const gitlabUpdateMergeRequestTool: ToolConfig<
     accessToken: {
       type: 'string',
       required: true,
+      visibility: 'user-only',
       description: 'GitLab Personal Access Token',
     },
     projectId: {
       type: 'string',
       required: true,
+      visibility: 'user-or-llm',
       description: 'Project ID or URL-encoded path',
     },
     mergeRequestIid: {
       type: 'number',
       required: true,
+      visibility: 'user-or-llm',
       description: 'Merge request internal ID (IID)',
     },
     title: {
       type: 'string',
       required: false,
+      visibility: 'user-or-llm',
       description: 'New merge request title',
     },
     description: {
       type: 'string',
       required: false,
+      visibility: 'user-or-llm',
       description: 'New merge request description',
     },
     stateEvent: {
       type: 'string',
       required: false,
+      visibility: 'user-or-llm',
       description: 'State event (close or reopen)',
     },
     labels: {
       type: 'string',
       required: false,
+      visibility: 'user-or-llm',
       description: 'Comma-separated list of label names',
     },
     assigneeIds: {
       type: 'array',
       required: false,
+      visibility: 'user-or-llm',
       description: 'Array of user IDs to assign',
     },
     milestoneId: {
       type: 'number',
       required: false,
+      visibility: 'user-or-llm',
       description: 'Milestone ID to assign',
     },
     targetBranch: {
       type: 'string',
       required: false,
+      visibility: 'user-or-llm',
       description: 'New target branch',
     },
     removeSourceBranch: {
       type: 'boolean',
       required: false,
+      visibility: 'user-or-llm',
       description: 'Delete source branch after merge',
     },
     squash: {
       type: 'boolean',
       required: false,
+      visibility: 'user-or-llm',
       description: 'Squash commits on merge',
     },
     draft: {
       type: 'boolean',
       required: false,
+      visibility: 'user-or-llm',
       description: 'Mark as draft (work in progress)',
     },
   },
diff --git a/apps/sim/tools/google_calendar/delete.ts b/apps/sim/tools/google_calendar/delete.ts
new file mode 100644
index 0000000000..4b6de94e21
--- /dev/null
+++ b/apps/sim/tools/google_calendar/delete.ts
@@ -0,0 +1,135 @@
+import { CALENDAR_API_BASE, type GoogleCalendarDeleteParams } from '@/tools/google_calendar/types'
+import type { ToolConfig } from '@/tools/types'
+
+interface GoogleCalendarDeleteResponse {
+  success: boolean
+  output: {
+    content: string
+    metadata: {
+      eventId: string
+      deleted: boolean
+    }
+  }
+}
+
+export const deleteTool: ToolConfig<GoogleCalendarDeleteParams, GoogleCalendarDeleteResponse> = {
+  id: 'google_calendar_delete',
+  name: 'Google Calendar Delete Event',
+  description: 'Delete an event from Google Calendar',
+  version: '1.0.0',
+
+  oauth: {
+    required: true,
+    provider: 'google-calendar',
+  },
+
+  params: {
+    accessToken: {
+      type: 'string',
+      required: true,
+      visibility: 'hidden',
+      description: 'Access token for Google Calendar API',
+    },
+    calendarId: {
+      type: 'string',
+      required: false,
+      visibility: 'user-only',
+      description: 'Calendar ID (defaults to primary)',
+    },
+    eventId: {
+      type: 'string',
+      required: true,
+      visibility: 'user-only',
+      description: 'Event ID to delete',
+    },
+    sendUpdates: {
+      type: 'string',
+      required: false,
+      visibility: 'user-only',
+      description: 'How to send updates to attendees: all, externalOnly, or none',
+    },
+  },
+
+  request: {
+    url: (params: GoogleCalendarDeleteParams) => {
+      const calendarId = params.calendarId || 'primary'
+      const queryParams = new URLSearchParams()
+
+      if (params.sendUpdates !== undefined) {
+        queryParams.append('sendUpdates', params.sendUpdates)
+      }
+
+      const queryString = queryParams.toString()
+      return `${CALENDAR_API_BASE}/calendars/${encodeURIComponent(calendarId)}/events/${encodeURIComponent(params.eventId)}${queryString ? `?${queryString}` : ''}`
+    },
+    method: 'DELETE',
+    headers: (params: GoogleCalendarDeleteParams) => ({
+      Authorization: `Bearer ${params.accessToken}`,
+      'Content-Type': 'application/json',
+    }),
+  },
+
+  transformResponse: async (response: Response, params) => {
+    // DELETE returns 204 No Content on success
+    if (response.status === 204 || response.ok) {
+      return {
+        success: true,
+        output: {
+          content: `Event successfully deleted`,
+          metadata: {
+            eventId: params?.eventId || '',
+            deleted: true,
+          },
+        },
+      }
+    }
+
+    const errorData = await response.json()
+    throw new Error(errorData.error?.message || 'Failed to delete event')
+  },
+
+  outputs: {
+    content: { type: 'string', description: 'Event deletion confirmation message' },
+    metadata: {
+      type: 'json',
+      description: 'Deletion details including event ID',
+    },
+  },
+}
+
+interface GoogleCalendarDeleteV2Response {
+  success: boolean
+  output: {
+    eventId: string
+    deleted: boolean
+  }
+}
+
+export const deleteV2Tool: ToolConfig<GoogleCalendarDeleteParams, GoogleCalendarDeleteV2Response> =
+  {
+    id: 'google_calendar_delete_v2',
+    name: 'Google Calendar Delete Event',
+    description: 'Delete an event from Google Calendar. Returns API-aligned fields only.',
+    version: '2.0.0',
+    oauth: deleteTool.oauth,
+    params: deleteTool.params,
+    request: deleteTool.request,
+    transformResponse: async (response: Response, params) => {
+      if (response.status === 204 || response.ok) {
+        return {
+          success: true,
+          output: {
+            eventId: params?.eventId || '',
+            deleted: true,
+          },
+        }
+      }
+
+      const errorData = await response.json()
+      throw new Error(errorData.error?.message || 'Failed to delete event')
+    },
+    outputs: {
+      eventId: { type: 'string', description: 'Deleted event ID' },
+      deleted: { type: 'boolean', description: 'Whether deletion was successful' },
+    },
+  }
diff --git a/apps/sim/tools/google_calendar/index.ts b/apps/sim/tools/google_calendar/index.ts
index 0f3105ae92..2ddfcf55e5 100644
--- a/apps/sim/tools/google_calendar/index.ts
+++ b/apps/sim/tools/google_calendar/index.ts
@@ -1,17 +1,32 @@
 import { createTool, createV2Tool } from '@/tools/google_calendar/create'
+import { deleteTool, deleteV2Tool } from '@/tools/google_calendar/delete'
 import { getTool, getV2Tool } from '@/tools/google_calendar/get'
+import { instancesTool, instancesV2Tool } from '@/tools/google_calendar/instances'
 import { inviteTool, inviteV2Tool } from '@/tools/google_calendar/invite'
 import { listTool, listV2Tool } from '@/tools/google_calendar/list'
+import { listCalendarsTool, listCalendarsV2Tool } from '@/tools/google_calendar/list_calendars'
+import { moveTool, moveV2Tool } from '@/tools/google_calendar/move'
 import { quickAddTool, quickAddV2Tool } from '@/tools/google_calendar/quick_add'
+import { updateTool, updateV2Tool } from '@/tools/google_calendar/update'
 
 export const googleCalendarCreateTool = createTool
+export const googleCalendarDeleteTool = deleteTool
 export const googleCalendarGetTool = getTool
+export const googleCalendarInstancesTool = instancesTool
 export const googleCalendarInviteTool = inviteTool
 export const googleCalendarListTool = listTool
+export const googleCalendarListCalendarsTool = listCalendarsTool
+export const googleCalendarMoveTool = moveTool
 export const googleCalendarQuickAddTool = quickAddTool
+export const googleCalendarUpdateTool = updateTool
 
 export const googleCalendarCreateV2Tool = createV2Tool
+export const googleCalendarDeleteV2Tool = deleteV2Tool
 export const googleCalendarGetV2Tool = getV2Tool
+export const googleCalendarInstancesV2Tool = instancesV2Tool
 export const googleCalendarInviteV2Tool = inviteV2Tool
 export const googleCalendarListV2Tool = listV2Tool
+export const googleCalendarListCalendarsV2Tool = listCalendarsV2Tool
+export const googleCalendarMoveV2Tool = moveV2Tool
 export const googleCalendarQuickAddV2Tool = quickAddV2Tool
+export const googleCalendarUpdateV2Tool = updateV2Tool
diff --git a/apps/sim/tools/google_calendar/instances.ts b/apps/sim/tools/google_calendar/instances.ts
new file mode 100644
index 0000000000..8bb672ab9c
--- /dev/null
+++ b/apps/sim/tools/google_calendar/instances.ts
@@ -0,0 +1,268 @@
+import {
+  CALENDAR_API_BASE,
+  type GoogleCalendarApiEventResponse,
+} from '@/tools/google_calendar/types'
+import type { ToolConfig } from '@/tools/types'
+
+interface GoogleCalendarInstancesParams {
+  accessToken: string
+  calendarId?: string
+  eventId: string
+  timeMin?: string
+  timeMax?: string
+  maxResults?: number
+  pageToken?: string
+  showDeleted?: boolean
+}
+
+interface GoogleCalendarInstancesResponse {
+  success: boolean
+  output: {
+    content: string
+    metadata: {
+      nextPageToken?: string
+      timeZone: string
+      instances: Array<{
+        id: string
+        htmlLink: string
+        status: string
+        summary: string
+        description?: string
+        location?: string
+        start: {
+          dateTime?: string
+          date?: string
+          timeZone?: string
+        }
+        end: {
+          dateTime?: string
+          date?: string
+          timeZone?: string
+        }
+        attendees?: Array<{
+          email: string
+          displayName?: string
+          responseStatus: string
+        }>
+        creator?: {
+          email: string
+          displayName?: string
+        }
+        organizer?: {
+          email: string
+          displayName?: string
+        }
+        recurringEventId: string
+        originalStartTime: {
+          dateTime?: string
+          date?: string
+          timeZone?: string
+        }
+      }>
+    }
+  }
+}
+
+interface InstanceApiResponse {
+  kind: string
+  etag: string
+  summary: string
+  description?: string
+  updated: string
+  timeZone: string
+  accessRole: string
+  nextPageToken?: string
+  items: Array<
+    GoogleCalendarApiEventResponse & {
+      recurringEventId: string
+      originalStartTime: {
+        dateTime?: string
+        date?: string
+        timeZone?: string
+      }
+    }
+  >
+}
+
+export const instancesTool: ToolConfig<
+  GoogleCalendarInstancesParams,
+  GoogleCalendarInstancesResponse
+> = {
+  id: 'google_calendar_instances',
+  name: 'Google Calendar Get Instances',
+  description: 'Get instances of a recurring event from Google Calendar',
+  version: '1.0.0',
+
+  oauth: {
+    required: true,
+    provider: 'google-calendar',
+  },
+
+  params: {
+    accessToken: {
+      type: 'string',
+      required: true,
+      visibility: 'hidden',
+      description: 'Access token for Google Calendar API',
+    },
+    calendarId: {
+      type: 'string',
+      required: false,
+      visibility: 'user-only',
+      description: 'Calendar ID (defaults to primary)',
+    },
+    eventId: {
+      type: 'string',
+      required: true,
+      visibility: 'user-only',
+      description: 'Recurring event ID to get instances of',
+    },
+    timeMin: {
+      type: 'string',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Lower bound for instances (RFC3339 timestamp, e.g., 2025-06-03T00:00:00Z)',
+    },
+    timeMax: {
+      type: 'string',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Upper bound for instances (RFC3339 timestamp, e.g., 2025-06-04T00:00:00Z)',
+    },
+    maxResults: {
+      type: 'number',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Maximum number of instances to return (default 250, max 2500)',
+    },
+    pageToken: {
+      type: 'string',
+      required: false,
+      visibility: 'user-only',
+      description: 'Token for retrieving subsequent pages of results',
+    },
+    showDeleted: {
+      type: 'boolean',
+      required: false,
+      visibility: 'hidden',
+      description: 'Include deleted instances',
+    },
+  },
+
+  request: {
+    url: (params: GoogleCalendarInstancesParams) => {
+      const calendarId = params.calendarId || 'primary'
+      const queryParams = new URLSearchParams()
+
+      if (params.timeMin) queryParams.append('timeMin', params.timeMin)
+      if (params.timeMax) queryParams.append('timeMax', params.timeMax)
+      if (params.maxResults) queryParams.append('maxResults', params.maxResults.toString())
+      if (params.pageToken) queryParams.append('pageToken', params.pageToken)
+      if (params.showDeleted !== undefined)
+        queryParams.append('showDeleted', params.showDeleted.toString())
+
+      const queryString = queryParams.toString()
+      return `${CALENDAR_API_BASE}/calendars/${encodeURIComponent(calendarId)}/events/${encodeURIComponent(params.eventId)}/instances${queryString ? `?${queryString}` : ''}`
+    },
+    method: 'GET',
+    headers: (params: GoogleCalendarInstancesParams) => ({
+      Authorization: `Bearer ${params.accessToken}`,
+      'Content-Type': 'application/json',
+    }),
+  },
+
+  transformResponse: async (response: Response) => {
+    const data: InstanceApiResponse = await response.json()
+    const instances = data.items || []
+    const instancesCount = instances.length
+
+    return {
+      success: true,
+      output: {
+        content: `Found ${instancesCount} instance${instancesCount !== 1 ? 's' : ''} of the recurring event`,
+        metadata: {
+          nextPageToken: data.nextPageToken,
+          timeZone: data.timeZone,
+          instances: instances.map((instance) => ({
+            id: instance.id,
+            htmlLink: instance.htmlLink,
+            status: instance.status,
+            summary: instance.summary || 'No title',
+            description: instance.description,
+            location: instance.location,
+            start: instance.start,
+            end: instance.end,
+            attendees: instance.attendees,
+            creator: instance.creator,
+            organizer: instance.organizer,
+            recurringEventId: instance.recurringEventId,
+            originalStartTime: instance.originalStartTime,
+          })),
+        },
+      },
+    }
+  },
+
+  outputs: {
+    content: { type: 'string', description: 'Summary of found instances count' },
+    metadata: {
+      type: 'json',
+      description: 'List of recurring event instances with pagination tokens',
+    },
+  },
+}
+
+interface GoogleCalendarInstancesV2Response {
+  success: boolean
+  output: {
+    nextPageToken: string | null
+    timeZone: string | null
+    instances: Array<Record<string, any>>
+  }
+}
+
+export const instancesV2Tool: ToolConfig<
+  GoogleCalendarInstancesParams,
+  GoogleCalendarInstancesV2Response
+> = {
+  id: 'google_calendar_instances_v2',
+  name: 'Google Calendar Get Instances',
+  description:
+    'Get instances of a recurring event from Google Calendar. Returns API-aligned fields only.',
+  version: '2.0.0',
+  oauth: instancesTool.oauth,
+  params: instancesTool.params,
+  request: instancesTool.request,
+  transformResponse: async (response: Response) => {
+    const data: InstanceApiResponse = await response.json()
+    const instances = data.items || []
+
+    return {
+      success: true,
+      output: {
+        nextPageToken: data.nextPageToken ?? null,
+        timeZone: data.timeZone ?? null,
+        instances: instances.map((instance) => ({
+          id: instance.id,
+          htmlLink: instance.htmlLink,
+          status: instance.status,
+          summary: instance.summary ?? null,
+          description: instance.description ?? null,
+          location: instance.location ?? null,
+          start: instance.start,
+          end: instance.end,
+          attendees: instance.attendees ?? null,
+          creator: instance.creator,
+          organizer: instance.organizer,
+          recurringEventId: instance.recurringEventId,
+          originalStartTime: instance.originalStartTime,
+        })),
+      },
+    }
+  },
+  outputs: {
+    nextPageToken: { type: 'string', description: 'Next page token', optional: true },
+    timeZone: { type: 'string', description: 'Calendar time zone', optional: true },
+    instances: { type: 'json', description: 'List of recurring event instances' },
+  },
+}
diff --git a/apps/sim/tools/google_calendar/list_calendars.ts b/apps/sim/tools/google_calendar/list_calendars.ts
new file mode 100644
index 0000000000..77aa38de5f
--- /dev/null
+++ b/apps/sim/tools/google_calendar/list_calendars.ts
@@ -0,0 +1,280 @@
+import { CALENDAR_API_BASE } from '@/tools/google_calendar/types'
+import type { ToolConfig } from '@/tools/types'
+
+interface GoogleCalendarListCalendarsParams {
+  accessToken: string
+  minAccessRole?: 'freeBusyReader' | 'reader' | 'writer' | 'owner'
+  maxResults?: number
+  pageToken?: string
+  showDeleted?: boolean
+  showHidden?: boolean
+}
+
+interface CalendarListEntry {
+  kind: string
+  etag: string
+  id: string
+  summary: string
+  description?: string
+  location?: string
+  timeZone: string
+  summaryOverride?: string
+  colorId: string
+  backgroundColor: string
+  foregroundColor: string
+  hidden?: boolean
+  selected?: boolean
+  accessRole: string
+  defaultReminders: Array<{
+    method: string
+    minutes: number
+  }>
+  notificationSettings?: {
+    notifications: Array<{
+      type: string
+      method: string
+    }>
+  }
+  primary?: boolean
+  deleted?: boolean
+  conferenceProperties?: {
+    allowedConferenceSolutionTypes: string[]
+  }
+}
+
+interface CalendarListApiResponse {
+  kind: string
+  etag: string
+  nextPageToken?: string
+  nextSyncToken?: string
+  items: CalendarListEntry[]
+}
+
+interface GoogleCalendarListCalendarsResponse {
+  success: boolean
+  output: {
+    content: string
+    metadata: {
+      nextPageToken?: string
+      calendars: Array<{
+        id: string
+        summary: string
+        description?: string
+        location?: string
+        timeZone: string
+        accessRole: string
+        backgroundColor: string
+        foregroundColor: string
+        primary?: boolean
+        hidden?: boolean
+        selected?: boolean
+      }>
+    }
+  }
+}
+
+export const listCalendarsTool: ToolConfig<
+  GoogleCalendarListCalendarsParams,
+  GoogleCalendarListCalendarsResponse
+> = {
+  id: 'google_calendar_list_calendars',
+  name: 'Google Calendar List Calendars',
+  description: "List all calendars in the user's calendar list",
+  version: '1.0.0',
+
+  oauth: {
+    required: true,
+    provider: 'google-calendar',
+  },
+
+  params: {
+    accessToken: {
+      type: 'string',
+      required: true,
+      visibility: 'hidden',
+      description: 'Access token for Google Calendar API',
+    },
+    minAccessRole: {
+      type: 'string',
+      required: false,
+      visibility: 'user-only',
+      description:
+        'Minimum access role for returned calendars: freeBusyReader, reader, writer, or owner',
+    },
+    maxResults: {
+      type: 'number',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Maximum number of calendars to return (default 100, max 250)',
+    },
+    pageToken: {
+      type: 'string',
+      required: false,
+      visibility: 'user-only',
+      description: 'Token for retrieving subsequent pages of results',
+    },
+    showDeleted: {
+      type: 'boolean',
+      required: false,
+      visibility: 'hidden',
+      description: 'Include deleted calendars',
+    },
+    showHidden: {
+      type: 'boolean',
+      required: false,
+      visibility: 'hidden',
+      description: 'Include hidden calendars',
+    },
+  },
+
+  request: {
+    url: (params: GoogleCalendarListCalendarsParams) => {
+      const queryParams = new URLSearchParams()
+
+      if (params.minAccessRole) queryParams.append('minAccessRole', params.minAccessRole)
+      if (params.maxResults) queryParams.append('maxResults', params.maxResults.toString())
+      if (params.pageToken) queryParams.append('pageToken', params.pageToken)
+      if (params.showDeleted !== undefined)
+        queryParams.append('showDeleted', params.showDeleted.toString())
+      if (params.showHidden !== undefined)
+        queryParams.append('showHidden', params.showHidden.toString())
+
+      const queryString = queryParams.toString()
+      return `${CALENDAR_API_BASE}/users/me/calendarList${queryString ? `?${queryString}` : ''}`
+    },
+    method: 'GET',
+    headers: (params: GoogleCalendarListCalendarsParams) => ({
+      Authorization: `Bearer ${params.accessToken}`,
+      'Content-Type': 'application/json',
+    }),
+  },
+
+  transformResponse: async (response: Response) => {
+    const data: CalendarListApiResponse = await response.json()
+    const calendars = data.items || []
+    const calendarsCount = calendars.length
+
+    return {
+      success: true,
+      output: {
+        content: `Found ${calendarsCount} calendar${calendarsCount !== 1 ? 's' : ''}`,
+        metadata: {
+          nextPageToken: data.nextPageToken,
+          calendars: calendars.map((calendar) => ({
+            id: calendar.id,
+            summary: calendar.summaryOverride || calendar.summary,
+            description: calendar.description,
+            location: calendar.location,
+            timeZone: calendar.timeZone,
+            accessRole: calendar.accessRole,
+            backgroundColor: calendar.backgroundColor,
+            foregroundColor: calendar.foregroundColor,
+            primary: calendar.primary,
+            hidden: calendar.hidden,
+            selected: calendar.selected,
+          })),
+        },
+      },
+    }
+  },
+
+  outputs: {
+    content: { type: 'string', description: 'Summary of found calendars count' },
+    metadata: {
+      type: 'json',
+      description: 'List of calendars with their details',
+    },
+  },
+}
+
+interface GoogleCalendarListCalendarsV2Response {
+  success: boolean
+  output: {
+    nextPageToken: string | null
+    calendars: Array<{
+      id: string
+      summary: string
+      description: string | null
+      location: string | null
+      timeZone: string
+      accessRole: string
+      backgroundColor: string
+      foregroundColor: string
+      primary: boolean | null
+      hidden: boolean | null
+      selected: boolean | null
+    }>
+  }
+}
+
+export const listCalendarsV2Tool: ToolConfig<
+  GoogleCalendarListCalendarsParams,
+  GoogleCalendarListCalendarsV2Response
+> = {
+  id: 'google_calendar_list_calendars_v2',
+  name: 'Google Calendar List Calendars',
+  description: "List all calendars in the user's calendar list. Returns API-aligned fields only.",
+  version: '2.0.0',
+  oauth: listCalendarsTool.oauth,
+  params: listCalendarsTool.params,
+  request: listCalendarsTool.request,
+  transformResponse: async (response: Response) => {
+    const data: CalendarListApiResponse = await response.json()
+    const calendars = data.items || []
+
+    return {
+      success: true,
+      output: {
+        nextPageToken: data.nextPageToken ?? null,
+        calendars: calendars.map((calendar) => ({
+          id: calendar.id,
+          summary: calendar.summaryOverride || calendar.summary,
+          description: calendar.description ?? null,
+          location: calendar.location ?? null,
+          timeZone: calendar.timeZone,
+          accessRole: calendar.accessRole,
+          backgroundColor: calendar.backgroundColor,
+          foregroundColor: calendar.foregroundColor,
+          primary: calendar.primary ?? null,
+          hidden: calendar.hidden ?? null,
+          selected: calendar.selected ?? null,
+        })),
+      },
+    }
+  },
+  outputs: {
+    nextPageToken: { type: 'string', description: 'Next page token', optional: true },
+    calendars: {
+      type: 'array',
+      description: 'List of calendars',
+      items: {
+        type: 'object',
+        properties: {
+          id: { type: 'string', description: 'Calendar ID' },
+          summary: { type: 'string', description: 'Calendar title' },
+          description: { type: 'string', description: 'Calendar description', optional: true },
+          location: { type: 'string', description: 'Calendar location', optional: true },
+          timeZone: { type: 'string', description: 'Calendar time zone' },
+          accessRole: { type: 'string', description: 'Access role for the calendar' },
+          backgroundColor: { type: 'string', description: 'Calendar background color' },
+          foregroundColor: { type: 'string', description: 'Calendar foreground color' },
+          primary: {
+            type: 'boolean',
+            description: 'Whether this is the primary calendar',
+            optional: true,
+          },
+          hidden: {
+            type: 'boolean',
+            description: 'Whether the calendar is hidden',
+            optional: true,
+          },
+          selected: {
+            type: 'boolean',
+            description: 'Whether the calendar is selected',
+            optional: true,
+          },
+        },
+      },
+    },
+  },
+}
diff --git a/apps/sim/tools/google_calendar/move.ts b/apps/sim/tools/google_calendar/move.ts
new file mode 100644
index 0000000000..3073ee41d4
--- /dev/null
+++ b/apps/sim/tools/google_calendar/move.ts
@@ -0,0 +1,208 @@
+import {
+  CALENDAR_API_BASE,
+  type GoogleCalendarApiEventResponse,
+} from '@/tools/google_calendar/types'
+import type { ToolConfig } from '@/tools/types'
+
+interface GoogleCalendarMoveParams {
+  accessToken: string
+  calendarId?: string
+  eventId: string
+  destinationCalendarId: string
+  sendUpdates?: 'all' | 'externalOnly' | 'none'
+}
+
+interface GoogleCalendarMoveResponse {
+  success: boolean
+  output: {
+    content: string
+    metadata: {
+      id: string
+      htmlLink: string
+      status: string
+      summary: string
+      description?: string
+      location?: string
+      start: {
+        dateTime?: string
+        date?: string
+        timeZone?: string
+      }
+      end: {
+        dateTime?: string
+        date?: string
+        timeZone?: string
+      }
+      attendees?: Array<{
+        email: string
+        displayName?: string
+        responseStatus: string
+      }>
+      creator?: {
+        email: string
+        displayName?: string
+      }
+      organizer?: {
+        email: string
+        displayName?: string
+      }
+    }
+  }
+}
+
+export const moveTool: ToolConfig<GoogleCalendarMoveParams, GoogleCalendarMoveResponse> = {
+  id: 'google_calendar_move',
+  name: 'Google Calendar Move Event',
+  description: 'Move an event to a different calendar',
+  version: '1.0.0',
+
+  oauth: {
+    required: true,
+    provider: 'google-calendar',
+  },
+
+  params: {
+    accessToken: {
+      type: 'string',
+      required: true,
+      visibility: 'hidden',
+      description: 'Access token for Google Calendar API',
+    },
+    calendarId: {
+      type: 'string',
+      required: false,
+      visibility: 'user-only',
+      description: 'Source calendar ID (defaults to primary)',
+    },
+    eventId: {
+      type: 'string',
+      required: true,
+      visibility: 'user-only',
+      description: 'Event ID to move',
+    },
+    destinationCalendarId: {
+      type: 'string',
+      required: true,
+      visibility: 'user-only',
+      description: 'Destination calendar ID',
+    },
+    sendUpdates: {
+      type: 'string',
+      required: false,
+      visibility: 'user-only',
+      description: 'How to send updates to attendees: all, externalOnly, or none',
+    },
+  },
+
+  request: {
+    url: (params: GoogleCalendarMoveParams) => {
+      const calendarId = params.calendarId || 'primary'
+      const queryParams = new URLSearchParams()
+
+      queryParams.append('destination', params.destinationCalendarId)
+
+      if (params.sendUpdates !== undefined) {
+        queryParams.append('sendUpdates', params.sendUpdates)
+      }
+
+      return `${CALENDAR_API_BASE}/calendars/${encodeURIComponent(calendarId)}/events/${encodeURIComponent(params.eventId)}/move?${queryParams.toString()}`
+    },
+    method: 'POST',
+    headers: (params: GoogleCalendarMoveParams) => ({
+      Authorization: `Bearer ${params.accessToken}`,
+      'Content-Type': 'application/json',
+    }),
+  },
+
+  transformResponse: async (response: Response) => {
+    const data: GoogleCalendarApiEventResponse = await response.json()
+
+    return {
+      success: true,
+      output: {
+        content: `Event "${data.summary}" moved successfully`,
+        metadata: {
+          id: data.id,
+          htmlLink: data.htmlLink,
+          status: data.status,
+          summary: data.summary,
+          description: data.description,
+          location: data.location,
+          start: data.start,
+          end: data.end,
+          attendees: data.attendees,
+          creator: data.creator,
+          organizer: data.organizer,
+        },
+      },
+    }
+  },
+
+  outputs: {
+    content: { type: 'string', description: 'Event move confirmation message' },
+    metadata: {
+      type: 'json',
+      description: 'Moved event metadata including new details',
+    },
+  },
+}
+
+interface GoogleCalendarMoveV2Response {
+  success: boolean
+  output: {
+    id: string
+    htmlLink: string
+    status: string
+    summary: string | null
+    description: string | null
+    location: string | null
+    start: any
+    end: any
+    attendees: any | null
+    creator: any
+    organizer: any
+  }
+}
+
+export const moveV2Tool: ToolConfig<GoogleCalendarMoveParams, GoogleCalendarMoveV2Response> = {
+  id: 'google_calendar_move_v2',
+  name: 'Google Calendar Move Event',
+  description: 'Move an event to a different calendar. Returns API-aligned fields only.',
+  version: '2.0.0',
+  oauth: moveTool.oauth,
+  params: moveTool.params,
+  request: moveTool.request,
+  transformResponse: async (response: Response) => {
+    const data: GoogleCalendarApiEventResponse = await response.json()
+
+    return {
+      success: true,
+      output: {
+        id: data.id,
+        htmlLink: data.htmlLink,
+        status: data.status,
+        summary: data.summary ?? null,
+        description: data.description ?? null,
+        location: data.location ?? null,
+        start: data.start,
+        end: data.end,
+        attendees: data.attendees ?? null,
+        creator: data.creator,
+        organizer: data.organizer,
+      },
+    }
+  },
+  outputs: {
+    id: { type: 'string', description: 'Event ID' },
+    htmlLink: { type: 'string', description: 'Event link' },
+    status: { type: 'string', description: 'Event status' },
+    summary: { type: 'string', description: 'Event title', optional: true },
+    description: { type: 'string', description: 'Event description', optional: true },
+    location: { type: 'string', description: 'Event location', optional: true },
+    start: { type: 'json', description: 'Event start' },
+    end: { type: 'json', description: 'Event end' },
+    attendees: { type: 'json', description: 'Event attendees', optional: true },
+    creator: { type: 'json', description: 'Event creator' },
+    organizer: { type: 'json', description: 'Event organizer' },
+  },
+}
diff --git a/apps/sim/tools/google_calendar/types.ts b/apps/sim/tools/google_calendar/types.ts
index c6e5352597..46b39f8a04 100644
--- a/apps/sim/tools/google_calendar/types.ts
+++ b/apps/sim/tools/google_calendar/types.ts
@@ -75,6 +75,30 @@ export interface GoogleCalendarInviteParams extends BaseGoogleCalendarParams {
   replaceExisting?: boolean // Whether to replace existing attendees or add to them
 }
 
+export interface GoogleCalendarMoveParams extends BaseGoogleCalendarParams {
+  eventId: string
+  destinationCalendarId: string
+  sendUpdates?: 'all' | 'externalOnly' | 'none'
+}
+
+export interface GoogleCalendarInstancesParams extends BaseGoogleCalendarParams {
+  eventId: string
+  timeMin?: string
+  timeMax?: string
+  maxResults?: number
+  pageToken?: string
+  showDeleted?: boolean
+}
+
+export interface GoogleCalendarListCalendarsParams {
+  accessToken: string
+  minAccessRole?: 'freeBusyReader' | 'reader' | 'writer' | 'owner'
+  maxResults?: number
+  pageToken?: string
+  showDeleted?: boolean
+  showHidden?: boolean
+}
+
 export type GoogleCalendarToolParams =
   | GoogleCalendarCreateParams
   | GoogleCalendarListParams
@@ -83,6 +107,9 @@ export type GoogleCalendarToolParams =
   | GoogleCalendarDeleteParams
   | GoogleCalendarQuickAddParams
   | GoogleCalendarInviteParams
+  | GoogleCalendarMoveParams
+  | GoogleCalendarInstancesParams
+  | GoogleCalendarListCalendarsParams
 
 interface EventMetadata {
   id: string
@@ -277,6 +304,65 @@ export interface GoogleCalendarApiListResponse {
   items: GoogleCalendarApiEventResponse[]
 }
 
+export interface GoogleCalendarDeleteResponse extends ToolResponse {
+  output: {
+    content: string
+    metadata: {
+      eventId: string
+      deleted: boolean
+    }
+  }
+}
+
+export interface GoogleCalendarMoveResponse extends ToolResponse {
+  output: {
+    content: string
+    metadata: EventMetadata
+  }
+}
+
+export interface GoogleCalendarInstancesResponse extends ToolResponse {
+  output: {
+    content: string
+    metadata: {
+      nextPageToken?: string
+      timeZone: string
+      instances: Array<
+        EventMetadata & {
+          recurringEventId: string
+          originalStartTime: {
+            dateTime?: string
+            date?: string
+            timeZone?: string
+          }
+        }
+      >
+    }
+  }
+}
+
+export interface GoogleCalendarListCalendarsResponse extends ToolResponse {
+  output: {
+    content: string
+    metadata: {
+      nextPageToken?: string
+      calendars: Array<{
+        id: string
+        summary: string
+        description?: string
+        location?: string
+        timeZone: string
+        accessRole: string
+        backgroundColor: string
+        foregroundColor: string
+        primary?: boolean
+        hidden?: boolean
+        selected?: boolean
+      }>
+    }
+  }
+}
+
 export type GoogleCalendarResponse =
   | GoogleCalendarCreateResponse
   | GoogleCalendarListResponse
@@ -284,3 +370,7 @@ export type GoogleCalendarResponse =
   | GoogleCalendarQuickAddResponse
   | GoogleCalendarInviteResponse
   | GoogleCalendarUpdateResponse
+  | GoogleCalendarDeleteResponse
+  | GoogleCalendarMoveResponse
+  | GoogleCalendarInstancesResponse
+  | GoogleCalendarListCalendarsResponse
diff --git a/apps/sim/tools/google_calendar/update.ts b/apps/sim/tools/google_calendar/update.ts
new file mode 100644
index 0000000000..be9ad15d59
--- /dev/null
+++ b/apps/sim/tools/google_calendar/update.ts
@@ -0,0 +1,255 @@
+import {
+  CALENDAR_API_BASE,
+  type GoogleCalendarApiEventResponse,
+  type GoogleCalendarUpdateParams,
+  type GoogleCalendarUpdateResponse,
+} from '@/tools/google_calendar/types'
+import type { ToolConfig } from '@/tools/types'
+
+export const updateTool: ToolConfig<GoogleCalendarUpdateParams, GoogleCalendarUpdateResponse> = {
+  id: 'google_calendar_update',
+  name: 'Google Calendar Update Event',
+  description: 'Update an existing event in Google Calendar',
+  version: '1.0.0',
+
+  oauth: {
+    required: true,
+    provider: 'google-calendar',
+  },
+
+  params: {
+    accessToken: {
+      type: 'string',
+      required: true,
+      visibility: 'hidden',
+      description: 'Access token for Google Calendar API',
+    },
+    calendarId: {
+      type: 'string',
+      required: false,
+      visibility: 'user-only',
+      description: 'Calendar ID (defaults to primary)',
+    },
+    eventId: {
+      type: 'string',
+      required: true,
+      visibility: 'user-only',
+      description: 'Event ID to update',
+    },
+    summary: {
+      type: 'string',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'New event title/summary',
+    },
+    description: {
+      type: 'string',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'New event description',
+    },
+    location: {
+      type: 'string',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'New event location',
+    },
+    startDateTime: {
+      type: 'string',
+      required: false,
+      visibility: 'user-or-llm',
+      description:
+        'New start date and time. MUST include timezone offset (e.g., 2025-06-03T10:00:00-08:00) OR provide timeZone parameter',
+    },
+    endDateTime: {
+      type: 'string',
+      required: false,
+      visibility: 'user-or-llm',
+      description:
+        'New end date and time. MUST include timezone offset (e.g., 2025-06-03T11:00:00-08:00) OR provide timeZone parameter',
+    },
+    timeZone: {
+      type: 'string',
+      required: false,
+      visibility: 'user-or-llm',
+      description:
+        'Time zone (e.g., America/Los_Angeles). Required if datetime does not include offset.',
+    },
+    attendees: {
+      type: 'array',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Array of attendee email addresses (replaces existing attendees)',
+    },
+    sendUpdates: {
+      type: 'string',
+      required: false,
+      visibility: 'user-only',
+      description: 'How to send updates to attendees: all, externalOnly, or none',
+    },
+  },
+
+  request: {
+    url: (params: GoogleCalendarUpdateParams) => {
+      const calendarId = params.calendarId || 'primary'
+      const queryParams = new URLSearchParams()
+
+      if (params.sendUpdates !== undefined) {
+        queryParams.append('sendUpdates', params.sendUpdates)
+      }
+
+      const queryString = queryParams.toString()
+      return `${CALENDAR_API_BASE}/calendars/${encodeURIComponent(calendarId)}/events/${encodeURIComponent(params.eventId)}${queryString ? `?${queryString}` : ''}`
+    },
+    method: 'PATCH',
+    headers: (params: GoogleCalendarUpdateParams) => ({
+      Authorization: `Bearer ${params.accessToken}`,
+      'Content-Type': 'application/json',
+    }),
+    body: (params: GoogleCalendarUpdateParams) => {
+      const updateData: Record<string, unknown> = {}
+
+      if (params.summary !== undefined) {
+        updateData.summary = params.summary
+      }
+
+      if (params.description !== undefined) {
+        updateData.description = params.description
+      }
+
+      if (params.location !== undefined) {
+        updateData.location = params.location
+      }
+
+      if (params.startDateTime !== undefined) {
+        const needsTimezone =
+          !params.startDateTime.includes('+') && !params.startDateTime.includes('-', 10)
+        updateData.start = {
+          dateTime: params.startDateTime,
+          ...(needsTimezone && params.timeZone ? { timeZone: params.timeZone } : {}),
+        }
+      }
+
+      if (params.endDateTime !== undefined) {
+        const needsTimezone =
+          !params.endDateTime.includes('+') && !params.endDateTime.includes('-', 10)
+        updateData.end = {
+          dateTime: params.endDateTime,
+          ...(needsTimezone && params.timeZone ? { timeZone: params.timeZone } : {}),
+        }
+      }
+
+      // Handle attendees - convert to array format
+      if (params.attendees !== undefined) {
+        let attendeeList: string[] = []
+        const attendees = params.attendees as string | string[]
+
+        if (Array.isArray(attendees)) {
+          attendeeList = attendees.filter((email: string) => email && email.trim().length > 0)
+        } else if (typeof attendees === 'string' && attendees.trim().length > 0) {
+          attendeeList = attendees
+            .split(',')
+            .map((email: string) => email.trim())
+            .filter((email: string) => email.length > 0)
+        }
+
+        updateData.attendees = attendeeList.map((email: string) => ({ email }))
+      }
+
+      return updateData
+    },
+  },
+
+  transformResponse: async (response: Response) => {
+    const data: GoogleCalendarApiEventResponse = await response.json()
+
+    return {
+      success: true,
+      output: {
+        content: `Event "${data.summary}" updated successfully`,
+        metadata: {
+          id: data.id,
+          htmlLink: data.htmlLink,
+          status: data.status,
+          summary: data.summary,
+          description: data.description,
+          location: data.location,
+          start: data.start,
+          end: data.end,
+          attendees: data.attendees,
+          creator: data.creator,
+          organizer: data.organizer,
+        },
+      },
+    }
+  },
+
+  outputs: {
+    content: { type: 'string', description: 'Event update confirmation message' },
+    metadata: {
+      type: 'json',
+      description: 'Updated event metadata including ID, status, and details',
+    },
+  },
+}
+
+interface GoogleCalendarUpdateV2Response {
+  success: boolean
+  output: {
+    id: string
+    htmlLink: string
+    status: string
+    summary: string | null
+    description: string | null
+    location: string | null
+    start: any
+    end: any
+    attendees: any | null
+    creator: any
+    organizer: any
+  }
+}
+
+export const updateV2Tool: ToolConfig<GoogleCalendarUpdateParams, GoogleCalendarUpdateV2Response> =
+  {
+    id: 'google_calendar_update_v2',
+    name: 'Google Calendar Update Event',
+    description: 'Update an existing event in Google Calendar. Returns API-aligned fields only.',
+    version: '2.0.0',
+    oauth: updateTool.oauth,
+    params: updateTool.params,
+    request: updateTool.request,
+    transformResponse: async (response: Response) => {
+      const data: GoogleCalendarApiEventResponse = await response.json()
+
+      return {
+        success: true,
+        output: {
+          id: data.id,
+          htmlLink: data.htmlLink,
+          status: data.status,
+          summary: data.summary ?? null,
+          description: data.description ?? null,
+          location: data.location ?? null,
+          start: data.start,
+          end: data.end,
+          attendees: data.attendees ?? null,
+          creator: data.creator,
+          organizer: data.organizer,
+        },
+      }
+    },
+    outputs: {
+      id: { type: 'string', description: 'Event ID' },
+      htmlLink: { type: 'string', description: 'Event link' },
+      status: { type: 'string', description: 'Event status' },
+      summary: { type: 'string', description: 'Event title', optional: true },
+      description: { type: 'string', description: 'Event description', optional: true },
+      location: { type: 'string', description: 'Event location', optional: true },
+      start: { type: 'json', description: 'Event start' },
+      end: { type: 'json', description: 'Event end' },
+      attendees: { type: 'json', description: 'Event attendees', optional: true },
+      creator: { type: 'json', description: 'Event creator' },
+      organizer: { type: 'json', description: 'Event organizer' },
+    },
+  }
diff --git a/apps/sim/tools/google_drive/copy.ts b/apps/sim/tools/google_drive/copy.ts
new file mode 100644
index 0000000000..fa28f54690
--- /dev/null
+++ b/apps/sim/tools/google_drive/copy.ts
@@ -0,0 +1,112 @@
+import type { GoogleDriveFile, GoogleDriveToolParams } from '@/tools/google_drive/types'
+import { ALL_FILE_FIELDS } from '@/tools/google_drive/utils'
+import type { ToolConfig, ToolResponse } from '@/tools/types'
+
+interface GoogleDriveCopyParams extends GoogleDriveToolParams {
+  fileId: string
+  newName?: string
+  destinationFolderId?: string
+}
+
+interface GoogleDriveCopyResponse extends ToolResponse {
+  output: {
+    file: GoogleDriveFile
+  }
+}
+
+export const copyTool: ToolConfig<GoogleDriveCopyParams, GoogleDriveCopyResponse> = {
+  id: 'google_drive_copy',
+  name: 'Copy Google Drive File',
+  description: 'Create a copy of a file in Google Drive',
+  version: '1.0.0',
+
+  oauth: {
+    required: true,
+    provider: 'google-drive',
+  },
+
+  params: {
+    accessToken: {
+      type: 'string',
+      required: true,
+      visibility: 'hidden',
+      description: 'OAuth access token',
+    },
+    fileId: {
+      type: 'string',
+      required: true,
+      visibility: 'user-or-llm',
+      description: 'The ID of the file to copy',
+    },
+    newName: {
+      type: 'string',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Name for the copied file (defaults to "Copy of [original name]")',
+    },
+    destinationFolderId: {
+      type: 'string',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'ID of the folder to place the copy in (defaults to same location as original)',
+    },
+  },
+
+  request: {
+    url: (params) => {
+      const url = new URL(`https://www.googleapis.com/drive/v3/files/${params.fileId?.trim()}/copy`)
+      url.searchParams.append('fields', ALL_FILE_FIELDS)
+      url.searchParams.append('supportsAllDrives', 'true')
+      return url.toString()
+    },
+    method: 'POST',
+    headers: (params) => ({
+      Authorization: `Bearer ${params.accessToken}`,
+      'Content-Type': 'application/json',
+    }),
+    body: (params) => {
+      const body: Record<string, unknown> = {}
+      if (params.newName) {
+        body.name = params.newName
+      }
+      if (params.destinationFolderId) {
+        body.parents = [params.destinationFolderId.trim()]
+      }
+      return body
+    },
+  },
+
+  transformResponse: async (response: Response) => {
+    const data = await response.json()
+
+    if (!response.ok) {
+      throw new Error(data.error?.message || 'Failed to copy Google Drive file')
+    }
+
+    return {
+      success: true,
+      output: {
+        file: data,
+      },
+    }
+  },
+
+  outputs: {
+    file: {
+      type: 'json',
+      description: 'The copied file metadata',
+      properties: {
+        id: { type: 'string', description: 'Google Drive file ID of the copy' },
+        kind: { type: 'string', description: 'Resource type identifier' },
+        name: { type: 'string', description: 'File name' },
+        mimeType: { type: 'string', description: 'MIME type' },
+        webViewLink: { type: 'string', description: 'URL to view in browser' },
+        parents: { type: 'json', description: 'Parent folder IDs' },
+        createdTime: { type: 'string', description: 'File creation time' },
+        modifiedTime: { type: 'string', description: 'Last modification time' },
+        owners: { type: 'json', description: 'List of file owners' },
+        size: { type: 'string', description: 'File size in bytes' },
+      },
+    },
+  },
+}
diff --git a/apps/sim/tools/google_drive/create_folder.ts b/apps/sim/tools/google_drive/create_folder.ts
index 6e04de4804..22643350ee 100644
--- a/apps/sim/tools/google_drive/create_folder.ts
+++ b/apps/sim/tools/google_drive/create_folder.ts
@@ -134,9 +134,9 @@ export const createFolderTool: ToolConfig<GoogleDriveToolParams, GoogleDriveUplo
       properties: {
         // Basic Info
         id: { type: 'string', description: 'Google Drive folder ID' },
+        kind: { type: 'string', description: 'Resource type identifier' },
         name: { type: 'string', description: 'Folder name' },
         mimeType: { type: 'string', description: 'MIME type (application/vnd.google-apps.folder)' },
-        kind: { type: 'string', description: 'Resource type identifier' },
         description: { type: 'string', description: 'Folder description' },
         // Ownership & Sharing
         owners: { type: 'json', description: 'List of folder owners' },
diff --git a/apps/sim/tools/google_drive/delete.ts b/apps/sim/tools/google_drive/delete.ts
new file mode 100644
index 0000000000..5db1349e74
--- /dev/null
+++ b/apps/sim/tools/google_drive/delete.ts
@@ -0,0 +1,78 @@
+import type { GoogleDriveToolParams } from '@/tools/google_drive/types'
+import type { ToolConfig, ToolResponse } from '@/tools/types'
+
+interface GoogleDriveDeleteParams extends GoogleDriveToolParams {
+  fileId: string
+}
+
+interface GoogleDriveDeleteResponse extends ToolResponse {
+  output: {
+    deleted: boolean
+    fileId: string
+  }
+}
+
+export const deleteTool: ToolConfig<GoogleDriveDeleteParams, GoogleDriveDeleteResponse> = {
+  id: 'google_drive_delete',
+  name: 'Delete Google Drive File',
+  description: 'Permanently delete a file from Google Drive (bypasses trash)',
+  version: '1.0.0',
+
+  oauth: {
+    required: true,
+    provider: 'google-drive',
+  },
+
+  params: {
+    accessToken: {
+      type: 'string',
+      required: true,
+      visibility: 'hidden',
+      description: 'OAuth access token',
+    },
+    fileId: {
+      type: 'string',
+      required: true,
+      visibility: 'user-or-llm',
+      description: 'The ID of the file to permanently delete',
+    },
+  },
+
+  request: {
+    url: (params) => {
+      const url = new URL(`https://www.googleapis.com/drive/v3/files/${params.fileId?.trim()}`)
+      url.searchParams.append('supportsAllDrives', 'true')
+      return url.toString()
+    },
+    method: 'DELETE',
+    headers: (params) => ({
+      Authorization: `Bearer ${params.accessToken}`,
+    }),
+  },
+
+  transformResponse: async (response: Response, params) => {
+    if (!response.ok) {
+      const data = await response.json()
+      throw new Error(data.error?.message || 'Failed to delete Google Drive file')
+    }
+
+    return {
+      success: true,
+      output: {
+        deleted: true,
+        fileId: params?.fileId ?? '',
+      },
+    }
+  },
+
+  outputs: {
+    deleted: {
+      type: 'boolean',
+      description: 'Whether the file was successfully deleted',
+    },
+    fileId: {
+      type: 'string',
+      description: 'The ID of the deleted file',
+    },
+  },
+}
diff --git a/apps/sim/tools/google_drive/download.ts b/apps/sim/tools/google_drive/download.ts
index db58ac3d88..7b06d4bbeb 100644
--- a/apps/sim/tools/google_drive/download.ts
+++ b/apps/sim/tools/google_drive/download.ts
@@ -239,9 +239,9 @@ export const downloadTool: ToolConfig<GoogleDriveToolParams, GoogleDriveDownload
       properties: {
         // Basic Info
         id: { type: 'string', description: 'Google Drive file ID' },
+        kind: { type: 'string', description: 'Resource type identifier' },
         name: { type: 'string', description: 'File name' },
         mimeType: { type: 'string', description: 'MIME type' },
-        kind: { type: 'string', description: 'Resource type identifier' },
         description: { type: 'string', description: 'File description' },
         originalFilename: { type: 'string', description: 'Original uploaded filename' },
         fullFileExtension: { type: 'string', description: 'Full file extension' },
diff --git a/apps/sim/tools/google_drive/get_about.ts b/apps/sim/tools/google_drive/get_about.ts
new file mode 100644
index 0000000000..59f8a39bdf
--- /dev/null
+++ b/apps/sim/tools/google_drive/get_about.ts
@@ -0,0 +1,137 @@
+import type { GoogleDriveToolParams, GoogleDriveUser } from '@/tools/google_drive/types'
+import type { ToolConfig, ToolResponse } from '@/tools/types'
+
+interface GoogleDriveGetAboutParams extends GoogleDriveToolParams {}
+
+interface GoogleDriveGetAboutResponse extends ToolResponse {
+  output: {
+    user: GoogleDriveUser & {
+      emailAddress: string
+    }
+    storageQuota: {
+      limit: string | null
+      usage: string
+      usageInDrive: string
+      usageInDriveTrash: string
+    }
+    canCreateDrives: boolean
+    importFormats: Record<string, string[]>
+    exportFormats: Record<string, string[]>
+    maxUploadSize: string
+  }
+}
+
+export const getAboutTool: ToolConfig<GoogleDriveGetAboutParams, GoogleDriveGetAboutResponse> = {
+  id: 'google_drive_get_about',
+  name: 'Get Google Drive Info',
+  description:
+    'Get information about the user and their Google Drive (storage quota, capabilities)',
+  version: '1.0.0',
+
+  oauth: {
+    required: true,
+    provider: 'google-drive',
+  },
+
+  params: {
+    accessToken: {
+      type: 'string',
+      required: true,
+      visibility: 'hidden',
+      description: 'OAuth access token',
+    },
+  },
+
+  request: {
+    url: () => {
+      const url = new URL('https://www.googleapis.com/drive/v3/about')
+      url.searchParams.append(
+        'fields',
+        'user,storageQuota,canCreateDrives,importFormats,exportFormats,maxUploadSize'
+      )
+      return url.toString()
+    },
+    method: 'GET',
+    headers: (params) => ({
+      Authorization: `Bearer ${params.accessToken}`,
+    }),
+  },
+
+  transformResponse: async (response: Response) => {
+    const data = await response.json()
+
+    if (!response.ok) {
+      throw new Error(data.error?.message || 'Failed to get Google Drive info')
+    }
+
+    return {
+      success: true,
+      output: {
+        user: {
+          displayName: data.user?.displayName ?? null,
+          emailAddress: data.user?.emailAddress ?? '',
+          photoLink: data.user?.photoLink ?? null,
+          permissionId: data.user?.permissionId ?? null,
+          me: data.user?.me ?? true,
+        },
+        storageQuota: {
+          limit: data.storageQuota?.limit ?? null,
+          usage: data.storageQuota?.usage ?? '0',
+          usageInDrive: data.storageQuota?.usageInDrive ?? '0',
+          usageInDriveTrash: data.storageQuota?.usageInDriveTrash ?? '0',
+        },
+        canCreateDrives: data.canCreateDrives ?? false,
+        importFormats: data.importFormats ?? {},
+        exportFormats: data.exportFormats ?? {},
+        maxUploadSize: data.maxUploadSize ?? '0',
+      },
+    }
+  },
+
+  outputs: {
+    user: {
+      type: 'json',
+      description: 'Information about the authenticated user',
+      properties: {
+        displayName: { type: 'string', description: 'User display name' },
+        emailAddress: { type: 'string', description: 'User email address' },
+        photoLink: { type: 'string', description: 'URL to user profile photo', optional: true },
+        permissionId: { type: 'string', description: 'User permission ID' },
+        me: { type: 'boolean', description: 'Whether this is the authenticated user' },
+      },
+    },
+    storageQuota: {
+      type: 'json',
+      description: 'Storage quota information in bytes',
+      properties: {
+        limit: {
+          type: 'string',
+          description: 'Total storage limit in bytes (null for unlimited)',
+          optional: true,
+        },
+        usage: { type: 'string', description: 'Total storage used in bytes' },
+        usageInDrive: { type: 'string', description: 'Storage used by Drive files in bytes' },
+        usageInDriveTrash: {
+          type: 'string',
+          description: 'Storage used by trashed files in bytes',
+        },
+      },
+    },
+    canCreateDrives: {
+      type: 'boolean',
+      description: 'Whether user can create shared drives',
+    },
+    importFormats: {
+      type: 'json',
+      description: 'Map of MIME types that can be imported and their target formats',
+    },
+    exportFormats: {
+      type: 'json',
+      description: 'Map of Google Workspace MIME types and their exportable formats',
+    },
+    maxUploadSize: {
+      type: 'string',
+      description: 'Maximum upload size in bytes',
+    },
+  },
+}
diff --git a/apps/sim/tools/google_drive/get_content.ts b/apps/sim/tools/google_drive/get_content.ts
index c6b465c952..b7a38afdb5 100644
--- a/apps/sim/tools/google_drive/get_content.ts
+++ b/apps/sim/tools/google_drive/get_content.ts
@@ -212,9 +212,9 @@ export const getContentTool: ToolConfig<GoogleDriveToolParams, GoogleDriveGetCon
       properties: {
         // Basic Info
         id: { type: 'string', description: 'Google Drive file ID' },
+        kind: { type: 'string', description: 'Resource type identifier' },
         name: { type: 'string', description: 'File name' },
         mimeType: { type: 'string', description: 'MIME type' },
-        kind: { type: 'string', description: 'Resource type identifier' },
         description: { type: 'string', description: 'File description' },
         originalFilename: { type: 'string', description: 'Original uploaded filename' },
         fullFileExtension: { type: 'string', description: 'Full file extension' },
diff --git a/apps/sim/tools/google_drive/get_file.ts b/apps/sim/tools/google_drive/get_file.ts
new file mode 100644
index 0000000000..a4a51d42de
--- /dev/null
+++ b/apps/sim/tools/google_drive/get_file.ts
@@ -0,0 +1,100 @@
+import type { GoogleDriveFile, GoogleDriveToolParams } from '@/tools/google_drive/types'
+import { ALL_FILE_FIELDS } from '@/tools/google_drive/utils'
+import type { ToolConfig, ToolResponse } from '@/tools/types'
+
+interface GoogleDriveGetFileParams extends GoogleDriveToolParams {
+  fileId: string
+}
+
+interface GoogleDriveGetFileResponse extends ToolResponse {
+  output: {
+    file: GoogleDriveFile
+  }
+}
+
+export const getFileTool: ToolConfig<GoogleDriveGetFileParams, GoogleDriveGetFileResponse> = {
+  id: 'google_drive_get_file',
+  name: 'Get Google Drive File',
+  description: 'Get metadata for a specific file in Google Drive by its ID',
+  version: '1.0.0',
+
+  oauth: {
+    required: true,
+    provider: 'google-drive',
+  },
+
+  params: {
+    accessToken: {
+      type: 'string',
+      required: true,
+      visibility: 'hidden',
+      description: 'OAuth access token',
+    },
+    fileId: {
+      type: 'string',
+      required: true,
+      visibility: 'user-or-llm',
+      description: 'The ID of the file to retrieve',
+    },
+  },
+
+  request: {
+    url: (params) => {
+      const url = new URL(`https://www.googleapis.com/drive/v3/files/${params.fileId?.trim()}`)
+      url.searchParams.append('fields', ALL_FILE_FIELDS)
+      url.searchParams.append('supportsAllDrives', 'true')
+      return url.toString()
+    },
+    method: 'GET',
+    headers: (params) => ({
+      Authorization: `Bearer ${params.accessToken}`,
+    }),
+  },
+
+  transformResponse: async (response: Response) => {
+    const data = await response.json()
+
+    if (!response.ok) {
+      throw new Error(data.error?.message || 'Failed to get Google Drive file')
+    }
+
+    return {
+      success: true,
+      output: {
+        file: data,
+      },
+    }
+  },
+
+  outputs: {
+    file: {
+      type: 'json',
+      description: 'The file metadata',
+      properties: {
+        id: { type: 'string', description: 'Google Drive file ID' },
+        kind: { type: 'string', description: 'Resource type identifier' },
+        name: { type: 'string', description: 'File name' },
+        mimeType: { type: 'string', description: 'MIME type' },
+        description: { type: 'string', description: 'File description', optional: true },
+        size: { type: 'string', description: 'File size in bytes', optional: true },
+        starred: { type: 'boolean', description: 'Whether file is starred' },
+        trashed: { type: 'boolean', description: 'Whether file is in trash' },
+        webViewLink: { type: 'string', description: 'URL to view in browser' },
+        webContentLink: { type: 'string', description: 'Direct download URL', optional: true },
+        iconLink: { type: 'string', description: 'URL to file icon' },
+        thumbnailLink: { type: 'string', description: 'URL to thumbnail', optional: true },
+        parents: { type: 'json', description: 'Parent folder IDs' },
+        owners: { type: 'json', description: 'List of file owners' },
+        permissions: { type: 'json', description: 'File permissions', optional: true },
+        createdTime: { type: 'string', description: 'File creation time' },
+        modifiedTime: { type: 'string', description: 'Last modification time' },
+        lastModifyingUser: { type: 'json', description: 'User who last modified the file' },
+        shared: { type: 'boolean', description: 'Whether file is shared' },
+        ownedByMe: { type: 'boolean', description: 'Whether owned by current user' },
+        capabilities: { type: 'json', description: 'User capabilities on file' },
+        md5Checksum: { type: 'string', description: 'MD5 hash', optional: true },
+        version: { type: 'string', description: 'Version number' },
+      },
+    },
+  },
+}
diff --git a/apps/sim/tools/google_drive/index.ts b/apps/sim/tools/google_drive/index.ts
index 4d1a6f1678..58dbdb03e7 100644
--- a/apps/sim/tools/google_drive/index.ts
+++ b/apps/sim/tools/google_drive/index.ts
@@ -1,11 +1,31 @@
+import { copyTool } from '@/tools/google_drive/copy'
 import { createFolderTool } from '@/tools/google_drive/create_folder'
+import { deleteTool } from '@/tools/google_drive/delete'
 import { downloadTool } from '@/tools/google_drive/download'
+import { getAboutTool } from '@/tools/google_drive/get_about'
 import { getContentTool } from '@/tools/google_drive/get_content'
+import { getFileTool } from '@/tools/google_drive/get_file'
 import { listTool } from '@/tools/google_drive/list'
+import { listPermissionsTool } from '@/tools/google_drive/list_permissions'
+import { shareTool } from '@/tools/google_drive/share'
+import { trashTool } from '@/tools/google_drive/trash'
+import { unshareTool } from '@/tools/google_drive/unshare'
+import { untrashTool } from '@/tools/google_drive/untrash'
+import { updateTool } from '@/tools/google_drive/update'
 import { uploadTool } from '@/tools/google_drive/upload'
 
+export const googleDriveCopyTool = copyTool
 export const googleDriveCreateFolderTool = createFolderTool
+export const googleDriveDeleteTool = deleteTool
 export const googleDriveDownloadTool = downloadTool
+export const googleDriveGetAboutTool = getAboutTool
 export const googleDriveGetContentTool = getContentTool
+export const googleDriveGetFileTool = getFileTool
 export const googleDriveListTool = listTool
+export const googleDriveListPermissionsTool = listPermissionsTool
+export const googleDriveShareTool = shareTool
+export const googleDriveTrashTool = trashTool
+export const googleDriveUnshareTool = unshareTool
+export const googleDriveUntrashTool = untrashTool
+export const googleDriveUpdateTool = updateTool
 export const googleDriveUploadTool = uploadTool
diff --git a/apps/sim/tools/google_drive/list.ts b/apps/sim/tools/google_drive/list.ts
index 7505ce471f..edfb1cc04e 100644
--- a/apps/sim/tools/google_drive/list.ts
+++ b/apps/sim/tools/google_drive/list.ts
@@ -123,9 +123,9 @@ export const listTool: ToolConfig<GoogleDriveToolParams, GoogleDriveListResponse
         properties: {
           // Basic Info
           id: { type: 'string', description: 'Google Drive file ID' },
+          kind: { type: 'string', description: 'Resource type identifier' },
           name: { type: 'string', description: 'File name' },
           mimeType: { type: 'string', description: 'MIME type' },
-          kind: { type: 'string', description: 'Resource type identifier' },
           description: { type: 'string', description: 'File description' },
           originalFilename: { type: 'string', description: 'Original uploaded filename' },
           fullFileExtension: { type: 'string', description: 'Full file extension' },
diff --git a/apps/sim/tools/google_drive/list_permissions.ts b/apps/sim/tools/google_drive/list_permissions.ts
new file mode 100644
index 0000000000..661a8ab9b2
--- /dev/null
+++ b/apps/sim/tools/google_drive/list_permissions.ts
@@ -0,0 +1,130 @@
+import type { GoogleDrivePermission, GoogleDriveToolParams } from '@/tools/google_drive/types'
+import type { ToolConfig, ToolResponse } from '@/tools/types'
+
+interface GoogleDriveListPermissionsParams extends GoogleDriveToolParams {
+  fileId: string
+}
+
+interface GoogleDriveListPermissionsResponse extends ToolResponse {
+  output: {
+    permissions: GoogleDrivePermission[]
+    nextPageToken?: string
+  }
+}
+
+export const listPermissionsTool: ToolConfig<
+  GoogleDriveListPermissionsParams,
+  GoogleDriveListPermissionsResponse
+> = {
+  id: 'google_drive_list_permissions',
+  name: 'List Google Drive Permissions',
+  description: 'List all permissions (who has access) for a file in Google Drive',
+  version: '1.0.0',
+
+  oauth: {
+    required: true,
+    provider: 'google-drive',
+  },
+
+  params: {
+    accessToken: {
+      type: 'string',
+      required: true,
+      visibility: 'hidden',
+      description: 'OAuth access token',
+    },
+    fileId: {
+      type: 'string',
+      required: true,
+      visibility: 'user-or-llm',
+      description: 'The ID of the file to list permissions for',
+    },
+  },
+
+  request: {
+    url: (params) => {
+      const url = new URL(
+        `https://www.googleapis.com/drive/v3/files/${params.fileId?.trim()}/permissions`
+      )
+      url.searchParams.append('supportsAllDrives', 'true')
+      url.searchParams.append(
+        'fields',
+        'nextPageToken,permissions(id,type,role,emailAddress,displayName,photoLink,domain,expirationTime,deleted,allowFileDiscovery,pendingOwner,permissionDetails)'
+      )
+      return url.toString()
+    },
+    method: 'GET',
+    headers: (params) => ({
+      Authorization: `Bearer ${params.accessToken}`,
+    }),
+  },
+
+  transformResponse: async (response: Response) => {
+    const data = await response.json()
+
+    if (!response.ok) {
+      throw new Error(data.error?.message || 'Failed to list Google Drive permissions')
+    }
+
+    const permissions = (data.permissions ?? []).map((p: Record<string, unknown>) => ({
+      id: p.id ?? null,
+      type: p.type ?? null,
+      role: p.role ?? null,
+      emailAddress: p.emailAddress ?? null,
+      displayName: p.displayName ?? null,
+      photoLink: p.photoLink ?? null,
+      domain: p.domain ?? null,
+      expirationTime: p.expirationTime ?? null,
+      deleted: p.deleted ?? false,
+      allowFileDiscovery: p.allowFileDiscovery ?? null,
+      pendingOwner: p.pendingOwner ?? false,
+      permissionDetails: p.permissionDetails ?? null,
+    }))
+
+    return {
+      success: true,
+      output: {
+        permissions,
+        nextPageToken: data.nextPageToken,
+      },
+    }
+  },
+
+  outputs: {
+    permissions: {
+      type: 'array',
+      description: 'List of permissions on the file',
+      items: {
+        type: 'object',
+        properties: {
+          id: { type: 'string', description: 'Permission ID (use to remove permission)' },
+          type: { type: 'string', description: 'Grantee type (user, group, domain, anyone)' },
+          role: {
+            type: 'string',
+            description:
+              'Permission role (owner, organizer, fileOrganizer, writer, commenter, reader)',
+          },
+          emailAddress: { type: 'string', description: 'Email of the grantee' },
+          displayName: { type: 'string', description: 'Display name of the grantee' },
+          photoLink: { type: 'string', description: 'Photo URL of the grantee' },
+          domain: { type: 'string', description: 'Domain of the grantee' },
+          expirationTime: { type: 'string', description: 'When permission expires' },
+          deleted: { type: 'boolean', description: 'Whether grantee account is deleted' },
+          allowFileDiscovery: {
+            type: 'boolean',
+            description: 'Whether file is discoverable by grantee',
+          },
+          pendingOwner: { type: 'boolean', description: 'Whether ownership transfer is pending' },
+          permissionDetails: {
+            type: 'json',
+            description: 'Details about inherited permissions',
+          },
+        },
+      },
+    },
+    nextPageToken: {
+      type: 'string',
+      description: 'Token for fetching the next page of permissions',
+    },
+  },
+}
diff --git a/apps/sim/tools/google_drive/share.ts b/apps/sim/tools/google_drive/share.ts
new file mode 100644
index 0000000000..6e01c9681a
--- /dev/null
+++ b/apps/sim/tools/google_drive/share.ts
@@ -0,0 +1,178 @@
+import type { GoogleDrivePermission, GoogleDriveToolParams } from '@/tools/google_drive/types'
+import type { ToolConfig, ToolResponse } from '@/tools/types'
+
+interface GoogleDriveShareParams extends GoogleDriveToolParams {
+  fileId: string
+  email?: string
+  domain?: string
+  type: 'user' | 'group' | 'domain' | 'anyone'
+  role: 'owner' | 'organizer' | 'fileOrganizer' | 'writer' | 'commenter' | 'reader'
+  transferOwnership?: boolean
+  moveToNewOwnersRoot?: boolean
+  sendNotification?: boolean
+  emailMessage?: string
+}
+
+interface GoogleDriveShareResponse extends ToolResponse {
+  output: {
+    permission: GoogleDrivePermission
+  }
+}
+
+export const shareTool: ToolConfig<GoogleDriveShareParams, GoogleDriveShareResponse> = {
+  id: 'google_drive_share',
+  name: 'Share Google Drive File',
+  description: 'Share a file with a user, group, domain, or make it public',
+  version: '1.0.0',
+
+  oauth: {
+    required: true,
+    provider: 'google-drive',
+  },
+
+  params: {
+    accessToken: {
+      type: 'string',
+      required: true,
+      visibility: 'hidden',
+      description: 'OAuth access token',
+    },
+    fileId: {
+      type: 'string',
+      required: true,
+      visibility: 'user-or-llm',
+      description: 'The ID of the file to share',
+    },
+    type: {
+      type: 'string',
+      required: true,
+      visibility: 'user-or-llm',
+      description: 'Type of grantee: user, group, domain, or anyone',
+    },
+    role: {
+      type: 'string',
+      required: true,
+      visibility: 'user-or-llm',
+      description:
+        'Permission role: owner (transfer ownership), organizer (shared drive only), fileOrganizer (shared drive only), writer (edit), commenter (view and comment), reader (view only)',
+    },
+    email: {
+      type: 'string',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Email address of the user or group (required for type=user or type=group)',
+    },
+    domain: {
+      type: 'string',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Domain to share with (required for type=domain)',
+    },
+    transferOwnership: {
+      type: 'boolean',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Required when role is owner. Transfers ownership to the specified user.',
+    },
+    moveToNewOwnersRoot: {
+      type: 'boolean',
+      required: false,
+      visibility: 'user-or-llm',
+      description:
+        "When transferring ownership, move the file to the new owner's My Drive root folder.",
+    },
+    sendNotification: {
+      type: 'boolean',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Whether to send an email notification (default: true)',
+    },
+    emailMessage: {
+      type: 'string',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Custom message to include in the notification email',
+    },
+  },
+
+  request: {
+    url: (params) => {
+      const url = new URL(
+        `https://www.googleapis.com/drive/v3/files/${params.fileId?.trim()}/permissions`
+      )
+      url.searchParams.append('supportsAllDrives', 'true')
+      if (params.transferOwnership) {
+        url.searchParams.append('transferOwnership', 'true')
+      }
+      if (params.moveToNewOwnersRoot) {
+        url.searchParams.append('moveToNewOwnersRoot', 'true')
+      }
+      if (params.sendNotification !== undefined) {
+        url.searchParams.append('sendNotificationEmail', String(params.sendNotification))
+      }
+      if (params.emailMessage) {
+        url.searchParams.append('emailMessage', params.emailMessage)
+      }
+      return url.toString()
+    },
+    method: 'POST',
+    headers: (params) => ({
+      Authorization: `Bearer ${params.accessToken}`,
+      'Content-Type': 'application/json',
+    }),
+    body: (params) => {
+      const body: Record<string, unknown> = {
+        type: params.type,
+        role: params.role,
+      }
+      if (params.email) {
+        body.emailAddress = params.email.trim()
+      }
+      if (params.domain) {
+        body.domain = params.domain.trim()
+      }
+      return body
+    },
+  },
+
+  transformResponse: async (response: Response) => {
+    const data = await response.json()
+
+    if (!response.ok) {
+      throw new Error(data.error?.message || 'Failed to share Google Drive file')
+    }
+
+    return {
+      success: true,
+      output: {
+        permission: {
+          id: data.id ?? null,
+          type: data.type ?? null,
+          role: data.role ?? null,
+          emailAddress: data.emailAddress ?? null,
+          displayName: data.displayName ?? null,
+          domain: data.domain ?? null,
+          expirationTime: data.expirationTime ?? null,
+          deleted: data.deleted ?? false,
+        },
+      },
+    }
+  },
+
+  outputs: {
+    permission: {
+      type: 'json',
+      description: 'The created permission details',
+      properties: {
+        id: { type: 'string', description: 'Permission ID' },
+        type: { type: 'string', description: 'Grantee type (user, group, domain, anyone)' },
+        role: { type: 'string', description: 'Permission role' },
+        emailAddress: { type: 'string', description: 'Email of the grantee', optional: true },
+        displayName: { type: 'string', description: 'Display name of the grantee', optional: true },
+        domain: { type: 'string', description: 'Domain of the grantee', optional: true },
+        expirationTime: { type: 'string', description: 'Expiration time', optional: true },
+        deleted: { type: 'boolean', description: 'Whether grantee is deleted' },
+      },
+    },
+  },
+}
diff --git a/apps/sim/tools/google_drive/trash.ts b/apps/sim/tools/google_drive/trash.ts
new file mode 100644
index 0000000000..9c8a1b5615
--- /dev/null
+++ b/apps/sim/tools/google_drive/trash.ts
@@ -0,0 +1,88 @@
+import type { GoogleDriveFile, GoogleDriveToolParams } from '@/tools/google_drive/types'
+import { ALL_FILE_FIELDS } from '@/tools/google_drive/utils'
+import type { ToolConfig, ToolResponse } from '@/tools/types'
+
+interface GoogleDriveTrashParams extends GoogleDriveToolParams {
+  fileId: string
+}
+
+interface GoogleDriveTrashResponse extends ToolResponse {
+  output: {
+    file: GoogleDriveFile
+  }
+}
+
+export const trashTool: ToolConfig<GoogleDriveTrashParams, GoogleDriveTrashResponse> = {
+  id: 'google_drive_trash',
+  name: 'Trash Google Drive File',
+  description: 'Move a file to the trash in Google Drive (can be restored later)',
+  version: '1.0.0',
+
+  oauth: {
+    required: true,
+    provider: 'google-drive',
+  },
+
+  params: {
+    accessToken: {
+      type: 'string',
+      required: true,
+      visibility: 'hidden',
+      description: 'OAuth access token',
+    },
+    fileId: {
+      type: 'string',
+      required: true,
+      visibility: 'user-or-llm',
+      description: 'The ID of the file to move to trash',
+    },
+  },
+
+  request: {
+    url: (params) => {
+      const url = new URL(`https://www.googleapis.com/drive/v3/files/${params.fileId?.trim()}`)
+      url.searchParams.append('fields', ALL_FILE_FIELDS)
+      url.searchParams.append('supportsAllDrives', 'true')
+      return url.toString()
+    },
+    method: 'PATCH',
+    headers: (params) => ({
+      Authorization: `Bearer ${params.accessToken}`,
+      'Content-Type': 'application/json',
+    }),
+    body: () => ({
+      trashed: true,
+    }),
+  },
+
+  transformResponse: async (response: Response) => {
+    const data = await response.json()
+
+    if (!response.ok) {
+      throw new Error(data.error?.message || 'Failed to trash Google Drive file')
+    }
+
+    return {
+      success: true,
+      output: {
+        file: data,
+      },
+    }
+  },
+
+  outputs: {
+    file: {
+      type: 'json',
+      description: 'The trashed file metadata',
+      properties: {
+        id: { type: 'string', description: 'Google Drive file ID' },
+        kind: { type: 'string', description: 'Resource type identifier' },
+        name: { type: 'string', description: 'File name' },
+        mimeType: { type: 'string', description: 'MIME type' },
+        trashed: { type: 'boolean', description: 'Whether file is in trash (should be true)' },
+        trashedTime: { type: 'string', description: 'When file was trashed' },
+        webViewLink: { type: 'string', description: 'URL to view in browser' },
+      },
+    },
+  },
+}
diff --git a/apps/sim/tools/google_drive/types.ts b/apps/sim/tools/google_drive/types.ts
index 0360338f88..5ce31af6bc 100644
--- a/apps/sim/tools/google_drive/types.ts
+++ b/apps/sim/tools/google_drive/types.ts
@@ -274,6 +274,11 @@ export interface GoogleDriveFile {
   resourceKey?: string
   shortcutDetails?: GoogleDriveShortcutDetails
   linkShareMetadata?: GoogleDriveLinkShareMetadata
+  hasAugmentedPermissions?: boolean
+  inheritedPermissionsDisabled?: boolean
+  downloadRestrictions?: {
+    restrictedForReaders?: boolean
+  }
 
   // Revisions (fetched separately but included in response)
   revisions?: GoogleDriveRevision[]
diff --git a/apps/sim/tools/google_drive/unshare.ts b/apps/sim/tools/google_drive/unshare.ts
new file mode 100644
index 0000000000..7a135c220c
--- /dev/null
+++ b/apps/sim/tools/google_drive/unshare.ts
@@ -0,0 +1,93 @@
+import type { GoogleDriveToolParams } from '@/tools/google_drive/types'
+import type { ToolConfig, ToolResponse } from '@/tools/types'
+
+interface GoogleDriveUnshareParams extends GoogleDriveToolParams {
+  fileId: string
+  permissionId: string
+}
+
+interface GoogleDriveUnshareResponse extends ToolResponse {
+  output: {
+    removed: boolean
+    fileId: string
+    permissionId: string
+  }
+}
+
+export const unshareTool: ToolConfig<GoogleDriveUnshareParams, GoogleDriveUnshareResponse> = {
+  id: 'google_drive_unshare',
+  name: 'Unshare Google Drive File',
+  description: 'Remove a permission from a file (revoke access)',
+  version: '1.0.0',
+
+  oauth: {
+    required: true,
+    provider: 'google-drive',
+  },
+
+  params: {
+    accessToken: {
+      type: 'string',
+      required: true,
+      visibility: 'hidden',
+      description: 'OAuth access token',
+    },
+    fileId: {
+      type: 'string',
+      required: true,
+      visibility: 'user-or-llm',
+      description: 'The ID of the file to modify permissions on',
+    },
+    permissionId: {
+      type: 'string',
+      required: true,
+      visibility: 'user-or-llm',
+      description: 'The ID of the permission to remove (use list_permissions to find this)',
+    },
+  },
+
+  request: {
+    url: (params) => {
+      const url = new URL(
+        `https://www.googleapis.com/drive/v3/files/${params.fileId?.trim()}/permissions/${params.permissionId?.trim()}`
+      )
+      url.searchParams.append('supportsAllDrives', 'true')
+      return url.toString()
+    },
+    method: 'DELETE',
+    headers: (params) => ({
+      Authorization: `Bearer ${params.accessToken}`,
+    }),
+  },
+
+  transformResponse: async (response: Response, params) => {
+    if (!response.ok) {
+      const data = await response.json()
+      throw new Error(data.error?.message || 'Failed to remove permission from Google Drive file')
+    }
+
+    return {
+      success: true,
+      output: {
+        removed: true,
+        fileId: params?.fileId ?? '',
+        permissionId: params?.permissionId ?? '',
+      },
+    }
+  },
+
+  outputs: {
+    removed: {
+      type: 'boolean',
+      description: 'Whether the permission was successfully removed',
+    },
+    fileId: {
+      type: 'string',
+      description: 'The ID of the file',
+    },
+    permissionId: {
+      type: 'string',
+      description: 'The ID of the removed permission',
+    },
+  },
+}
diff --git a/apps/sim/tools/google_drive/untrash.ts b/apps/sim/tools/google_drive/untrash.ts
new file mode 100644
index 0000000000..2a4e8268a5
--- /dev/null
+++ b/apps/sim/tools/google_drive/untrash.ts
@@ -0,0 +1,88 @@
+import type { GoogleDriveFile, GoogleDriveToolParams } from '@/tools/google_drive/types'
+import { ALL_FILE_FIELDS } from '@/tools/google_drive/utils'
+import type { ToolConfig, ToolResponse } from '@/tools/types'
+
+interface GoogleDriveUntrashParams extends GoogleDriveToolParams {
+  fileId: string
+}
+
+interface GoogleDriveUntrashResponse extends ToolResponse {
+  output: {
+    file: GoogleDriveFile
+  }
+}
+
+export const untrashTool: ToolConfig<GoogleDriveUntrashParams, GoogleDriveUntrashResponse> = {
+  id: 'google_drive_untrash',
+  name: 'Restore Google Drive File',
+  description: 'Restore a file from the trash in Google Drive',
+  version: '1.0.0',
+
+  oauth: {
+    required: true,
+    provider: 'google-drive',
+  },
+
+  params: {
+    accessToken: {
+      type: 'string',
+      required: true,
+      visibility: 'hidden',
+      description: 'OAuth access token',
+    },
+    fileId: {
+      type: 'string',
+      required: true,
+      visibility: 'user-or-llm',
+      description: 'The ID of the file to restore from trash',
+    },
+  },
+
+  request: {
+    url: (params) => {
+      const url = new URL(`https://www.googleapis.com/drive/v3/files/${params.fileId?.trim()}`)
+      url.searchParams.append('fields', ALL_FILE_FIELDS)
+      url.searchParams.append('supportsAllDrives', 'true')
+      return url.toString()
+    },
+    method: 'PATCH',
+    headers: (params) => ({
+      Authorization: `Bearer ${params.accessToken}`,
+      'Content-Type': 'application/json',
+    }),
+    body: () => ({
+      trashed: false,
+    }),
+  },
+
+  transformResponse: async (response: Response) => {
+    const data = await response.json()
+
+    if (!response.ok) {
+      throw new Error(data.error?.message || 'Failed to restore Google Drive file from trash')
+    }
+
+    return {
+      success: true,
+      output: {
+        file: data,
+      },
+    }
+  },
+
+  outputs: {
+    file: {
+      type: 'json',
+      description: 'The restored file metadata',
+      properties: {
+        id: { type: 'string', description: 'Google Drive file ID' },
+        kind: { type: 'string', description: 'Resource type identifier' },
+        name: { type: 'string', description: 'File name' },
+        mimeType: { type: 'string', description: 'MIME type' },
+        trashed: { type: 'boolean', description: 'Whether file is in trash (should be false)' },
+        webViewLink: { type: 'string', description: 'URL to view in browser' },
+        parents: { type: 'json', description: 'Parent folder IDs' },
+      },
+    },
+  },
+}
diff --git a/apps/sim/tools/google_drive/update.ts b/apps/sim/tools/google_drive/update.ts
new file mode 100644
index 0000000000..ed934994df
--- /dev/null
+++ b/apps/sim/tools/google_drive/update.ts
@@ -0,0 +1,141 @@
+import type { GoogleDriveFile, GoogleDriveToolParams } from '@/tools/google_drive/types'
+import { ALL_FILE_FIELDS } from '@/tools/google_drive/utils'
+import type { ToolConfig, ToolResponse } from '@/tools/types'
+
+interface GoogleDriveUpdateParams extends GoogleDriveToolParams {
+  fileId: string
+  name?: string
+  description?: string
+  addParents?: string
+  removeParents?: string
+  starred?: boolean
+}
+
+interface GoogleDriveUpdateResponse extends ToolResponse {
+  output: {
+    file: GoogleDriveFile
+  }
+}
+
+export const updateTool: ToolConfig<GoogleDriveUpdateParams, GoogleDriveUpdateResponse> = {
+  id: 'google_drive_update',
+  name: 'Update Google Drive File',
+  description: 'Update file metadata in Google Drive (rename, move, star, add description)',
+  version: '1.0.0',
+
+  oauth: {
+    required: true,
+    provider: 'google-drive',
+  },
+
+  params: {
+    accessToken: {
+      type: 'string',
+      required: true,
+      visibility: 'hidden',
+      description: 'OAuth access token',
+    },
+    fileId: {
+      type: 'string',
+      required: true,
+      visibility: 'user-or-llm',
+      description: 'The ID of the file to update',
+    },
+    name: {
+      type: 'string',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'New name for the file',
+    },
+    description: {
+      type: 'string',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'New description for the file',
+    },
+    addParents: {
+      type: 'string',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Comma-separated list of parent folder IDs to add (moves file to these folders)',
+    },
+    removeParents: {
+      type: 'string',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Comma-separated list of parent folder IDs to remove',
+    },
+    starred: {
+      type: 'boolean',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Whether to star or unstar the file',
+    },
+  },
+
+  request: {
+    url: (params) => {
+      const url = new URL(`https://www.googleapis.com/drive/v3/files/${params.fileId?.trim()}`)
+      url.searchParams.append('fields', ALL_FILE_FIELDS)
+      url.searchParams.append('supportsAllDrives', 'true')
+      if (params.addParents) {
+        url.searchParams.append('addParents', params.addParents.trim())
+      }
+      if (params.removeParents) {
+        url.searchParams.append('removeParents', params.removeParents.trim())
+      }
+      return url.toString()
+    },
+    method: 'PATCH',
+    headers: (params) => ({
+      Authorization: `Bearer ${params.accessToken}`,
+      'Content-Type': 'application/json',
+    }),
+    body: (params) => {
+      const body: Record<string, unknown> = {}
+      if (params.name !== undefined) {
+        body.name = params.name
+      }
+      if (params.description !== undefined) {
+        body.description = params.description
+      }
+      if (params.starred !== undefined) {
+        body.starred = params.starred
+      }
+      return body
+    },
+  },
+
+  transformResponse: async (response: Response) => {
+    const data = await response.json()
+
+    if (!response.ok) {
+      throw new Error(data.error?.message || 'Failed to update Google Drive file')
+    }
+
+    return {
+      success: true,
+      output: {
+        file: data,
+      },
+    }
+  },
+
+  outputs: {
+    file: {
+      type: 'json',
+      description: 'The updated file metadata',
+      properties: {
+        id: { type: 'string', description: 'Google Drive file ID' },
+        kind: { type: 'string', description: 'Resource type identifier' },
+        name: { type: 'string', description: 'File name' },
+        mimeType: { type: 'string', description: 'MIME type' },
+        description: { type: 'string', description: 'File description', optional: true },
+        starred: { type: 'boolean', description: 'Whether file is starred' },
+        webViewLink: { type: 'string', description: 'URL to view in browser' },
+        parents: { type: 'json', description: 'Parent folder IDs' },
+        modifiedTime: { type: 'string', description: 'Last modification time' },
+      },
+    },
+  },
+}
diff --git a/apps/sim/tools/google_drive/upload.ts b/apps/sim/tools/google_drive/upload.ts
index df321fe9f0..85093a697d 100644
--- a/apps/sim/tools/google_drive/upload.ts
+++ b/apps/sim/tools/google_drive/upload.ts
@@ -263,9 +263,9 @@ export const uploadTool: ToolConfig<GoogleDriveToolParams, GoogleDriveUploadResp
       properties: {
         // Basic Info
         id: { type: 'string', description: 'Google Drive file ID' },
+        kind: { type: 'string', description: 'Resource type identifier' },
         name: { type: 'string', description: 'File name' },
         mimeType: { type: 'string', description: 'MIME type' },
-        kind: { type: 'string', description: 'Resource type identifier' },
         description: { type: 'string', description: 'File description' },
         originalFilename: { type: 'string', description: 'Original uploaded filename' },
         fullFileExtension: { type: 'string', description: 'Full file extension' },
diff --git a/apps/sim/tools/google_drive/utils.ts b/apps/sim/tools/google_drive/utils.ts
index 15abfc35a4..e58b27eb98 100644
--- a/apps/sim/tools/google_drive/utils.ts
+++ b/apps/sim/tools/google_drive/utils.ts
@@ -73,6 +73,10 @@ export const ALL_FILE_FIELDS = [
   'resourceKey',
   'shortcutDetails',
   'linkShareMetadata',
+  'labelInfo',
+  'hasAugmentedPermissions',
+  'inheritedPermissionsDisabled',
+  'downloadRestrictions',
 ].join(',')
 
 // All revision fields from Google Drive API v3
diff --git a/apps/sim/tools/google_form/index.ts b/apps/sim/tools/google_form/index.ts
deleted file mode 100644
index 2ec798a88f..0000000000
--- a/apps/sim/tools/google_form/index.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import { getResponsesTool } from '@/tools/google_form/get_responses'
-
-export const googleFormsGetResponsesTool = getResponsesTool
diff --git a/apps/sim/tools/google_form/types.ts b/apps/sim/tools/google_form/types.ts
deleted file mode 100644
index fea4c42dde..0000000000
--- a/apps/sim/tools/google_form/types.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-export interface GoogleFormsResponse {
-  responseId?: string
-  createTime?: string
-  lastSubmittedTime?: string
-  answers?: Record<string, unknown>
-  respondentEmail?: string
-  totalScore?: number
-  [key: string]: unknown
-}
-
-export interface GoogleFormsResponseList {
-  responses?: GoogleFormsResponse[]
-  nextPageToken?: string
-}
-
-export interface GoogleFormsGetResponsesParams {
-  accessToken: string
-  formId: string
-  responseId?: string
-  pageSize?: number
-}
diff --git a/apps/sim/tools/google_form/utils.ts b/apps/sim/tools/google_form/utils.ts
deleted file mode 100644
index 70dff427a1..0000000000
--- a/apps/sim/tools/google_form/utils.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import { createLogger } from '@sim/logger'
-
-export const FORMS_API_BASE = 'https://forms.googleapis.com/v1'
-
-const logger = createLogger('GoogleFormsUtils')
-
-export function buildListResponsesUrl(params: { formId: string; pageSize?: number }): string {
-  const { formId, pageSize } = params
-  const url = new URL(`${FORMS_API_BASE}/forms/${encodeURIComponent(formId)}/responses`)
-  if (pageSize && pageSize > 0) {
-    const limited = Math.min(pageSize, 5000)
-    url.searchParams.set('pageSize', String(limited))
-  }
-  const finalUrl = url.toString()
-  logger.debug('Built Google Forms list responses URL', { finalUrl })
-  return finalUrl
-}
-
-export function buildGetResponseUrl(params: { formId: string; responseId: string }): string {
-  const { formId, responseId } = params
-  const finalUrl = `${FORMS_API_BASE}/forms/${encodeURIComponent(formId)}/responses/${encodeURIComponent(responseId)}`
-  logger.debug('Built Google Forms get response URL', { finalUrl })
-  return finalUrl
-}
diff --git a/apps/sim/tools/google_forms/batch_update.ts b/apps/sim/tools/google_forms/batch_update.ts
new file mode 100644
index 0000000000..42596ca107
--- /dev/null
+++ b/apps/sim/tools/google_forms/batch_update.ts
@@ -0,0 +1,189 @@
+import type {
+  GoogleForm,
+  GoogleFormsBatchUpdateParams,
+  GoogleFormsBatchUpdateResponse,
+} from '@/tools/google_forms/types'
+import { buildBatchUpdateUrl } from '@/tools/google_forms/utils'
+import type { ToolConfig } from '@/tools/types'
+
+interface BatchUpdateApiResponse {
+  replies?: Record<string, unknown>[]
+  writeControl?: {
+    requiredRevisionId?: string
+    targetRevisionId?: string
+  }
+  form?: GoogleForm
+}
+
+export const batchUpdateTool: ToolConfig<
+  GoogleFormsBatchUpdateParams,
+  GoogleFormsBatchUpdateResponse
+> = {
+  id: 'google_forms_batch_update',
+  name: 'Google Forms: Batch Update',
+  description: 'Apply multiple updates to a form (add items, update info, change settings, etc.)',
+  version: '1.0.0',
+
+  oauth: {
+    required: true,
+    provider: 'google-forms',
+  },
+
+  params: {
+    accessToken: {
+      type: 'string',
+      required: true,
+      visibility: 'hidden',
+      description: 'OAuth access token',
+    },
+    formId: {
+      type: 'string',
+      required: true,
+      visibility: 'user-only',
+      description: 'The ID of the Google Form to update',
+    },
+    requests: {
+      type: 'json',
+      required: true,
+      visibility: 'user-or-llm',
+      description:
+        'Array of update requests (updateFormInfo, updateSettings, createItem, updateItem, moveItem, deleteItem)',
+    },
+    includeFormInResponse: {
+      type: 'boolean',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Whether to return the updated form in the response',
+    },
+  },
+
+  request: {
+    url: (params: GoogleFormsBatchUpdateParams) => buildBatchUpdateUrl(params.formId),
+    method: 'POST',
+    headers: (params: GoogleFormsBatchUpdateParams) => ({
+      Authorization: `Bearer ${params.accessToken}`,
+      'Content-Type': 'application/json',
+    }),
+    body: (params: GoogleFormsBatchUpdateParams) => ({
+      requests: params.requests,
+      includeFormInResponse: params.includeFormInResponse ?? false,
+    }),
+  },
+
+  transformResponse: async (response: Response) => {
+    const data = (await response.json()) as BatchUpdateApiResponse
+
+    if (!response.ok) {
+      const errorData = data as unknown as { error?: { message?: string } }
+      return {
+        success: false,
+        output: {
+          replies: [],
+          writeControl: null,
+          form: null,
+        },
+        error: errorData.error?.message ?? 'Failed to batch update form',
+      }
+    }
+
+    return {
+      success: true,
+      output: {
+        replies: data.replies ?? [],
+        writeControl: data.writeControl ?? null,
+        form: data.form ?? null,
+      },
+    }
+  },
+
+  outputs: {
+    replies: {
+      type: 'array',
+      description: 'The replies from each update request',
+      items: {
+        type: 'json',
+      },
+    },
+    writeControl: {
+      type: 'object',
+      description: 'Write control information with revision IDs',
+      optional: true,
+      properties: {
+        requiredRevisionId: {
+          type: 'string',
+          description: 'Required revision ID for conflict detection',
+        },
+        targetRevisionId: { type: 'string', description: 'Target revision ID' },
+      },
+    },
+    form: {
+      type: 'object',
+      description: 'The updated form (if includeFormInResponse was true)',
+      optional: true,
+      properties: {
+        formId: { type: 'string', description: 'The form ID' },
+        info: {
+          type: 'object',
+          description: 'Form info containing title and description',
+          properties: {
+            title: { type: 'string', description: 'The form title visible to responders' },
+            description: { type: 'string', description: 'The form description' },
+            documentTitle: { type: 'string', description: 'The document title visible in Drive' },
+          },
+        },
+        settings: {
+          type: 'object',
+          description: 'Form settings',
+          properties: {
+            quizSettings: {
+              type: 'object',
+              description: 'Quiz settings',
+              properties: {
+                isQuiz: { type: 'boolean', description: 'Whether the form is a quiz' },
+              },
+            },
+            emailCollectionType: { type: 'string', description: 'Email collection type' },
+          },
+        },
+        items: {
+          type: 'array',
+          description: 'The form items (questions, sections, etc.)',
+          items: {
+            type: 'object',
+            properties: {
+              itemId: { type: 'string', description: 'Item ID' },
+              title: { type: 'string', description: 'Item title' },
+              description: { type: 'string', description: 'Item description' },
+              questionItem: { type: 'json', description: 'Question item configuration' },
+              questionGroupItem: { type: 'json', description: 'Question group configuration' },
+              pageBreakItem: { type: 'json', description: 'Page break configuration' },
+              textItem: { type: 'json', description: 'Text item configuration' },
+              imageItem: { type: 'json', description: 'Image item configuration' },
+              videoItem: { type: 'json', description: 'Video item configuration' },
+            },
+          },
+        },
+        revisionId: { type: 'string', description: 'The revision ID of the form' },
+        responderUri: { type: 'string', description: 'The URI to share with responders' },
+        linkedSheetId: { type: 'string', description: 'The ID of the linked Google Sheet' },
+        publishSettings: {
+          type: 'object',
+          description: 'Form publish settings',
+          properties: {
+            publishState: {
+              type: 'object',
+              description: 'Current publish state',
+              properties: {
+                isPublished: { type: 'boolean', description: 'Whether the form is published' },
+                isAcceptingResponses: {
+                  type: 'boolean',
+                  description: 'Whether the form is accepting responses',
+                },
+              },
+            },
+          },
+        },
+      },
+    },
+  },
+}
diff --git a/apps/sim/tools/google_forms/create_form.ts b/apps/sim/tools/google_forms/create_form.ts
new file mode 100644
index 0000000000..bd31a9bd72
--- /dev/null
+++ b/apps/sim/tools/google_forms/create_form.ts
@@ -0,0 +1,106 @@
+import type {
+  GoogleForm,
+  GoogleFormsCreateFormParams,
+  GoogleFormsCreateFormResponse,
+} from '@/tools/google_forms/types'
+import { buildCreateFormUrl } from '@/tools/google_forms/utils'
+import type { ToolConfig } from '@/tools/types'
+
+export const createFormTool: ToolConfig<
+  GoogleFormsCreateFormParams,
+  GoogleFormsCreateFormResponse
+> = {
+  id: 'google_forms_create_form',
+  name: 'Google Forms: Create Form',
+  description: 'Create a new Google Form with a title',
+  version: '1.0.0',
+
+  oauth: {
+    required: true,
+    provider: 'google-forms',
+  },
+
+  params: {
+    accessToken: {
+      type: 'string',
+      required: true,
+      visibility: 'hidden',
+      description: 'OAuth access token',
+    },
+    title: {
+      type: 'string',
+      required: true,
+      visibility: 'user-or-llm',
+      description: 'The title of the form visible to responders',
+    },
+    documentTitle: {
+      type: 'string',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'The document title visible in Drive (defaults to form title)',
+    },
+    unpublished: {
+      type: 'boolean',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'If true, create an unpublished form that does not accept responses',
+    },
+  },
+
+  request: {
+    url: (params: GoogleFormsCreateFormParams) => buildCreateFormUrl(params.unpublished),
+    method: 'POST',
+    headers: (params: GoogleFormsCreateFormParams) => ({
+      Authorization: `Bearer ${params.accessToken}`,
+      'Content-Type': 'application/json',
+    }),
+    body: (params: GoogleFormsCreateFormParams) => ({
+      info: {
+        title: params.title,
+        ...(params.documentTitle ? { documentTitle: params.documentTitle } : {}),
+      },
+    }),
+  },
+
+  transformResponse: async (response: Response) => {
+    const data = (await response.json()) as GoogleForm
+
+    if (!response.ok) {
+      const errorData = data as unknown as { error?: { message?: string } }
+      return {
+        success: false,
+        output: {
+          formId: '',
+          title: null,
+          documentTitle: null,
+          responderUri: null,
+          revisionId: null,
+        },
+        error: errorData.error?.message ?? 'Failed to create form',
+      }
+    }
+
+    return {
+      success: true,
+      output: {
+        formId: data.formId ?? '',
+        title: data.info?.title ?? null,
+        documentTitle: data.info?.documentTitle ?? null,
+        responderUri: data.responderUri ?? null,
+        revisionId: data.revisionId ?? null,
+      },
+    }
+  },
+
+  outputs: {
+    formId: { type: 'string', description: 'The ID of the created form' },
+    title: { type: 'string', description: 'The form title', optional: true },
+    documentTitle: { type: 'string', description: 'The document title in Drive', optional: true },
+    responderUri: {
+      type: 'string',
+      description: 'The URI to share with responders',
+      optional: true,
+    },
+    revisionId: { type: 'string', description: 'The revision ID of the form', optional: true },
+  },
+}
diff --git a/apps/sim/tools/google_forms/create_watch.ts b/apps/sim/tools/google_forms/create_watch.ts
new file mode 100644
index 0000000000..4f7874d577
--- /dev/null
+++ b/apps/sim/tools/google_forms/create_watch.ts
@@ -0,0 +1,120 @@
+import type {
+  GoogleFormsCreateWatchParams,
+  GoogleFormsCreateWatchResponse,
+  GoogleFormsWatch,
+} from '@/tools/google_forms/types'
+import { buildCreateWatchUrl } from '@/tools/google_forms/utils'
+import type { ToolConfig } from '@/tools/types'
+
+export const createWatchTool: ToolConfig<
+  GoogleFormsCreateWatchParams,
+  GoogleFormsCreateWatchResponse
+> = {
+  id: 'google_forms_create_watch',
+  name: 'Google Forms: Create Watch',
+  description: 'Create a notification watch for form changes (schema changes or new responses)',
+  version: '1.0.0',
+
+  oauth: {
+    required: true,
+    provider: 'google-forms',
+  },
+
+  params: {
+    accessToken: {
+      type: 'string',
+      required: true,
+      visibility: 'hidden',
+      description: 'OAuth access token',
+    },
+    formId: {
+      type: 'string',
+      required: true,
+      visibility: 'user-only',
+      description: 'The ID of the Google Form to watch',
+    },
+    eventType: {
+      type: 'string',
+      required: true,
+      visibility: 'user-or-llm',
+      description: 'Event type to watch: SCHEMA (form changes) or RESPONSES (new submissions)',
+    },
+    topicName: {
+      type: 'string',
+      required: true,
+      visibility: 'user-only',
+      description: 'The Cloud Pub/Sub topic name (format: projects/{project}/topics/{topic})',
+    },
+    watchId: {
+      type: 'string',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Custom watch ID (4-63 chars, lowercase letters, numbers, hyphens)',
+    },
+  },
+
+  request: {
+    url: (params: GoogleFormsCreateWatchParams) => buildCreateWatchUrl(params.formId),
+    method: 'POST',
+    headers: (params: GoogleFormsCreateWatchParams) => ({
+      Authorization: `Bearer ${params.accessToken}`,
+      'Content-Type': 'application/json',
+    }),
+    body: (params: GoogleFormsCreateWatchParams) => ({
+      watch: {
+        target: {
+          topic: {
+            topicName: params.topicName,
+          },
+        },
+        eventType: params.eventType,
+      },
+      ...(params.watchId ? { watchId: params.watchId } : {}),
+    }),
+  },
+
+  transformResponse: async (response: Response) => {
+    const data = (await response.json()) as GoogleFormsWatch
+
+    if (!response.ok) {
+      const errorData = data as unknown as { error?: { message?: string } }
+      return {
+        success: false,
+        output: {
+          id: '',
+          eventType: '',
+          topicName: null,
+          createTime: null,
+          expireTime: null,
+          state: null,
+        },
+        error: errorData.error?.message ?? 'Failed to create watch',
+      }
+    }
+
+    return {
+      success: true,
+      output: {
+        id: data.id ?? '',
+        eventType: data.eventType ?? '',
+        topicName: data.target?.topic?.topicName ?? null,
+        createTime: data.createTime ?? null,
+        expireTime: data.expireTime ?? null,
+        state: data.state ?? null,
+      },
+    }
+  },
+
+  outputs: {
+    id: { type: 'string', description: 'The watch ID' },
+    eventType: { type: 'string', description: 'The event type being watched' },
+    topicName: { type: 'string', description: 'The Cloud Pub/Sub topic', optional: true },
+    createTime: { type: 'string', description: 'When the watch was created', optional: true },
+    expireTime: {
+      type: 'string',
+      description: 'When the watch expires (7 days after creation)',
+      optional: true,
+    },
+    state: { type: 'string', description: 'The watch state (ACTIVE, SUSPENDED)', optional: true },
+  },
+}
diff --git a/apps/sim/tools/google_forms/delete_watch.ts b/apps/sim/tools/google_forms/delete_watch.ts
new file mode 100644
index 0000000000..41eed7bd6c
--- /dev/null
+++ b/apps/sim/tools/google_forms/delete_watch.ts
@@ -0,0 +1,76 @@
+import type {
+  GoogleFormsDeleteWatchParams,
+  GoogleFormsDeleteWatchResponse,
+} from '@/tools/google_forms/types'
+import { buildDeleteWatchUrl } from '@/tools/google_forms/utils'
+import type { ToolConfig } from '@/tools/types'
+
+export const deleteWatchTool: ToolConfig<
+  GoogleFormsDeleteWatchParams,
+  GoogleFormsDeleteWatchResponse
+> = {
+  id: 'google_forms_delete_watch',
+  name: 'Google Forms: Delete Watch',
+  description: 'Delete a notification watch from a form',
+  version: '1.0.0',
+
+  oauth: {
+    required: true,
+    provider: 'google-forms',
+  },
+
+  params: {
+    accessToken: {
+      type: 'string',
+      required: true,
+      visibility: 'hidden',
+      description: 'OAuth access token',
+    },
+    formId: {
+      type: 'string',
+      required: true,
+      visibility: 'user-only',
+      description: 'The ID of the Google Form',
+    },
+    watchId: {
+      type: 'string',
+      required: true,
+      visibility: 'user-only',
+      description: 'The ID of the watch to delete',
+    },
+  },
+
+  request: {
+    url: (params: GoogleFormsDeleteWatchParams) =>
+      buildDeleteWatchUrl(params.formId, params.watchId),
+    method: 'DELETE',
+    headers: (params: GoogleFormsDeleteWatchParams) => ({
+      Authorization: `Bearer ${params.accessToken}`,
+      'Content-Type': 'application/json',
+    }),
+  },
+
+  transformResponse: async (response: Response) => {
+    if (!response.ok) {
+      const data = (await response.json()) as { error?: { message?: string } }
+      return {
+        success: false,
+        output: {
+          deleted: false,
+        },
+        error: data.error?.message ?? 'Failed to delete watch',
+      }
+    }
+
+    return {
+      success: true,
+      output: {
+        deleted: true,
+      },
+    }
+  },
+
+  outputs: {
+    deleted: { type: 'boolean', description: 'Whether the watch was successfully deleted' },
+  },
+}
diff --git a/apps/sim/tools/google_forms/get_form.ts b/apps/sim/tools/google_forms/get_form.ts
new file mode 100644
index 0000000000..0aab231b09
--- /dev/null
+++ b/apps/sim/tools/google_forms/get_form.ts
@@ -0,0 +1,119 @@
+import type {
+  GoogleForm,
+  GoogleFormsGetFormParams,
+  GoogleFormsGetFormResponse,
+} from '@/tools/google_forms/types'
+import { buildGetFormUrl } from '@/tools/google_forms/utils'
+import type { ToolConfig } from '@/tools/types'
+
+export const getFormTool: ToolConfig<GoogleFormsGetFormParams, GoogleFormsGetFormResponse> = {
+  id: 'google_forms_get_form',
+  name: 'Google Forms: Get Form',
+  description: 'Retrieve a form structure including its items, settings, and metadata',
+  version: '1.0.0',
+
+  oauth: {
+    required: true,
+    provider: 'google-forms',
+  },
+
+  params: {
+    accessToken: {
+      type: 'string',
+      required: true,
+      visibility: 'hidden',
+      description: 'OAuth access token',
+    },
+    formId: {
+      type: 'string',
+      required: true,
+      visibility: 'user-only',
+      description: 'The ID of the Google Form to retrieve',
+    },
+  },
+
+  request: {
+    url: (params: GoogleFormsGetFormParams) => buildGetFormUrl(params.formId),
+    method: 'GET',
+    headers: (params: GoogleFormsGetFormParams) => ({
+      Authorization: `Bearer ${params.accessToken}`,
+      'Content-Type': 'application/json',
+    }),
+  },
+
+  transformResponse: async (response: Response) => {
+    const data = (await response.json()) as GoogleForm
+
+    if (!response.ok) {
+      const errorData = data as unknown as { error?: { message?: string } }
+      return {
+        success: false,
+        output: {
+          formId: '',
+          title: null,
+          description: null,
+          documentTitle: null,
+          responderUri: null,
+          linkedSheetId: null,
+          revisionId: null,
+          items: [],
+          settings: null,
+          publishSettings: null,
+        },
+        error: errorData.error?.message ?? 'Failed to get form',
+      }
+    }
+
+    return {
+      success: true,
+      output: {
+        formId: data.formId ?? '',
+        title: data.info?.title ?? null,
+        description: data.info?.description ?? null,
+        documentTitle: data.info?.documentTitle ?? null,
+        responderUri: data.responderUri ?? null,
+        linkedSheetId: data.linkedSheetId ?? null,
+        revisionId: data.revisionId ?? null,
+        items: data.items ?? [],
+        settings: data.settings ?? null,
+        publishSettings: data.publishSettings ?? null,
+      },
+    }
+  },
+
+  outputs: {
+    formId: { type: 'string', description: 'The form ID' },
+    title: { type: 'string', description: 'The form title visible to responders', optional: true },
+    description: { type: 'string', description: 'The form description', optional: true },
+    documentTitle: {
+      type: 'string',
+      description: 'The document title visible in Drive',
+      optional: true,
+    },
+    responderUri: {
+      type: 'string',
+      description: 'The URI to share with responders',
+      optional: true,
+    },
+    linkedSheetId: {
+      type: 'string',
+      description: 'The ID of the linked Google Sheet',
+      optional: true,
+    },
+    revisionId: { type: 'string', description: 'The revision ID of the form', optional: true },
+    items: {
+      type: 'array',
+      description: 'The form items (questions, sections, etc.)',
+      items: {
+        type: 'object',
+        properties: {
+          itemId: { type: 'string', description: 'Item ID' },
+          title: { type: 'string', description: 'Item title' },
+          description: { type: 'string', description: 'Item description' },
+        },
+      },
+    },
+    settings: { type: 'json', description: 'Form settings', optional: true },
+    publishSettings: { type: 'json', description: 'Form publish settings', optional: true },
+  },
+}
diff --git a/apps/sim/tools/google_form/get_responses.ts b/apps/sim/tools/google_forms/get_responses.ts
similarity index 80%
rename from apps/sim/tools/google_form/get_responses.ts
rename to apps/sim/tools/google_forms/get_responses.ts
index 9cdc754c21..f9fc606f94 100644
--- a/apps/sim/tools/google_form/get_responses.ts
+++ b/apps/sim/tools/google_forms/get_responses.ts
@@ -2,8 +2,8 @@ import type {
   GoogleFormsGetResponsesParams,
   GoogleFormsResponse,
   GoogleFormsResponseList,
-} from '@/tools/google_form/types'
-import { buildGetResponseUrl, buildListResponsesUrl } from '@/tools/google_form/utils'
+} from '@/tools/google_forms/types'
+import { buildGetResponseUrl, buildListResponsesUrl } from '@/tools/google_forms/utils'
 import type { ToolConfig } from '@/tools/types'
 
 export const getResponsesTool: ToolConfig<GoogleFormsGetResponsesParams> = {
@@ -165,4 +165,43 @@ export const getResponsesTool: ToolConfig<GoogleFormsGetResponsesParams> = {
       } as unknown as Record<string, unknown>,
     }
   },
+
+  outputs: {
+    responses: {
+      type: 'array',
+      description: 'Array of form responses (when no responseId provided)',
+      items: {
+        type: 'object',
+        properties: {
+          responseId: { type: 'string', description: 'Unique response ID' },
+          createTime: { type: 'string', description: 'When the response was created' },
+          lastSubmittedTime: {
+            type: 'string',
+            description: 'When the response was last submitted',
+          },
+          answers: {
+            type: 'json',
+            description: 'Map of question IDs to answer values',
+          },
+        },
+      },
+    },
+    response: {
+      type: 'object',
+      description: 'Single form response (when responseId is provided)',
+      properties: {
+        responseId: { type: 'string', description: 'Unique response ID' },
+        createTime: { type: 'string', description: 'When the response was created' },
+        lastSubmittedTime: { type: 'string', description: 'When the response was last submitted' },
+        answers: {
+          type: 'json',
+          description: 'Map of question IDs to answer values',
+        },
+      },
+    },
+    raw: {
+      type: 'json',
+      description: 'Raw API response data',
+    },
+  },
 }
diff --git a/apps/sim/tools/google_forms/index.ts b/apps/sim/tools/google_forms/index.ts
new file mode 100644
index 0000000000..919daff2c4
--- /dev/null
+++ b/apps/sim/tools/google_forms/index.ts
@@ -0,0 +1,21 @@
+import { batchUpdateTool } from '@/tools/google_forms/batch_update'
+import { createFormTool } from '@/tools/google_forms/create_form'
+import { createWatchTool } from '@/tools/google_forms/create_watch'
+import { deleteWatchTool } from '@/tools/google_forms/delete_watch'
+import { getFormTool } from '@/tools/google_forms/get_form'
+import { getResponsesTool } from '@/tools/google_forms/get_responses'
+import { listWatchesTool } from '@/tools/google_forms/list_watches'
+import { renewWatchTool } from '@/tools/google_forms/renew_watch'
+import { setPublishSettingsTool } from '@/tools/google_forms/set_publish_settings'
+
+export const googleFormsGetResponsesTool = getResponsesTool
+export const googleFormsGetFormTool = getFormTool
+export const googleFormsCreateFormTool = createFormTool
+export const googleFormsBatchUpdateTool = batchUpdateTool
+export const googleFormsSetPublishSettingsTool = setPublishSettingsTool
+export const googleFormsCreateWatchTool = createWatchTool
+export const googleFormsListWatchesTool = listWatchesTool
+export const googleFormsDeleteWatchTool = deleteWatchTool
+export const googleFormsRenewWatchTool = renewWatchTool
+
+export * from './types'
diff --git a/apps/sim/tools/google_forms/list_watches.ts b/apps/sim/tools/google_forms/list_watches.ts
new file mode 100644
index 0000000000..3442c0afaa
--- /dev/null
+++ b/apps/sim/tools/google_forms/list_watches.ts
@@ -0,0 +1,99 @@
+import type {
+  GoogleFormsListWatchesParams,
+  GoogleFormsListWatchesResponse,
+  GoogleFormsWatch,
+} from '@/tools/google_forms/types'
+import { buildListWatchesUrl } from '@/tools/google_forms/utils'
+import type { ToolConfig } from '@/tools/types'
+
+interface ListWatchesApiResponse {
+  watches?: GoogleFormsWatch[]
+}
+
+export const listWatchesTool: ToolConfig<
+  GoogleFormsListWatchesParams,
+  GoogleFormsListWatchesResponse
+> = {
+  id: 'google_forms_list_watches',
+  name: 'Google Forms: List Watches',
+  description: 'List all notification watches for a form',
+  version: '1.0.0',
+
+  oauth: {
+    required: true,
+    provider: 'google-forms',
+  },
+
+  params: {
+    accessToken: {
+      type: 'string',
+      required: true,
+      visibility: 'hidden',
+      description: 'OAuth access token',
+    },
+    formId: {
+      type: 'string',
+      required: true,
+      visibility: 'user-only',
+      description: 'The ID of the Google Form',
+    },
+  },
+
+  request: {
+    url: (params: GoogleFormsListWatchesParams) => buildListWatchesUrl(params.formId),
+    method: 'GET',
+    headers: (params: GoogleFormsListWatchesParams) => ({
+      Authorization: `Bearer ${params.accessToken}`,
+      'Content-Type': 'application/json',
+    }),
+  },
+
+  transformResponse: async (response: Response) => {
+    const data = (await response.json()) as ListWatchesApiResponse
+
+    if (!response.ok) {
+      const errorData = data as unknown as { error?: { message?: string } }
+      return {
+        success: false,
+        output: {
+          watches: [],
+        },
+        error: errorData.error?.message ?? 'Failed to list watches',
+      }
+    }
+
+    const watches = (data.watches ?? []).map((watch) => ({
+      id: watch.id,
+      target: watch.target,
+      eventType: watch.eventType,
+      createTime: watch.createTime,
+      expireTime: watch.expireTime,
+      state: watch.state,
+      errorType: watch.errorType,
+    }))
+
+    return {
+      success: true,
+      output: {
+        watches,
+      },
+    }
+  },
+
+  outputs: {
+    watches: {
+      type: 'array',
+      description: 'List of watches for the form',
+      items: {
+        type: 'object',
+        properties: {
+          id: { type: 'string', description: 'Watch ID' },
+          eventType: { type: 'string', description: 'Event type (SCHEMA or RESPONSES)' },
+          createTime: { type: 'string', description: 'When the watch was created' },
+          expireTime: { type: 'string', description: 'When the watch expires' },
+          state: { type: 'string', description: 'Watch state' },
+        },
+      },
+    },
+  },
+}
diff --git a/apps/sim/tools/google_forms/renew_watch.ts b/apps/sim/tools/google_forms/renew_watch.ts
new file mode 100644
index 0000000000..21a6a9a93e
--- /dev/null
+++ b/apps/sim/tools/google_forms/renew_watch.ts
@@ -0,0 +1,87 @@
+import type {
+  GoogleFormsRenewWatchParams,
+  GoogleFormsRenewWatchResponse,
+  GoogleFormsWatch,
+} from '@/tools/google_forms/types'
+import { buildRenewWatchUrl } from '@/tools/google_forms/utils'
+import type { ToolConfig } from '@/tools/types'
+
+export const renewWatchTool: ToolConfig<
+  GoogleFormsRenewWatchParams,
+  GoogleFormsRenewWatchResponse
+> = {
+  id: 'google_forms_renew_watch',
+  name: 'Google Forms: Renew Watch',
+  description: 'Renew a notification watch for another 7 days',
+  version: '1.0.0',
+
+  oauth: {
+    required: true,
+    provider: 'google-forms',
+  },
+
+  params: {
+    accessToken: {
+      type: 'string',
+      required: true,
+      visibility: 'hidden',
+      description: 'OAuth access token',
+    },
+    formId: {
+      type: 'string',
+      required: true,
+      visibility: 'user-only',
+      description: 'The ID of the Google Form',
+    },
+    watchId: {
+      type: 'string',
+      required: true,
+      visibility: 'user-only',
+      description: 'The ID of the watch to renew',
+    },
+  },
+
+  request: {
+    url: (params: GoogleFormsRenewWatchParams) => buildRenewWatchUrl(params.formId, params.watchId),
+    method: 'POST',
+    headers: (params: GoogleFormsRenewWatchParams) => ({
+      Authorization: `Bearer ${params.accessToken}`,
+      'Content-Type': 'application/json',
+    }),
+  },
+
+  transformResponse: async (response: Response) => {
+    const data = (await response.json()) as GoogleFormsWatch
+
+    if (!response.ok) {
+      const errorData = data as unknown as { error?: { message?: string } }
+      return {
+        success: false,
+        output: {
+          id: '',
+          eventType: null,
+          expireTime: null,
+          state: null,
+        },
+        error: errorData.error?.message ?? 'Failed to renew watch',
+      }
+    }
+
+    return {
+      success: true,
+      output: {
+        id: data.id ?? '',
+        eventType: data.eventType ?? null,
+        expireTime: data.expireTime ?? null,
+        state: data.state ?? null,
+      },
+    }
+  },
+
+  outputs: {
+    id: { type: 'string', description: 'The watch ID' },
+    eventType: { type: 'string', description: 'The event type being watched', optional: true },
+    expireTime: { type: 'string', description: 'The new expiration time', optional: true },
+    state: { type: 'string', description: 'The watch state', optional: true },
+  },
+}
diff --git a/apps/sim/tools/google_forms/set_publish_settings.ts b/apps/sim/tools/google_forms/set_publish_settings.ts
new file mode 100644
index 0000000000..fa3a3b5ad2
--- /dev/null
+++ b/apps/sim/tools/google_forms/set_publish_settings.ts
@@ -0,0 +1,119 @@
+import type {
+  GoogleFormsPublishSettings,
+  GoogleFormsSetPublishSettingsParams,
+  GoogleFormsSetPublishSettingsResponse,
+} from '@/tools/google_forms/types'
+import { buildSetPublishSettingsUrl } from '@/tools/google_forms/utils'
+import type { ToolConfig } from '@/tools/types'
+
+interface SetPublishSettingsApiResponse {
+  formId?: string
+  publishSettings?: GoogleFormsPublishSettings
+}
+
+export const setPublishSettingsTool: ToolConfig<
+  GoogleFormsSetPublishSettingsParams,
+  GoogleFormsSetPublishSettingsResponse
+> = {
+  id: 'google_forms_set_publish_settings',
+  name: 'Google Forms: Set Publish Settings',
+  description: 'Update the publish settings of a form (publish/unpublish, accept responses)',
+  version: '1.0.0',
+
+  oauth: {
+    required: true,
+    provider: 'google-forms',
+  },
+
+  params: {
+    accessToken: {
+      type: 'string',
+      required: true,
+      visibility: 'hidden',
+      description: 'OAuth access token',
+    },
+    formId: {
+      type: 'string',
+      required: true,
+      visibility: 'user-only',
+      description: 'The ID of the Google Form',
+    },
+    isPublished: {
+      type: 'boolean',
+      required: true,
+      visibility: 'user-or-llm',
+      description: 'Whether the form is published and visible to others',
+    },
+    isAcceptingResponses: {
+      type: 'boolean',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Whether the form accepts responses (forced to false if isPublished is false)',
+    },
+  },
+
+  request: {
+    url: (params: GoogleFormsSetPublishSettingsParams) => buildSetPublishSettingsUrl(params.formId),
+    method: 'POST',
+    headers: (params: GoogleFormsSetPublishSettingsParams) => ({
+      Authorization: `Bearer ${params.accessToken}`,
+      'Content-Type': 'application/json',
+    }),
+    body: (params: GoogleFormsSetPublishSettingsParams) => ({
+      publishSettings: {
+        publishState: {
+          isPublished: params.isPublished,
+          ...(params.isAcceptingResponses !== undefined
+            ? { isAcceptingResponses: params.isAcceptingResponses }
+            : {}),
+        },
+      },
+      updateMask: 'publishState',
+    }),
+  },
+
+  transformResponse: async (response: Response) => {
+    const data = (await response.json()) as SetPublishSettingsApiResponse
+
+    if (!response.ok) {
+      const errorData = data as unknown as { error?: { message?: string } }
+      return {
+        success: false,
+        output: {
+          formId: '',
+          publishSettings: {},
+        },
+        error: errorData.error?.message ?? 'Failed to set publish settings',
+      }
+    }
+
+    return {
+      success: true,
+      output: {
+        formId: data.formId ?? '',
+        publishSettings: data.publishSettings ?? {},
+      },
+    }
+  },
+
+  outputs: {
+    formId: { type: 'string', description: 'The form ID' },
+    publishSettings: {
+      type: 'json',
+      description: 'The updated publish settings',
+      properties: {
+        publishState: {
+          type: 'object',
+          description: 'The publish state',
+          properties: {
+            isPublished: { type: 'boolean', description: 'Whether the form is published' },
+            isAcceptingResponses: {
+              type: 'boolean',
+              description: 'Whether the form accepts responses',
+            },
+          },
+        },
+      },
+    },
+  },
+}
diff --git a/apps/sim/tools/google_forms/types.ts b/apps/sim/tools/google_forms/types.ts
new file mode 100644
index 0000000000..4806914492
--- /dev/null
+++ b/apps/sim/tools/google_forms/types.ts
@@ -0,0 +1,268 @@
+import type { ToolResponse } from '@/tools/types'
+
+// ============================================
+// Common Types
+// ============================================
+
+export interface GoogleFormsResponse {
+  responseId?: string
+  createTime?: string
+  lastSubmittedTime?: string
+  answers?: Record<string, unknown>
+  respondentEmail?: string
+  totalScore?: number
+  [key: string]: unknown
+}
+
+export interface GoogleFormsResponseList {
+  responses?: GoogleFormsResponse[]
+  nextPageToken?: string
+}
+
+export interface GoogleFormsInfo {
+  title?: string
+  description?: string
+  documentTitle?: string
+}
+
+export interface GoogleFormsSettings {
+  quizSettings?: {
+    isQuiz?: boolean
+  }
+  emailCollectionType?:
+    | 'EMAIL_COLLECTION_TYPE_UNSPECIFIED'
+    | 'DO_NOT_COLLECT'
+    | 'VERIFIED'
+    | 'RESPONDER_INPUT'
+  [key: string]: unknown
+}
+
+export interface GoogleFormsPublishState {
+  isPublished?: boolean
+  isAcceptingResponses?: boolean
+}
+
+export interface GoogleFormsPublishSettings {
+  publishState?: GoogleFormsPublishState
+}
+
+export interface GoogleFormsItem {
+  itemId?: string
+  title?: string
+  description?: string
+  questionItem?: Record<string, unknown>
+  questionGroupItem?: Record<string, unknown>
+  pageBreakItem?: Record<string, unknown>
+  textItem?: Record<string, unknown>
+  imageItem?: Record<string, unknown>
+  videoItem?: Record<string, unknown>
+}
+
+export interface GoogleForm {
+  formId?: string
+  info?: GoogleFormsInfo
+  settings?: GoogleFormsSettings
+  items?: GoogleFormsItem[]
+  revisionId?: string
+  responderUri?: string
+  linkedSheetId?: string
+  publishSettings?: GoogleFormsPublishSettings
+}
+
+export interface GoogleFormsWatch {
+  id?: string
+  target?: {
+    topic?: {
+      topicName?: string
+    }
+  }
+  eventType?: 'EVENT_TYPE_UNSPECIFIED' | 'SCHEMA' | 'RESPONSES'
+  createTime?: string
+  expireTime?: string
+  state?: 'STATE_UNSPECIFIED' | 'ACTIVE' | 'SUSPENDED'
+  errorType?: string
+}
+
+// ============================================
+// Get Responses Params
+// ============================================
+
+export interface GoogleFormsGetResponsesParams {
+  accessToken: string
+  formId: string
+  responseId?: string
+  pageSize?: number
+}
+
+// ============================================
+// Get Form Params & Response
+// ============================================
+
+export interface GoogleFormsGetFormParams {
+  accessToken: string
+  formId: string
+}
+
+export interface GoogleFormsGetFormResponse extends ToolResponse {
+  output: {
+    formId: string
+    title: string | null
+    description: string | null
+    documentTitle: string | null
+    responderUri: string | null
+    linkedSheetId: string | null
+    revisionId: string | null
+    items: GoogleFormsItem[]
+    settings: GoogleFormsSettings | null
+    publishSettings: GoogleFormsPublishSettings | null
+  }
+}
+
+// ============================================
+// Create Form Params & Response
+// ============================================
+
+export interface GoogleFormsCreateFormParams {
+  accessToken: string
+  title: string
+  documentTitle?: string
+  unpublished?: boolean
+}
+
+export interface GoogleFormsCreateFormResponse extends ToolResponse {
+  output: {
+    formId: string
+    title: string | null
+    documentTitle: string | null
+    responderUri: string | null
+    revisionId: string | null
+  }
+}
+
+// ============================================
+// Batch Update Params & Response
+// ============================================
+
+export interface GoogleFormsBatchUpdateRequest {
+  updateFormInfo?: {
+    info: Partial<GoogleFormsInfo>
+    updateMask: string
+  }
+  updateSettings?: {
+    settings: Partial<GoogleFormsSettings>
+    updateMask: string
+  }
+  createItem?: {
+    item: GoogleFormsItem
+    location: { index: number }
+  }
+  updateItem?: {
+    item: GoogleFormsItem
+    location: { index: number }
+    updateMask: string
+  }
+  moveItem?: {
+    originalLocation: { index: number }
+    newLocation: { index: number }
+  }
+  deleteItem?: {
+    location: { index: number }
+  }
+}
+
+export interface GoogleFormsBatchUpdateParams {
+  accessToken: string
+  formId: string
+  requests: GoogleFormsBatchUpdateRequest[]
+  includeFormInResponse?: boolean
+}
+
+export interface GoogleFormsBatchUpdateResponse extends ToolResponse {
+  output: {
+    replies: Record<string, unknown>[]
+    writeControl: {
+      requiredRevisionId?: string
+      targetRevisionId?: string
+    } | null
+    form: GoogleForm | null
+  }
+}
+
+// ============================================
+// Set Publish Settings Params & Response
+// ============================================
+
+export interface GoogleFormsSetPublishSettingsParams {
+  accessToken: string
+  formId: string
+  isPublished: boolean
+  isAcceptingResponses?: boolean
+}
+
+export interface GoogleFormsSetPublishSettingsResponse extends ToolResponse {
+  output: {
+    formId: string
+    publishSettings: GoogleFormsPublishSettings
+  }
+}
+
+// ============================================
+// Watch Params & Responses
+// ============================================
+
+export interface GoogleFormsCreateWatchParams {
+  accessToken: string
+  formId: string
+  eventType: 'SCHEMA' | 'RESPONSES'
+  topicName: string
+  watchId?: string
+}
+
+export interface GoogleFormsCreateWatchResponse extends ToolResponse {
+  output: {
+    id: string
+    eventType: string
+    topicName: string | null
+    createTime: string | null
+    expireTime: string | null
+    state: string | null
+  }
+}
+
+export interface GoogleFormsListWatchesParams {
+  accessToken: string
+  formId: string
+}
+
+export interface GoogleFormsListWatchesResponse extends ToolResponse {
+  output: {
+    watches: GoogleFormsWatch[]
+  }
+}
+
+export interface GoogleFormsDeleteWatchParams {
+  accessToken: string
+  formId: string
+  watchId: string
+}
+
+export interface GoogleFormsDeleteWatchResponse extends ToolResponse {
+  output: {
+    deleted: boolean
+  }
+}
+
+export interface GoogleFormsRenewWatchParams {
+  accessToken: string
+  formId: string
+  watchId: string
+}
+
+export interface GoogleFormsRenewWatchResponse extends ToolResponse {
+  output: {
+    id: string
+    eventType: string | null
+    expireTime: string | null
+    state: string | null
+  }
+}
diff --git a/apps/sim/tools/google_forms/utils.ts b/apps/sim/tools/google_forms/utils.ts
new file mode 100644
index 0000000000..0a7e155e21
--- /dev/null
+++ b/apps/sim/tools/google_forms/utils.ts
@@ -0,0 +1,76 @@
+import { createLogger } from '@sim/logger'
+
+export const FORMS_API_BASE = 'https://forms.googleapis.com/v1'
+
+const logger = createLogger('GoogleFormsUtils')
+
+export function buildListResponsesUrl(params: { formId: string; pageSize?: number }): string {
+  const { formId, pageSize } = params
+  const url = new URL(`${FORMS_API_BASE}/forms/${encodeURIComponent(formId)}/responses`)
+  if (pageSize && pageSize > 0) {
+    const limited = Math.min(pageSize, 5000)
+    url.searchParams.set('pageSize', String(limited))
+  }
+  const finalUrl = url.toString()
+  logger.debug('Built Google Forms list responses URL', { finalUrl })
+  return finalUrl
+}
+
+export function buildGetResponseUrl(params: { formId: string; responseId: string }): string {
+  const { formId, responseId } = params
+  const finalUrl = `${FORMS_API_BASE}/forms/${encodeURIComponent(formId)}/responses/${encodeURIComponent(responseId)}`
+  logger.debug('Built Google Forms get response URL', { finalUrl })
+  return finalUrl
+}
+
+export function buildGetFormUrl(formId: string): string {
+  const finalUrl = `${FORMS_API_BASE}/forms/${encodeURIComponent(formId)}`
+  logger.debug('Built Google Forms get form URL', { finalUrl })
+  return finalUrl
+}
+
+export function buildCreateFormUrl(unpublished?: boolean): string {
+  const url = new URL(`${FORMS_API_BASE}/forms`)
+  if (unpublished) {
+    url.searchParams.set('unpublished', 'true')
+  }
+  const finalUrl = url.toString()
+  logger.debug('Built Google Forms create form URL', { finalUrl })
+  return finalUrl
+}
+
+export function buildBatchUpdateUrl(formId: string): string {
+  const finalUrl = `${FORMS_API_BASE}/forms/${encodeURIComponent(formId)}:batchUpdate`
+  logger.debug('Built Google Forms batch update URL', { finalUrl })
+  return finalUrl
+}
+
+export function buildSetPublishSettingsUrl(formId: string): string {
+  const finalUrl = `${FORMS_API_BASE}/forms/${encodeURIComponent(formId)}:setPublishSettings`
+  logger.debug('Built Google Forms set publish settings URL', { finalUrl })
+  return finalUrl
+}
+
+export function buildListWatchesUrl(formId: string): string {
+  const finalUrl = `${FORMS_API_BASE}/forms/${encodeURIComponent(formId)}/watches`
+  logger.debug('Built Google Forms list watches URL', { finalUrl })
+  return finalUrl
+}
+
+export function buildCreateWatchUrl(formId: string): string {
+  const finalUrl = `${FORMS_API_BASE}/forms/${encodeURIComponent(formId)}/watches`
+  logger.debug('Built Google Forms create watch URL', { finalUrl })
+  return finalUrl
+}
+
+export function buildDeleteWatchUrl(formId: string, watchId: string): string {
+  const finalUrl = `${FORMS_API_BASE}/forms/${encodeURIComponent(formId)}/watches/${encodeURIComponent(watchId)}`
+  logger.debug('Built Google Forms delete watch URL', { finalUrl })
+  return finalUrl
+}
+
+export function buildRenewWatchUrl(formId: string, watchId: string): string {
+  const finalUrl = `${FORMS_API_BASE}/forms/${encodeURIComponent(formId)}/watches/${encodeURIComponent(watchId)}:renew`
+  logger.debug('Built Google Forms renew watch URL', { finalUrl })
+  return finalUrl
+}
diff --git a/apps/sim/tools/google_groups/add_alias.ts b/apps/sim/tools/google_groups/add_alias.ts
new file mode 100644
index 0000000000..6ea8ed30b9
--- /dev/null
+++ b/apps/sim/tools/google_groups/add_alias.ts
@@ -0,0 +1,75 @@
+import type { ToolConfig } from '@/tools/types'
+import type { GoogleGroupsAddAliasParams, GoogleGroupsAddAliasResponse } from './types'
+
+export const addAliasTool: ToolConfig<GoogleGroupsAddAliasParams, GoogleGroupsAddAliasResponse> = {
+  id: 'google_groups_add_alias',
+  name: 'Google Groups Add Alias',
+  description: 'Add an email alias to a Google Group',
+  version: '1.0.0',
+
+  oauth: {
+    required: true,
+    provider: 'google-groups',
+  },
+
+  params: {
+    accessToken: {
+      type: 'string',
+      required: true,
+      visibility: 'hidden',
+      description: 'OAuth access token',
+    },
+    groupKey: {
+      type: 'string',
+      required: true,
+      visibility: 'user-or-llm',
+      description: 'Group email address or unique group ID',
+    },
+    alias: {
+      type: 'string',
+      required: true,
+      visibility: 'user-or-llm',
+      description: 'The email alias to add to the group',
+    },
+  },
+
+  request: {
+    url: (params) => {
+      const encodedGroupKey = encodeURIComponent(params.groupKey.trim())
+      return `https://admin.googleapis.com/admin/directory/v1/groups/${encodedGroupKey}/aliases`
+    },
+    method: 'POST',
+    headers: (params) => ({
+      Authorization: `Bearer ${params.accessToken}`,
+      'Content-Type': 'application/json',
+    }),
+    body: (params) => ({
+      alias: params.alias.trim(),
+    }),
+  },
+
+  transformResponse: async (response) => {
+    const data = await response.json()
+    if (!response.ok) {
+      throw new Error(data.error?.message || 'Failed to add group alias')
+    }
+    return {
+      success: true,
+      output: {
+        id: data.id ?? null,
+        primaryEmail: data.primaryEmail ?? null,
+        alias: data.alias ?? null,
+        kind: data.kind ?? null,
+        etag: data.etag ?? null,
+      },
+    }
+  },
+
+  outputs: {
+    id: { type: 'string', description: 'Unique group identifier' },
+    primaryEmail: { type: 'string', description: "Group's primary email address" },
+    alias: { type: 'string', description: 'The alias that was added' },
+    kind: { type: 'string', description: 'API resource type' },
+    etag: { type: 'string', description: 'Resource version identifier' },
+  },
+}
diff --git a/apps/sim/tools/google_groups/get_settings.ts b/apps/sim/tools/google_groups/get_settings.ts
new file mode 100644
index 0000000000..761ba54148
--- /dev/null
+++ b/apps/sim/tools/google_groups/get_settings.ts
@@ -0,0 +1,151 @@
+import type { ToolConfig } from '@/tools/types'
+import type { GoogleGroupsGetSettingsParams, GoogleGroupsGetSettingsResponse } from './types'
+
+export const getSettingsTool: ToolConfig<
+  GoogleGroupsGetSettingsParams,
+  GoogleGroupsGetSettingsResponse
+> = {
+  id: 'google_groups_get_settings',
+  name: 'Google Groups Get Settings',
+  description:
+    'Get the settings for a Google Group including access permissions, moderation, and posting options',
+  version: '1.0.0',
+
+  oauth: {
+    required: true,
+    provider: 'google-groups',
+  },
+
+  params: {
+    accessToken: {
+      type: 'string',
+      required: true,
+      visibility: 'hidden',
+      description: 'OAuth access token',
+    },
+    groupEmail: {
+      type: 'string',
+      required: true,
+      visibility: 'user-or-llm',
+      description: 'The email address of the group',
+    },
+  },
+
+  request: {
+    url: (params) => {
+      const encodedEmail = encodeURIComponent(params.groupEmail.trim())
+      return `https://www.googleapis.com/groups/v1/groups/${encodedEmail}`
+    },
+    method: 'GET',
+    headers: (params) => ({
+      Authorization: `Bearer ${params.accessToken}`,
+      'Content-Type': 'application/json',
+    }),
+  },
+
+  transformResponse: async (response) => {
+    const data = await response.json()
+    if (!response.ok) {
+      throw new Error(data.error?.message || 'Failed to get group settings')
+    }
+    return {
+      success: true,
+      output: {
+        email: data.email ?? null,
+        name: data.name ?? null,
+        description: data.description ?? null,
+        whoCanJoin: data.whoCanJoin ?? null,
+        whoCanViewMembership: data.whoCanViewMembership ?? null,
+        whoCanViewGroup: data.whoCanViewGroup ?? null,
+        whoCanPostMessage: data.whoCanPostMessage ?? null,
+        allowExternalMembers: data.allowExternalMembers ?? null,
+        allowWebPosting: data.allowWebPosting ?? null,
+        primaryLanguage: data.primaryLanguage ?? null,
+        isArchived: data.isArchived ?? null,
+        archiveOnly: data.archiveOnly ?? null,
+        messageModerationLevel: data.messageModerationLevel ?? null,
+        spamModerationLevel: data.spamModerationLevel ?? null,
+        replyTo: data.replyTo ?? null,
+        customReplyTo: data.customReplyTo ?? null,
+        includeCustomFooter: data.includeCustomFooter ?? null,
+        customFooterText: data.customFooterText ?? null,
+        sendMessageDenyNotification: data.sendMessageDenyNotification ?? null,
+        defaultMessageDenyNotificationText: data.defaultMessageDenyNotificationText ?? null,
+        membersCanPostAsTheGroup: data.membersCanPostAsTheGroup ?? null,
+        includeInGlobalAddressList: data.includeInGlobalAddressList ?? null,
+        whoCanLeaveGroup: data.whoCanLeaveGroup ?? null,
+        whoCanContactOwner: data.whoCanContactOwner ?? null,
+        favoriteRepliesOnTop: data.favoriteRepliesOnTop ?? null,
+        whoCanApproveMembers: data.whoCanApproveMembers ?? null,
+        whoCanBanUsers: data.whoCanBanUsers ?? null,
+        whoCanModerateMembers: data.whoCanModerateMembers ?? null,
+        whoCanModerateContent: data.whoCanModerateContent ?? null,
+        whoCanAssistContent: data.whoCanAssistContent ?? null,
+        enableCollaborativeInbox: data.enableCollaborativeInbox ?? null,
+        whoCanDiscoverGroup: data.whoCanDiscoverGroup ?? null,
+        defaultSender: data.defaultSender ?? null,
+      },
+    }
+  },
+
+  outputs: {
+    email: { type: 'string', description: "The group's email address" },
+    name: { type: 'string', description: 'The group name (max 75 characters)' },
+    description: { type: 'string', description: 'The group description (max 4096 characters)' },
+    whoCanJoin: {
+      type: 'string',
+      description:
+        'Who can join the group (ANYONE_CAN_JOIN, ALL_IN_DOMAIN_CAN_JOIN, INVITED_CAN_JOIN, CAN_REQUEST_TO_JOIN)',
+    },
+    whoCanViewMembership: { type: 'string', description: 'Who can view group membership' },
+    whoCanViewGroup: { type: 'string', description: 'Who can view group messages' },
+    whoCanPostMessage: { type: 'string', description: 'Who can post messages to the group' },
+    allowExternalMembers: { type: 'string', description: 'Whether external users can be members' },
+    allowWebPosting: { type: 'string', description: 'Whether web posting is allowed' },
+    primaryLanguage: { type: 'string', description: "The group's primary language" },
+    isArchived: { type: 'string', description: 'Whether messages are archived' },
+    archiveOnly: { type: 'string', description: 'Whether the group is archive-only (inactive)' },
+    messageModerationLevel: { type: 'string', description: 'Message moderation level' },
+    spamModerationLevel: {
+      type: 'string',
+      description: 'Spam handling level (ALLOW, MODERATE, SILENTLY_MODERATE, REJECT)',
+    },
+    replyTo: { type: 'string', description: 'Default reply destination' },
+    customReplyTo: { type: 'string', description: 'Custom email for replies' },
+    includeCustomFooter: { type: 'string', description: 'Whether to include custom footer' },
+    customFooterText: { type: 'string', description: 'Custom footer text (max 1000 characters)' },
+    sendMessageDenyNotification: {
+      type: 'string',
+      description: 'Whether to send rejection notifications',
+    },
+    defaultMessageDenyNotificationText: {
+      type: 'string',
+      description: 'Default rejection message text',
+    },
+    membersCanPostAsTheGroup: {
+      type: 'string',
+      description: 'Whether members can post as the group',
+    },
+    includeInGlobalAddressList: {
+      type: 'string',
+      description: 'Whether included in Global Address List',
+    },
+    whoCanLeaveGroup: { type: 'string', description: 'Who can leave the group' },
+    whoCanContactOwner: { type: 'string', description: 'Who can contact the group owner' },
+    favoriteRepliesOnTop: { type: 'string', description: 'Whether favorite replies appear at top' },
+    whoCanApproveMembers: { type: 'string', description: 'Who can approve new members' },
+    whoCanBanUsers: { type: 'string', description: 'Who can ban users' },
+    whoCanModerateMembers: { type: 'string', description: 'Who can manage members' },
+    whoCanModerateContent: { type: 'string', description: 'Who can moderate content' },
+    whoCanAssistContent: { type: 'string', description: 'Who can assist with content metadata' },
+    enableCollaborativeInbox: {
+      type: 'string',
+      description: 'Whether collaborative inbox is enabled',
+    },
+    whoCanDiscoverGroup: { type: 'string', description: 'Who can discover the group' },
+    defaultSender: {
+      type: 'string',
+      description: 'Default sender identity (DEFAULT_SELF or GROUP)',
+    },
+  },
+}
diff --git a/apps/sim/tools/google_groups/index.ts b/apps/sim/tools/google_groups/index.ts
index c1f7aa42c9..fbedaa7c15 100644
--- a/apps/sim/tools/google_groups/index.ts
+++ b/apps/sim/tools/google_groups/index.ts
@@ -1,23 +1,33 @@
+import { addAliasTool } from './add_alias'
 import { addMemberTool } from './add_member'
 import { createGroupTool } from './create_group'
 import { deleteGroupTool } from './delete_group'
 import { getGroupTool } from './get_group'
 import { getMemberTool } from './get_member'
+import { getSettingsTool } from './get_settings'
 import { hasMemberTool } from './has_member'
+import { listAliasesTool } from './list_aliases'
 import { listGroupsTool } from './list_groups'
 import { listMembersTool } from './list_members'
+import { removeAliasTool } from './remove_alias'
 import { removeMemberTool } from './remove_member'
 import { updateGroupTool } from './update_group'
 import { updateMemberTool } from './update_member'
+import { updateSettingsTool } from './update_settings'
 
+export const googleGroupsAddAliasTool = addAliasTool
 export const googleGroupsAddMemberTool = addMemberTool
 export const googleGroupsCreateGroupTool = createGroupTool
 export const googleGroupsDeleteGroupTool = deleteGroupTool
 export const googleGroupsGetGroupTool = getGroupTool
 export const googleGroupsGetMemberTool = getMemberTool
+export const googleGroupsGetSettingsTool = getSettingsTool
 export const googleGroupsHasMemberTool = hasMemberTool
+export const googleGroupsListAliasesTool = listAliasesTool
 export const googleGroupsListGroupsTool = listGroupsTool
 export const googleGroupsListMembersTool = listMembersTool
+export const googleGroupsRemoveAliasTool = removeAliasTool
 export const googleGroupsRemoveMemberTool = removeMemberTool
 export const googleGroupsUpdateGroupTool = updateGroupTool
 export const googleGroupsUpdateMemberTool = updateMemberTool
+export const googleGroupsUpdateSettingsTool = updateSettingsTool
diff --git a/apps/sim/tools/google_groups/list_aliases.ts b/apps/sim/tools/google_groups/list_aliases.ts
new file mode 100644
index 0000000000..d207ff6a49
--- /dev/null
+++ b/apps/sim/tools/google_groups/list_aliases.ts
@@ -0,0 +1,74 @@
+import type { ToolConfig } from '@/tools/types'
+import type { GoogleGroupsListAliasesParams, GoogleGroupsListAliasesResponse } from './types'
+
+export const listAliasesTool: ToolConfig<
+  GoogleGroupsListAliasesParams,
+  GoogleGroupsListAliasesResponse
+> = {
+  id: 'google_groups_list_aliases',
+  name: 'Google Groups List Aliases',
+  description: 'List all email aliases for a Google Group',
+  version: '1.0.0',
+
+  oauth: {
+    required: true,
+    provider: 'google-groups',
+  },
+
+  params: {
+    accessToken: {
+      type: 'string',
+      required: true,
+      visibility: 'hidden',
+      description: 'OAuth access token',
+    },
+    groupKey: {
+      type: 'string',
+      required: true,
+      visibility: 'user-or-llm',
+      description: 'Group email address or unique group ID',
+    },
+  },
+
+  request: {
+    url: (params) => {
+      const encodedGroupKey = encodeURIComponent(params.groupKey.trim())
+      return `https://admin.googleapis.com/admin/directory/v1/groups/${encodedGroupKey}/aliases`
+    },
+    method: 'GET',
+    headers: (params) => ({
+      Authorization: `Bearer ${params.accessToken}`,
+      'Content-Type': 'application/json',
+    }),
+  },
+
+  transformResponse: async (response) => {
+    const data = await response.json()
+    if (!response.ok) {
+      throw new Error(data.error?.message || 'Failed to list group aliases')
+    }
+    return {
+      success: true,
+      output: {
+        aliases: data.aliases ?? [],
+      },
+    }
+  },
+
+  outputs: {
+    aliases: {
+      type: 'array',
+      description: 'List of email aliases for the group',
+      items: {
+        type: 'object',
+        properties: {
+          id: { type: 'string', description: 'Unique group identifier' },
+          primaryEmail: { type: 'string', description: "Group's primary email address" },
+          alias: { type: 'string', description: 'Alias email address' },
+          kind: { type: 'string', description: 'API resource type' },
+          etag: { type: 'string', description: 'Resource version identifier' },
+        },
+      },
+    },
+  },
+}
diff --git a/apps/sim/tools/google_groups/remove_alias.ts b/apps/sim/tools/google_groups/remove_alias.ts
new file mode 100644
index 0000000000..46a503a1ba
--- /dev/null
+++ b/apps/sim/tools/google_groups/remove_alias.ts
@@ -0,0 +1,68 @@
+import type { ToolConfig } from '@/tools/types'
+import type { GoogleGroupsRemoveAliasParams, GoogleGroupsRemoveAliasResponse } from './types'
+
+export const removeAliasTool: ToolConfig<
+  GoogleGroupsRemoveAliasParams,
+  GoogleGroupsRemoveAliasResponse
+> = {
+  id: 'google_groups_remove_alias',
+  name: 'Google Groups Remove Alias',
+  description: 'Remove an email alias from a Google Group',
+  version: '1.0.0',
+
+  oauth: {
+    required: true,
+    provider: 'google-groups',
+  },
+
+  params: {
+    accessToken: {
+      type: 'string',
+      required: true,
+      visibility: 'hidden',
+      description: 'OAuth access token',
+    },
+    groupKey: {
+      type: 'string',
+      required: true,
+      visibility: 'user-or-llm',
+      description: 'Group email address or unique group ID',
+    },
+    alias: {
+      type: 'string',
+      required: true,
+      visibility: 'user-or-llm',
+      description: 'The email alias to remove from the group',
+    },
+  },
+
+  request: {
+    url: (params) => {
+      const encodedGroupKey = encodeURIComponent(params.groupKey.trim())
+      const encodedAlias = encodeURIComponent(params.alias.trim())
+      return `https://admin.googleapis.com/admin/directory/v1/groups/${encodedGroupKey}/aliases/${encodedAlias}`
+    },
+    method: 'DELETE',
+    headers: (params) => ({
+      Authorization: `Bearer ${params.accessToken}`,
+      'Content-Type': 'application/json',
+    }),
+  },
+
+  transformResponse: async (response) => {
+    if (!response.ok) {
+      const data = await response.json()
+      throw new Error(data.error?.message || 'Failed to remove group alias')
+    }
+    return {
+      success: true,
+      output: {
+        deleted: true,
+      },
+    }
+  },
+
+  outputs: {
+    deleted: { type: 'boolean', description: 'Whether the alias was successfully deleted' },
+  },
+}
diff --git a/apps/sim/tools/google_groups/types.ts b/apps/sim/tools/google_groups/types.ts
index 5de0f4d74e..e56809f94e 100644
--- a/apps/sim/tools/google_groups/types.ts
+++ b/apps/sim/tools/google_groups/types.ts
@@ -103,9 +103,197 @@ export interface GoogleGroupsHasMemberParams extends GoogleGroupsCommonParams {
   memberKey: string
 }
 
+/**
+ * Parameters for listing group aliases
+ */
+export interface GoogleGroupsListAliasesParams extends GoogleGroupsCommonParams {
+  groupKey: string
+}
+
+/**
+ * Parameters for adding a group alias
+ */
+export interface GoogleGroupsAddAliasParams extends GoogleGroupsCommonParams {
+  groupKey: string
+  alias: string
+}
+
+/**
+ * Parameters for removing a group alias
+ */
+export interface GoogleGroupsRemoveAliasParams extends GoogleGroupsCommonParams {
+  groupKey: string
+  alias: string
+}
+
+/**
+ * Parameters for getting group settings
+ */
+export interface GoogleGroupsGetSettingsParams extends GoogleGroupsCommonParams {
+  groupEmail: string
+}
+
+/**
+ * Parameters for updating group settings
+ */
+export interface GoogleGroupsUpdateSettingsParams extends GoogleGroupsCommonParams {
+  groupEmail: string
+  name?: string
+  description?: string
+  whoCanJoin?: string
+  whoCanViewMembership?: string
+  whoCanViewGroup?: string
+  whoCanPostMessage?: string
+  allowExternalMembers?: string
+  allowWebPosting?: string
+  primaryLanguage?: string
+  isArchived?: string
+  archiveOnly?: string
+  messageModerationLevel?: string
+  spamModerationLevel?: string
+  replyTo?: string
+  customReplyTo?: string
+  includeCustomFooter?: string
+  customFooterText?: string
+  sendMessageDenyNotification?: string
+  defaultMessageDenyNotificationText?: string
+  membersCanPostAsTheGroup?: string
+  includeInGlobalAddressList?: string
+  whoCanLeaveGroup?: string
+  whoCanContactOwner?: string
+  favoriteRepliesOnTop?: string
+  whoCanApproveMembers?: string
+  whoCanBanUsers?: string
+  whoCanModerateMembers?: string
+  whoCanModerateContent?: string
+  whoCanAssistContent?: string
+  enableCollaborativeInbox?: string
+  whoCanDiscoverGroup?: string
+  defaultSender?: string
+}
+
 /**
  * Standard response for Google Groups operations
  */
 export interface GoogleGroupsResponse extends ToolResponse {
   output: Record<string, unknown>
 }
+
+/**
+ * Response for listing group aliases
+ */
+export interface GoogleGroupsListAliasesResponse extends ToolResponse {
+  output: {
+    aliases: Array<{
+      id?: string
+      primaryEmail?: string
+      alias?: string
+      kind?: string
+      etag?: string
+    }>
+  }
+}
+
+/**
+ * Response for adding a group alias
+ */
+export interface GoogleGroupsAddAliasResponse extends ToolResponse {
+  output: {
+    id: string | null
+    primaryEmail: string | null
+    alias: string | null
+    kind: string | null
+    etag: string | null
+  }
+}
+
+/**
+ * Response for removing a group alias
+ */
+export interface GoogleGroupsRemoveAliasResponse extends ToolResponse {
+  output: {
+    deleted: boolean
+  }
+}
+
+/**
+ * Response for getting group settings
+ */
+export interface GoogleGroupsGetSettingsResponse extends ToolResponse {
+  output: {
+    email: string | null
+    name: string | null
+    description: string | null
+    whoCanJoin: string | null
+    whoCanViewMembership: string | null
+    whoCanViewGroup: string | null
+    whoCanPostMessage: string | null
+    allowExternalMembers: string | null
+    allowWebPosting: string | null
+    primaryLanguage: string | null
+    isArchived: string | null
+    archiveOnly: string | null
+    messageModerationLevel: string | null
+    spamModerationLevel: string | null
+    replyTo: string | null
+    customReplyTo: string | null
+    includeCustomFooter: string | null
+    customFooterText: string | null
+    sendMessageDenyNotification: string | null
+    defaultMessageDenyNotificationText: string | null
+    membersCanPostAsTheGroup: string | null
+    includeInGlobalAddressList: string | null
+    whoCanLeaveGroup: string | null
+    whoCanContactOwner: string | null
+    favoriteRepliesOnTop: string | null
+    whoCanApproveMembers: string | null
+    whoCanBanUsers: string | null
+    whoCanModerateMembers: string | null
+    whoCanModerateContent: string | null
+    whoCanAssistContent: string | null
+    enableCollaborativeInbox: string | null
+    whoCanDiscoverGroup: string | null
+    defaultSender: string | null
+  }
+}
+
+/**
+ * Response for updating group settings
+ */
+export interface GoogleGroupsUpdateSettingsResponse extends ToolResponse {
+  output: {
+    email: string | null
+    name: string | null
+    description: string | null
+    whoCanJoin: string | null
+    whoCanViewMembership: string | null
+    whoCanViewGroup: string | null
+    whoCanPostMessage: string | null
+    allowExternalMembers: string | null
+    allowWebPosting: string | null
+    primaryLanguage: string | null
+    isArchived: string | null
+    archiveOnly: string | null
+    messageModerationLevel: string | null
+    spamModerationLevel: string | null
+    replyTo: string | null
+    customReplyTo: string | null
+    includeCustomFooter: string | null
+    customFooterText: string | null
+    sendMessageDenyNotification: string | null
+    defaultMessageDenyNotificationText: string | null
+    membersCanPostAsTheGroup: string | null
+    includeInGlobalAddressList: string | null
+    whoCanLeaveGroup: string | null
+    whoCanContactOwner: string | null
+    favoriteRepliesOnTop: string | null
+    whoCanApproveMembers: string | null
+    whoCanBanUsers: string | null
+    whoCanModerateMembers: string | null
+    whoCanModerateContent: string | null
+    whoCanAssistContent: string | null
+    enableCollaborativeInbox: string | null
+    whoCanDiscoverGroup: string | null
+    defaultSender: string | null
+  }
+}
diff --git a/apps/sim/tools/google_groups/update_settings.ts b/apps/sim/tools/google_groups/update_settings.ts
new file mode 100644
index 0000000000..143a7d93f7
--- /dev/null
+++ b/apps/sim/tools/google_groups/update_settings.ts
@@ -0,0 +1,396 @@
+import type { ToolConfig } from '@/tools/types'
+import type { GoogleGroupsUpdateSettingsParams, GoogleGroupsUpdateSettingsResponse } from './types'
+
+export const updateSettingsTool: ToolConfig<
+  GoogleGroupsUpdateSettingsParams,
+  GoogleGroupsUpdateSettingsResponse
+> = {
+  id: 'google_groups_update_settings',
+  name: 'Google Groups Update Settings',
+  description:
+    'Update the settings for a Google Group including access permissions, moderation, and posting options',
+  version: '1.0.0',
+
+  oauth: {
+    required: true,
+    provider: 'google-groups',
+  },
+
+  params: {
+    accessToken: {
+      type: 'string',
+      required: true,
+      visibility: 'hidden',
+      description: 'OAuth access token',
+    },
+    groupEmail: {
+      type: 'string',
+      required: true,
+      visibility: 'user-or-llm',
+      description: 'The email address of the group',
+    },
+    name: {
+      type: 'string',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'The group name (max 75 characters)',
+    },
+    description: {
+      type: 'string',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'The group description (max 4096 characters)',
+    },
+    whoCanJoin: {
+      type: 'string',
+      required: false,
+      visibility: 'user-or-llm',
+      description:
+        'Who can join: ANYONE_CAN_JOIN, ALL_IN_DOMAIN_CAN_JOIN, INVITED_CAN_JOIN, CAN_REQUEST_TO_JOIN',
+    },
+    whoCanViewMembership: {
+      type: 'string',
+      required: false,
+      visibility: 'user-or-llm',
+      description:
+        'Who can view membership: ALL_IN_DOMAIN_CAN_VIEW, ALL_MEMBERS_CAN_VIEW, ALL_MANAGERS_CAN_VIEW',
+    },
+    whoCanViewGroup: {
+      type: 'string',
+      required: false,
+      visibility: 'user-or-llm',
+      description:
+        'Who can view group messages: ANYONE_CAN_VIEW, ALL_IN_DOMAIN_CAN_VIEW, ALL_MEMBERS_CAN_VIEW, ALL_MANAGERS_CAN_VIEW',
+    },
+    whoCanPostMessage: {
+      type: 'string',
+      required: false,
+      visibility: 'user-or-llm',
+      description:
+        'Who can post: NONE_CAN_POST, ALL_MANAGERS_CAN_POST, ALL_MEMBERS_CAN_POST, ALL_OWNERS_CAN_POST, ALL_IN_DOMAIN_CAN_POST, ANYONE_CAN_POST',
+    },
+    allowExternalMembers: {
+      type: 'string',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Whether external users can be members: true or false',
+    },
+    allowWebPosting: {
+      type: 'string',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Whether web posting is allowed: true or false',
+    },
+    primaryLanguage: {
+      type: 'string',
+      required: false,
+      visibility: 'user-or-llm',
+      description: "The group's primary language (e.g., en)",
+    },
+    isArchived: {
+      type: 'string',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Whether messages are archived: true or false',
+    },
+    archiveOnly: {
+      type: 'string',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Whether the group is archive-only (inactive): true or false',
+    },
+    messageModerationLevel: {
+      type: 'string',
+      required: false,
+      visibility: 'user-or-llm',
+      description:
+        'Message moderation: MODERATE_ALL_MESSAGES, MODERATE_NON_MEMBERS, MODERATE_NEW_MEMBERS, MODERATE_NONE',
+    },
+    spamModerationLevel: {
+      type: 'string',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Spam handling: ALLOW, MODERATE, SILENTLY_MODERATE, REJECT',
+    },
+    replyTo: {
+      type: 'string',
+      required: false,
+      visibility: 'user-or-llm',
+      description:
+        'Default reply: REPLY_TO_CUSTOM, REPLY_TO_SENDER, REPLY_TO_LIST, REPLY_TO_OWNER, REPLY_TO_IGNORE, REPLY_TO_MANAGERS',
+    },
+    customReplyTo: {
+      type: 'string',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Custom email for replies (when replyTo is REPLY_TO_CUSTOM)',
+    },
+    includeCustomFooter: {
+      type: 'string',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Whether to include custom footer: true or false',
+    },
+    customFooterText: {
+      type: 'string',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Custom footer text (max 1000 characters)',
+    },
+    sendMessageDenyNotification: {
+      type: 'string',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Whether to send rejection notifications: true or false',
+    },
+    defaultMessageDenyNotificationText: {
+      type: 'string',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Default rejection message text',
+    },
+    membersCanPostAsTheGroup: {
+      type: 'string',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Whether members can post as the group: true or false',
+    },
+    includeInGlobalAddressList: {
+      type: 'string',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Whether included in Global Address List: true or false',
+    },
+    whoCanLeaveGroup: {
+      type: 'string',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Who can leave: ALL_MANAGERS_CAN_LEAVE, ALL_MEMBERS_CAN_LEAVE, NONE_CAN_LEAVE',
+    },
+    whoCanContactOwner: {
+      type: 'string',
+      required: false,
+      visibility: 'user-or-llm',
+      description:
+        'Who can contact owner: ALL_IN_DOMAIN_CAN_CONTACT, ALL_MANAGERS_CAN_CONTACT, ALL_MEMBERS_CAN_CONTACT, ANYONE_CAN_CONTACT',
+    },
+    favoriteRepliesOnTop: {
+      type: 'string',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Whether favorite replies appear at top: true or false',
+    },
+    whoCanApproveMembers: {
+      type: 'string',
+      required: false,
+      visibility: 'user-or-llm',
+      description:
+        'Who can approve members: ALL_OWNERS_CAN_APPROVE, ALL_MANAGERS_CAN_APPROVE, ALL_MEMBERS_CAN_APPROVE, NONE_CAN_APPROVE',
+    },
+    whoCanBanUsers: {
+      type: 'string',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Who can ban users: OWNERS_ONLY, OWNERS_AND_MANAGERS, NONE',
+    },
+    whoCanModerateMembers: {
+      type: 'string',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Who can manage members: OWNERS_ONLY, OWNERS_AND_MANAGERS, ALL_MEMBERS, NONE',
+    },
+    whoCanModerateContent: {
+      type: 'string',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Who can moderate content: OWNERS_ONLY, OWNERS_AND_MANAGERS, ALL_MEMBERS, NONE',
+    },
+    whoCanAssistContent: {
+      type: 'string',
+      required: false,
+      visibility: 'user-or-llm',
+      description:
+        'Who can assist with content metadata: OWNERS_ONLY, OWNERS_AND_MANAGERS, ALL_MEMBERS, NONE',
+    },
+    enableCollaborativeInbox: {
+      type: 'string',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Whether collaborative inbox is enabled: true or false',
+    },
+    whoCanDiscoverGroup: {
+      type: 'string',
+      required: false,
+      visibility: 'user-or-llm',
+      description:
+        'Who can discover: ANYONE_CAN_DISCOVER, ALL_IN_DOMAIN_CAN_DISCOVER, ALL_MEMBERS_CAN_DISCOVER',
+    },
+    defaultSender: {
+      type: 'string',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Default sender: DEFAULT_SELF or GROUP',
+    },
+  },
+
+  request: {
+    url: (params) => {
+      const encodedEmail = encodeURIComponent(params.groupEmail.trim())
+      return `https://www.googleapis.com/groups/v1/groups/${encodedEmail}`
+    },
+    method: 'PATCH',
+    headers: (params) => ({
+      Authorization: `Bearer ${params.accessToken}`,
+      'Content-Type': 'application/json',
+    }),
+    body: (params) => {
+      const body: Record<string, string> = {}
+      if (params.name !== undefined) body.name = params.name
+      if (params.description !== undefined) body.description = params.description
+      if (params.whoCanJoin !== undefined) body.whoCanJoin = params.whoCanJoin
+      if (params.whoCanViewMembership !== undefined)
+        body.whoCanViewMembership = params.whoCanViewMembership
+      if (params.whoCanViewGroup !== undefined) body.whoCanViewGroup = params.whoCanViewGroup
+      if (params.whoCanPostMessage !== undefined) body.whoCanPostMessage = params.whoCanPostMessage
+      if (params.allowExternalMembers !== undefined)
+        body.allowExternalMembers = params.allowExternalMembers
+      if (params.allowWebPosting !== undefined) body.allowWebPosting = params.allowWebPosting
+      if (params.primaryLanguage !== undefined) body.primaryLanguage = params.primaryLanguage
+      if (params.isArchived !== undefined) body.isArchived = params.isArchived
+      if (params.archiveOnly !== undefined) body.archiveOnly = params.archiveOnly
+      if (params.messageModerationLevel !== undefined)
+        body.messageModerationLevel = params.messageModerationLevel
+      if (params.spamModerationLevel !== undefined)
+        body.spamModerationLevel = params.spamModerationLevel
+      if (params.replyTo !== undefined) body.replyTo = params.replyTo
+      if (params.customReplyTo !== undefined) body.customReplyTo = params.customReplyTo
+      if (params.includeCustomFooter !== undefined)
+        body.includeCustomFooter = params.includeCustomFooter
+      if (params.customFooterText !== undefined) body.customFooterText = params.customFooterText
+      if (params.sendMessageDenyNotification !== undefined)
+        body.sendMessageDenyNotification = params.sendMessageDenyNotification
+      if (params.defaultMessageDenyNotificationText !== undefined)
+        body.defaultMessageDenyNotificationText = params.defaultMessageDenyNotificationText
+      if (params.membersCanPostAsTheGroup !== undefined)
+        body.membersCanPostAsTheGroup = params.membersCanPostAsTheGroup
+      if (params.includeInGlobalAddressList !== undefined)
+        body.includeInGlobalAddressList = params.includeInGlobalAddressList
+      if (params.whoCanLeaveGroup !== undefined) body.whoCanLeaveGroup = params.whoCanLeaveGroup
+      if (params.whoCanContactOwner !== undefined)
+        body.whoCanContactOwner = params.whoCanContactOwner
+      if (params.favoriteRepliesOnTop !== undefined)
+        body.favoriteRepliesOnTop = params.favoriteRepliesOnTop
+      if (params.whoCanApproveMembers !== undefined)
+        body.whoCanApproveMembers = params.whoCanApproveMembers
+      if (params.whoCanBanUsers !== undefined) body.whoCanBanUsers = params.whoCanBanUsers
+      if (params.whoCanModerateMembers !== undefined)
+        body.whoCanModerateMembers = params.whoCanModerateMembers
+      if (params.whoCanModerateContent !== undefined)
+        body.whoCanModerateContent = params.whoCanModerateContent
+      if (params.whoCanAssistContent !== undefined)
+        body.whoCanAssistContent = params.whoCanAssistContent
+      if (params.enableCollaborativeInbox !== undefined)
+        body.enableCollaborativeInbox = params.enableCollaborativeInbox
+      if (params.whoCanDiscoverGroup !== undefined)
+        body.whoCanDiscoverGroup = params.whoCanDiscoverGroup
+      if (params.defaultSender !== undefined) body.defaultSender = params.defaultSender
+      return body
+    },
+  },
+
+  transformResponse: async (response) => {
+    const data = await response.json()
+    if (!response.ok) {
+      throw new Error(data.error?.message || 'Failed to update group settings')
+    }
+    return {
+      success: true,
+      output: {
+        email: data.email ?? null,
+        name: data.name ?? null,
+        description: data.description ?? null,
+        whoCanJoin: data.whoCanJoin ?? null,
+        whoCanViewMembership: data.whoCanViewMembership ?? null,
+        whoCanViewGroup: data.whoCanViewGroup ?? null,
+        whoCanPostMessage: data.whoCanPostMessage ?? null,
+        allowExternalMembers: data.allowExternalMembers ?? null,
+        allowWebPosting: data.allowWebPosting ?? null,
+        primaryLanguage: data.primaryLanguage ?? null,
+        isArchived: data.isArchived ?? null,
+        archiveOnly: data.archiveOnly ?? null,
+        messageModerationLevel: data.messageModerationLevel ?? null,
+        spamModerationLevel: data.spamModerationLevel ?? null,
+        replyTo: data.replyTo ?? null,
+        customReplyTo: data.customReplyTo ?? null,
+        includeCustomFooter: data.includeCustomFooter ?? null,
+        customFooterText: data.customFooterText ?? null,
+        sendMessageDenyNotification: data.sendMessageDenyNotification ?? null,
+        defaultMessageDenyNotificationText: data.defaultMessageDenyNotificationText ?? null,
+        membersCanPostAsTheGroup: data.membersCanPostAsTheGroup ?? null,
+        includeInGlobalAddressList: data.includeInGlobalAddressList ?? null,
+        whoCanLeaveGroup: data.whoCanLeaveGroup ?? null,
+        whoCanContactOwner: data.whoCanContactOwner ?? null,
+        favoriteRepliesOnTop: data.favoriteRepliesOnTop ?? null,
+        whoCanApproveMembers: data.whoCanApproveMembers ?? null,
+        whoCanBanUsers: data.whoCanBanUsers ?? null,
+        whoCanModerateMembers: data.whoCanModerateMembers ?? null,
+        whoCanModerateContent: data.whoCanModerateContent ?? null,
+        whoCanAssistContent: data.whoCanAssistContent ?? null,
+        enableCollaborativeInbox: data.enableCollaborativeInbox ?? null,
+        whoCanDiscoverGroup: data.whoCanDiscoverGroup ?? null,
+        defaultSender: data.defaultSender ?? null,
+      },
+    }
+  },
+
+  outputs: {
+    email: { type: 'string', description: "The group's email address" },
+    name: { type: 'string', description: 'The group name' },
+    description: { type: 'string', description: 'The group description' },
+    whoCanJoin: { type: 'string', description: 'Who can join the group' },
+    whoCanViewMembership: { type: 'string', description: 'Who can view group membership' },
+    whoCanViewGroup: { type: 'string', description: 'Who can view group messages' },
+    whoCanPostMessage: { type: 'string', description: 'Who can post messages to the group' },
+    allowExternalMembers: { type: 'string', description: 'Whether external users can be members' },
+    allowWebPosting: { type: 'string', description: 'Whether web posting is allowed' },
+    primaryLanguage: { type: 'string', description: "The group's primary language" },
+    isArchived: { type: 'string', description: 'Whether messages are archived' },
+    archiveOnly: { type: 'string', description: 'Whether the group is archive-only' },
+    messageModerationLevel: { type: 'string', description: 'Message moderation level' },
+    spamModerationLevel: { type: 'string', description: 'Spam handling level' },
+    replyTo: { type: 'string', description: 'Default reply destination' },
+    customReplyTo: { type: 'string', description: 'Custom email for replies' },
+    includeCustomFooter: { type: 'string', description: 'Whether to include custom footer' },
+    customFooterText: { type: 'string', description: 'Custom footer text' },
+    sendMessageDenyNotification: {
+      type: 'string',
+      description: 'Whether to send rejection notifications',
+    },
+    defaultMessageDenyNotificationText: {
+      type: 'string',
+      description: 'Default rejection message text',
+    },
+    membersCanPostAsTheGroup: {
+      type: 'string',
+      description: 'Whether members can post as the group',
+    },
+    includeInGlobalAddressList: {
+      type: 'string',
+      description: 'Whether included in Global Address List',
+    },
+    whoCanLeaveGroup: { type: 'string', description: 'Who can leave the group' },
+    whoCanContactOwner: { type: 'string', description: 'Who can contact the group owner' },
+    favoriteRepliesOnTop: { type: 'string', description: 'Whether favorite replies appear at top' },
+    whoCanApproveMembers: { type: 'string', description: 'Who can approve new members' },
+    whoCanBanUsers: { type: 'string', description: 'Who can ban users' },
+    whoCanModerateMembers: { type: 'string', description: 'Who can manage members' },
+    whoCanModerateContent: { type: 'string', description: 'Who can moderate content' },
+    whoCanAssistContent: { type: 'string', description: 'Who can assist with content metadata' },
+    enableCollaborativeInbox: {
+      type: 'string',
+      description: 'Whether collaborative inbox is enabled',
+    },
+    whoCanDiscoverGroup: { type: 'string', description: 'Who can discover the group' },
+    defaultSender: { type: 'string', description: 'Default sender identity' },
+  },
+}
diff --git a/apps/sim/tools/google_sheets/append.ts b/apps/sim/tools/google_sheets/append.ts
index 86e59afebe..d5283512a4 100644
--- a/apps/sim/tools/google_sheets/append.ts
+++ b/apps/sim/tools/google_sheets/append.ts
@@ -1,6 +1,8 @@
 import type {
   GoogleSheetsAppendResponse,
   GoogleSheetsToolParams,
+  GoogleSheetsV2AppendResponse,
+  GoogleSheetsV2ToolParams,
 } from '@/tools/google_sheets/types'
 import type { ToolConfig } from '@/tools/types'
 
@@ -226,3 +228,197 @@ export const appendTool: ToolConfig<GoogleSheetsToolParams, GoogleSheetsAppendRe
     },
   },
 }
+
+export const appendV2Tool: ToolConfig<GoogleSheetsV2ToolParams, GoogleSheetsV2AppendResponse> = {
+  id: 'google_sheets_append_v2',
+  name: 'Append to Google Sheets V2',
+  description: 'Append data to the end of a specific sheet in a Google Sheets spreadsheet',
+  version: '2.0.0',
+
+  oauth: {
+    required: true,
+    provider: 'google-sheets',
+  },
+
+  params: {
+    accessToken: {
+      type: 'string',
+      required: true,
+      visibility: 'hidden',
+      description: 'The access token for the Google Sheets API',
+    },
+    spreadsheetId: {
+      type: 'string',
+      required: true,
+      visibility: 'user-only',
+      description: 'The ID of the spreadsheet to append to',
+    },
+    sheetName: {
+      type: 'string',
+      required: true,
+      visibility: 'user-or-llm',
+      description: 'The name of the sheet/tab to append to',
+    },
+    values: {
+      type: 'array',
+      required: true,
+      visibility: 'user-or-llm',
+      description:
+        'The data to append as a 2D array (e.g. [["Alice", 30], ["Bob", 25]]) or array of objects.',
+    },
+    valueInputOption: {
+      type: 'string',
+      required: false,
+      visibility: 'hidden',
+      description: 'The format of the data to append',
+    },
+    insertDataOption: {
+      type: 'string',
+      required: false,
+      visibility: 'hidden',
+      description: 'How to insert the data (OVERWRITE or INSERT_ROWS)',
+    },
+    includeValuesInResponse: {
+      type: 'boolean',
+      required: false,
+      visibility: 'hidden',
+      description: 'Whether to include the appended values in the response',
+    },
+  },
+
+  request: {
+    url: (params) => {
+      const sheetName = params.sheetName?.trim()
+      if (!sheetName) {
+        throw new Error('Sheet name is required')
+      }
+
+      const url = new URL(
+        `https://sheets.googleapis.com/v4/spreadsheets/${params.spreadsheetId}/values/${encodeURIComponent(sheetName)}:append`
+      )
+
+      const valueInputOption = params.valueInputOption || 'USER_ENTERED'
+      url.searchParams.append('valueInputOption', valueInputOption)
+
+      if (params.insertDataOption) {
+        url.searchParams.append('insertDataOption', params.insertDataOption)
+      }
+
+      if (params.includeValuesInResponse) {
+        url.searchParams.append('includeValuesInResponse', 'true')
+      }
+
+      return url.toString()
+    },
+    method: 'POST',
+    headers: (params) => ({
+      Authorization: `Bearer ${params.accessToken}`,
+      'Content-Type': 'application/json',
+    }),
+    body: (params) => {
+      let processedValues: any = params.values || []
+
+      if (typeof processedValues === 'string') {
+        try {
+          processedValues = JSON.parse(processedValues)
+        } catch (_error) {
+          try {
+            const sanitizedInput = (processedValues as string)
+              .replace(/\n/g, '\\n')
+              .replace(/\r/g, '\\r')
+              .replace(/\t/g, '\\t')
+            processedValues = JSON.parse(sanitizedInput)
+          } catch (_secondError) {
+            processedValues = [[processedValues]]
+          }
+        }
+      }
+
+      if (
+        Array.isArray(processedValues) &&
+        processedValues.length > 0 &&
+        typeof processedValues[0] === 'object' &&
+        !Array.isArray(processedValues[0])
+      ) {
+        const allKeys = new Set<string>()
+        processedValues.forEach((obj: any) => {
+          if (obj && typeof obj === 'object') {
+            Object.keys(obj).forEach((key) => allKeys.add(key))
+          }
+        })
+        const headers = Array.from(allKeys)
+
+        const rows = processedValues.map((obj: any) => {
+          if (!obj || typeof obj !== 'object') {
+            return Array(headers.length).fill('')
+          }
+          return headers.map((key) => {
+            const value = obj[key]
+            if (value !== null && typeof value === 'object') {
+              return JSON.stringify(value)
+            }
+            return value === undefined ? '' : value
+          })
+        })
+
+        processedValues = [headers, ...rows]
+      } else if (!Array.isArray(processedValues)) {
+        processedValues = [[String(processedValues)]]
+      } else if (!processedValues.every((item: any) => Array.isArray(item))) {
+        processedValues = (processedValues as any[]).map((row: any) =>
+          Array.isArray(row) ? row : [String(row)]
+        )
+      }
+
+      const body: Record<string, any> = {
+        majorDimension: params.majorDimension || 'ROWS',
+        values: processedValues,
+      }
+
+      return body
+    },
+  },
+
+  transformResponse: async (response: Response) => {
+    const data = await response.json()
+
+    const urlParts = typeof response.url === 'string' ? response.url.split('/spreadsheets/') : []
+    const spreadsheetId = urlParts[1]?.split('/')[0] || ''
+
+    const metadata = {
+      spreadsheetId,
+      spreadsheetUrl: `https://docs.google.com/spreadsheets/d/${spreadsheetId}`,
+    }
+
+    return {
+      success: true,
+      output: {
+        tableRange: data.tableRange ?? '',
+        updatedRange: data.updates?.updatedRange ?? '',
+        updatedRows: data.updates?.updatedRows ?? 0,
+        updatedColumns: data.updates?.updatedColumns ?? 0,
+        updatedCells: data.updates?.updatedCells ?? 0,
+        metadata: {
+          spreadsheetId: metadata.spreadsheetId,
+          spreadsheetUrl: metadata.spreadsheetUrl,
+        },
+      },
+    }
+  },
+
+  outputs: {
+    tableRange: { type: 'string', description: 'Range of the table where data was appended' },
+    updatedRange: { type: 'string', description: 'Range of cells that were updated' },
+    updatedRows: { type: 'number', description: 'Number of rows updated' },
+    updatedColumns: { type: 'number', description: 'Number of columns updated' },
+    updatedCells: { type: 'number', description: 'Number of cells updated' },
+    metadata: {
+      type: 'json',
+      description: 'Spreadsheet metadata including ID and URL',
+      properties: {
+        spreadsheetId: { type: 'string', description: 'Google Sheets spreadsheet ID' },
+        spreadsheetUrl: { type: 'string', description: 'Spreadsheet URL' },
+      },
+    },
+  },
+}
diff --git a/apps/sim/tools/google_sheets/append_v2.ts b/apps/sim/tools/google_sheets/append_v2.ts
deleted file mode 100644
index a3f64cb6c6..0000000000
--- a/apps/sim/tools/google_sheets/append_v2.ts
+++ /dev/null
@@ -1,199 +0,0 @@
-import type {
-  GoogleSheetsV2AppendResponse,
-  GoogleSheetsV2ToolParams,
-} from '@/tools/google_sheets/types'
-import type { ToolConfig } from '@/tools/types'
-
-export const appendV2Tool: ToolConfig<GoogleSheetsV2ToolParams, GoogleSheetsV2AppendResponse> = {
-  id: 'google_sheets_append_v2',
-  name: 'Append to Google Sheets V2',
-  description: 'Append data to the end of a specific sheet in a Google Sheets spreadsheet',
-  version: '2.0.0',
-
-  oauth: {
-    required: true,
-    provider: 'google-sheets',
-  },
-
-  params: {
-    accessToken: {
-      type: 'string',
-      required: true,
-      visibility: 'hidden',
-      description: 'The access token for the Google Sheets API',
-    },
-    spreadsheetId: {
-      type: 'string',
-      required: true,
-      visibility: 'user-only',
-      description: 'The ID of the spreadsheet to append to',
-    },
-    sheetName: {
-      type: 'string',
-      required: true,
-      visibility: 'user-or-llm',
-      description: 'The name of the sheet/tab to append to',
-    },
-    values: {
-      type: 'array',
-      required: true,
-      visibility: 'user-or-llm',
-      description:
-        'The data to append as a 2D array (e.g. [["Alice", 30], ["Bob", 25]]) or array of objects.',
-    },
-    valueInputOption: {
-      type: 'string',
-      required: false,
-      visibility: 'hidden',
-      description: 'The format of the data to append',
-    },
-    insertDataOption: {
-      type: 'string',
-      required: false,
-      visibility: 'hidden',
-      description: 'How to insert the data (OVERWRITE or INSERT_ROWS)',
-    },
-    includeValuesInResponse: {
-      type: 'boolean',
-      required: false,
-      visibility: 'hidden',
-      description: 'Whether to include the appended values in the response',
-    },
-  },
-
-  request: {
-    url: (params) => {
-      const sheetName = params.sheetName?.trim()
-      if (!sheetName) {
-        throw new Error('Sheet name is required')
-      }
-
-      const url = new URL(
-        `https://sheets.googleapis.com/v4/spreadsheets/${params.spreadsheetId}/values/${encodeURIComponent(sheetName)}:append`
-      )
-
-      const valueInputOption = params.valueInputOption || 'USER_ENTERED'
-      url.searchParams.append('valueInputOption', valueInputOption)
-
-      if (params.insertDataOption) {
-        url.searchParams.append('insertDataOption', params.insertDataOption)
-      }
-
-      if (params.includeValuesInResponse) {
-        url.searchParams.append('includeValuesInResponse', 'true')
-      }
-
-      return url.toString()
-    },
-    method: 'POST',
-    headers: (params) => ({
-      Authorization: `Bearer ${params.accessToken}`,
-      'Content-Type': 'application/json',
-    }),
-    body: (params) => {
-      let processedValues: any = params.values || []
-
-      if (typeof processedValues === 'string') {
-        try {
-          processedValues = JSON.parse(processedValues)
-        } catch (_error) {
-          try {
-            const sanitizedInput = (processedValues as string)
-              .replace(/\n/g, '\\n')
-              .replace(/\r/g, '\\r')
-              .replace(/\t/g, '\\t')
-            processedValues = JSON.parse(sanitizedInput)
-          } catch (_secondError) {
-            processedValues = [[processedValues]]
-          }
-        }
-      }
-
-      if (
-        Array.isArray(processedValues) &&
-        processedValues.length > 0 &&
-        typeof processedValues[0] === 'object' &&
-        !Array.isArray(processedValues[0])
-      ) {
-        const allKeys = new Set<string>()
-        processedValues.forEach((obj: any) => {
-          if (obj && typeof obj === 'object') {
-            Object.keys(obj).forEach((key) => allKeys.add(key))
-          }
-        })
-        const headers = Array.from(allKeys)
-
-        const rows = processedValues.map((obj: any) => {
-          if (!obj || typeof obj !== 'object') {
-            return Array(headers.length).fill('')
-          }
-          return headers.map((key) => {
-            const value = obj[key]
-            if (value !== null && typeof value === 'object') {
-              return JSON.stringify(value)
-            }
-            return value === undefined ? '' : value
-          })
-        })
-
-        processedValues = [headers, ...rows]
-      } else if (!Array.isArray(processedValues)) {
-        processedValues = [[String(processedValues)]]
-      } else if (!processedValues.every((item: any) => Array.isArray(item))) {
-        processedValues = (processedValues as any[]).map((row: any) =>
-          Array.isArray(row) ? row : [String(row)]
-        )
-      }
-
-      const body: Record<string, any> = {
-        majorDimension: params.majorDimension || 'ROWS',
-        values: processedValues,
-      }
-
-      return body
-    },
-  },
-
-  transformResponse: async (response: Response) => {
-    const data = await response.json()
-
-    const urlParts = typeof response.url === 'string' ? response.url.split('/spreadsheets/') : []
-    const spreadsheetId = urlParts[1]?.split('/')[0] || ''
-
-    const metadata = {
-      spreadsheetId,
-      spreadsheetUrl: `https://docs.google.com/spreadsheets/d/${spreadsheetId}`,
-    }
-
-    return {
-      success: true,
-      output: {
-        tableRange: data.tableRange ?? '',
-        updatedRange: data.updates?.updatedRange ?? '',
-        updatedRows: data.updates?.updatedRows ?? 0,
-        updatedColumns: data.updates?.updatedColumns ?? 0,
-        updatedCells: data.updates?.updatedCells ?? 0,
-        metadata: {
-          spreadsheetId: metadata.spreadsheetId,
-          spreadsheetUrl: metadata.spreadsheetUrl,
-        },
-      },
-    }
-  },
-
-  outputs: {
-    tableRange: { type: 'string', description: 'Range of the table where data was appended' },
-    updatedRange: { type: 'string', description: 'Range of cells that were updated' },
-    updatedRows: { type: 'number', description: 'Number of rows updated' },
-    updatedColumns: { type: 'number', description: 'Number of columns updated' },
-    updatedCells: { type: 'number', description: 'Number of cells updated' },
-    metadata: {
-      type: 'json',
-      description: 'Spreadsheet metadata including ID and URL',
-      properties: {
-        spreadsheetId: { type: 'string', description: 'Google Sheets spreadsheet ID' },
-        spreadsheetUrl: { type: 'string', description: 'Spreadsheet URL' },
-      },
-    },
-  },
-}
diff --git a/apps/sim/tools/google_sheets/batch_clear.ts b/apps/sim/tools/google_sheets/batch_clear.ts
new file mode 100644
index 0000000000..ac76c60b6d
--- /dev/null
+++ b/apps/sim/tools/google_sheets/batch_clear.ts
@@ -0,0 +1,112 @@
+import type {
+  GoogleSheetsV2BatchClearParams,
+  GoogleSheetsV2BatchClearResponse,
+} from '@/tools/google_sheets/types'
+import type { ToolConfig } from '@/tools/types'
+
+export const batchClearV2Tool: ToolConfig<
+  GoogleSheetsV2BatchClearParams,
+  GoogleSheetsV2BatchClearResponse
+> = {
+  id: 'google_sheets_batch_clear_v2',
+  name: 'Batch Clear Google Sheets V2',
+  description: 'Clear multiple ranges in a Google Sheets spreadsheet in a single request',
+  version: '2.0.0',
+
+  oauth: {
+    required: true,
+    provider: 'google-sheets',
+  },
+
+  params: {
+    accessToken: {
+      type: 'string',
+      required: true,
+      visibility: 'hidden',
+      description: 'The access token for the Google Sheets API',
+    },
+    spreadsheetId: {
+      type: 'string',
+      required: true,
+      visibility: 'user-only',
+      description: 'The ID of the spreadsheet',
+    },
+    ranges: {
+      type: 'json',
+      required: true,
+      visibility: 'user-or-llm',
+      description:
+        'Array of ranges to clear (e.g., ["Sheet1!A1:D10", "Sheet2!A1:B5"]). Each range should include sheet name.',
+    },
+  },
+
+  request: {
+    url: (params) => {
+      const spreadsheetId = params.spreadsheetId?.trim()
+      if (!spreadsheetId) {
+        throw new Error('Spreadsheet ID is required')
+      }
+
+      return `https://sheets.googleapis.com/v4/spreadsheets/${spreadsheetId}/values:batchClear`
+    },
+    method: 'POST',
+    headers: (params) => {
+      if (!params.accessToken) {
+        throw new Error('Access token is required')
+      }
+
+      return {
+        Authorization: `Bearer ${params.accessToken}`,
+        'Content-Type': 'application/json',
+      }
+    },
+    body: (params) => {
+      const ranges = params.ranges
+      if (!ranges || !Array.isArray(ranges) || ranges.length === 0) {
+        throw new Error('At least one range is required')
+      }
+
+      return {
+        ranges,
+      }
+    },
+  },
+
+  transformResponse: async (response: Response) => {
+    const data = await response.json()
+
+    const spreadsheetId = data.spreadsheetId ?? ''
+    const clearedRanges = data.clearedRanges ?? []
+
+    return {
+      success: true,
+      output: {
+        spreadsheetId,
+        clearedRanges,
+        metadata: {
+          spreadsheetId,
+          spreadsheetUrl: `https://docs.google.com/spreadsheets/d/${spreadsheetId}`,
+        },
+      },
+    }
+  },
+
+  outputs: {
+    spreadsheetId: { type: 'string', description: 'The spreadsheet ID' },
+    clearedRanges: {
+      type: 'array',
+      description: 'Array of ranges that were cleared',
+      items: {
+        type: 'string',
+      },
+    },
+    metadata: {
+      type: 'json',
+      description: 'Spreadsheet metadata including ID and URL',
+      properties: {
+        spreadsheetId: { type: 'string', description: 'Google Sheets spreadsheet ID' },
+        spreadsheetUrl: { type: 'string', description: 'Spreadsheet URL' },
+      },
+    },
+  },
+}
diff --git a/apps/sim/tools/google_sheets/batch_get.ts b/apps/sim/tools/google_sheets/batch_get.ts
new file mode 100644
index 0000000000..bb83bdf4ff
--- /dev/null
+++ b/apps/sim/tools/google_sheets/batch_get.ts
@@ -0,0 +1,143 @@
+import type {
+  GoogleSheetsV2BatchGetParams,
+  GoogleSheetsV2BatchGetResponse,
+} from '@/tools/google_sheets/types'
+import type { ToolConfig } from '@/tools/types'
+
+export const batchGetV2Tool: ToolConfig<
+  GoogleSheetsV2BatchGetParams,
+  GoogleSheetsV2BatchGetResponse
+> = {
+  id: 'google_sheets_batch_get_v2',
+  name: 'Batch Read Google Sheets V2',
+  description: 'Read multiple ranges from a Google Sheets spreadsheet in a single request',
+  version: '2.0.0',
+
+  oauth: {
+    required: true,
+    provider: 'google-sheets',
+  },
+
+  params: {
+    accessToken: {
+      type: 'string',
+      required: true,
+      visibility: 'hidden',
+      description: 'The access token for the Google Sheets API',
+    },
+    spreadsheetId: {
+      type: 'string',
+      required: true,
+      visibility: 'user-only',
+      description: 'The ID of the spreadsheet',
+    },
+    ranges: {
+      type: 'json',
+      required: true,
+      visibility: 'user-or-llm',
+      description:
+        'Array of ranges to read (e.g., ["Sheet1!A1:D10", "Sheet2!A1:B5"]). Each range should include sheet name.',
+    },
+    majorDimension: {
+      type: 'string',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'The major dimension of values: "ROWS" (default) or "COLUMNS"',
+    },
+    valueRenderOption: {
+      type: 'string',
+      required: false,
+      visibility: 'user-or-llm',
+      description:
+        'How values should be rendered: "FORMATTED_VALUE" (default), "UNFORMATTED_VALUE", or "FORMULA"',
+    },
+  },
+
+  request: {
+    url: (params) => {
+      const spreadsheetId = params.spreadsheetId?.trim()
+      if (!spreadsheetId) {
+        throw new Error('Spreadsheet ID is required')
+      }
+
+      const ranges = params.ranges
+      if (!ranges || !Array.isArray(ranges) || ranges.length === 0) {
+        throw new Error('At least one range is required')
+      }
+
+      const queryParams = new URLSearchParams()
+      ranges.forEach((range: string) => {
+        queryParams.append('ranges', range)
+      })
+
+      if (params.majorDimension) {
+        queryParams.append('majorDimension', params.majorDimension)
+      }
+
+      if (params.valueRenderOption) {
+        queryParams.append('valueRenderOption', params.valueRenderOption)
+      }
+
+      return `https://sheets.googleapis.com/v4/spreadsheets/${spreadsheetId}/values:batchGet?${queryParams.toString()}`
+    },
+    method: 'GET',
+    headers: (params) => {
+      if (!params.accessToken) {
+        throw new Error('Access token is required')
+      }
+
+      return {
+        Authorization: `Bearer ${params.accessToken}`,
+      }
+    },
+  },
+
+  transformResponse: async (response: Response) => {
+    const data = await response.json()
+
+    const valueRanges =
+      data.valueRanges?.map((vr: any) => ({
+        range: vr.range ?? '',
+        majorDimension: vr.majorDimension ?? 'ROWS',
+        values: vr.values ?? [],
+      })) ?? []
+
+    const spreadsheetId = data.spreadsheetId ?? ''
+
+    return {
+      success: true,
+      output: {
+        spreadsheetId,
+        valueRanges,
+        metadata: {
+          spreadsheetId,
+          spreadsheetUrl: `https://docs.google.com/spreadsheets/d/${spreadsheetId}`,
+        },
+      },
+    }
+  },
+
+  outputs: {
+    spreadsheetId: { type: 'string', description: 'The spreadsheet ID' },
+    valueRanges: {
+      type: 'array',
+      description: 'Array of value ranges read from the spreadsheet',
+      items: {
+        type: 'object',
+        properties: {
+          range: { type: 'string', description: 'The range that was read' },
+          majorDimension: { type: 'string', description: 'Major dimension (ROWS or COLUMNS)' },
+          values: { type: 'array', description: 'The cell values as a 2D array' },
+        },
+      },
+    },
+    metadata: {
+      type: 'json',
+      description: 'Spreadsheet metadata including ID and URL',
+      properties: {
+        spreadsheetId: { type: 'string', description: 'Google Sheets spreadsheet ID' },
+        spreadsheetUrl: { type: 'string', description: 'Spreadsheet URL' },
+      },
+    },
+  },
+}
diff --git a/apps/sim/tools/google_sheets/batch_update.ts b/apps/sim/tools/google_sheets/batch_update.ts
new file mode 100644
index 0000000000..2b18975e71
--- /dev/null
+++ b/apps/sim/tools/google_sheets/batch_update.ts
@@ -0,0 +1,149 @@
+import type {
+  GoogleSheetsV2BatchUpdateParams,
+  GoogleSheetsV2BatchUpdateResponse,
+} from '@/tools/google_sheets/types'
+import type { ToolConfig } from '@/tools/types'
+
+export const batchUpdateV2Tool: ToolConfig<
+  GoogleSheetsV2BatchUpdateParams,
+  GoogleSheetsV2BatchUpdateResponse
+> = {
+  id: 'google_sheets_batch_update_v2',
+  name: 'Batch Update Google Sheets V2',
+  description: 'Update multiple ranges in a Google Sheets spreadsheet in a single request',
+  version: '2.0.0',
+
+  oauth: {
+    required: true,
+    provider: 'google-sheets',
+  },
+
+  params: {
+    accessToken: {
+      type: 'string',
+      required: true,
+      visibility: 'hidden',
+      description: 'The access token for the Google Sheets API',
+    },
+    spreadsheetId: {
+      type: 'string',
+      required: true,
+      visibility: 'user-only',
+      description: 'The ID of the spreadsheet',
+    },
+    data: {
+      type: 'json',
+      required: true,
+      visibility: 'user-or-llm',
+      description:
+        'Array of value ranges to update. Each item should have "range" (e.g., "Sheet1!A1:D10") and "values" (2D array).',
+    },
+    valueInputOption: {
+      type: 'string',
+      required: false,
+      visibility: 'user-or-llm',
+      description:
+        'How input data should be interpreted: "RAW" or "USER_ENTERED" (default). USER_ENTERED parses formulas.',
+    },
+  },
+
+  request: {
+    url: (params) => {
+      const spreadsheetId = params.spreadsheetId?.trim()
+      if (!spreadsheetId) {
+        throw new Error('Spreadsheet ID is required')
+      }
+
+      return `https://sheets.googleapis.com/v4/spreadsheets/${spreadsheetId}/values:batchUpdate`
+    },
+    method: 'POST',
+    headers: (params) => {
+      if (!params.accessToken) {
+        throw new Error('Access token is required')
+      }
+
+      return {
+        Authorization: `Bearer ${params.accessToken}`,
+        'Content-Type': 'application/json',
+      }
+    },
+    body: (params) => {
+      const data = params.data
+      if (!data || !Array.isArray(data) || data.length === 0) {
+        throw new Error('At least one data range is required')
+      }
+
+      return {
+        valueInputOption: params.valueInputOption ?? 'USER_ENTERED',
+        data: data.map((item: any) => ({
+          range: item.range,
+          values: item.values,
+        })),
+      }
+    },
+  },
+
+  transformResponse: async (response: Response) => {
+    const data = await response.json()
+
+    const responses =
+      data.responses?.map((r: any) => ({
+        spreadsheetId: r.spreadsheetId ?? '',
+        updatedRange: r.updatedRange ?? '',
+        updatedRows: r.updatedRows ?? 0,
+        updatedColumns: r.updatedColumns ?? 0,
+        updatedCells: r.updatedCells ?? 0,
+      })) ?? []
+
+    const spreadsheetId = data.spreadsheetId ?? ''
+
+    return {
+      success: true,
+      output: {
+        spreadsheetId,
+        totalUpdatedRows: data.totalUpdatedRows ?? 0,
+        totalUpdatedColumns: data.totalUpdatedColumns ?? 0,
+        totalUpdatedCells: data.totalUpdatedCells ?? 0,
+        totalUpdatedSheets: data.totalUpdatedSheets ?? 0,
+        responses,
+        metadata: {
+          spreadsheetId,
+          spreadsheetUrl: `https://docs.google.com/spreadsheets/d/${spreadsheetId}`,
+        },
+      },
+    }
+  },
+
+  outputs: {
+    spreadsheetId: { type: 'string', description: 'The spreadsheet ID' },
+    totalUpdatedRows: { type: 'number', description: 'Total number of rows updated' },
+    totalUpdatedColumns: { type: 'number', description: 'Total number of columns updated' },
+    totalUpdatedCells: { type: 'number', description: 'Total number of cells updated' },
+    totalUpdatedSheets: { type: 'number', description: 'Total number of sheets updated' },
+    responses: {
+      type: 'array',
+      description: 'Array of update responses for each range',
+      items: {
+        type: 'object',
+        properties: {
+          spreadsheetId: { type: 'string', description: 'The spreadsheet ID' },
+          updatedRange: { type: 'string', description: 'The range that was updated' },
+          updatedRows: { type: 'number', description: 'Number of rows updated in this range' },
+          updatedColumns: {
+            type: 'number',
+            description: 'Number of columns updated in this range',
+          },
+          updatedCells: { type: 'number', description: 'Number of cells updated in this range' },
+        },
+      },
+    },
+    metadata: {
+      type: 'json',
+      description: 'Spreadsheet metadata including ID and URL',
+      properties: {
+        spreadsheetId: { type: 'string', description: 'Google Sheets spreadsheet ID' },
+        spreadsheetUrl: { type: 'string', description: 'Spreadsheet URL' },
+      },
+    },
+  },
+}
diff --git a/apps/sim/tools/google_sheets/read_v2.ts b/apps/sim/tools/google_sheets/clear.ts
similarity index 66%
rename from apps/sim/tools/google_sheets/read_v2.ts
rename to apps/sim/tools/google_sheets/clear.ts
index 8f06e7b666..5435e4e75a 100644
--- a/apps/sim/tools/google_sheets/read_v2.ts
+++ b/apps/sim/tools/google_sheets/clear.ts
@@ -1,13 +1,13 @@
 import type {
-  GoogleSheetsV2ReadResponse,
-  GoogleSheetsV2ToolParams,
+  GoogleSheetsV2ClearParams,
+  GoogleSheetsV2ClearResponse,
 } from '@/tools/google_sheets/types'
 import type { ToolConfig } from '@/tools/types'
 
-export const readV2Tool: ToolConfig<GoogleSheetsV2ToolParams, GoogleSheetsV2ReadResponse> = {
-  id: 'google_sheets_read_v2',
-  name: 'Read from Google Sheets V2',
-  description: 'Read data from a specific sheet in a Google Sheets spreadsheet',
+export const clearV2Tool: ToolConfig<GoogleSheetsV2ClearParams, GoogleSheetsV2ClearResponse> = {
+  id: 'google_sheets_clear_v2',
+  name: 'Clear Google Sheets Range V2',
+  description: 'Clear values from a specific range in a Google Sheets spreadsheet',
   version: '2.0.0',
 
   oauth: {
@@ -32,14 +32,13 @@ export const readV2Tool: ToolConfig<GoogleSheetsV2ToolParams, GoogleSheetsV2Read
       type: 'string',
       required: true,
       visibility: 'user-or-llm',
-      description: 'The name of the sheet/tab to read from',
+      description: 'The name of the sheet/tab to clear',
     },
     cellRange: {
       type: 'string',
       required: false,
       visibility: 'user-or-llm',
-      description:
-        'The cell range to read (e.g. "A1:D10"). Defaults to "A1:Z1000" if not specified.',
+      description: 'The cell range to clear (e.g. "A1:D10"). Clears entire sheet if not specified.',
     },
   },
 
@@ -55,12 +54,12 @@ export const readV2Tool: ToolConfig<GoogleSheetsV2ToolParams, GoogleSheetsV2Read
         throw new Error('Sheet name is required')
       }
 
-      const cellRange = params.cellRange?.trim() || 'A1:Z1000'
-      const fullRange = `${sheetName}!${cellRange}`
+      const cellRange = params.cellRange?.trim()
+      const fullRange = cellRange ? `${sheetName}!${cellRange}` : sheetName
 
-      return `https://sheets.googleapis.com/v4/spreadsheets/${spreadsheetId}/values/${encodeURIComponent(fullRange)}`
+      return `https://sheets.googleapis.com/v4/spreadsheets/${spreadsheetId}/values/${encodeURIComponent(fullRange)}:clear`
     },
-    method: 'GET',
+    method: 'POST',
     headers: (params) => {
       if (!params.accessToken) {
         throw new Error('Access token is required')
@@ -68,16 +67,16 @@ export const readV2Tool: ToolConfig<GoogleSheetsV2ToolParams, GoogleSheetsV2Read
 
       return {
         Authorization: `Bearer ${params.accessToken}`,
+        'Content-Type': 'application/json',
       }
     },
+    body: () => ({}),
   },
 
-  transformResponse: async (response: Response, params?: GoogleSheetsV2ToolParams) => {
+  transformResponse: async (response: Response, params?: GoogleSheetsV2ClearParams) => {
     const data = await response.json()
 
-    const urlParts = typeof response.url === 'string' ? response.url.split('/spreadsheets/') : []
-    const spreadsheetId = urlParts[1]?.split('/')[0] || ''
-
+    const spreadsheetId = params?.spreadsheetId ?? ''
     const metadata = {
       spreadsheetId,
       spreadsheetUrl: `https://docs.google.com/spreadsheets/d/${spreadsheetId}`,
@@ -86,9 +85,8 @@ export const readV2Tool: ToolConfig<GoogleSheetsV2ToolParams, GoogleSheetsV2Read
     return {
       success: true,
       output: {
+        clearedRange: data.clearedRange ?? '',
         sheetName: params?.sheetName ?? '',
-        range: data.range ?? '',
-        values: data.values ?? [],
         metadata: {
           spreadsheetId: metadata.spreadsheetId,
           spreadsheetUrl: metadata.spreadsheetUrl,
@@ -98,9 +96,8 @@ export const readV2Tool: ToolConfig<GoogleSheetsV2ToolParams, GoogleSheetsV2Read
   },
 
   outputs: {
-    sheetName: { type: 'string', description: 'Name of the sheet that was read' },
-    range: { type: 'string', description: 'The range of cells that was read' },
-    values: { type: 'array', description: 'The cell values as a 2D array' },
+    clearedRange: { type: 'string', description: 'The range that was cleared' },
+    sheetName: { type: 'string', description: 'Name of the sheet that was cleared' },
     metadata: {
       type: 'json',
       description: 'Spreadsheet metadata including ID and URL',
diff --git a/apps/sim/tools/google_sheets/copy_sheet.ts b/apps/sim/tools/google_sheets/copy_sheet.ts
new file mode 100644
index 0000000000..f0d62859f6
--- /dev/null
+++ b/apps/sim/tools/google_sheets/copy_sheet.ts
@@ -0,0 +1,119 @@
+import type {
+  GoogleSheetsV2CopySheetParams,
+  GoogleSheetsV2CopySheetResponse,
+} from '@/tools/google_sheets/types'
+import type { ToolConfig } from '@/tools/types'
+
+export const copySheetV2Tool: ToolConfig<
+  GoogleSheetsV2CopySheetParams,
+  GoogleSheetsV2CopySheetResponse
+> = {
+  id: 'google_sheets_copy_sheet_v2',
+  name: 'Copy Sheet V2',
+  description: 'Copy a sheet from one spreadsheet to another',
+  version: '2.0.0',
+
+  oauth: {
+    required: true,
+    provider: 'google-sheets',
+  },
+
+  params: {
+    accessToken: {
+      type: 'string',
+      required: true,
+      visibility: 'hidden',
+      description: 'The access token for the Google Sheets API',
+    },
+    sourceSpreadsheetId: {
+      type: 'string',
+      required: true,
+      visibility: 'user-only',
+      description: 'The ID of the source spreadsheet',
+    },
+    sheetId: {
+      type: 'number',
+      required: true,
+      visibility: 'user-or-llm',
+      description:
+        'The ID of the sheet to copy (numeric ID, not the sheet name). Use Get Spreadsheet to find sheet IDs.',
+    },
+    destinationSpreadsheetId: {
+      type: 'string',
+      required: true,
+      visibility: 'user-or-llm',
+      description: 'The ID of the destination spreadsheet where the sheet will be copied',
+    },
+  },
+
+  request: {
+    url: (params) => {
+      const sourceSpreadsheetId = params.sourceSpreadsheetId?.trim()
+      if (!sourceSpreadsheetId) {
+        throw new Error('Source spreadsheet ID is required')
+      }
+
+      const sheetId = params.sheetId
+      if (sheetId === undefined || sheetId === null) {
+        throw new Error('Sheet ID is required')
+      }
+
+      return `https://sheets.googleapis.com/v4/spreadsheets/${sourceSpreadsheetId}/sheets/${sheetId}:copyTo`
+    },
+    method: 'POST',
+    headers: (params) => {
+      if (!params.accessToken) {
+        throw new Error('Access token is required')
+      }
+
+      return {
+        Authorization: `Bearer ${params.accessToken}`,
+        'Content-Type': 'application/json',
+      }
+    },
+    body: (params) => {
+      const destinationSpreadsheetId = params.destinationSpreadsheetId?.trim()
+      if (!destinationSpreadsheetId) {
+        throw new Error('Destination spreadsheet ID is required')
+      }
+
+      return {
+        destinationSpreadsheetId,
+      }
+    },
+  },
+
+  transformResponse: async (response: Response, params?: GoogleSheetsV2CopySheetParams) => {
+    const data = await response.json()
+
+    return {
+      success: true,
+      output: {
+        sheetId: data.sheetId ?? 0,
+        title: data.title ?? '',
+        index: data.index ?? 0,
+        sheetType: data.sheetType ?? 'GRID',
+        destinationSpreadsheetId: params?.destinationSpreadsheetId ?? '',
+        destinationSpreadsheetUrl: `https://docs.google.com/spreadsheets/d/${params?.destinationSpreadsheetId ?? ''}`,
+      },
+    }
+  },
+
+  outputs: {
+    sheetId: {
+      type: 'number',
+      description: 'The ID of the newly created sheet in the destination',
+    },
+    title: { type: 'string', description: 'The title of the copied sheet' },
+    index: { type: 'number', description: 'The index (position) of the copied sheet' },
+    sheetType: { type: 'string', description: 'The type of the sheet (GRID, CHART, etc.)' },
+    destinationSpreadsheetId: {
+      type: 'string',
+      description: 'The ID of the destination spreadsheet',
+    },
+    destinationSpreadsheetUrl: {
+      type: 'string',
+      description: 'URL to the destination spreadsheet',
+    },
+  },
+}
diff --git a/apps/sim/tools/google_sheets/create_spreadsheet.ts b/apps/sim/tools/google_sheets/create_spreadsheet.ts
new file mode 100644
index 0000000000..b403c3fe46
--- /dev/null
+++ b/apps/sim/tools/google_sheets/create_spreadsheet.ts
@@ -0,0 +1,139 @@
+import type {
+  GoogleSheetsV2CreateSpreadsheetParams,
+  GoogleSheetsV2CreateSpreadsheetResponse,
+} from '@/tools/google_sheets/types'
+import type { ToolConfig } from '@/tools/types'
+
+export const createSpreadsheetV2Tool: ToolConfig<
+  GoogleSheetsV2CreateSpreadsheetParams,
+  GoogleSheetsV2CreateSpreadsheetResponse
+> = {
+  id: 'google_sheets_create_spreadsheet_v2',
+  name: 'Create Spreadsheet V2',
+  description: 'Create a new Google Sheets spreadsheet',
+  version: '2.0.0',
+
+  oauth: {
+    required: true,
+    provider: 'google-sheets',
+  },
+
+  params: {
+    accessToken: {
+      type: 'string',
+      required: true,
+      visibility: 'hidden',
+      description: 'The access token for the Google Sheets API',
+    },
+    title: {
+      type: 'string',
+      required: true,
+      visibility: 'user-or-llm',
+      description: 'The title of the new spreadsheet',
+    },
+    sheetTitles: {
+      type: 'json',
+      required: false,
+      visibility: 'user-or-llm',
+      description:
+        'Array of sheet names to create (e.g., ["Sheet1", "Data", "Summary"]). Defaults to a single "Sheet1".',
+    },
+    locale: {
+      type: 'string',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'The locale of the spreadsheet (e.g., "en_US")',
+    },
+    timeZone: {
+      type: 'string',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'The time zone of the spreadsheet (e.g., "America/New_York")',
+    },
+  },
+
+  request: {
+    url: () => 'https://sheets.googleapis.com/v4/spreadsheets',
+    method: 'POST',
+    headers: (params) => {
+      if (!params.accessToken) {
+        throw new Error('Access token is required')
+      }
+
+      return {
+        Authorization: `Bearer ${params.accessToken}`,
+        'Content-Type': 'application/json',
+      }
+    },
+    body: (params) => {
+      const title = params.title?.trim()
+      if (!title) {
+        throw new Error('Spreadsheet title is required')
+      }
+
+      const sheetTitles = params.sheetTitles ?? ['Sheet1']
+      const sheets = sheetTitles.map((sheetTitle: string, index: number) => ({
+        properties: {
+          title: sheetTitle,
+          index,
+        },
+      }))
+
+      const body: any = {
+        properties: {
+          title,
+        },
+        sheets,
+      }
+
+      if (params.locale) {
+        body.properties.locale = params.locale
+      }
+
+      if (params.timeZone) {
+        body.properties.timeZone = params.timeZone
+      }
+
+      return body
+    },
+  },
+
+  transformResponse: async (response: Response) => {
+    const data = await response.json()
+
+    const sheets =
+      data.sheets?.map((sheet: any) => ({
+        sheetId: sheet.properties?.sheetId ?? 0,
+        title: sheet.properties?.title ?? '',
+        index: sheet.properties?.index ?? 0,
+      })) ?? []
+
+    return {
+      success: true,
+      output: {
+        spreadsheetId: data.spreadsheetId ?? '',
+        title: data.properties?.title ?? '',
+        spreadsheetUrl: data.spreadsheetUrl ?? '',
+        sheets,
+      },
+    }
+  },
+
+  outputs: {
+    spreadsheetId: { type: 'string', description: 'The ID of the created spreadsheet' },
+    title: { type: 'string', description: 'The title of the created spreadsheet' },
+    spreadsheetUrl: { type: 'string', description: 'URL to the created spreadsheet' },
+    sheets: {
+      type: 'array',
+      description: 'List of sheets created in the spreadsheet',
+      items: {
+        type: 'object',
+        properties: {
+          sheetId: { type: 'number', description: 'The sheet ID' },
+          title: { type: 'string', description: 'The sheet title/name' },
+          index: { type: 'number', description: 'The sheet index (position)' },
+        },
+      },
+    },
+  },
+}
diff --git a/apps/sim/tools/google_sheets/get_spreadsheet.ts b/apps/sim/tools/google_sheets/get_spreadsheet.ts
new file mode 100644
index 0000000000..afb06a91db
--- /dev/null
+++ b/apps/sim/tools/google_sheets/get_spreadsheet.ts
@@ -0,0 +1,112 @@
+import type {
+  GoogleSheetsV2GetSpreadsheetParams,
+  GoogleSheetsV2GetSpreadsheetResponse,
+} from '@/tools/google_sheets/types'
+import type { ToolConfig } from '@/tools/types'
+
+export const getSpreadsheetV2Tool: ToolConfig<
+  GoogleSheetsV2GetSpreadsheetParams,
+  GoogleSheetsV2GetSpreadsheetResponse
+> = {
+  id: 'google_sheets_get_spreadsheet_v2',
+  name: 'Get Spreadsheet Info V2',
+  description: 'Get metadata about a Google Sheets spreadsheet including title and sheet list',
+  version: '2.0.0',
+
+  oauth: {
+    required: true,
+    provider: 'google-sheets',
+  },
+
+  params: {
+    accessToken: {
+      type: 'string',
+      required: true,
+      visibility: 'hidden',
+      description: 'The access token for the Google Sheets API',
+    },
+    spreadsheetId: {
+      type: 'string',
+      required: true,
+      visibility: 'user-only',
+      description: 'The ID of the spreadsheet',
+    },
+    includeGridData: {
+      type: 'boolean',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Whether to include grid data (cell values). Defaults to false.',
+    },
+  },
+
+  request: {
+    url: (params) => {
+      const spreadsheetId = params.spreadsheetId?.trim()
+      if (!spreadsheetId) {
+        throw new Error('Spreadsheet ID is required')
+      }
+
+      const includeGridData = params.includeGridData ? 'true' : 'false'
+      return `https://sheets.googleapis.com/v4/spreadsheets/${spreadsheetId}?includeGridData=${includeGridData}`
+    },
+    method: 'GET',
+    headers: (params) => {
+      if (!params.accessToken) {
+        throw new Error('Access token is required')
+      }
+
+      return {
+        Authorization: `Bearer ${params.accessToken}`,
+      }
+    },
+  },
+
+  transformResponse: async (response: Response) => {
+    const data = await response.json()
+
+    const sheets =
+      data.sheets?.map((sheet: any) => ({
+        sheetId: sheet.properties?.sheetId ?? 0,
+        title: sheet.properties?.title ?? '',
+        index: sheet.properties?.index ?? 0,
+        rowCount: sheet.properties?.gridProperties?.rowCount ?? null,
+        columnCount: sheet.properties?.gridProperties?.columnCount ?? null,
+        hidden: sheet.properties?.hidden ?? false,
+      })) ?? []
+
+    return {
+      success: true,
+      output: {
+        spreadsheetId: data.spreadsheetId ?? '',
+        title: data.properties?.title ?? '',
+        locale: data.properties?.locale ?? null,
+        timeZone: data.properties?.timeZone ?? null,
+        spreadsheetUrl: data.spreadsheetUrl ?? '',
+        sheets,
+      },
+    }
+  },
+
+  outputs: {
+    spreadsheetId: { type: 'string', description: 'The spreadsheet ID' },
+    title: { type: 'string', description: 'The title of the spreadsheet' },
+    locale: { type: 'string', description: 'The locale of the spreadsheet', optional: true },
+    timeZone: { type: 'string', description: 'The time zone of the spreadsheet', optional: true },
+    spreadsheetUrl: { type: 'string', description: 'URL to the spreadsheet' },
+    sheets: {
+      type: 'array',
+      description: 'List of sheets in the spreadsheet',
+      items: {
+        type: 'object',
+        properties: {
+          sheetId: { type: 'number', description: 'The sheet ID' },
+          title: { type: 'string', description: 'The sheet title/name' },
+          index: { type: 'number', description: 'The sheet index (position)' },
+          rowCount: { type: 'number', description: 'Number of rows in the sheet' },
+          columnCount: { type: 'number', description: 'Number of columns in the sheet' },
+          hidden: { type: 'boolean', description: 'Whether the sheet is hidden' },
+        },
+      },
+    },
+  },
+}
diff --git a/apps/sim/tools/google_sheets/index.ts b/apps/sim/tools/google_sheets/index.ts
index e8612b80de..750e0a3b26 100644
--- a/apps/sim/tools/google_sheets/index.ts
+++ b/apps/sim/tools/google_sheets/index.ts
@@ -1,11 +1,14 @@
-import { appendTool } from '@/tools/google_sheets/append'
-import { appendV2Tool } from '@/tools/google_sheets/append_v2'
-import { readTool } from '@/tools/google_sheets/read'
-import { readV2Tool } from '@/tools/google_sheets/read_v2'
-import { updateTool } from '@/tools/google_sheets/update'
-import { updateV2Tool } from '@/tools/google_sheets/update_v2'
-import { writeTool } from '@/tools/google_sheets/write'
-import { writeV2Tool } from '@/tools/google_sheets/write_v2'
+import { appendTool, appendV2Tool } from '@/tools/google_sheets/append'
+import { batchClearV2Tool } from '@/tools/google_sheets/batch_clear'
+import { batchGetV2Tool } from '@/tools/google_sheets/batch_get'
+import { batchUpdateV2Tool } from '@/tools/google_sheets/batch_update'
+import { clearV2Tool } from '@/tools/google_sheets/clear'
+import { copySheetV2Tool } from '@/tools/google_sheets/copy_sheet'
+import { createSpreadsheetV2Tool } from '@/tools/google_sheets/create_spreadsheet'
+import { getSpreadsheetV2Tool } from '@/tools/google_sheets/get_spreadsheet'
+import { readTool, readV2Tool } from '@/tools/google_sheets/read'
+import { updateTool, updateV2Tool } from '@/tools/google_sheets/update'
+import { writeTool, writeV2Tool } from '@/tools/google_sheets/write'
 
 // V1 exports
 export const googleSheetsReadTool = readTool
@@ -18,3 +21,10 @@ export const googleSheetsReadV2Tool = readV2Tool
 export const googleSheetsWriteV2Tool = writeV2Tool
 export const googleSheetsUpdateV2Tool = updateV2Tool
 export const googleSheetsAppendV2Tool = appendV2Tool
+export const googleSheetsClearV2Tool = clearV2Tool
+export const googleSheetsGetSpreadsheetV2Tool = getSpreadsheetV2Tool
+export const googleSheetsCreateSpreadsheetV2Tool = createSpreadsheetV2Tool
+export const googleSheetsBatchGetV2Tool = batchGetV2Tool
+export const googleSheetsBatchUpdateV2Tool = batchUpdateV2Tool
+export const googleSheetsBatchClearV2Tool = batchClearV2Tool
+export const googleSheetsCopySheetV2Tool = copySheetV2Tool
diff --git a/apps/sim/tools/google_sheets/read.ts b/apps/sim/tools/google_sheets/read.ts
index 1e591eac6f..11b521aa2c 100644
--- a/apps/sim/tools/google_sheets/read.ts
+++ b/apps/sim/tools/google_sheets/read.ts
@@ -1,4 +1,9 @@
-import type { GoogleSheetsReadResponse, GoogleSheetsToolParams } from '@/tools/google_sheets/types'
+import type {
+  GoogleSheetsReadResponse,
+  GoogleSheetsToolParams,
+  GoogleSheetsV2ReadResponse,
+  GoogleSheetsV2ToolParams,
+} from '@/tools/google_sheets/types'
 import type { ToolConfig } from '@/tools/types'
 
 export const readTool: ToolConfig<GoogleSheetsToolParams, GoogleSheetsReadResponse> = {
@@ -111,3 +116,111 @@ export const readTool: ToolConfig<GoogleSheetsToolParams, GoogleSheetsReadRespon
     },
   },
 }
+
+export const readV2Tool: ToolConfig<GoogleSheetsV2ToolParams, GoogleSheetsV2ReadResponse> = {
+  id: 'google_sheets_read_v2',
+  name: 'Read from Google Sheets V2',
+  description: 'Read data from a specific sheet in a Google Sheets spreadsheet',
+  version: '2.0.0',
+
+  oauth: {
+    required: true,
+    provider: 'google-sheets',
+  },
+
+  params: {
+    accessToken: {
+      type: 'string',
+      required: true,
+      visibility: 'hidden',
+      description: 'The access token for the Google Sheets API',
+    },
+    spreadsheetId: {
+      type: 'string',
+      required: true,
+      visibility: 'user-only',
+      description: 'The ID of the spreadsheet',
+    },
+    sheetName: {
+      type: 'string',
+      required: true,
+      visibility: 'user-or-llm',
+      description: 'The name of the sheet/tab to read from',
+    },
+    cellRange: {
+      type: 'string',
+      required: false,
+      visibility: 'user-or-llm',
+      description:
+        'The cell range to read (e.g. "A1:D10"). Defaults to "A1:Z1000" if not specified.',
+    },
+  },
+
+  request: {
+    url: (params) => {
+      const spreadsheetId = params.spreadsheetId?.trim()
+      if (!spreadsheetId) {
+        throw new Error('Spreadsheet ID is required')
+      }
+
+      const sheetName = params.sheetName?.trim()
+      if (!sheetName) {
+        throw new Error('Sheet name is required')
+      }
+
+      const cellRange = params.cellRange?.trim() || 'A1:Z1000'
+      const fullRange = `${sheetName}!${cellRange}`
+
+      return `https://sheets.googleapis.com/v4/spreadsheets/${spreadsheetId}/values/${encodeURIComponent(fullRange)}`
+    },
+    method: 'GET',
+    headers: (params) => {
+      if (!params.accessToken) {
+        throw new Error('Access token is required')
+      }
+
+      return {
+        Authorization: `Bearer ${params.accessToken}`,
+      }
+    },
+  },
+
+  transformResponse: async (response: Response, params?: GoogleSheetsV2ToolParams) => {
+    const data = await response.json()
+
+    const urlParts = typeof response.url === 'string' ? response.url.split('/spreadsheets/') : []
+    const spreadsheetId = urlParts[1]?.split('/')[0] || ''
+
+    const metadata = {
+      spreadsheetId,
+      spreadsheetUrl: `https://docs.google.com/spreadsheets/d/${spreadsheetId}`,
+    }
+
+    return {
+      success: true,
+      output: {
+        sheetName: params?.sheetName ?? '',
+        range: data.range ?? '',
+        values: data.values ?? [],
+        metadata: {
+          spreadsheetId: metadata.spreadsheetId,
+          spreadsheetUrl: metadata.spreadsheetUrl,
+        },
+      },
+    }
+  },
+
+  outputs: {
+    sheetName: { type: 'string', description: 'Name of the sheet that was read' },
+    range: { type: 'string', description: 'The range of cells that was read' },
+    values: { type: 'array', description: 'The cell values as a 2D array' },
+    metadata: {
+      type: 'json',
+      description: 'Spreadsheet metadata including ID and URL',
+      properties: {
+        spreadsheetId: { type: 'string', description: 'Google Sheets spreadsheet ID' },
+        spreadsheetUrl: { type: 'string', description: 'Spreadsheet URL' },
+      },
+    },
+  },
+}
diff --git a/apps/sim/tools/google_sheets/types.ts b/apps/sim/tools/google_sheets/types.ts
index 8d51ae065d..74fdc84a1a 100644
--- a/apps/sim/tools/google_sheets/types.ts
+++ b/apps/sim/tools/google_sheets/types.ts
@@ -136,3 +136,157 @@ export type GoogleSheetsV2Response =
   | GoogleSheetsV2WriteResponse
   | GoogleSheetsV2UpdateResponse
   | GoogleSheetsV2AppendResponse
+  | GoogleSheetsV2ClearResponse
+  | GoogleSheetsV2GetSpreadsheetResponse
+  | GoogleSheetsV2CreateSpreadsheetResponse
+  | GoogleSheetsV2BatchGetResponse
+  | GoogleSheetsV2BatchUpdateResponse
+  | GoogleSheetsV2BatchClearResponse
+  | GoogleSheetsV2CopySheetResponse
+
+// V2 Clear Types
+export interface GoogleSheetsV2ClearParams {
+  accessToken: string
+  spreadsheetId: string
+  sheetName: string
+  cellRange?: string
+}
+
+export interface GoogleSheetsV2ClearResponse extends ToolResponse {
+  output: {
+    clearedRange: string
+    sheetName: string
+    metadata: GoogleSheetsMetadata
+  }
+}
+
+// V2 Get Spreadsheet Types
+export interface GoogleSheetsV2GetSpreadsheetParams {
+  accessToken: string
+  spreadsheetId: string
+  includeGridData?: boolean
+}
+
+export interface GoogleSheetsV2GetSpreadsheetResponse extends ToolResponse {
+  output: {
+    spreadsheetId: string
+    title: string
+    locale: string | null
+    timeZone: string | null
+    spreadsheetUrl: string
+    sheets: {
+      sheetId: number
+      title: string
+      index: number
+      rowCount: number | null
+      columnCount: number | null
+      hidden: boolean
+    }[]
+  }
+}
+
+// V2 Create Spreadsheet Types
+export interface GoogleSheetsV2CreateSpreadsheetParams {
+  accessToken: string
+  title: string
+  sheetTitles?: string[]
+  locale?: string
+  timeZone?: string
+}
+
+export interface GoogleSheetsV2CreateSpreadsheetResponse extends ToolResponse {
+  output: {
+    spreadsheetId: string
+    title: string
+    spreadsheetUrl: string
+    sheets: {
+      sheetId: number
+      title: string
+      index: number
+    }[]
+  }
+}
+
+// V2 Batch Get Types
+export interface GoogleSheetsV2BatchGetParams {
+  accessToken: string
+  spreadsheetId: string
+  ranges: string[]
+  majorDimension?: 'ROWS' | 'COLUMNS'
+  valueRenderOption?: 'FORMATTED_VALUE' | 'UNFORMATTED_VALUE' | 'FORMULA'
+}
+
+export interface GoogleSheetsV2BatchGetResponse extends ToolResponse {
+  output: {
+    spreadsheetId: string
+    valueRanges: {
+      range: string
+      majorDimension: string
+      values: any[][]
+    }[]
+    metadata: GoogleSheetsMetadata
+  }
+}
+
+// V2 Batch Update Types
+export interface GoogleSheetsV2BatchUpdateParams {
+  accessToken: string
+  spreadsheetId: string
+  data: {
+    range: string
+    values: any[][]
+  }[]
+  valueInputOption?: 'RAW' | 'USER_ENTERED'
+}
+
+export interface GoogleSheetsV2BatchUpdateResponse extends ToolResponse {
+  output: {
+    spreadsheetId: string
+    totalUpdatedRows: number
+    totalUpdatedColumns: number
+    totalUpdatedCells: number
+    totalUpdatedSheets: number
+    responses: {
+      spreadsheetId: string
+      updatedRange: string
+      updatedRows: number
+      updatedColumns: number
+      updatedCells: number
+    }[]
+    metadata: GoogleSheetsMetadata
+  }
+}
+
+// V2 Batch Clear Types
+export interface GoogleSheetsV2BatchClearParams {
+  accessToken: string
+  spreadsheetId: string
+  ranges: string[]
+}
+
+export interface GoogleSheetsV2BatchClearResponse extends ToolResponse {
+  output: {
+    spreadsheetId: string
+    clearedRanges: string[]
+    metadata: GoogleSheetsMetadata
+  }
+}
+
+// V2 Copy Sheet Types
+export interface GoogleSheetsV2CopySheetParams {
+  accessToken: string
+  sourceSpreadsheetId: string
+  sheetId: number
+  destinationSpreadsheetId: string
+}
+
+export interface GoogleSheetsV2CopySheetResponse extends ToolResponse {
+  output: {
+    sheetId: number
+    title: string
+    index: number
+    sheetType: string
+    destinationSpreadsheetId: string
+    destinationSpreadsheetUrl: string
+  }
+}
diff --git a/apps/sim/tools/google_sheets/update.ts b/apps/sim/tools/google_sheets/update.ts
index 07eb18dd36..c3d100bea7 100644
--- a/apps/sim/tools/google_sheets/update.ts
+++ b/apps/sim/tools/google_sheets/update.ts
@@ -1,6 +1,8 @@
 import type {
   GoogleSheetsToolParams,
   GoogleSheetsUpdateResponse,
+  GoogleSheetsV2ToolParams,
+  GoogleSheetsV2UpdateResponse,
 } from '@/tools/google_sheets/types'
 import type { ToolConfig } from '@/tools/types'
 
@@ -179,3 +181,183 @@ export const updateTool: ToolConfig<GoogleSheetsToolParams, GoogleSheetsUpdateRe
     },
   },
 }
+
+export const updateV2Tool: ToolConfig<GoogleSheetsV2ToolParams, GoogleSheetsV2UpdateResponse> = {
+  id: 'google_sheets_update_v2',
+  name: 'Update Google Sheets V2',
+  description: 'Update data in a specific sheet in a Google Sheets spreadsheet',
+  version: '2.0.0',
+
+  oauth: {
+    required: true,
+    provider: 'google-sheets',
+  },
+
+  params: {
+    accessToken: {
+      type: 'string',
+      required: true,
+      visibility: 'hidden',
+      description: 'The access token for the Google Sheets API',
+    },
+    spreadsheetId: {
+      type: 'string',
+      required: true,
+      visibility: 'user-only',
+      description: 'The ID of the spreadsheet to update',
+    },
+    sheetName: {
+      type: 'string',
+      required: true,
+      visibility: 'user-or-llm',
+      description: 'The name of the sheet/tab to update',
+    },
+    cellRange: {
+      type: 'string',
+      required: false,
+      visibility: 'user-or-llm',
+      description:
+        'The cell range to update (e.g. "A1:D10", "A1"). Defaults to "A1" if not specified.',
+    },
+    values: {
+      type: 'array',
+      required: true,
+      visibility: 'user-or-llm',
+      description:
+        'The data to update as a 2D array (e.g. [["Name", "Age"], ["Alice", 30]]) or array of objects.',
+    },
+    valueInputOption: {
+      type: 'string',
+      required: false,
+      visibility: 'hidden',
+      description: 'The format of the data to update',
+    },
+    includeValuesInResponse: {
+      type: 'boolean',
+      required: false,
+      visibility: 'hidden',
+      description: 'Whether to include the updated values in the response',
+    },
+  },
+
+  request: {
+    url: (params) => {
+      const sheetName = params.sheetName?.trim()
+      if (!sheetName) {
+        throw new Error('Sheet name is required')
+      }
+
+      const cellRange = params.cellRange?.trim() || 'A1'
+      const fullRange = `${sheetName}!${cellRange}`
+
+      const url = new URL(
+        `https://sheets.googleapis.com/v4/spreadsheets/${params.spreadsheetId}/values/${encodeURIComponent(fullRange)}`
+      )
+
+      const valueInputOption = params.valueInputOption || 'USER_ENTERED'
+      url.searchParams.append('valueInputOption', valueInputOption)
+
+      if (params.includeValuesInResponse) {
+        url.searchParams.append('includeValuesInResponse', 'true')
+      }
+
+      return url.toString()
+    },
+    method: 'PUT',
+    headers: (params) => ({
+      Authorization: `Bearer ${params.accessToken}`,
+      'Content-Type': 'application/json',
+    }),
+    body: (params) => {
+      let processedValues: any = params.values || []
+
+      // Minimal shape enforcement: Google requires a 2D array
+      if (!Array.isArray(processedValues)) {
+        processedValues = [[processedValues]]
+      } else if (!processedValues.every((item: any) => Array.isArray(item))) {
+        processedValues = (processedValues as any[]).map((row: any) =>
+          Array.isArray(row) ? row : [row]
+        )
+      }
+
+      // Handle array of objects
+      if (
+        Array.isArray(processedValues) &&
+        processedValues.length > 0 &&
+        typeof processedValues[0] === 'object' &&
+        !Array.isArray(processedValues[0])
+      ) {
+        const allKeys = new Set<string>()
+        processedValues.forEach((obj: any) => {
+          if (obj && typeof obj === 'object') {
+            Object.keys(obj).forEach((key) => allKeys.add(key))
+          }
+        })
+        const headers = Array.from(allKeys)
+
+        const rows = processedValues.map((obj: any) => {
+          if (!obj || typeof obj !== 'object') {
+            return Array(headers.length).fill('')
+          }
+          return headers.map((key) => {
+            const value = obj[key]
+            if (value !== null && typeof value === 'object') {
+              return JSON.stringify(value)
+            }
+            return value === undefined ? '' : value
+          })
+        })
+
+        processedValues = [headers, ...rows]
+      }
+
+      const body: Record<string, any> = {
+        majorDimension: params.majorDimension || 'ROWS',
+        values: processedValues,
+      }
+
+      return body
+    },
+  },
+
+  transformResponse: async (response: Response) => {
+    const data = await response.json()
+
+    const urlParts = typeof response.url === 'string' ? response.url.split('/spreadsheets/') : []
+    const spreadsheetId = urlParts[1]?.split('/')[0] || ''
+
+    const metadata = {
+      spreadsheetId,
+      spreadsheetUrl: `https://docs.google.com/spreadsheets/d/${spreadsheetId}`,
+    }
+
+    return {
+      success: true,
+      output: {
+        updatedRange: data.updatedRange ?? null,
+        updatedRows: data.updatedRows ?? 0,
+        updatedColumns: data.updatedColumns ?? 0,
+        updatedCells: data.updatedCells ?? 0,
+        metadata: {
+          spreadsheetId: metadata.spreadsheetId,
+          spreadsheetUrl: metadata.spreadsheetUrl,
+        },
+      },
+    }
+  },
+
+  outputs: {
+    updatedRange: { type: 'string', description: 'Range of cells that were updated' },
+    updatedRows: { type: 'number', description: 'Number of rows updated' },
+    updatedColumns: { type: 'number', description: 'Number of columns updated' },
+    updatedCells: { type: 'number', description: 'Number of cells updated' },
+    metadata: {
+      type: 'json',
+      description: 'Spreadsheet metadata including ID and URL',
+      properties: {
+        spreadsheetId: { type: 'string', description: 'Google Sheets spreadsheet ID' },
+        spreadsheetUrl: { type: 'string', description: 'Spreadsheet URL' },
+      },
+    },
+  },
+}
diff --git a/apps/sim/tools/google_sheets/update_v2.ts b/apps/sim/tools/google_sheets/update_v2.ts
deleted file mode 100644
index 55a7b347af..0000000000
--- a/apps/sim/tools/google_sheets/update_v2.ts
+++ /dev/null
@@ -1,185 +0,0 @@
-import type {
-  GoogleSheetsV2ToolParams,
-  GoogleSheetsV2UpdateResponse,
-} from '@/tools/google_sheets/types'
-import type { ToolConfig } from '@/tools/types'
-
-export const updateV2Tool: ToolConfig<GoogleSheetsV2ToolParams, GoogleSheetsV2UpdateResponse> = {
-  id: 'google_sheets_update_v2',
-  name: 'Update Google Sheets V2',
-  description: 'Update data in a specific sheet in a Google Sheets spreadsheet',
-  version: '2.0.0',
-
-  oauth: {
-    required: true,
-    provider: 'google-sheets',
-  },
-
-  params: {
-    accessToken: {
-      type: 'string',
-      required: true,
-      visibility: 'hidden',
-      description: 'The access token for the Google Sheets API',
-    },
-    spreadsheetId: {
-      type: 'string',
-      required: true,
-      visibility: 'user-only',
-      description: 'The ID of the spreadsheet to update',
-    },
-    sheetName: {
-      type: 'string',
-      required: true,
-      visibility: 'user-or-llm',
-      description: 'The name of the sheet/tab to update',
-    },
-    cellRange: {
-      type: 'string',
-      required: false,
-      visibility: 'user-or-llm',
-      description:
-        'The cell range to update (e.g. "A1:D10", "A1"). Defaults to "A1" if not specified.',
-    },
-    values: {
-      type: 'array',
-      required: true,
-      visibility: 'user-or-llm',
-      description:
-        'The data to update as a 2D array (e.g. [["Name", "Age"], ["Alice", 30]]) or array of objects.',
-    },
-    valueInputOption: {
-      type: 'string',
-      required: false,
-      visibility: 'hidden',
-      description: 'The format of the data to update',
-    },
-    includeValuesInResponse: {
-      type: 'boolean',
-      required: false,
-      visibility: 'hidden',
-      description: 'Whether to include the updated values in the response',
-    },
-  },
-
-  request: {
-    url: (params) => {
-      const sheetName = params.sheetName?.trim()
-      if (!sheetName) {
-        throw new Error('Sheet name is required')
-      }
-
-      const cellRange = params.cellRange?.trim() || 'A1'
-      const fullRange = `${sheetName}!${cellRange}`
-
-      const url = new URL(
-        `https://sheets.googleapis.com/v4/spreadsheets/${params.spreadsheetId}/values/${encodeURIComponent(fullRange)}`
-      )
-
-      const valueInputOption = params.valueInputOption || 'USER_ENTERED'
-      url.searchParams.append('valueInputOption', valueInputOption)
-
-      if (params.includeValuesInResponse) {
-        url.searchParams.append('includeValuesInResponse', 'true')
-      }
-
-      return url.toString()
-    },
-    method: 'PUT',
-    headers: (params) => ({
-      Authorization: `Bearer ${params.accessToken}`,
-      'Content-Type': 'application/json',
-    }),
-    body: (params) => {
-      let processedValues: any = params.values || []
-
-      // Minimal shape enforcement: Google requires a 2D array
-      if (!Array.isArray(processedValues)) {
-        processedValues = [[processedValues]]
-      } else if (!processedValues.every((item: any) => Array.isArray(item))) {
-        processedValues = (processedValues as any[]).map((row: any) =>
-          Array.isArray(row) ? row : [row]
-        )
-      }
-
-      // Handle array of objects
-      if (
-        Array.isArray(processedValues) &&
-        processedValues.length > 0 &&
-        typeof processedValues[0] === 'object' &&
-        !Array.isArray(processedValues[0])
-      ) {
-        const allKeys = new Set<string>()
-        processedValues.forEach((obj: any) => {
-          if (obj && typeof obj === 'object') {
-            Object.keys(obj).forEach((key) => allKeys.add(key))
-          }
-        })
-        const headers = Array.from(allKeys)
-
-        const rows = processedValues.map((obj: any) => {
-          if (!obj || typeof obj !== 'object') {
-            return Array(headers.length).fill('')
-          }
-          return headers.map((key) => {
-            const value = obj[key]
-            if (value !== null && typeof value === 'object') {
-              return JSON.stringify(value)
-            }
-            return value === undefined ? '' : value
-          })
-        })
-
-        processedValues = [headers, ...rows]
-      }
-
-      const body: Record<string, any> = {
-        majorDimension: params.majorDimension || 'ROWS',
-        values: processedValues,
-      }
-
-      return body
-    },
-  },
-
-  transformResponse: async (response: Response) => {
-    const data = await response.json()
-
-    const urlParts = typeof response.url === 'string' ? response.url.split('/spreadsheets/') : []
-    const spreadsheetId = urlParts[1]?.split('/')[0] || ''
-
-    const metadata = {
-      spreadsheetId,
-      spreadsheetUrl: `https://docs.google.com/spreadsheets/d/${spreadsheetId}`,
-    }
-
-    return {
-      success: true,
-      output: {
-        updatedRange: data.updatedRange ?? null,
-        updatedRows: data.updatedRows ?? 0,
-        updatedColumns: data.updatedColumns ?? 0,
-        updatedCells: data.updatedCells ?? 0,
-        metadata: {
-          spreadsheetId: metadata.spreadsheetId,
-          spreadsheetUrl: metadata.spreadsheetUrl,
-        },
-      },
-    }
-  },
-
-  outputs: {
-    updatedRange: { type: 'string', description: 'Range of cells that were updated' },
-    updatedRows: { type: 'number', description: 'Number of rows updated' },
-    updatedColumns: { type: 'number', description: 'Number of columns updated' },
-    updatedCells: { type: 'number', description: 'Number of cells updated' },
-    metadata: {
-      type: 'json',
-      description: 'Spreadsheet metadata including ID and URL',
-      properties: {
-        spreadsheetId: { type: 'string', description: 'Google Sheets spreadsheet ID' },
-        spreadsheetUrl: { type: 'string', description: 'Spreadsheet URL' },
-      },
-    },
-  },
-}
diff --git a/apps/sim/tools/google_sheets/write.ts b/apps/sim/tools/google_sheets/write.ts
index 3115418cac..154b991d86 100644
--- a/apps/sim/tools/google_sheets/write.ts
+++ b/apps/sim/tools/google_sheets/write.ts
@@ -1,4 +1,9 @@
-import type { GoogleSheetsToolParams, GoogleSheetsWriteResponse } from '@/tools/google_sheets/types'
+import type {
+  GoogleSheetsToolParams,
+  GoogleSheetsV2ToolParams,
+  GoogleSheetsV2WriteResponse,
+  GoogleSheetsWriteResponse,
+} from '@/tools/google_sheets/types'
 import type { ToolConfig } from '@/tools/types'
 
 export const writeTool: ToolConfig<GoogleSheetsToolParams, GoogleSheetsWriteResponse> = {
@@ -177,3 +182,175 @@ export const writeTool: ToolConfig<GoogleSheetsToolParams, GoogleSheetsWriteResp
     },
   },
 }
+
+export const writeV2Tool: ToolConfig<GoogleSheetsV2ToolParams, GoogleSheetsV2WriteResponse> = {
+  id: 'google_sheets_write_v2',
+  name: 'Write to Google Sheets V2',
+  description: 'Write data to a specific sheet in a Google Sheets spreadsheet',
+  version: '2.0.0',
+
+  oauth: {
+    required: true,
+    provider: 'google-sheets',
+  },
+
+  params: {
+    accessToken: {
+      type: 'string',
+      required: true,
+      visibility: 'hidden',
+      description: 'The access token for the Google Sheets API',
+    },
+    spreadsheetId: {
+      type: 'string',
+      required: true,
+      visibility: 'user-only',
+      description: 'The ID of the spreadsheet',
+    },
+    sheetName: {
+      type: 'string',
+      required: true,
+      visibility: 'user-or-llm',
+      description: 'The name of the sheet/tab to write to',
+    },
+    cellRange: {
+      type: 'string',
+      required: false,
+      visibility: 'user-or-llm',
+      description:
+        'The cell range to write to (e.g. "A1:D10", "A1"). Defaults to "A1" if not specified.',
+    },
+    values: {
+      type: 'array',
+      required: true,
+      visibility: 'user-or-llm',
+      description:
+        'The data to write as a 2D array (e.g. [["Name", "Age"], ["Alice", 30], ["Bob", 25]]) or array of objects.',
+    },
+    valueInputOption: {
+      type: 'string',
+      required: false,
+      visibility: 'hidden',
+      description: 'The format of the data to write',
+    },
+    includeValuesInResponse: {
+      type: 'boolean',
+      required: false,
+      visibility: 'hidden',
+      description: 'Whether to include the written values in the response',
+    },
+  },
+
+  request: {
+    url: (params) => {
+      const sheetName = params.sheetName?.trim()
+      if (!sheetName) {
+        throw new Error('Sheet name is required')
+      }
+
+      // Build the range: SheetName!CellRange or just SheetName!A1
+      const cellRange = params.cellRange?.trim() || 'A1'
+      const fullRange = `${sheetName}!${cellRange}`
+
+      const url = new URL(
+        `https://sheets.googleapis.com/v4/spreadsheets/${params.spreadsheetId}/values/${encodeURIComponent(fullRange)}`
+      )
+
+      const valueInputOption = params.valueInputOption || 'USER_ENTERED'
+      url.searchParams.append('valueInputOption', valueInputOption)
+
+      if (params.includeValuesInResponse) {
+        url.searchParams.append('includeValuesInResponse', 'true')
+      }
+
+      return url.toString()
+    },
+    method: 'PUT',
+    headers: (params) => ({
+      Authorization: `Bearer ${params.accessToken}`,
+      'Content-Type': 'application/json',
+    }),
+    body: (params) => {
+      let processedValues: any = params.values || []
+
+      // Handle array of objects
+      if (
+        Array.isArray(processedValues) &&
+        processedValues.length > 0 &&
+        typeof processedValues[0] === 'object' &&
+        !Array.isArray(processedValues[0])
+      ) {
+        const allKeys = new Set<string>()
+        processedValues.forEach((obj: any) => {
+          if (obj && typeof obj === 'object') {
+            Object.keys(obj).forEach((key) => allKeys.add(key))
+          }
+        })
+        const headers = Array.from(allKeys)
+
+        const rows = processedValues.map((obj: any) => {
+          if (!obj || typeof obj !== 'object') {
+            return Array(headers.length).fill('')
+          }
+          return headers.map((key) => {
+            const value = obj[key]
+            if (value !== null && typeof value === 'object') {
+              return JSON.stringify(value)
+            }
+            return value === undefined ? '' : value
+          })
+        })
+
+        processedValues = [headers, ...rows]
+      }
+
+      const body: Record<string, any> = {
+        majorDimension: params.majorDimension || 'ROWS',
+        values: processedValues,
+      }
+
+      return body
+    },
+  },
+
+  transformResponse: async (response: Response) => {
+    const data = await response.json()
+
+    const urlParts = typeof response.url === 'string' ? response.url.split('/spreadsheets/') : []
+    const spreadsheetId = urlParts[1]?.split('/')[0] || ''
+
+    const metadata = {
+      spreadsheetId,
+      spreadsheetUrl: `https://docs.google.com/spreadsheets/d/${spreadsheetId}`,
+    }
+
+    return {
+      success: true,
+      output: {
+        updatedRange: data.updatedRange ?? null,
+        updatedRows: data.updatedRows ?? 0,
+        updatedColumns: data.updatedColumns ?? 0,
+        updatedCells: data.updatedCells ?? 0,
+        metadata: {
+          spreadsheetId: metadata.spreadsheetId,
+          spreadsheetUrl: metadata.spreadsheetUrl,
+        },
+      },
+    }
+  },
+
+  outputs: {
+    updatedRange: { type: 'string', description: 'Range of cells that were updated' },
+    updatedRows: { type: 'number', description: 'Number of rows updated' },
+    updatedColumns: { type: 'number', description: 'Number of columns updated' },
+    updatedCells: { type: 'number', description: 'Number of cells updated' },
+    metadata: {
+      type: 'json',
+      description: 'Spreadsheet metadata including ID and URL',
+      properties: {
+        spreadsheetId: { type: 'string', description: 'Google Sheets spreadsheet ID' },
+        spreadsheetUrl: { type: 'string', description: 'Spreadsheet URL' },
+      },
+    },
+  },
+}
diff --git a/apps/sim/tools/google_sheets/write_v2.ts b/apps/sim/tools/google_sheets/write_v2.ts
deleted file mode 100644
index f72ac5ba4b..0000000000
--- a/apps/sim/tools/google_sheets/write_v2.ts
+++ /dev/null
@@ -1,177 +0,0 @@
-import type {
-  GoogleSheetsV2ToolParams,
-  GoogleSheetsV2WriteResponse,
-} from '@/tools/google_sheets/types'
-import type { ToolConfig } from '@/tools/types'
-
-export const writeV2Tool: ToolConfig<GoogleSheetsV2ToolParams, GoogleSheetsV2WriteResponse> = {
-  id: 'google_sheets_write_v2',
-  name: 'Write to Google Sheets V2',
-  description: 'Write data to a specific sheet in a Google Sheets spreadsheet',
-  version: '2.0.0',
-
-  oauth: {
-    required: true,
-    provider: 'google-sheets',
-  },
-
-  params: {
-    accessToken: {
-      type: 'string',
-      required: true,
-      visibility: 'hidden',
-      description: 'The access token for the Google Sheets API',
-    },
-    spreadsheetId: {
-      type: 'string',
-      required: true,
-      visibility: 'user-only',
-      description: 'The ID of the spreadsheet',
-    },
-    sheetName: {
-      type: 'string',
-      required: true,
-      visibility: 'user-or-llm',
-      description: 'The name of the sheet/tab to write to',
-    },
-    cellRange: {
-      type: 'string',
-      required: false,
-      visibility: 'user-or-llm',
-      description:
-        'The cell range to write to (e.g. "A1:D10", "A1"). Defaults to "A1" if not specified.',
-    },
-    values: {
-      type: 'array',
-      required: true,
-      visibility: 'user-or-llm',
-      description:
-        'The data to write as a 2D array (e.g. [["Name", "Age"], ["Alice", 30], ["Bob", 25]]) or array of objects.',
-    },
-    valueInputOption: {
-      type: 'string',
-      required: false,
-      visibility: 'hidden',
-      description: 'The format of the data to write',
-    },
-    includeValuesInResponse: {
-      type: 'boolean',
-      required: false,
-      visibility: 'hidden',
-      description: 'Whether to include the written values in the response',
-    },
-  },
-
-  request: {
-    url: (params) => {
-      const sheetName = params.sheetName?.trim()
-      if (!sheetName) {
-        throw new Error('Sheet name is required')
-      }
-
-      // Build the range: SheetName!CellRange or just SheetName!A1
-      const cellRange = params.cellRange?.trim() || 'A1'
-      const fullRange = `${sheetName}!${cellRange}`
-
-      const url = new URL(
-        `https://sheets.googleapis.com/v4/spreadsheets/${params.spreadsheetId}/values/${encodeURIComponent(fullRange)}`
-      )
-
-      const valueInputOption = params.valueInputOption || 'USER_ENTERED'
-      url.searchParams.append('valueInputOption', valueInputOption)
-
-      if (params.includeValuesInResponse) {
-        url.searchParams.append('includeValuesInResponse', 'true')
-      }
-
-      return url.toString()
-    },
-    method: 'PUT',
-    headers: (params) => ({
-      Authorization: `Bearer ${params.accessToken}`,
-      'Content-Type': 'application/json',
-    }),
-    body: (params) => {
-      let processedValues: any = params.values || []
-
-      // Handle array of objects
-      if (
-        Array.isArray(processedValues) &&
-        processedValues.length > 0 &&
-        typeof processedValues[0] === 'object' &&
-        !Array.isArray(processedValues[0])
-      ) {
-        const allKeys = new Set<string>()
-        processedValues.forEach((obj: any) => {
-          if (obj && typeof obj === 'object') {
-            Object.keys(obj).forEach((key) => allKeys.add(key))
-          }
-        })
-        const headers = Array.from(allKeys)
-
-        const rows = processedValues.map((obj: any) => {
-          if (!obj || typeof obj !== 'object') {
-            return Array(headers.length).fill('')
-          }
-          return headers.map((key) => {
-            const value = obj[key]
-            if (value !== null && typeof value === 'object') {
-              return JSON.stringify(value)
-            }
-            return value === undefined ? '' : value
-          })
-        })
-
-        processedValues = [headers, ...rows]
-      }
-
-      const body: Record<string, any> = {
-        majorDimension: params.majorDimension || 'ROWS',
-        values: processedValues,
-      }
-
-      return body
-    },
-  },
-
-  transformResponse: async (response: Response) => {
-    const data = await response.json()
-
-    const urlParts = typeof response.url === 'string' ? response.url.split('/spreadsheets/') : []
-    const spreadsheetId = urlParts[1]?.split('/')[0] || ''
-
-    const metadata = {
-      spreadsheetId,
-      spreadsheetUrl: `https://docs.google.com/spreadsheets/d/${spreadsheetId}`,
-    }
-
-    return {
-      success: true,
-      output: {
-        updatedRange: data.updatedRange ?? null,
-        updatedRows: data.updatedRows ?? 0,
-        updatedColumns: data.updatedColumns ?? 0,
-        updatedCells: data.updatedCells ?? 0,
-        metadata: {
-          spreadsheetId: metadata.spreadsheetId,
-          spreadsheetUrl: metadata.spreadsheetUrl,
-        },
-      },
-    }
-  },
-
-  outputs: {
-    updatedRange: { type: 'string', description: 'Range of cells that were updated' },
-    updatedRows: { type: 'number', description: 'Number of rows updated' },
-    updatedColumns: { type: 'number', description: 'Number of columns updated' },
-    updatedCells: { type: 'number', description: 'Number of cells updated' },
-    metadata: {
-      type: 'json',
-      description: 'Spreadsheet metadata including ID and URL',
-      properties: {
-        spreadsheetId: { type: 'string', description: 'Google Sheets spreadsheet ID' },
-        spreadsheetUrl: { type: 'string', description: 'Spreadsheet URL' },
-      },
-    },
-  },
-}
diff --git a/apps/sim/tools/google_slides/add_image.ts b/apps/sim/tools/google_slides/add_image.ts
index 9056667fc6..5a72a711b6 100644
--- a/apps/sim/tools/google_slides/add_image.ts
+++ b/apps/sim/tools/google_slides/add_image.ts
@@ -51,36 +51,43 @@ export const addImageTool: ToolConfig<AddImageParams, AddImageResponse> = {
     presentationId: {
       type: 'string',
       required: true,
+      visibility: 'user-only',
       description: 'The ID of the presentation',
     },
     pageObjectId: {
       type: 'string',
       required: true,
+      visibility: 'user-or-llm',
       description: 'The object ID of the slide/page to add the image to',
     },
     imageUrl: {
       type: 'string',
       required: true,
+      visibility: 'user-or-llm',
       description: 'The publicly accessible URL of the image (must be PNG, JPEG, or GIF, max 50MB)',
     },
     width: {
       type: 'number',
       required: false,
+      visibility: 'user-or-llm',
       description: 'Width of the image in points (default: 300)',
     },
     height: {
       type: 'number',
       required: false,
+      visibility: 'user-or-llm',
       description: 'Height of the image in points (default: 200)',
     },
     positionX: {
       type: 'number',
       required: false,
+      visibility: 'user-or-llm',
       description: 'X position from the left edge in points (default: 100)',
     },
     positionY: {
       type: 'number',
       required: false,
+      visibility: 'user-or-llm',
       description: 'Y position from the top edge in points (default: 100)',
     },
   },
@@ -193,6 +200,24 @@ export const addImageTool: ToolConfig<AddImageParams, AddImageResponse> = {
     metadata: {
       type: 'json',
       description: 'Operation metadata including presentation ID and image URL',
+      properties: {
+        presentationId: {
+          type: 'string',
+          description: 'The presentation ID',
+        },
+        pageObjectId: {
+          type: 'string',
+          description: 'The page object ID where the image was inserted',
+        },
+        imageUrl: {
+          type: 'string',
+          description: 'The source image URL',
+        },
+        url: {
+          type: 'string',
+          description: 'URL to open the presentation',
+        },
+      },
     },
   },
 }
diff --git a/apps/sim/tools/google_slides/add_slide.ts b/apps/sim/tools/google_slides/add_slide.ts
index eb86707466..7b0b8b852c 100644
--- a/apps/sim/tools/google_slides/add_slide.ts
+++ b/apps/sim/tools/google_slides/add_slide.ts
@@ -60,23 +60,27 @@ export const addSlideTool: ToolConfig<AddSlideParams, AddSlideResponse> = {
     presentationId: {
       type: 'string',
       required: true,
+      visibility: 'user-only',
       description: 'The ID of the presentation',
     },
     layout: {
       type: 'string',
       required: false,
+      visibility: 'user-or-llm',
       description:
         'The predefined layout for the slide (BLANK, TITLE, TITLE_AND_BODY, TITLE_ONLY, SECTION_HEADER, etc.). Defaults to BLANK.',
     },
     insertionIndex: {
       type: 'number',
       required: false,
+      visibility: 'user-or-llm',
       description:
         'The optional zero-based index indicating where to insert the slide. If not specified, the slide is added at the end.',
     },
     placeholderIdMappings: {
       type: 'string',
       required: false,
+      visibility: 'user-or-llm',
       description:
         'JSON array of placeholder mappings to assign custom object IDs to placeholders. Format: [{"layoutPlaceholder":{"type":"TITLE"},"objectId":"custom_title_id"}]',
     },
@@ -182,6 +186,25 @@ export const addSlideTool: ToolConfig<AddSlideParams, AddSlideResponse> = {
     metadata: {
       type: 'json',
       description: 'Operation metadata including presentation ID, layout, and URL',
+      properties: {
+        presentationId: {
+          type: 'string',
+          description: 'The presentation ID',
+        },
+        layout: {
+          type: 'string',
+          description: 'The layout used for the new slide',
+        },
+        insertionIndex: {
+          type: 'number',
+          description: 'The zero-based index where the slide was inserted',
+          optional: true,
+        },
+        url: {
+          type: 'string',
+          description: 'URL to open the presentation',
+        },
+      },
     },
   },
 }
diff --git a/apps/sim/tools/google_slides/create.ts b/apps/sim/tools/google_slides/create.ts
index ff44c5393a..f64b083296 100644
--- a/apps/sim/tools/google_slides/create.ts
+++ b/apps/sim/tools/google_slides/create.ts
@@ -153,6 +153,24 @@ export const createTool: ToolConfig<GoogleSlidesToolParams, GoogleSlidesCreateRe
     metadata: {
       type: 'json',
       description: 'Created presentation metadata including ID, title, and URL',
+      properties: {
+        presentationId: {
+          type: 'string',
+          description: 'The presentation ID',
+        },
+        title: {
+          type: 'string',
+          description: 'The presentation title',
+        },
+        mimeType: {
+          type: 'string',
+          description: 'The mime type of the presentation',
+        },
+        url: {
+          type: 'string',
+          description: 'URL to open the presentation',
+        },
+      },
     },
   },
 }
diff --git a/apps/sim/tools/google_slides/create_shape.ts b/apps/sim/tools/google_slides/create_shape.ts
new file mode 100644
index 0000000000..f9575a9358
--- /dev/null
+++ b/apps/sim/tools/google_slides/create_shape.ts
@@ -0,0 +1,366 @@
+import { createLogger } from '@sim/logger'
+import type { ToolConfig } from '@/tools/types'
+
+const logger = createLogger('GoogleSlidesCreateShapeTool')
+
+interface CreateShapeParams {
+  accessToken: string
+  presentationId: string
+  pageObjectId: string
+  shapeType: string
+  width?: number
+  height?: number
+  positionX?: number
+  positionY?: number
+}
+
+interface CreateShapeResponse {
+  success: boolean
+  output: {
+    shapeId: string
+    shapeType: string
+    metadata: {
+      presentationId: string
+      pageObjectId: string
+      url: string
+    }
+  }
+}
+
+// EMU (English Metric Units) conversion: 1 pt = 12700 EMU
+const PT_TO_EMU = 12700
+
+// Common shape types available in Google Slides API
+const SHAPE_TYPES = [
+  'TEXT_BOX',
+  'RECTANGLE',
+  'ROUND_RECTANGLE',
+  'ELLIPSE',
+  'ARC',
+  'BENT_ARROW',
+  'BENT_UP_ARROW',
+  'BEVEL',
+  'BLOCK_ARC',
+  'BRACE_PAIR',
+  'BRACKET_PAIR',
+  'CAN',
+  'CHEVRON',
+  'CHORD',
+  'CLOUD',
+  'CORNER',
+  'CUBE',
+  'CURVED_DOWN_ARROW',
+  'CURVED_LEFT_ARROW',
+  'CURVED_RIGHT_ARROW',
+  'CURVED_UP_ARROW',
+  'DECAGON',
+  'DIAGONAL_STRIPE',
+  'DIAMOND',
+  'DODECAGON',
+  'DONUT',
+  'DOUBLE_WAVE',
+  'DOWN_ARROW',
+  'DOWN_ARROW_CALLOUT',
+  'FOLDED_CORNER',
+  'FRAME',
+  'HALF_FRAME',
+  'HEART',
+  'HEPTAGON',
+  'HEXAGON',
+  'HOME_PLATE',
+  'HORIZONTAL_SCROLL',
+  'IRREGULAR_SEAL_1',
+  'IRREGULAR_SEAL_2',
+  'LEFT_ARROW',
+  'LEFT_ARROW_CALLOUT',
+  'LEFT_BRACE',
+  'LEFT_BRACKET',
+  'LEFT_RIGHT_ARROW',
+  'LEFT_RIGHT_ARROW_CALLOUT',
+  'LEFT_RIGHT_UP_ARROW',
+  'LEFT_UP_ARROW',
+  'LIGHTNING_BOLT',
+  'MATH_DIVIDE',
+  'MATH_EQUAL',
+  'MATH_MINUS',
+  'MATH_MULTIPLY',
+  'MATH_NOT_EQUAL',
+  'MATH_PLUS',
+  'MOON',
+  'NO_SMOKING',
+  'NOTCHED_RIGHT_ARROW',
+  'OCTAGON',
+  'PARALLELOGRAM',
+  'PENTAGON',
+  'PIE',
+  'PLAQUE',
+  'PLUS',
+  'QUAD_ARROW',
+  'QUAD_ARROW_CALLOUT',
+  'RIBBON',
+  'RIBBON_2',
+  'RIGHT_ARROW',
+  'RIGHT_ARROW_CALLOUT',
+  'RIGHT_BRACE',
+  'RIGHT_BRACKET',
+  'ROUND_1_RECTANGLE',
+  'ROUND_2_DIAGONAL_RECTANGLE',
+  'ROUND_2_SAME_RECTANGLE',
+  'RIGHT_TRIANGLE',
+  'SMILEY_FACE',
+  'SNIP_1_RECTANGLE',
+  'SNIP_2_DIAGONAL_RECTANGLE',
+  'SNIP_2_SAME_RECTANGLE',
+  'SNIP_ROUND_RECTANGLE',
+  'STAR_10',
+  'STAR_12',
+  'STAR_16',
+  'STAR_24',
+  'STAR_32',
+  'STAR_4',
+  'STAR_5',
+  'STAR_6',
+  'STAR_7',
+  'STAR_8',
+  'STRIPED_RIGHT_ARROW',
+  'SUN',
+  'TRAPEZOID',
+  'TRIANGLE',
+  'UP_ARROW',
+  'UP_ARROW_CALLOUT',
+  'UP_DOWN_ARROW',
+  'UTURN_ARROW',
+  'VERTICAL_SCROLL',
+  'WAVE',
+  'WEDGE_ELLIPSE_CALLOUT',
+  'WEDGE_RECTANGLE_CALLOUT',
+  'WEDGE_ROUND_RECTANGLE_CALLOUT',
+  'FLOW_CHART_ALTERNATE_PROCESS',
+  'FLOW_CHART_COLLATE',
+  'FLOW_CHART_CONNECTOR',
+  'FLOW_CHART_DECISION',
+  'FLOW_CHART_DELAY',
+  'FLOW_CHART_DISPLAY',
+  'FLOW_CHART_DOCUMENT',
+  'FLOW_CHART_EXTRACT',
+  'FLOW_CHART_INPUT_OUTPUT',
+  'FLOW_CHART_INTERNAL_STORAGE',
+  'FLOW_CHART_MAGNETIC_DISK',
+  'FLOW_CHART_MAGNETIC_DRUM',
+  'FLOW_CHART_MAGNETIC_TAPE',
+  'FLOW_CHART_MANUAL_INPUT',
+  'FLOW_CHART_MANUAL_OPERATION',
+  'FLOW_CHART_MERGE',
+  'FLOW_CHART_MULTIDOCUMENT',
+  'FLOW_CHART_OFFLINE_STORAGE',
+  'FLOW_CHART_OFFPAGE_CONNECTOR',
+  'FLOW_CHART_ONLINE_STORAGE',
+  'FLOW_CHART_OR',
+  'FLOW_CHART_PREDEFINED_PROCESS',
+  'FLOW_CHART_PREPARATION',
+  'FLOW_CHART_PROCESS',
+  'FLOW_CHART_PUNCHED_CARD',
+  'FLOW_CHART_PUNCHED_TAPE',
+  'FLOW_CHART_SORT',
+  'FLOW_CHART_SUMMING_JUNCTION',
+  'FLOW_CHART_TERMINATOR',
+  'ARROW_EAST',
+  'ARROW_NORTH_EAST',
+  'ARROW_NORTH',
+  'SPEECH',
+  'STARBURST',
+  'TEARDROP',
+  'ELLIPSE_RIBBON',
+  'ELLIPSE_RIBBON_2',
+  'CLOUD_CALLOUT',
+  'CUSTOM',
+] as const
+
+export const createShapeTool: ToolConfig<CreateShapeParams, CreateShapeResponse> = {
+  id: 'google_slides_create_shape',
+  name: 'Create Shape in Google Slides',
+  description:
+    'Create a shape (rectangle, ellipse, text box, arrow, etc.) on a slide in a Google Slides presentation',
+  version: '1.0.0',
+
+  oauth: {
+    required: true,
+    provider: 'google-drive',
+  },
+
+  params: {
+    accessToken: {
+      type: 'string',
+      required: true,
+      visibility: 'hidden',
+      description: 'The access token for the Google Slides API',
+    },
+    presentationId: {
+      type: 'string',
+      required: true,
+      visibility: 'user-only',
+      description: 'The ID of the presentation',
+    },
+    pageObjectId: {
+      type: 'string',
+      required: true,
+      visibility: 'user-or-llm',
+      description: 'The object ID of the slide/page to add the shape to',
+    },
+    shapeType: {
+      type: 'string',
+      required: true,
+      visibility: 'user-or-llm',
+      description:
+        'The type of shape to create. Common types: TEXT_BOX, RECTANGLE, ROUND_RECTANGLE, ELLIPSE, TRIANGLE, DIAMOND, STAR_5, ARROW_EAST, HEART, CLOUD',
+    },
+    width: {
+      type: 'number',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Width of the shape in points (default: 200)',
+    },
+    height: {
+      type: 'number',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Height of the shape in points (default: 100)',
+    },
+    positionX: {
+      type: 'number',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'X position from the left edge in points (default: 100)',
+    },
+    positionY: {
+      type: 'number',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Y position from the top edge in points (default: 100)',
+    },
+  },
+
+  request: {
+    url: (params) => {
+      const presentationId = params.presentationId?.trim()
+      if (!presentationId) {
+        throw new Error('Presentation ID is required')
+      }
+      return `https://slides.googleapis.com/v1/presentations/${presentationId}:batchUpdate`
+    },
+    method: 'POST',
+    headers: (params) => {
+      if (!params.accessToken) {
+        throw new Error('Access token is required')
+      }
+      return {
+        Authorization: `Bearer ${params.accessToken}`,
+        'Content-Type': 'application/json',
+      }
+    },
+    body: (params) => {
+      const pageObjectId = params.pageObjectId?.trim()
+      if (!pageObjectId) {
+        throw new Error('Page Object ID is required')
+      }
+
+      let shapeType = (params.shapeType || 'RECTANGLE').toUpperCase()
+      if (!SHAPE_TYPES.includes(shapeType as (typeof SHAPE_TYPES)[number])) {
+        logger.warn(`Invalid shape type "${params.shapeType}", defaulting to RECTANGLE`)
+        shapeType = 'RECTANGLE'
+      }
+
+      // Generate a unique object ID for the new shape
+      const shapeObjectId = `shape_${Date.now()}_${Math.random().toString(36).substring(2, 9)}`
+
+      // Convert points to EMU
+      const widthEmu = (params.width || 200) * PT_TO_EMU
+      const heightEmu = (params.height || 100) * PT_TO_EMU
+      const translateX = (params.positionX || 100) * PT_TO_EMU
+      const translateY = (params.positionY || 100) * PT_TO_EMU
+
+      return {
+        requests: [
+          {
+            createShape: {
+              objectId: shapeObjectId,
+              shapeType,
+              elementProperties: {
+                pageObjectId,
+                size: {
+                  width: {
+                    magnitude: widthEmu,
+                    unit: 'EMU',
+                  },
+                  height: {
+                    magnitude: heightEmu,
+                    unit: 'EMU',
+                  },
+                },
+                transform: {
+                  scaleX: 1,
+                  scaleY: 1,
+                  translateX,
+                  translateY,
+                  unit: 'EMU',
+                },
+              },
+            },
+          },
+        ],
+      }
+    },
+  },
+
+  transformResponse: async (response: Response, params) => {
+    const data = await response.json()
+
+    if (!response.ok) {
+      logger.error('Google Slides API error:', { data })
+      throw new Error(data.error?.message || 'Failed to create shape')
+    }
+
+    const createShapeReply = data.replies?.[0]?.createShape
+    const shapeId = createShapeReply?.objectId || ''
+
+    const presentationId = params?.presentationId?.trim() || ''
+    const pageObjectId = params?.pageObjectId?.trim() || ''
+    const shapeType = (params?.shapeType || 'RECTANGLE').toUpperCase()
+
+    return {
+      success: true,
+      output: {
+        shapeId,
+        shapeType,
+        metadata: {
+          presentationId,
+          pageObjectId,
+          url: `https://docs.google.com/presentation/d/${presentationId}/edit`,
+        },
+      },
+    }
+  },
+
+  outputs: {
+    shapeId: {
+      type: 'string',
+      description: 'The object ID of the newly created shape',
+    },
+    shapeType: {
+      type: 'string',
+      description: 'The type of shape that was created',
+    },
+    metadata: {
+      type: 'object',
+      description: 'Operation metadata including presentation ID and page object ID',
+      properties: {
+        presentationId: { type: 'string', description: 'The presentation ID' },
+        pageObjectId: {
+          type: 'string',
+          description: 'The page object ID where the shape was created',
+        },
+        url: { type: 'string', description: 'URL to the presentation' },
+      },
+    },
+  },
+}
diff --git a/apps/sim/tools/google_slides/create_table.ts b/apps/sim/tools/google_slides/create_table.ts
new file mode 100644
index 0000000000..bb059b6fcd
--- /dev/null
+++ b/apps/sim/tools/google_slides/create_table.ts
@@ -0,0 +1,235 @@
+import { createLogger } from '@sim/logger'
+import type { ToolConfig } from '@/tools/types'
+
+const logger = createLogger('GoogleSlidesCreateTableTool')
+
+interface CreateTableParams {
+  accessToken: string
+  presentationId: string
+  pageObjectId: string
+  rows: number
+  columns: number
+  width?: number
+  height?: number
+  positionX?: number
+  positionY?: number
+}
+
+interface CreateTableResponse {
+  success: boolean
+  output: {
+    tableId: string
+    rows: number
+    columns: number
+    metadata: {
+      presentationId: string
+      pageObjectId: string
+      url: string
+    }
+  }
+}
+
+// EMU (English Metric Units) conversion: 1 pt = 12700 EMU
+const PT_TO_EMU = 12700
+
+export const createTableTool: ToolConfig<CreateTableParams, CreateTableResponse> = {
+  id: 'google_slides_create_table',
+  name: 'Create Table in Google Slides',
+  description: 'Create a new table on a slide in a Google Slides presentation',
+  version: '1.0.0',
+
+  oauth: {
+    required: true,
+    provider: 'google-drive',
+  },
+
+  params: {
+    accessToken: {
+      type: 'string',
+      required: true,
+      visibility: 'hidden',
+      description: 'The access token for the Google Slides API',
+    },
+    presentationId: {
+      type: 'string',
+      required: true,
+      visibility: 'user-only',
+      description: 'The ID of the presentation',
+    },
+    pageObjectId: {
+      type: 'string',
+      required: true,
+      visibility: 'user-or-llm',
+      description: 'The object ID of the slide/page to add the table to',
+    },
+    rows: {
+      type: 'number',
+      required: true,
+      visibility: 'user-or-llm',
+      description: 'Number of rows in the table (minimum 1)',
+    },
+    columns: {
+      type: 'number',
+      required: true,
+      visibility: 'user-or-llm',
+      description: 'Number of columns in the table (minimum 1)',
+    },
+    width: {
+      type: 'number',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Width of the table in points (default: 400)',
+    },
+    height: {
+      type: 'number',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Height of the table in points (default: 200)',
+    },
+    positionX: {
+      type: 'number',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'X position from the left edge in points (default: 100)',
+    },
+    positionY: {
+      type: 'number',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Y position from the top edge in points (default: 100)',
+    },
+  },
+
+  request: {
+    url: (params) => {
+      const presentationId = params.presentationId?.trim()
+      if (!presentationId) {
+        throw new Error('Presentation ID is required')
+      }
+      return `https://slides.googleapis.com/v1/presentations/${presentationId}:batchUpdate`
+    },
+    method: 'POST',
+    headers: (params) => {
+      if (!params.accessToken) {
+        throw new Error('Access token is required')
+      }
+      return {
+        Authorization: `Bearer ${params.accessToken}`,
+        'Content-Type': 'application/json',
+      }
+    },
+    body: (params) => {
+      const pageObjectId = params.pageObjectId?.trim()
+      if (!pageObjectId) {
+        throw new Error('Page Object ID is required')
+      }
+
+      const rows = params.rows
+      const columns = params.columns
+
+      if (!rows || rows < 1) {
+        throw new Error('Rows must be at least 1')
+      }
+      if (!columns || columns < 1) {
+        throw new Error('Columns must be at least 1')
+      }
+
+      // Generate a unique object ID for the new table
+      const tableObjectId = `table_${Date.now()}_${Math.random().toString(36).substring(2, 9)}`
+
+      // Convert points to EMU
+      const widthEmu = (params.width || 400) * PT_TO_EMU
+      const heightEmu = (params.height || 200) * PT_TO_EMU
+      const translateX = (params.positionX || 100) * PT_TO_EMU
+      const translateY = (params.positionY || 100) * PT_TO_EMU
+
+      return {
+        requests: [
+          {
+            createTable: {
+              objectId: tableObjectId,
+              rows,
+              columns,
+              elementProperties: {
+                pageObjectId,
+                size: {
+                  width: {
+                    magnitude: widthEmu,
+                    unit: 'EMU',
+                  },
+                  height: {
+                    magnitude: heightEmu,
+                    unit: 'EMU',
+                  },
+                },
+                transform: {
+                  scaleX: 1,
+                  scaleY: 1,
+                  translateX,
+                  translateY,
+                  unit: 'EMU',
+                },
+              },
+            },
+          },
+        ],
+      }
+    },
+  },
+
+  transformResponse: async (response: Response, params) => {
+    const data = await response.json()
+
+    if (!response.ok) {
+      logger.error('Google Slides API error:', { data })
+      throw new Error(data.error?.message || 'Failed to create table')
+    }
+
+    const createTableReply = data.replies?.[0]?.createTable
+    const tableId = createTableReply?.objectId || ''
+
+    const presentationId = params?.presentationId?.trim() || ''
+    const pageObjectId = params?.pageObjectId?.trim() || ''
+
+    return {
+      success: true,
+      output: {
+        tableId,
+        rows: params?.rows ?? 0,
+        columns: params?.columns ?? 0,
+        metadata: {
+          presentationId,
+          pageObjectId,
+          url: `https://docs.google.com/presentation/d/${presentationId}/edit`,
+        },
+      },
+    }
+  },
+
+  outputs: {
+    tableId: {
+      type: 'string',
+      description: 'The object ID of the newly created table',
+    },
+    rows: {
+      type: 'number',
+      description: 'Number of rows in the table',
+    },
+    columns: {
+      type: 'number',
+      description: 'Number of columns in the table',
+    },
+    metadata: {
+      type: 'object',
+      description: 'Operation metadata including presentation ID and page object ID',
+      properties: {
+        presentationId: { type: 'string', description: 'The presentation ID' },
+        pageObjectId: {
+          type: 'string',
+          description: 'The page object ID where the table was created',
+        },
+        url: { type: 'string', description: 'URL to the presentation' },
+      },
+    },
+  },
+}
diff --git a/apps/sim/tools/google_slides/delete_object.ts b/apps/sim/tools/google_slides/delete_object.ts
new file mode 100644
index 0000000000..218d7e99bf
--- /dev/null
+++ b/apps/sim/tools/google_slides/delete_object.ts
@@ -0,0 +1,135 @@
+import { createLogger } from '@sim/logger'
+import type { ToolConfig } from '@/tools/types'
+
+const logger = createLogger('GoogleSlidesDeleteObjectTool')
+
+interface DeleteObjectParams {
+  accessToken: string
+  presentationId: string
+  objectId: string
+}
+
+interface DeleteObjectResponse {
+  success: boolean
+  output: {
+    deleted: boolean
+    objectId: string
+    metadata: {
+      presentationId: string
+      url: string
+    }
+  }
+}
+
+export const deleteObjectTool: ToolConfig<DeleteObjectParams, DeleteObjectResponse> = {
+  id: 'google_slides_delete_object',
+  name: 'Delete Object from Google Slides',
+  description:
+    'Delete a page element (shape, image, table, etc.) or an entire slide from a Google Slides presentation',
+  version: '1.0.0',
+
+  oauth: {
+    required: true,
+    provider: 'google-drive',
+  },
+
+  params: {
+    accessToken: {
+      type: 'string',
+      required: true,
+      visibility: 'hidden',
+      description: 'The access token for the Google Slides API',
+    },
+    presentationId: {
+      type: 'string',
+      required: true,
+      visibility: 'user-only',
+      description: 'The ID of the presentation',
+    },
+    objectId: {
+      type: 'string',
+      required: true,
+      visibility: 'user-or-llm',
+      description: 'The object ID of the element or slide to delete',
+    },
+  },
+
+  request: {
+    url: (params) => {
+      const presentationId = params.presentationId?.trim()
+      if (!presentationId) {
+        throw new Error('Presentation ID is required')
+      }
+      return `https://slides.googleapis.com/v1/presentations/${presentationId}:batchUpdate`
+    },
+    method: 'POST',
+    headers: (params) => {
+      if (!params.accessToken) {
+        throw new Error('Access token is required')
+      }
+      return {
+        Authorization: `Bearer ${params.accessToken}`,
+        'Content-Type': 'application/json',
+      }
+    },
+    body: (params) => {
+      const objectId = params.objectId?.trim()
+      if (!objectId) {
+        throw new Error('Object ID is required')
+      }
+
+      return {
+        requests: [
+          {
+            deleteObject: {
+              objectId,
+            },
+          },
+        ],
+      }
+    },
+  },
+
+  transformResponse: async (response: Response, params) => {
+    const data = await response.json()
+
+    if (!response.ok) {
+      logger.error('Google Slides API error:', { data })
+      throw new Error(data.error?.message || 'Failed to delete object')
+    }
+
+    const presentationId = params?.presentationId?.trim() || ''
+    const objectId = params?.objectId?.trim() || ''
+
+    return {
+      success: true,
+      output: {
+        deleted: true,
+        objectId,
+        metadata: {
+          presentationId,
+          url: `https://docs.google.com/presentation/d/${presentationId}/edit`,
+        },
+      },
+    }
+  },
+
+  outputs: {
+    deleted: {
+      type: 'boolean',
+      description: 'Whether the object was successfully deleted',
+    },
+    objectId: {
+      type: 'string',
+      description: 'The object ID that was deleted',
+    },
+    metadata: {
+      type: 'object',
+      description: 'Operation metadata including presentation ID and URL',
+      properties: {
+        presentationId: { type: 'string', description: 'The presentation ID' },
+        url: { type: 'string', description: 'URL to the presentation' },
+      },
+    },
+  },
+}
diff --git a/apps/sim/tools/google_slides/duplicate_object.ts b/apps/sim/tools/google_slides/duplicate_object.ts
new file mode 100644
index 0000000000..ad01e22493
--- /dev/null
+++ b/apps/sim/tools/google_slides/duplicate_object.ts
@@ -0,0 +1,160 @@
+import { createLogger } from '@sim/logger'
+import type { ToolConfig } from '@/tools/types'
+
+const logger = createLogger('GoogleSlidesDuplicateObjectTool')
+
+interface DuplicateObjectParams {
+  accessToken: string
+  presentationId: string
+  objectId: string
+  objectIds?: string
+}
+
+interface DuplicateObjectResponse {
+  success: boolean
+  output: {
+    duplicatedObjectId: string
+    metadata: {
+      presentationId: string
+      sourceObjectId: string
+      url: string
+    }
+  }
+}
+
+export const duplicateObjectTool: ToolConfig<DuplicateObjectParams, DuplicateObjectResponse> = {
+  id: 'google_slides_duplicate_object',
+  name: 'Duplicate Object in Google Slides',
+  description:
+    'Duplicate an object (slide, shape, image, table, etc.) in a Google Slides presentation',
+  version: '1.0.0',
+
+  oauth: {
+    required: true,
+    provider: 'google-drive',
+  },
+
+  params: {
+    accessToken: {
+      type: 'string',
+      required: true,
+      visibility: 'hidden',
+      description: 'The access token for the Google Slides API',
+    },
+    presentationId: {
+      type: 'string',
+      required: true,
+      visibility: 'user-only',
+      description: 'The ID of the presentation',
+    },
+    objectId: {
+      type: 'string',
+      required: true,
+      visibility: 'user-or-llm',
+      description: 'The object ID of the element or slide to duplicate',
+    },
+    objectIds: {
+      type: 'string',
+      required: false,
+      visibility: 'user-or-llm',
+      description:
+        'Optional JSON object mapping source object IDs (within the slide being duplicated) to new object IDs for the duplicates. Format: {"sourceId1":"newId1","sourceId2":"newId2"}',
+    },
+  },
+
+  request: {
+    url: (params) => {
+      const presentationId = params.presentationId?.trim()
+      if (!presentationId) {
+        throw new Error('Presentation ID is required')
+      }
+      return `https://slides.googleapis.com/v1/presentations/${presentationId}:batchUpdate`
+    },
+    method: 'POST',
+    headers: (params) => {
+      if (!params.accessToken) {
+        throw new Error('Access token is required')
+      }
+      return {
+        Authorization: `Bearer ${params.accessToken}`,
+        'Content-Type': 'application/json',
+      }
+    },
+    body: (params) => {
+      const objectId = params.objectId?.trim()
+      if (!objectId) {
+        throw new Error('Object ID is required')
+      }
+
+      const duplicateRequest: Record<string, any> = {
+        objectId,
+      }
+
+      // Parse objectIds mapping if provided
+      if (params.objectIds?.trim()) {
+        try {
+          const mapping = JSON.parse(params.objectIds)
+          if (typeof mapping === 'object' && !Array.isArray(mapping)) {
+            duplicateRequest.objectIds = mapping
+          }
+        } catch (e) {
+          logger.warn('Invalid objectIds JSON, ignoring:', e)
+        }
+      }
+
+      return {
+        requests: [
+          {
+            duplicateObject: duplicateRequest,
+          },
+        ],
+      }
+    },
+  },
+
+  transformResponse: async (response: Response, params) => {
+    const data = await response.json()
+
+    if (!response.ok) {
+      logger.error('Google Slides API error:', { data })
+      throw new Error(data.error?.message || 'Failed to duplicate object')
+    }
+
+    const duplicateReply = data.replies?.[0]?.duplicateObject
+    const duplicatedObjectId = duplicateReply?.objectId ?? ''
+
+    const presentationId = params?.presentationId?.trim() || ''
+    const objectId = params?.objectId?.trim() || ''
+
+    return {
+      success: true,
+      output: {
+        duplicatedObjectId,
+        metadata: {
+          presentationId,
+          sourceObjectId: objectId,
+          url: `https://docs.google.com/presentation/d/${presentationId}/edit`,
+        },
+      },
+    }
+  },
+
+  outputs: {
+    duplicatedObjectId: {
+      type: 'string',
+      description: 'The object ID of the newly created duplicate',
+    },
+    metadata: {
+      type: 'object',
+      description: 'Operation metadata including presentation ID and source object ID',
+      properties: {
+        presentationId: { type: 'string', description: 'The presentation ID' },
+        sourceObjectId: {
+          type: 'string',
+          description: 'The original object ID that was duplicated',
+        },
+        url: { type: 'string', description: 'URL to the presentation' },
+      },
+    },
+  },
+}
diff --git a/apps/sim/tools/google_slides/get_page.ts b/apps/sim/tools/google_slides/get_page.ts
new file mode 100644
index 0000000000..e3a989544a
--- /dev/null
+++ b/apps/sim/tools/google_slides/get_page.ts
@@ -0,0 +1,164 @@
+import { createLogger } from '@sim/logger'
+import type { ToolConfig } from '@/tools/types'
+
+const logger = createLogger('GoogleSlidesGetPageTool')
+
+interface GetPageParams {
+  accessToken: string
+  presentationId: string
+  pageObjectId: string
+}
+
+interface GetPageResponse {
+  success: boolean
+  output: {
+    objectId: string
+    pageType: string
+    pageElements: any[]
+    slideProperties: {
+      layoutObjectId: string | null
+      masterObjectId: string | null
+      notesPage: any | null
+    } | null
+    metadata: {
+      presentationId: string
+      url: string
+    }
+  }
+}
+
+export const getPageTool: ToolConfig<GetPageParams, GetPageResponse> = {
+  id: 'google_slides_get_page',
+  name: 'Get Slide Page',
+  description:
+    'Get detailed information about a specific slide/page in a Google Slides presentation',
+  version: '1.0.0',
+
+  oauth: {
+    required: true,
+    provider: 'google-drive',
+  },
+
+  params: {
+    accessToken: {
+      type: 'string',
+      required: true,
+      visibility: 'hidden',
+      description: 'The access token for the Google Slides API',
+    },
+    presentationId: {
+      type: 'string',
+      required: true,
+      visibility: 'user-only',
+      description: 'The ID of the presentation',
+    },
+    pageObjectId: {
+      type: 'string',
+      required: true,
+      visibility: 'user-or-llm',
+      description: 'The object ID of the slide/page to retrieve',
+    },
+  },
+
+  request: {
+    url: (params) => {
+      const presentationId = params.presentationId?.trim()
+      const pageObjectId = params.pageObjectId?.trim()
+
+      if (!presentationId) {
+        throw new Error('Presentation ID is required')
+      }
+      if (!pageObjectId) {
+        throw new Error('Page Object ID is required')
+      }
+
+      return `https://slides.googleapis.com/v1/presentations/${presentationId}/pages/${pageObjectId}`
+    },
+    method: 'GET',
+    headers: (params) => {
+      if (!params.accessToken) {
+        throw new Error('Access token is required')
+      }
+      return {
+        Authorization: `Bearer ${params.accessToken}`,
+      }
+    },
+  },
+
+  transformResponse: async (response: Response, params) => {
+    const data = await response.json()
+
+    if (!response.ok) {
+      logger.error('Google Slides API error:', { data })
+      throw new Error(data.error?.message || 'Failed to get page')
+    }
+
+    const presentationId = params?.presentationId?.trim() || ''
+
+    return {
+      success: true,
+      output: {
+        objectId: data.objectId,
+        pageType: data.pageType ?? 'SLIDE',
+        pageElements: data.pageElements ?? [],
+        slideProperties: data.slideProperties
+          ? {
+              layoutObjectId: data.slideProperties.layoutObjectId ?? null,
+              masterObjectId: data.slideProperties.masterObjectId ?? null,
+              notesPage: data.slideProperties.notesPage ?? null,
+            }
+          : null,
+        metadata: {
+          presentationId,
+          url: `https://docs.google.com/presentation/d/${presentationId}/edit`,
+        },
+      },
+    }
+  },
+
+  outputs: {
+    objectId: {
+      type: 'string',
+      description: 'The object ID of the page',
+    },
+    pageType: {
+      type: 'string',
+      description: 'The type of page (SLIDE, MASTER, LAYOUT, NOTES, NOTES_MASTER)',
+    },
+    pageElements: {
+      type: 'array',
+      description: 'Array of page elements (shapes, images, tables, etc.) on this page',
+      items: {
+        type: 'json',
+      },
+    },
+    slideProperties: {
+      type: 'object',
+      description: 'Properties specific to slides (layout, master, notes)',
+      optional: true,
+      properties: {
+        layoutObjectId: {
+          type: 'string',
+          description: 'Object ID of the layout this slide is based on',
+        },
+        masterObjectId: {
+          type: 'string',
+          description: 'Object ID of the master this slide is based on',
+        },
+        notesPage: {
+          type: 'json',
+          description: 'The notes page associated with the slide',
+          optional: true,
+        },
+      },
+    },
+    metadata: {
+      type: 'object',
+      description: 'Operation metadata including presentation ID and URL',
+      properties: {
+        presentationId: { type: 'string', description: 'The presentation ID' },
+        url: { type: 'string', description: 'URL to the presentation' },
+      },
+    },
+  },
+}
diff --git a/apps/sim/tools/google_slides/get_thumbnail.ts b/apps/sim/tools/google_slides/get_thumbnail.ts
index 4af7443caf..c1c5f7e4f3 100644
--- a/apps/sim/tools/google_slides/get_thumbnail.ts
+++ b/apps/sim/tools/google_slides/get_thumbnail.ts
@@ -53,22 +53,26 @@ export const getThumbnailTool: ToolConfig<GetThumbnailParams, GetThumbnailRespon
     presentationId: {
       type: 'string',
       required: true,
+      visibility: 'user-only',
       description: 'The ID of the presentation',
     },
     pageObjectId: {
       type: 'string',
       required: true,
+      visibility: 'user-or-llm',
       description: 'The object ID of the slide/page to get a thumbnail for',
     },
     thumbnailSize: {
       type: 'string',
       required: false,
+      visibility: 'user-or-llm',
       description:
         'The size of the thumbnail: SMALL (200px), MEDIUM (800px), or LARGE (1600px). Defaults to MEDIUM.',
     },
     mimeType: {
       type: 'string',
       required: false,
+      visibility: 'user-or-llm',
       description: 'The MIME type of the thumbnail image: PNG or GIF. Defaults to PNG.',
     },
   },
@@ -163,6 +167,24 @@ export const getThumbnailTool: ToolConfig<GetThumbnailParams, GetThumbnailRespon
     metadata: {
       type: 'json',
       description: 'Operation metadata including presentation ID and page object ID',
+      properties: {
+        presentationId: {
+          type: 'string',
+          description: 'The presentation ID',
+        },
+        pageObjectId: {
+          type: 'string',
+          description: 'The page object ID for the thumbnail',
+        },
+        thumbnailSize: {
+          type: 'string',
+          description: 'The requested thumbnail size',
+        },
+        mimeType: {
+          type: 'string',
+          description: 'The thumbnail MIME type',
+        },
+      },
     },
   },
 }
diff --git a/apps/sim/tools/google_slides/index.ts b/apps/sim/tools/google_slides/index.ts
index a9808be20c..5245d87f91 100644
--- a/apps/sim/tools/google_slides/index.ts
+++ b/apps/sim/tools/google_slides/index.ts
@@ -1,9 +1,16 @@
 import { addImageTool } from '@/tools/google_slides/add_image'
 import { addSlideTool } from '@/tools/google_slides/add_slide'
 import { createTool } from '@/tools/google_slides/create'
+import { createShapeTool } from '@/tools/google_slides/create_shape'
+import { createTableTool } from '@/tools/google_slides/create_table'
+import { deleteObjectTool } from '@/tools/google_slides/delete_object'
+import { duplicateObjectTool } from '@/tools/google_slides/duplicate_object'
+import { getPageTool } from '@/tools/google_slides/get_page'
 import { getThumbnailTool } from '@/tools/google_slides/get_thumbnail'
+import { insertTextTool } from '@/tools/google_slides/insert_text'
 import { readTool } from '@/tools/google_slides/read'
 import { replaceAllTextTool } from '@/tools/google_slides/replace_all_text'
+import { updateSlidesPositionTool } from '@/tools/google_slides/update_slides_position'
 import { writeTool } from '@/tools/google_slides/write'
 
 export const googleSlidesReadTool = readTool
@@ -13,3 +20,10 @@ export const googleSlidesReplaceAllTextTool = replaceAllTextTool
 export const googleSlidesAddSlideTool = addSlideTool
 export const googleSlidesGetThumbnailTool = getThumbnailTool
 export const googleSlidesAddImageTool = addImageTool
+export const googleSlidesGetPageTool = getPageTool
+export const googleSlidesDeleteObjectTool = deleteObjectTool
+export const googleSlidesDuplicateObjectTool = duplicateObjectTool
+export const googleSlidesUpdateSlidesPositionTool = updateSlidesPositionTool
+export const googleSlidesCreateTableTool = createTableTool
+export const googleSlidesCreateShapeTool = createShapeTool
+export const googleSlidesInsertTextTool = insertTextTool
diff --git a/apps/sim/tools/google_slides/insert_text.ts b/apps/sim/tools/google_slides/insert_text.ts
new file mode 100644
index 0000000000..1524538e5a
--- /dev/null
+++ b/apps/sim/tools/google_slides/insert_text.ts
@@ -0,0 +1,163 @@
+import { createLogger } from '@sim/logger'
+import type { ToolConfig } from '@/tools/types'
+
+const logger = createLogger('GoogleSlidesInsertTextTool')
+
+interface InsertTextParams {
+  accessToken: string
+  presentationId: string
+  objectId: string
+  text: string
+  insertionIndex?: number
+}
+
+interface InsertTextResponse {
+  success: boolean
+  output: {
+    inserted: boolean
+    objectId: string
+    text: string
+    metadata: {
+      presentationId: string
+      url: string
+    }
+  }
+}
+
+export const insertTextTool: ToolConfig<InsertTextParams, InsertTextResponse> = {
+  id: 'google_slides_insert_text',
+  name: 'Insert Text in Google Slides',
+  description:
+    'Insert text into a shape or table cell in a Google Slides presentation. Use this to add text to text boxes, shapes, or table cells.',
+  version: '1.0.0',
+
+  oauth: {
+    required: true,
+    provider: 'google-drive',
+  },
+
+  params: {
+    accessToken: {
+      type: 'string',
+      required: true,
+      visibility: 'hidden',
+      description: 'The access token for the Google Slides API',
+    },
+    presentationId: {
+      type: 'string',
+      required: true,
+      visibility: 'user-only',
+      description: 'The ID of the presentation',
+    },
+    objectId: {
+      type: 'string',
+      required: true,
+      visibility: 'user-or-llm',
+      description:
+        'The object ID of the shape or table cell to insert text into. For table cells, use the cell object ID.',
+    },
+    text: {
+      type: 'string',
+      required: true,
+      visibility: 'user-or-llm',
+      description: 'The text to insert',
+    },
+    insertionIndex: {
+      type: 'number',
+      required: false,
+      visibility: 'user-or-llm',
+      description:
+        'The zero-based index at which to insert the text. If not specified, text is inserted at the beginning (index 0).',
+    },
+  },
+
+  request: {
+    url: (params) => {
+      const presentationId = params.presentationId?.trim()
+      if (!presentationId) {
+        throw new Error('Presentation ID is required')
+      }
+      return `https://slides.googleapis.com/v1/presentations/${presentationId}:batchUpdate`
+    },
+    method: 'POST',
+    headers: (params) => {
+      if (!params.accessToken) {
+        throw new Error('Access token is required')
+      }
+      return {
+        Authorization: `Bearer ${params.accessToken}`,
+        'Content-Type': 'application/json',
+      }
+    },
+    body: (params) => {
+      const objectId = params.objectId?.trim()
+      if (!objectId) {
+        throw new Error('Object ID is required')
+      }
+
+      if (params.text === undefined || params.text === null) {
+        throw new Error('Text is required')
+      }
+
+      return {
+        requests: [
+          {
+            insertText: {
+              objectId,
+              text: params.text,
+              insertionIndex: params.insertionIndex ?? 0,
+            },
+          },
+        ],
+      }
+    },
+  },
+
+  transformResponse: async (response: Response, params) => {
+    const data = await response.json()
+
+    if (!response.ok) {
+      logger.error('Google Slides API error:', { data })
+      throw new Error(data.error?.message || 'Failed to insert text')
+    }
+
+    const presentationId = params?.presentationId?.trim() || ''
+    const objectId = params?.objectId?.trim() || ''
+
+    return {
+      success: true,
+      output: {
+        inserted: true,
+        objectId,
+        text: params?.text ?? '',
+        metadata: {
+          presentationId,
+          url: `https://docs.google.com/presentation/d/${presentationId}/edit`,
+        },
+      },
+    }
+  },
+
+  outputs: {
+    inserted: {
+      type: 'boolean',
+      description: 'Whether the text was successfully inserted',
+    },
+    objectId: {
+      type: 'string',
+      description: 'The object ID where text was inserted',
+    },
+    text: {
+      type: 'string',
+      description: 'The text that was inserted',
+    },
+    metadata: {
+      type: 'object',
+      description: 'Operation metadata including presentation ID and URL',
+      properties: {
+        presentationId: { type: 'string', description: 'The presentation ID' },
+        url: { type: 'string', description: 'URL to the presentation' },
+      },
+    },
+  },
+}
diff --git a/apps/sim/tools/google_slides/read.ts b/apps/sim/tools/google_slides/read.ts
index 85accfac91..636a54bbaf 100644
--- a/apps/sim/tools/google_slides/read.ts
+++ b/apps/sim/tools/google_slides/read.ts
@@ -79,6 +79,39 @@ export const readTool: ToolConfig<GoogleSlidesToolParams, GoogleSlidesReadRespon
     metadata: {
       type: 'json',
       description: 'Presentation metadata including ID, title, and URL',
+      properties: {
+        presentationId: {
+          type: 'string',
+          description: 'The presentation ID',
+        },
+        title: {
+          type: 'string',
+          description: 'The presentation title',
+        },
+        pageSize: {
+          type: 'object',
+          description: 'Presentation page size',
+          optional: true,
+          properties: {
+            width: {
+              type: 'json',
+              description: 'Page width as a Dimension object',
+            },
+            height: {
+              type: 'json',
+              description: 'Page height as a Dimension object',
+            },
+          },
+        },
+        mimeType: {
+          type: 'string',
+          description: 'The mime type of the presentation',
+        },
+        url: {
+          type: 'string',
+          description: 'URL to open the presentation',
+        },
+      },
     },
   },
 }
diff --git a/apps/sim/tools/google_slides/replace_all_text.ts b/apps/sim/tools/google_slides/replace_all_text.ts
index 3d2abd680d..57cae99d28 100644
--- a/apps/sim/tools/google_slides/replace_all_text.ts
+++ b/apps/sim/tools/google_slides/replace_all_text.ts
@@ -46,26 +46,31 @@ export const replaceAllTextTool: ToolConfig<ReplaceAllTextParams, ReplaceAllText
     presentationId: {
       type: 'string',
       required: true,
+      visibility: 'user-only',
       description: 'The ID of the presentation',
     },
     findText: {
       type: 'string',
       required: true,
+      visibility: 'user-or-llm',
       description: 'The text to find (e.g., {{placeholder}})',
     },
     replaceText: {
       type: 'string',
       required: true,
+      visibility: 'user-or-llm',
       description: 'The text to replace with',
     },
     matchCase: {
       type: 'boolean',
       required: false,
+      visibility: 'user-or-llm',
       description: 'Whether the search should be case-sensitive (default: true)',
     },
     pageObjectIds: {
       type: 'string',
       required: false,
+      visibility: 'user-or-llm',
       description:
         'Comma-separated list of slide object IDs to limit replacements to specific slides (leave empty for all slides)',
     },
@@ -159,6 +164,24 @@ export const replaceAllTextTool: ToolConfig<ReplaceAllTextParams, ReplaceAllText
     metadata: {
       type: 'json',
       description: 'Operation metadata including presentation ID and URL',
+      properties: {
+        presentationId: {
+          type: 'string',
+          description: 'The presentation ID',
+        },
+        findText: {
+          type: 'string',
+          description: 'The text that was searched for',
+        },
+        replaceText: {
+          type: 'string',
+          description: 'The text that replaced the matches',
+        },
+        url: {
+          type: 'string',
+          description: 'URL to open the presentation',
+        },
+      },
     },
   },
 }
diff --git a/apps/sim/tools/google_slides/update_slides_position.ts b/apps/sim/tools/google_slides/update_slides_position.ts
new file mode 100644
index 0000000000..9215d35e04
--- /dev/null
+++ b/apps/sim/tools/google_slides/update_slides_position.ts
@@ -0,0 +1,171 @@
+import { createLogger } from '@sim/logger'
+import type { ToolConfig } from '@/tools/types'
+
+const logger = createLogger('GoogleSlidesUpdateSlidesPositionTool')
+
+interface UpdateSlidesPositionParams {
+  accessToken: string
+  presentationId: string
+  slideObjectIds: string
+  insertionIndex: number
+}
+
+interface UpdateSlidesPositionResponse {
+  success: boolean
+  output: {
+    moved: boolean
+    slideObjectIds: string[]
+    insertionIndex: number
+    metadata: {
+      presentationId: string
+      url: string
+    }
+  }
+}
+
+export const updateSlidesPositionTool: ToolConfig<
+  UpdateSlidesPositionParams,
+  UpdateSlidesPositionResponse
+> = {
+  id: 'google_slides_update_slides_position',
+  name: 'Reorder Slides in Google Slides',
+  description: 'Move one or more slides to a new position in a Google Slides presentation',
+  version: '1.0.0',
+
+  oauth: {
+    required: true,
+    provider: 'google-drive',
+  },
+
+  params: {
+    accessToken: {
+      type: 'string',
+      required: true,
+      visibility: 'hidden',
+      description: 'The access token for the Google Slides API',
+    },
+    presentationId: {
+      type: 'string',
+      required: true,
+      visibility: 'user-only',
+      description: 'The ID of the presentation',
+    },
+    slideObjectIds: {
+      type: 'string',
+      required: true,
+      visibility: 'user-or-llm',
+      description:
+        'Comma-separated list of slide object IDs to move. The slides will maintain their relative order.',
+    },
+    insertionIndex: {
+      type: 'number',
+      required: true,
+      visibility: 'user-or-llm',
+      description:
+        'The zero-based index where the slides should be moved. All slides with indices greater than or equal to this will be shifted right.',
+    },
+  },
+
+  request: {
+    url: (params) => {
+      const presentationId = params.presentationId?.trim()
+      if (!presentationId) {
+        throw new Error('Presentation ID is required')
+      }
+      return `https://slides.googleapis.com/v1/presentations/${presentationId}:batchUpdate`
+    },
+    method: 'POST',
+    headers: (params) => {
+      if (!params.accessToken) {
+        throw new Error('Access token is required')
+      }
+      return {
+        Authorization: `Bearer ${params.accessToken}`,
+        'Content-Type': 'application/json',
+      }
+    },
+    body: (params) => {
+      if (!params.slideObjectIds?.trim()) {
+        throw new Error('Slide object IDs are required')
+      }
+      if (params.insertionIndex === undefined || params.insertionIndex < 0) {
+        throw new Error('Insertion index must be a non-negative number')
+      }
+
+      const slideObjectIds = params.slideObjectIds
+        .split(',')
+        .map((id) => id.trim())
+        .filter((id) => id.length > 0)
+
+      if (slideObjectIds.length === 0) {
+        throw new Error('At least one slide object ID is required')
+      }
+
+      return {
+        requests: [
+          {
+            updateSlidesPosition: {
+              slideObjectIds,
+              insertionIndex: params.insertionIndex,
+            },
+          },
+        ],
+      }
+    },
+  },
+
+  transformResponse: async (response: Response, params) => {
+    const data = await response.json()
+
+    if (!response.ok) {
+      logger.error('Google Slides API error:', { data })
+      throw new Error(data.error?.message || 'Failed to update slides position')
+    }
+
+    const presentationId = params?.presentationId?.trim() || ''
+    const slideObjectIds =
+      params?.slideObjectIds
+        ?.split(',')
+        .map((id) => id.trim())
+        .filter((id) => id.length > 0) ?? []
+
+    return {
+      success: true,
+      output: {
+        moved: true,
+        slideObjectIds,
+        insertionIndex: params?.insertionIndex ?? 0,
+        metadata: {
+          presentationId,
+          url: `https://docs.google.com/presentation/d/${presentationId}/edit`,
+        },
+      },
+    }
+  },
+
+  outputs: {
+    moved: {
+      type: 'boolean',
+      description: 'Whether the slides were successfully moved',
+    },
+    slideObjectIds: {
+      type: 'array',
+      description: 'The slide object IDs that were moved',
+      items: {
+        type: 'string',
+      },
+    },
+    insertionIndex: {
+      type: 'number',
+      description: 'The index where the slides were moved to',
+    },
+    metadata: {
+      type: 'object',
+      description: 'Operation metadata including presentation ID and URL',
+      properties: {
+        presentationId: { type: 'string', description: 'The presentation ID' },
+        url: { type: 'string', description: 'URL to the presentation' },
+      },
+    },
+  },
+}
diff --git a/apps/sim/tools/google_slides/write.ts b/apps/sim/tools/google_slides/write.ts
index dbe5e1e3e2..12e95bf96b 100644
--- a/apps/sim/tools/google_slides/write.ts
+++ b/apps/sim/tools/google_slides/write.ts
@@ -23,16 +23,19 @@ export const writeTool: ToolConfig<GoogleSlidesToolParams, GoogleSlidesWriteResp
     presentationId: {
       type: 'string',
       required: true,
+      visibility: 'user-only',
       description: 'The ID of the presentation to write to',
     },
     content: {
       type: 'string',
       required: true,
+      visibility: 'user-or-llm',
       description: 'The content to write to the slide',
     },
     slideIndex: {
       type: 'number',
       required: false,
+      visibility: 'user-or-llm',
       description: 'The index of the slide to write to (defaults to first slide)',
     },
   },
@@ -89,11 +92,39 @@ export const writeTool: ToolConfig<GoogleSlidesToolParams, GoogleSlidesWriteResp
         }
       ).then((res) => res.json())
 
-      const slideIndex = params.slideIndex || 0
+      const metadata = {
+        presentationId,
+        title: presentationData.title || 'Updated Presentation',
+        mimeType: 'application/vnd.google-apps.presentation',
+        url: `https://docs.google.com/presentation/d/${presentationId}/edit`,
+      }
+
+      const slideIndex =
+        typeof params.slideIndex === 'string'
+          ? Number.parseInt(params.slideIndex, 10)
+          : (params.slideIndex ?? 0)
       const slide = presentationData.slides?.[slideIndex]
 
+      if (Number.isNaN(slideIndex) || slideIndex < 0) {
+        return {
+          success: false,
+          error: 'Slide index must be a non-negative number',
+          output: {
+            updatedContent: false,
+            metadata,
+          },
+        }
+      }
+
       if (!slide) {
-        throw new Error(`Slide at index ${slideIndex} not found`)
+        return {
+          success: false,
+          error: `Slide at index ${slideIndex} not found`,
+          output: {
+            updatedContent: false,
+            metadata,
+          },
+        }
       }
 
       // Create requests to add content to the slide
@@ -150,15 +181,14 @@ export const writeTool: ToolConfig<GoogleSlidesToolParams, GoogleSlidesWriteResp
       if (!updateResponse.ok) {
         const errorText = await updateResponse.text()
         logger.error('Failed to update presentation:', { errorText })
-        throw new Error('Failed to update presentation')
-      }
-
-      // Create presentation metadata
-      const metadata = {
-        presentationId,
-        title: presentationData.title || 'Updated Presentation',
-        mimeType: 'application/vnd.google-apps.presentation',
-        url: `https://docs.google.com/presentation/d/${presentationId}/edit`,
+        return {
+          success: false,
+          error: 'Failed to update presentation',
+          output: {
+            updatedContent: false,
+            metadata,
+          },
+        }
       }
 
       return {
@@ -182,6 +212,24 @@ export const writeTool: ToolConfig<GoogleSlidesToolParams, GoogleSlidesWriteResp
     metadata: {
       type: 'json',
       description: 'Updated presentation metadata including ID, title, and URL',
+      properties: {
+        presentationId: {
+          type: 'string',
+          description: 'The presentation ID',
+        },
+        title: {
+          type: 'string',
+          description: 'The presentation title',
+        },
+        mimeType: {
+          type: 'string',
+          description: 'The mime type of the presentation',
+        },
+        url: {
+          type: 'string',
+          description: 'URL to open the presentation',
+        },
+      },
     },
   },
 
diff --git a/apps/sim/tools/guardrails/validate.ts b/apps/sim/tools/guardrails/validate.ts
index 9bb8d6c173..f791fa89c0 100644
--- a/apps/sim/tools/guardrails/validate.ts
+++ b/apps/sim/tools/guardrails/validate.ts
@@ -45,56 +45,67 @@ export const guardrailsValidateTool: ToolConfig<GuardrailsValidateInput, Guardra
       input: {
         type: 'string',
         required: true,
+        visibility: 'user-or-llm',
         description: 'Content to validate (from wired block)',
       },
       validationType: {
         type: 'string',
         required: true,
+        visibility: 'user-only',
         description: 'Type of validation: json, regex, hallucination, or pii',
       },
       regex: {
         type: 'string',
         required: false,
+        visibility: 'user-only',
         description: 'Regex pattern (required for regex validation)',
       },
       knowledgeBaseId: {
         type: 'string',
         required: false,
+        visibility: 'user-only',
         description: 'Knowledge base ID (required for hallucination check)',
       },
       threshold: {
         type: 'string',
         required: false,
+        visibility: 'user-only',
         description: 'Confidence threshold (0-10 scale, default: 3, scores below fail)',
       },
       topK: {
         type: 'string',
         required: false,
+        visibility: 'user-only',
         description: 'Number of chunks to retrieve from knowledge base (default: 10)',
       },
       model: {
         type: 'string',
         required: false,
+        visibility: 'user-only',
         description: 'LLM model for confidence scoring (default: gpt-4o-mini)',
       },
       apiKey: {
         type: 'string',
         required: false,
+        visibility: 'user-only',
         description: 'API key for LLM provider (optional if using hosted)',
       },
       piiEntityTypes: {
         type: 'array',
         required: false,
+        visibility: 'user-only',
         description: 'PII entity types to detect (empty = detect all)',
       },
       piiMode: {
         type: 'string',
         required: false,
+        visibility: 'user-only',
         description: 'PII action mode: block or mask (default: block)',
       },
       piiLanguage: {
         type: 'string',
         required: false,
+        visibility: 'user-only',
         description: 'Language for PII detection (default: en)',
       },
     },
diff --git a/apps/sim/tools/http/request.ts b/apps/sim/tools/http/request.ts
index db47883f50..eae6ab94ac 100644
--- a/apps/sim/tools/http/request.ts
+++ b/apps/sim/tools/http/request.ts
@@ -1,5 +1,6 @@
 import type { RequestParams, RequestResponse } from '@/tools/http/types'
-import { getDefaultHeaders, processUrl, transformTable } from '@/tools/http/utils'
+import { getDefaultHeaders, processUrl } from '@/tools/http/utils'
+import { transformTable } from '@/tools/shared/table'
 import type { ToolConfig } from '@/tools/types'
 
 export const requestTool: ToolConfig<RequestParams, RequestResponse> = {
@@ -13,31 +14,38 @@ export const requestTool: ToolConfig<RequestParams, RequestResponse> = {
     url: {
       type: 'string',
       required: true,
+      visibility: 'user-or-llm',
       description: 'The URL to send the request to',
     },
     method: {
       type: 'string',
       default: 'GET',
+      visibility: 'user-or-llm',
       description: 'HTTP method (GET, POST, PUT, PATCH, DELETE)',
     },
     headers: {
       type: 'object',
+      visibility: 'user-or-llm',
       description: 'HTTP headers to include',
     },
     body: {
       type: 'object',
+      visibility: 'user-or-llm',
       description: 'Request body (for POST, PUT, PATCH)',
     },
     params: {
       type: 'object',
+      visibility: 'user-or-llm',
       description: 'URL query parameters to append',
     },
     pathParams: {
       type: 'object',
+      visibility: 'user-or-llm',
       description: 'URL path parameters to replace (e.g., :id in /users/:id)',
     },
     formData: {
       type: 'object',
+      visibility: 'user-or-llm',
       description: 'Form data to send (will set appropriate Content-Type)',
     },
   },
diff --git a/apps/sim/tools/http/utils.ts b/apps/sim/tools/http/utils.ts
index eb108fef36..876cc91da5 100644
--- a/apps/sim/tools/http/utils.ts
+++ b/apps/sim/tools/http/utils.ts
@@ -1,6 +1,7 @@
 import { createLogger } from '@sim/logger'
 import { isTest } from '@/lib/core/config/feature-flags'
 import { getBaseUrl } from '@/lib/core/utils/urls'
+import { transformTable } from '@/tools/shared/table'
 import type { TableRow } from '@/tools/types'
 
 const logger = createLogger('HTTPRequestUtils')
@@ -119,28 +120,3 @@ export const shouldUseProxy = (url: string): boolean => {
     return false
   }
 }
-
-/**
- * Transforms a table from the store format to a key-value object
- * Local copy of the function to break circular dependencies
- * @param table Array of table rows from the store
- * @returns Record of key-value pairs
- */
-export const transformTable = (table: TableRow[] | null): Record<string, any> => {
-  if (!table) return {}
-
-  return table.reduce(
-    (acc, row) => {
-      if (row.cells?.Key && row.cells?.Value !== undefined) {
-        // Extract the Value cell as is - it should already be properly resolved
-        // by the InputResolver based on variable type (number, string, boolean etc.)
-        const value = row.cells.Value
-
-        // Store the correctly typed value in the result object
-        acc[row.cells.Key] = value
-      }
-      return acc
-    },
-    {} as Record<string, any>
-  )
-}
diff --git a/apps/sim/tools/http/webhook_request.ts b/apps/sim/tools/http/webhook_request.ts
index f04da4c1f8..33d7c5051a 100644
--- a/apps/sim/tools/http/webhook_request.ts
+++ b/apps/sim/tools/http/webhook_request.ts
@@ -21,18 +21,22 @@ export const webhookRequestTool: ToolConfig<WebhookRequestParams, RequestRespons
     url: {
       type: 'string',
       required: true,
+      visibility: 'user-or-llm',
       description: 'The webhook URL to send the request to',
     },
     body: {
       type: 'object',
+      visibility: 'user-or-llm',
       description: 'JSON payload to send',
     },
     secret: {
       type: 'string',
+      visibility: 'user-or-llm',
       description: 'Optional secret for HMAC-SHA256 signature',
     },
     headers: {
       type: 'object',
+      visibility: 'user-or-llm',
       description: 'Additional headers to include',
     },
   },
@@ -46,7 +50,6 @@ export const webhookRequestTool: ToolConfig<WebhookRequestParams, RequestRespons
       const timestamp = Date.now()
       const deliveryId = uuidv4()
 
-      // Start with webhook-specific headers
       const webhookHeaders: Record<string, string> = {
         'Content-Type': 'application/json',
         'X-Webhook-Timestamp': timestamp.toString(),
@@ -54,7 +57,6 @@ export const webhookRequestTool: ToolConfig<WebhookRequestParams, RequestRespons
         'Idempotency-Key': deliveryId,
       }
 
-      // Add signature if secret is provided
       if (params.secret) {
         const bodyString =
           typeof params.body === 'string' ? params.body : JSON.stringify(params.body || {})
@@ -62,7 +64,6 @@ export const webhookRequestTool: ToolConfig<WebhookRequestParams, RequestRespons
         webhookHeaders['X-Webhook-Signature'] = `t=${timestamp},v1=${signature}`
       }
 
-      // Merge with user-provided headers (user headers take precedence)
       const userHeaders = params.headers || {}
 
       return { ...webhookHeaders, ...userHeaders }
@@ -83,7 +84,6 @@ export const webhookRequestTool: ToolConfig<WebhookRequestParams, RequestRespons
       ? response.json()
       : response.text())
 
-    // Check if this is a proxy response
     if (
       contentType.includes('application/json') &&
       typeof data === 'object' &&
diff --git a/apps/sim/tools/kalshi/amend_order.ts b/apps/sim/tools/kalshi/amend_order.ts
index 3d56fdebce..360104a2e1 100644
--- a/apps/sim/tools/kalshi/amend_order.ts
+++ b/apps/sim/tools/kalshi/amend_order.ts
@@ -45,56 +45,67 @@ export const kalshiAmendOrderTool: ToolConfig<KalshiAmendOrderParams, KalshiAmen
     orderId: {
       type: 'string',
       required: true,
+      visibility: 'user-or-llm',
       description: 'The order ID to amend',
     },
     ticker: {
       type: 'string',
       required: true,
+      visibility: 'user-or-llm',
       description: 'Market ticker',
     },
     side: {
       type: 'string',
       required: true,
+      visibility: 'user-or-llm',
       description: "Side of the order: 'yes' or 'no'",
     },
     action: {
       type: 'string',
       required: true,
+      visibility: 'user-or-llm',
       description: "Action type: 'buy' or 'sell'",
     },
     clientOrderId: {
       type: 'string',
       required: true,
+      visibility: 'user-or-llm',
       description: 'The original client-specified order ID',
     },
     updatedClientOrderId: {
       type: 'string',
       required: true,
+      visibility: 'user-or-llm',
       description: 'The new client-specified order ID after amendment',
     },
     count: {
       type: 'string',
       required: false,
+      visibility: 'user-or-llm',
       description: 'Updated quantity for the order',
     },
     yesPrice: {
       type: 'string',
       required: false,
+      visibility: 'user-or-llm',
       description: 'Updated yes price in cents (1-99)',
     },
     noPrice: {
       type: 'string',
       required: false,
+      visibility: 'user-or-llm',
       description: 'Updated no price in cents (1-99)',
     },
     yesPriceDollars: {
       type: 'string',
       required: false,
+      visibility: 'user-or-llm',
       description: 'Updated yes price in dollars (e.g., "0.56")',
     },
     noPriceDollars: {
       type: 'string',
       required: false,
+      visibility: 'user-or-llm',
       description: 'Updated no price in dollars (e.g., "0.56")',
     },
   },
diff --git a/apps/sim/tools/kalshi/cancel_order.ts b/apps/sim/tools/kalshi/cancel_order.ts
index 36b11cdf8b..d5f8d7843b 100644
--- a/apps/sim/tools/kalshi/cancel_order.ts
+++ b/apps/sim/tools/kalshi/cancel_order.ts
@@ -37,6 +37,7 @@ export const kalshiCancelOrderTool: ToolConfig<KalshiCancelOrderParams, KalshiCa
       orderId: {
         type: 'string',
         required: true,
+        visibility: 'user-or-llm',
         description: 'The order ID to cancel',
       },
     },
diff --git a/apps/sim/tools/kalshi/create_order.ts b/apps/sim/tools/kalshi/create_order.ts
index cd12253f99..5518078821 100644
--- a/apps/sim/tools/kalshi/create_order.ts
+++ b/apps/sim/tools/kalshi/create_order.ts
@@ -52,86 +52,103 @@ export const kalshiCreateOrderTool: ToolConfig<KalshiCreateOrderParams, KalshiCr
       ticker: {
         type: 'string',
         required: true,
+        visibility: 'user-or-llm',
         description: 'Market ticker (e.g., KXBTC-24DEC31)',
       },
       side: {
         type: 'string',
         required: true,
+        visibility: 'user-or-llm',
         description: "Side of the order: 'yes' or 'no'",
       },
       action: {
         type: 'string',
         required: true,
+        visibility: 'user-or-llm',
         description: "Action type: 'buy' or 'sell'",
       },
       count: {
         type: 'string',
         required: true,
+        visibility: 'user-or-llm',
         description: 'Number of contracts (minimum 1)',
       },
       type: {
         type: 'string',
         required: false,
+        visibility: 'user-or-llm',
         description: "Order type: 'limit' or 'market' (default: limit)",
       },
       yesPrice: {
         type: 'string',
         required: false,
+        visibility: 'user-or-llm',
         description: 'Yes price in cents (1-99)',
       },
       noPrice: {
         type: 'string',
         required: false,
+        visibility: 'user-or-llm',
         description: 'No price in cents (1-99)',
       },
       yesPriceDollars: {
         type: 'string',
         required: false,
+        visibility: 'user-or-llm',
         description: 'Yes price in dollars (e.g., "0.56")',
       },
       noPriceDollars: {
         type: 'string',
         required: false,
+        visibility: 'user-or-llm',
         description: 'No price in dollars (e.g., "0.56")',
       },
       clientOrderId: {
         type: 'string',
         required: false,
+        visibility: 'user-or-llm',
         description: 'Custom order identifier',
       },
       expirationTs: {
         type: 'string',
         required: false,
+        visibility: 'user-or-llm',
         description: 'Unix timestamp for order expiration',
       },
       timeInForce: {
         type: 'string',
         required: false,
+        visibility: 'user-or-llm',
         description: "Time in force: 'fill_or_kill', 'good_till_canceled', 'immediate_or_cancel'",
       },
       buyMaxCost: {
         type: 'string',
         required: false,
+        visibility: 'user-or-llm',
         description: 'Maximum cost in cents (auto-enables fill_or_kill)',
       },
       postOnly: {
         type: 'string',
         required: false,
+        visibility: 'user-or-llm',
         description: "Set to 'true' for maker-only orders",
       },
       reduceOnly: {
         type: 'string',
         required: false,
+        visibility: 'user-or-llm',
         description: "Set to 'true' for position reduction only",
       },
       selfTradePreventionType: {
         type: 'string',
         required: false,
+        visibility: 'user-or-llm',
         description: "Self-trade prevention: 'taker_at_cross' or 'maker'",
       },
       orderGroupId: {
         type: 'string',
         required: false,
+        visibility: 'user-or-llm',
         description: 'Associated order group ID',
       },
     },
diff --git a/apps/sim/tools/kalshi/get_candlesticks.ts b/apps/sim/tools/kalshi/get_candlesticks.ts
index 40c24f0847..6a140d3cdf 100644
--- a/apps/sim/tools/kalshi/get_candlesticks.ts
+++ b/apps/sim/tools/kalshi/get_candlesticks.ts
@@ -30,26 +30,31 @@ export const kalshiGetCandlesticksTool: ToolConfig<
     seriesTicker: {
       type: 'string',
       required: true,
+      visibility: 'user-or-llm',
       description: 'Series ticker',
     },
     ticker: {
       type: 'string',
       required: true,
+      visibility: 'user-or-llm',
       description: 'Market ticker (e.g., KXBTC-24DEC31)',
     },
     startTs: {
       type: 'number',
       required: true,
+      visibility: 'user-or-llm',
       description: 'Start timestamp (Unix seconds)',
     },
     endTs: {
       type: 'number',
       required: true,
+      visibility: 'user-or-llm',
       description: 'End timestamp (Unix seconds)',
     },
     periodInterval: {
       type: 'number',
       required: true,
+      visibility: 'user-or-llm',
       description: 'Period interval: 1 (1min), 60 (1hour), or 1440 (1day)',
     },
   },
diff --git a/apps/sim/tools/kalshi/get_event.ts b/apps/sim/tools/kalshi/get_event.ts
index 26e4c82bc5..ec32965a9d 100644
--- a/apps/sim/tools/kalshi/get_event.ts
+++ b/apps/sim/tools/kalshi/get_event.ts
@@ -24,11 +24,13 @@ export const kalshiGetEventTool: ToolConfig<KalshiGetEventParams, KalshiGetEvent
     eventTicker: {
       type: 'string',
       required: true,
+      visibility: 'user-or-llm',
       description: 'The event ticker',
     },
     withNestedMarkets: {
       type: 'string',
       required: false,
+      visibility: 'user-or-llm',
       description: 'Include nested markets in response (true/false)',
     },
   },
diff --git a/apps/sim/tools/kalshi/get_events.ts b/apps/sim/tools/kalshi/get_events.ts
index b407050428..4ed5c29e44 100644
--- a/apps/sim/tools/kalshi/get_events.ts
+++ b/apps/sim/tools/kalshi/get_events.ts
@@ -26,26 +26,31 @@ export const kalshiGetEventsTool: ToolConfig<KalshiGetEventsParams, KalshiGetEve
     status: {
       type: 'string',
       required: false,
+      visibility: 'user-or-llm',
       description: 'Filter by status (open, closed, settled)',
     },
     seriesTicker: {
       type: 'string',
       required: false,
+      visibility: 'user-or-llm',
       description: 'Filter by series ticker',
     },
     withNestedMarkets: {
       type: 'string',
       required: false,
+      visibility: 'user-or-llm',
       description: 'Include nested markets in response (true/false)',
     },
     limit: {
       type: 'string',
       required: false,
+      visibility: 'user-or-llm',
       description: 'Number of results (1-200, default: 200)',
     },
     cursor: {
       type: 'string',
       required: false,
+      visibility: 'user-or-llm',
       description: 'Pagination cursor for next page',
     },
   },
diff --git a/apps/sim/tools/kalshi/get_fills.ts b/apps/sim/tools/kalshi/get_fills.ts
index 5579d7a12a..1ca8b88980 100644
--- a/apps/sim/tools/kalshi/get_fills.ts
+++ b/apps/sim/tools/kalshi/get_fills.ts
@@ -44,31 +44,37 @@ export const kalshiGetFillsTool: ToolConfig<KalshiGetFillsParams, KalshiGetFills
     ticker: {
       type: 'string',
       required: false,
+      visibility: 'user-or-llm',
       description: 'Filter by market ticker',
     },
     orderId: {
       type: 'string',
       required: false,
+      visibility: 'user-or-llm',
       description: 'Filter by order ID',
     },
     minTs: {
       type: 'number',
       required: false,
+      visibility: 'user-or-llm',
       description: 'Minimum timestamp (Unix milliseconds)',
     },
     maxTs: {
       type: 'number',
       required: false,
+      visibility: 'user-or-llm',
       description: 'Maximum timestamp (Unix milliseconds)',
     },
     limit: {
       type: 'string',
       required: false,
+      visibility: 'user-or-llm',
       description: 'Number of results (1-1000, default: 100)',
     },
     cursor: {
       type: 'string',
       required: false,
+      visibility: 'user-or-llm',
       description: 'Pagination cursor for next page',
     },
   },
diff --git a/apps/sim/tools/kalshi/get_market.ts b/apps/sim/tools/kalshi/get_market.ts
index 15b80bfdbc..b549715020 100644
--- a/apps/sim/tools/kalshi/get_market.ts
+++ b/apps/sim/tools/kalshi/get_market.ts
@@ -23,6 +23,7 @@ export const kalshiGetMarketTool: ToolConfig<KalshiGetMarketParams, KalshiGetMar
     ticker: {
       type: 'string',
       required: true,
+      visibility: 'user-or-llm',
       description: 'The market ticker (e.g., "KXBTC-24DEC31")',
     },
   },
diff --git a/apps/sim/tools/kalshi/get_markets.ts b/apps/sim/tools/kalshi/get_markets.ts
index cf1a37767f..c8b743c28f 100644
--- a/apps/sim/tools/kalshi/get_markets.ts
+++ b/apps/sim/tools/kalshi/get_markets.ts
@@ -26,26 +26,31 @@ export const kalshiGetMarketsTool: ToolConfig<KalshiGetMarketsParams, KalshiGetM
     status: {
       type: 'string',
       required: false,
+      visibility: 'user-or-llm',
       description: 'Filter by status (unopened, open, closed, settled)',
     },
     seriesTicker: {
       type: 'string',
       required: false,
+      visibility: 'user-or-llm',
       description: 'Filter by series ticker',
     },
     eventTicker: {
       type: 'string',
       required: false,
+      visibility: 'user-or-llm',
       description: 'Filter by event ticker',
     },
     limit: {
       type: 'string',
       required: false,
+      visibility: 'user-or-llm',
       description: 'Number of results (1-1000, default: 100)',
     },
     cursor: {
       type: 'string',
       required: false,
+      visibility: 'user-or-llm',
       description: 'Pagination cursor for next page',
     },
   },
diff --git a/apps/sim/tools/kalshi/get_order.ts b/apps/sim/tools/kalshi/get_order.ts
index 6c5066211d..ed6a4c9f4d 100644
--- a/apps/sim/tools/kalshi/get_order.ts
+++ b/apps/sim/tools/kalshi/get_order.ts
@@ -35,6 +35,7 @@ export const kalshiGetOrderTool: ToolConfig<KalshiGetOrderParams, KalshiGetOrder
     orderId: {
       type: 'string',
       required: true,
+      visibility: 'user-or-llm',
       description: 'The order ID to retrieve',
     },
   },
diff --git a/apps/sim/tools/kalshi/get_orderbook.ts b/apps/sim/tools/kalshi/get_orderbook.ts
index abcf91b983..4f6ff03036 100644
--- a/apps/sim/tools/kalshi/get_orderbook.ts
+++ b/apps/sim/tools/kalshi/get_orderbook.ts
@@ -26,6 +26,7 @@ export const kalshiGetOrderbookTool: ToolConfig<
     ticker: {
       type: 'string',
       required: true,
+      visibility: 'user-or-llm',
       description: 'Market ticker (e.g., KXBTC-24DEC31)',
     },
   },
diff --git a/apps/sim/tools/kalshi/get_orders.ts b/apps/sim/tools/kalshi/get_orders.ts
index 0ed992a3fd..25f0a02434 100644
--- a/apps/sim/tools/kalshi/get_orders.ts
+++ b/apps/sim/tools/kalshi/get_orders.ts
@@ -43,26 +43,31 @@ export const kalshiGetOrdersTool: ToolConfig<KalshiGetOrdersParams, KalshiGetOrd
     ticker: {
       type: 'string',
       required: false,
+      visibility: 'user-or-llm',
       description: 'Filter by market ticker',
     },
     eventTicker: {
       type: 'string',
       required: false,
+      visibility: 'user-or-llm',
       description: 'Filter by event ticker (max 10 comma-separated)',
     },
     status: {
       type: 'string',
       required: false,
+      visibility: 'user-or-llm',
       description: 'Filter by status (resting, canceled, executed)',
     },
     limit: {
       type: 'string',
       required: false,
+      visibility: 'user-or-llm',
       description: 'Number of results (1-200, default: 100)',
     },
     cursor: {
       type: 'string',
       required: false,
+      visibility: 'user-or-llm',
       description: 'Pagination cursor for next page',
     },
   },
diff --git a/apps/sim/tools/kalshi/get_positions.ts b/apps/sim/tools/kalshi/get_positions.ts
index 0d28b9ccdb..4dfa1573a4 100644
--- a/apps/sim/tools/kalshi/get_positions.ts
+++ b/apps/sim/tools/kalshi/get_positions.ts
@@ -46,26 +46,31 @@ export const kalshiGetPositionsTool: ToolConfig<
     ticker: {
       type: 'string',
       required: false,
+      visibility: 'user-or-llm',
       description: 'Filter by market ticker',
     },
     eventTicker: {
       type: 'string',
       required: false,
+      visibility: 'user-or-llm',
       description: 'Filter by event ticker (max 10 comma-separated)',
     },
     settlementStatus: {
       type: 'string',
       required: false,
+      visibility: 'user-or-llm',
       description: 'Filter by settlement status (all, unsettled, settled). Default: unsettled',
     },
     limit: {
       type: 'string',
       required: false,
+      visibility: 'user-or-llm',
       description: 'Number of results (1-1000, default: 100)',
     },
     cursor: {
       type: 'string',
       required: false,
+      visibility: 'user-or-llm',
       description: 'Pagination cursor for next page',
     },
   },
diff --git a/apps/sim/tools/kalshi/get_series_by_ticker.ts b/apps/sim/tools/kalshi/get_series_by_ticker.ts
index 19f4f22771..781a481164 100644
--- a/apps/sim/tools/kalshi/get_series_by_ticker.ts
+++ b/apps/sim/tools/kalshi/get_series_by_ticker.ts
@@ -26,6 +26,7 @@ export const kalshiGetSeriesByTickerTool: ToolConfig<
     seriesTicker: {
       type: 'string',
       required: true,
+      visibility: 'user-or-llm',
       description: 'Series ticker',
     },
   },
diff --git a/apps/sim/tools/kalshi/get_trades.ts b/apps/sim/tools/kalshi/get_trades.ts
index 3e2fcecc14..30fc268aef 100644
--- a/apps/sim/tools/kalshi/get_trades.ts
+++ b/apps/sim/tools/kalshi/get_trades.ts
@@ -22,11 +22,13 @@ export const kalshiGetTradesTool: ToolConfig<KalshiGetTradesParams, KalshiGetTra
     limit: {
       type: 'string',
       required: false,
+      visibility: 'user-or-llm',
       description: 'Number of results (1-1000, default: 100)',
     },
     cursor: {
       type: 'string',
       required: false,
+      visibility: 'user-or-llm',
       description: 'Pagination cursor for next page',
     },
   },
diff --git a/apps/sim/tools/knowledge/create_document.ts b/apps/sim/tools/knowledge/create_document.ts
index 81c8a9a9f2..5b82d504a7 100644
--- a/apps/sim/tools/knowledge/create_document.ts
+++ b/apps/sim/tools/knowledge/create_document.ts
@@ -1,4 +1,6 @@
 import type { KnowledgeCreateDocumentResponse } from '@/tools/knowledge/types'
+import { enrichKBTagsSchema } from '@/tools/schema-enrichers'
+import { formatDocumentTagsForAPI, parseDocumentTags } from '@/tools/shared/tags'
 import type { ToolConfig } from '@/tools/types'
 
 export const knowledgeCreateDocumentTool: ToolConfig<any, KnowledgeCreateDocumentResponse> = {
@@ -26,61 +28,18 @@ export const knowledgeCreateDocumentTool: ToolConfig<any, KnowledgeCreateDocumen
       visibility: 'user-or-llm',
       description: 'Content of the document',
     },
-    tag1: {
-      type: 'string',
-      required: false,
-      visibility: 'user-or-llm',
-      description: 'Tag 1 value for the document',
-    },
-    tag2: {
-      type: 'string',
-      required: false,
-      visibility: 'user-or-llm',
-      description: 'Tag 2 value for the document',
-    },
-    tag3: {
-      type: 'string',
-      required: false,
-      visibility: 'user-or-llm',
-      description: 'Tag 3 value for the document',
-    },
-    tag4: {
-      type: 'string',
-      required: false,
-      visibility: 'user-or-llm',
-      description: 'Tag 4 value for the document',
-    },
-    tag5: {
-      type: 'string',
-      required: false,
-      visibility: 'user-or-llm',
-      description: 'Tag 5 value for the document',
-    },
-    tag6: {
-      type: 'string',
-      required: false,
-      visibility: 'user-or-llm',
-      description: 'Tag 6 value for the document',
-    },
-    tag7: {
-      type: 'string',
+    documentTags: {
+      type: 'object',
       required: false,
       visibility: 'user-or-llm',
-      description: 'Tag 7 value for the document',
+      description: 'Document tags',
     },
-    documentTagsData: {
-      type: 'array',
-      required: false,
-      visibility: 'user-or-llm',
-      description: 'Structured tag data with names, types, and values',
-      items: {
-        type: 'object',
-        properties: {
-          tagName: { type: 'string' },
-          tagValue: { type: 'string' },
-          tagType: { type: 'string' },
-        },
-      },
+  },
+
+  schemaEnrichment: {
+    documentTags: {
+      dependsOn: 'knowledgeBaseId',
+      enrichSchema: enrichKBTagsSchema,
     },
   },
 
@@ -118,24 +77,9 @@ export const knowledgeCreateDocumentTool: ToolConfig<any, KnowledgeCreateDocumen
 
       const dataUri = `data:text/plain;base64,${base64Content}`
 
-      const tagData: Record<string, string> = {}
-
-      if (params.documentTags) {
-        let parsedTags = params.documentTags
-
-        // Handle both string (JSON) and array formats
-        if (typeof params.documentTags === 'string') {
-          try {
-            parsedTags = JSON.parse(params.documentTags)
-          } catch (error) {
-            parsedTags = []
-          }
-        }
-
-        if (Array.isArray(parsedTags)) {
-          tagData.documentTagsData = JSON.stringify(parsedTags)
-        }
-      }
+      // Parse document tags from various formats (object, array, JSON string)
+      const parsedTags = parseDocumentTags(params.documentTags)
+      const tagData = formatDocumentTagsForAPI(parsedTags)
 
       const documents = [
         {
diff --git a/apps/sim/tools/knowledge/search.ts b/apps/sim/tools/knowledge/search.ts
index aee78f7646..574017d083 100644
--- a/apps/sim/tools/knowledge/search.ts
+++ b/apps/sim/tools/knowledge/search.ts
@@ -1,5 +1,6 @@
-import type { StructuredFilter } from '@/lib/knowledge/types'
 import type { KnowledgeSearchResponse } from '@/tools/knowledge/types'
+import { enrichKBTagFiltersSchema } from '@/tools/schema-enrichers'
+import { parseTagFilters } from '@/tools/shared/tags'
 import type { ToolConfig } from '@/tools/types'
 
 export const knowledgeSearchTool: ToolConfig<any, KnowledgeSearchResponse> = {
@@ -42,6 +43,13 @@ export const knowledgeSearchTool: ToolConfig<any, KnowledgeSearchResponse> = {
     },
   },
 
+  schemaEnrichment: {
+    tagFilters: {
+      dependsOn: 'knowledgeBaseId',
+      enrichSchema: enrichKBTagFiltersSchema,
+    },
+  },
+
   request: {
     url: () => '/api/knowledge/search',
     method: 'POST',
@@ -54,40 +62,8 @@ export const knowledgeSearchTool: ToolConfig<any, KnowledgeSearchResponse> = {
       // Use single knowledge base ID
       const knowledgeBaseIds = [params.knowledgeBaseId]
 
-      // Parse dynamic tag filters
-      let structuredFilters: StructuredFilter[] = []
-      if (params.tagFilters) {
-        let tagFilters = params.tagFilters
-
-        // Handle both string (JSON) and array formats
-        if (typeof tagFilters === 'string') {
-          try {
-            tagFilters = JSON.parse(tagFilters)
-          } catch {
-            tagFilters = []
-          }
-        }
-
-        if (Array.isArray(tagFilters)) {
-          // Send full filter objects with operator support
-          structuredFilters = tagFilters
-            .filter((filter: Record<string, unknown>) => {
-              // For boolean, any value is valid; for others, check for non-empty string
-              if (filter.fieldType === 'boolean') {
-                return filter.tagName && filter.tagValue !== undefined
-              }
-              return filter.tagName && filter.tagValue && String(filter.tagValue).trim().length > 0
-            })
-            .map((filter: Record<string, unknown>) => ({
-              tagName: filter.tagName as string,
-              tagSlot: (filter.tagSlot as string) || '', // Will be resolved by API from tagName
-              fieldType: (filter.fieldType as string) || 'text',
-              operator: (filter.operator as string) || 'eq',
-              value: filter.tagValue as string | number | boolean,
-              valueTo: filter.valueTo as string | number | undefined,
-            }))
-        }
-      }
+      // Parse tag filters from various formats (array, JSON string)
+      const structuredFilters = parseTagFilters(params.tagFilters)
 
       const requestBody = {
         knowledgeBaseIds,
diff --git a/apps/sim/tools/memory/add.ts b/apps/sim/tools/memory/add.ts
index b550d8d99d..6d199edc4a 100644
--- a/apps/sim/tools/memory/add.ts
+++ b/apps/sim/tools/memory/add.ts
@@ -11,12 +11,14 @@ export const memoryAddTool: ToolConfig<any, MemoryResponse> = {
     conversationId: {
       type: 'string',
       required: false,
+      visibility: 'user-or-llm',
       description:
         'Conversation identifier (e.g., user-123, session-abc). If a memory with this conversationId already exists, the new message will be appended to it.',
     },
     id: {
       type: 'string',
       required: false,
+      visibility: 'user-or-llm',
       description:
         'Legacy parameter for conversation identifier. Use conversationId instead. Provided for backwards compatibility.',
     },
diff --git a/apps/sim/tools/memory/delete.ts b/apps/sim/tools/memory/delete.ts
index aa5a577e19..b32d1fcbf1 100644
--- a/apps/sim/tools/memory/delete.ts
+++ b/apps/sim/tools/memory/delete.ts
@@ -11,12 +11,14 @@ export const memoryDeleteTool: ToolConfig<any, MemoryResponse> = {
     conversationId: {
       type: 'string',
       required: false,
+      visibility: 'user-or-llm',
       description:
         'Conversation identifier (e.g., user-123, session-abc). Deletes all memories for this conversation.',
     },
     id: {
       type: 'string',
       required: false,
+      visibility: 'user-or-llm',
       description:
         'Legacy parameter for conversation identifier. Use conversationId instead. Provided for backwards compatibility.',
     },
diff --git a/apps/sim/tools/memory/get.ts b/apps/sim/tools/memory/get.ts
index 21830a42ec..2712563761 100644
--- a/apps/sim/tools/memory/get.ts
+++ b/apps/sim/tools/memory/get.ts
@@ -11,12 +11,14 @@ export const memoryGetTool: ToolConfig<any, MemoryResponse> = {
     conversationId: {
       type: 'string',
       required: false,
+      visibility: 'user-or-llm',
       description:
         'Conversation identifier (e.g., user-123, session-abc). Returns memories for this conversation.',
     },
     id: {
       type: 'string',
       required: false,
+      visibility: 'user-or-llm',
       description:
         'Legacy parameter for conversation identifier. Use conversationId instead. Provided for backwards compatibility.',
     },
diff --git a/apps/sim/tools/microsoft_excel/index.ts b/apps/sim/tools/microsoft_excel/index.ts
index c39b792560..bf1e8b1aad 100644
--- a/apps/sim/tools/microsoft_excel/index.ts
+++ b/apps/sim/tools/microsoft_excel/index.ts
@@ -1,9 +1,7 @@
-import { readTool } from '@/tools/microsoft_excel/read'
-import { readV2Tool } from '@/tools/microsoft_excel/read_v2'
+import { readTool, readV2Tool } from '@/tools/microsoft_excel/read'
 import { tableAddTool } from '@/tools/microsoft_excel/table_add'
 import { worksheetAddTool } from '@/tools/microsoft_excel/worksheet_add'
-import { writeTool } from '@/tools/microsoft_excel/write'
-import { writeV2Tool } from '@/tools/microsoft_excel/write_v2'
+import { writeTool, writeV2Tool } from '@/tools/microsoft_excel/write'
 
 // V1 exports
 export const microsoftExcelReadTool = readTool
diff --git a/apps/sim/tools/microsoft_excel/read.ts b/apps/sim/tools/microsoft_excel/read.ts
index 38e1ff2a50..49e8540ce5 100644
--- a/apps/sim/tools/microsoft_excel/read.ts
+++ b/apps/sim/tools/microsoft_excel/read.ts
@@ -2,6 +2,8 @@ import type {
   ExcelCellValue,
   MicrosoftExcelReadResponse,
   MicrosoftExcelToolParams,
+  MicrosoftExcelV2ReadResponse,
+  MicrosoftExcelV2ToolParams,
 } from '@/tools/microsoft_excel/types'
 import {
   getSpreadsheetWebUrl,
@@ -213,3 +215,126 @@ export const readTool: ToolConfig<MicrosoftExcelToolParams, MicrosoftExcelReadRe
     },
   },
 }
+
+export const readV2Tool: ToolConfig<MicrosoftExcelV2ToolParams, MicrosoftExcelV2ReadResponse> = {
+  id: 'microsoft_excel_read_v2',
+  name: 'Read from Microsoft Excel V2',
+  description: 'Read data from a specific sheet in a Microsoft Excel spreadsheet',
+  version: '2.0.0',
+
+  oauth: {
+    required: true,
+    provider: 'microsoft-excel',
+  },
+
+  params: {
+    accessToken: {
+      type: 'string',
+      required: true,
+      visibility: 'hidden',
+      description: 'The access token for the Microsoft Excel API',
+    },
+    spreadsheetId: {
+      type: 'string',
+      required: true,
+      visibility: 'user-only',
+      description: 'The ID of the spreadsheet to read from',
+    },
+    sheetName: {
+      type: 'string',
+      required: true,
+      visibility: 'user-or-llm',
+      description: 'The name of the sheet/tab to read from',
+    },
+    cellRange: {
+      type: 'string',
+      required: false,
+      visibility: 'user-or-llm',
+      description:
+        'The cell range to read (e.g., "A1:D10"). If not specified, reads the entire used range.',
+    },
+  },
+
+  request: {
+    url: (params) => {
+      const spreadsheetId = params.spreadsheetId?.trim()
+      if (!spreadsheetId) {
+        throw new Error('Spreadsheet ID is required')
+      }
+
+      const sheetName = params.sheetName?.trim()
+      if (!sheetName) {
+        throw new Error('Sheet name is required')
+      }
+
+      const encodedSheetName = encodeURIComponent(sheetName)
+
+      // If no cell range specified, fetch usedRange
+      if (!params.cellRange) {
+        return `https://graph.microsoft.com/v1.0/me/drive/items/${spreadsheetId}/workbook/worksheets('${encodedSheetName}')/usedRange(valuesOnly=true)`
+      }
+
+      const cellRange = params.cellRange.trim()
+      const encodedAddress = encodeURIComponent(cellRange)
+
+      return `https://graph.microsoft.com/v1.0/me/drive/items/${spreadsheetId}/workbook/worksheets('${encodedSheetName}')/range(address='${encodedAddress}')`
+    },
+    method: 'GET',
+    headers: (params) => {
+      if (!params.accessToken) {
+        throw new Error('Access token is required')
+      }
+
+      return {
+        Authorization: `Bearer ${params.accessToken}`,
+      }
+    },
+  },
+
+  transformResponse: async (response: Response, params?: MicrosoftExcelV2ToolParams) => {
+    const data = await response.json()
+
+    const urlParts = response.url.split('/drive/items/')
+    const spreadsheetId = urlParts[1]?.split('/')[0] || ''
+
+    const accessToken = params?.accessToken
+    if (!accessToken) {
+      throw new Error('Access token is required')
+    }
+    const webUrl = await getSpreadsheetWebUrl(spreadsheetId, accessToken)
+
+    const address: string = data.address || data.addressLocal || ''
+    const rawValues: ExcelCellValue[][] = data.values || []
+    const values = trimTrailingEmptyRowsAndColumns(rawValues)
+
+    // Extract sheet name from address (format: SheetName!A1:B2)
+    const sheetName = params?.sheetName || address.split('!')[0] || ''
+
+    return {
+      success: true,
+      output: {
+        sheetName,
+        range: address,
+        values,
+        metadata: {
+          spreadsheetId,
+          spreadsheetUrl: webUrl,
+        },
+      },
+    }
+  },
+
+  outputs: {
+    sheetName: { type: 'string', description: 'Name of the sheet that was read' },
+    range: { type: 'string', description: 'The range that was read' },
+    values: { type: 'array', description: 'Array of rows containing cell values' },
+    metadata: {
+      type: 'json',
+      description: 'Spreadsheet metadata including ID and URL',
+      properties: {
+        spreadsheetId: { type: 'string', description: 'Microsoft Excel spreadsheet ID' },
+        spreadsheetUrl: { type: 'string', description: 'Spreadsheet URL' },
+      },
+    },
+  },
+}
diff --git a/apps/sim/tools/microsoft_excel/read_v2.ts b/apps/sim/tools/microsoft_excel/read_v2.ts
deleted file mode 100644
index 1d4e047690..0000000000
--- a/apps/sim/tools/microsoft_excel/read_v2.ts
+++ /dev/null
@@ -1,133 +0,0 @@
-import type {
-  ExcelCellValue,
-  MicrosoftExcelV2ReadResponse,
-  MicrosoftExcelV2ToolParams,
-} from '@/tools/microsoft_excel/types'
-import {
-  getSpreadsheetWebUrl,
-  trimTrailingEmptyRowsAndColumns,
-} from '@/tools/microsoft_excel/utils'
-import type { ToolConfig } from '@/tools/types'
-
-export const readV2Tool: ToolConfig<MicrosoftExcelV2ToolParams, MicrosoftExcelV2ReadResponse> = {
-  id: 'microsoft_excel_read_v2',
-  name: 'Read from Microsoft Excel V2',
-  description: 'Read data from a specific sheet in a Microsoft Excel spreadsheet',
-  version: '2.0.0',
-
-  oauth: {
-    required: true,
-    provider: 'microsoft-excel',
-  },
-
-  params: {
-    accessToken: {
-      type: 'string',
-      required: true,
-      visibility: 'hidden',
-      description: 'The access token for the Microsoft Excel API',
-    },
-    spreadsheetId: {
-      type: 'string',
-      required: true,
-      visibility: 'user-only',
-      description: 'The ID of the spreadsheet to read from',
-    },
-    sheetName: {
-      type: 'string',
-      required: true,
-      visibility: 'user-or-llm',
-      description: 'The name of the sheet/tab to read from',
-    },
-    cellRange: {
-      type: 'string',
-      required: false,
-      visibility: 'user-or-llm',
-      description:
-        'The cell range to read (e.g., "A1:D10"). If not specified, reads the entire used range.',
-    },
-  },
-
-  request: {
-    url: (params) => {
-      const spreadsheetId = params.spreadsheetId?.trim()
-      if (!spreadsheetId) {
-        throw new Error('Spreadsheet ID is required')
-      }
-
-      const sheetName = params.sheetName?.trim()
-      if (!sheetName) {
-        throw new Error('Sheet name is required')
-      }
-
-      const encodedSheetName = encodeURIComponent(sheetName)
-
-      // If no cell range specified, fetch usedRange
-      if (!params.cellRange) {
-        return `https://graph.microsoft.com/v1.0/me/drive/items/${spreadsheetId}/workbook/worksheets('${encodedSheetName}')/usedRange(valuesOnly=true)`
-      }
-
-      const cellRange = params.cellRange.trim()
-      const encodedAddress = encodeURIComponent(cellRange)
-
-      return `https://graph.microsoft.com/v1.0/me/drive/items/${spreadsheetId}/workbook/worksheets('${encodedSheetName}')/range(address='${encodedAddress}')`
-    },
-    method: 'GET',
-    headers: (params) => {
-      if (!params.accessToken) {
-        throw new Error('Access token is required')
-      }
-
-      return {
-        Authorization: `Bearer ${params.accessToken}`,
-      }
-    },
-  },
-
-  transformResponse: async (response: Response, params?: MicrosoftExcelV2ToolParams) => {
-    const data = await response.json()
-
-    const urlParts = response.url.split('/drive/items/')
-    const spreadsheetId = urlParts[1]?.split('/')[0] || ''
-
-    const accessToken = params?.accessToken
-    if (!accessToken) {
-      throw new Error('Access token is required')
-    }
-    const webUrl = await getSpreadsheetWebUrl(spreadsheetId, accessToken)
-
-    const address: string = data.address || data.addressLocal || ''
-    const rawValues: ExcelCellValue[][] = data.values || []
-    const values = trimTrailingEmptyRowsAndColumns(rawValues)
-
-    // Extract sheet name from address (format: SheetName!A1:B2)
-    const sheetName = params?.sheetName || address.split('!')[0] || ''
-
-    return {
-      success: true,
-      output: {
-        sheetName,
-        range: address,
-        values,
-        metadata: {
-          spreadsheetId,
-          spreadsheetUrl: webUrl,
-        },
-      },
-    }
-  },
-
-  outputs: {
-    sheetName: { type: 'string', description: 'Name of the sheet that was read' },
-    range: { type: 'string', description: 'The range that was read' },
-    values: { type: 'array', description: 'Array of rows containing cell values' },
-    metadata: {
-      type: 'json',
-      description: 'Spreadsheet metadata including ID and URL',
-      properties: {
-        spreadsheetId: { type: 'string', description: 'Microsoft Excel spreadsheet ID' },
-        spreadsheetUrl: { type: 'string', description: 'Spreadsheet URL' },
-      },
-    },
-  },
-}
diff --git a/apps/sim/tools/microsoft_excel/write.ts b/apps/sim/tools/microsoft_excel/write.ts
index 07aa4acf88..d400bf28a4 100644
--- a/apps/sim/tools/microsoft_excel/write.ts
+++ b/apps/sim/tools/microsoft_excel/write.ts
@@ -1,5 +1,7 @@
 import type {
   MicrosoftExcelToolParams,
+  MicrosoftExcelV2ToolParams,
+  MicrosoftExcelV2WriteResponse,
   MicrosoftExcelWriteResponse,
 } from '@/tools/microsoft_excel/types'
 import { getSpreadsheetWebUrl } from '@/tools/microsoft_excel/utils'
@@ -182,3 +184,181 @@ export const writeTool: ToolConfig<MicrosoftExcelToolParams, MicrosoftExcelWrite
     },
   },
 }
+
+export const writeV2Tool: ToolConfig<MicrosoftExcelV2ToolParams, MicrosoftExcelV2WriteResponse> = {
+  id: 'microsoft_excel_write_v2',
+  name: 'Write to Microsoft Excel V2',
+  description: 'Write data to a specific sheet in a Microsoft Excel spreadsheet',
+  version: '2.0.0',
+
+  oauth: {
+    required: true,
+    provider: 'microsoft-excel',
+  },
+
+  params: {
+    accessToken: {
+      type: 'string',
+      required: true,
+      visibility: 'hidden',
+      description: 'The access token for the Microsoft Excel API',
+    },
+    spreadsheetId: {
+      type: 'string',
+      required: true,
+      visibility: 'user-only',
+      description: 'The ID of the spreadsheet to write to',
+    },
+    sheetName: {
+      type: 'string',
+      required: true,
+      visibility: 'user-or-llm',
+      description: 'The name of the sheet/tab to write to',
+    },
+    cellRange: {
+      type: 'string',
+      required: false,
+      visibility: 'user-or-llm',
+      description:
+        'The cell range to write to (e.g., "A1:D10", "A1"). Defaults to "A1" if not specified.',
+    },
+    values: {
+      type: 'array',
+      required: true,
+      visibility: 'user-or-llm',
+      description:
+        'The data to write as a 2D array (e.g. [["Name", "Age"], ["Alice", 30], ["Bob", 25]]) or array of objects.',
+    },
+    valueInputOption: {
+      type: 'string',
+      required: false,
+      visibility: 'hidden',
+      description: 'The format of the data to write',
+    },
+    includeValuesInResponse: {
+      type: 'boolean',
+      required: false,
+      visibility: 'hidden',
+      description: 'Whether to include the written values in the response',
+    },
+  },
+
+  request: {
+    url: (params) => {
+      const spreadsheetId = params.spreadsheetId?.trim()
+      if (!spreadsheetId) {
+        throw new Error('Spreadsheet ID is required')
+      }
+
+      const sheetName = params.sheetName?.trim()
+      if (!sheetName) {
+        throw new Error('Sheet name is required')
+      }
+
+      const cellRange = params.cellRange?.trim() || 'A1'
+      const encodedSheetName = encodeURIComponent(sheetName)
+      const encodedAddress = encodeURIComponent(cellRange)
+
+      const url = new URL(
+        `https://graph.microsoft.com/v1.0/me/drive/items/${spreadsheetId}/workbook/worksheets('${encodedSheetName}')/range(address='${encodedAddress}')`
+      )
+
+      const valueInputOption = params.valueInputOption || 'USER_ENTERED'
+      url.searchParams.append('valueInputOption', valueInputOption)
+
+      if (params.includeValuesInResponse) {
+        url.searchParams.append('includeValuesInResponse', 'true')
+      }
+
+      return url.toString()
+    },
+    method: 'PATCH',
+    headers: (params) => ({
+      Authorization: `Bearer ${params.accessToken}`,
+      'Content-Type': 'application/json',
+    }),
+    body: (params) => {
+      let processedValues: any = params.values || []
+
+      // Handle array of objects
+      if (
+        Array.isArray(processedValues) &&
+        processedValues.length > 0 &&
+        typeof processedValues[0] === 'object' &&
+        !Array.isArray(processedValues[0])
+      ) {
+        const allKeys = new Set<string>()
+        processedValues.forEach((obj: any) => {
+          if (obj && typeof obj === 'object') {
+            Object.keys(obj).forEach((key) => allKeys.add(key))
+          }
+        })
+        const headers = Array.from(allKeys)
+
+        const rows = processedValues.map((obj: any) => {
+          if (!obj || typeof obj !== 'object') {
+            return Array(headers.length).fill('')
+          }
+          return headers.map((key) => {
+            const value = obj[key]
+            if (value !== null && typeof value === 'object') {
+              return JSON.stringify(value)
+            }
+            return value === undefined ? '' : value
+          })
+        })
+
+        processedValues = [headers, ...rows]
+      }
+
+      const body: Record<string, any> = {
+        majorDimension: params.majorDimension || 'ROWS',
+        values: processedValues,
+      }
+
+      return body
+    },
+  },
+
+  transformResponse: async (response: Response, params?: MicrosoftExcelV2ToolParams) => {
+    const data = await response.json()
+
+    const urlParts = response.url.split('/drive/items/')
+    const spreadsheetId = urlParts[1]?.split('/')[0] || ''
+
+    const accessToken = params?.accessToken
+    if (!accessToken) {
+      throw new Error('Access token is required')
+    }
+    const webUrl = await getSpreadsheetWebUrl(spreadsheetId, accessToken)
+
+    return {
+      success: true,
+      output: {
+        updatedRange: data.address ?? null,
+        updatedRows: data.rowCount ?? 0,
+        updatedColumns: data.columnCount ?? 0,
+        updatedCells: (data.rowCount ?? 0) * (data.columnCount ?? 0),
+        metadata: {
+          spreadsheetId,
+          spreadsheetUrl: webUrl,
+        },
+      },
+    }
+  },
+
+  outputs: {
+    updatedRange: { type: 'string', description: 'Range of cells that were updated' },
+    updatedRows: { type: 'number', description: 'Number of rows updated' },
+    updatedColumns: { type: 'number', description: 'Number of columns updated' },
+    updatedCells: { type: 'number', description: 'Number of cells updated' },
+    metadata: {
+      type: 'json',
+      description: 'Spreadsheet metadata including ID and URL',
+      properties: {
+        spreadsheetId: { type: 'string', description: 'Microsoft Excel spreadsheet ID' },
+        spreadsheetUrl: { type: 'string', description: 'Spreadsheet URL' },
+      },
+    },
+  },
+}
diff --git a/apps/sim/tools/microsoft_excel/write_v2.ts b/apps/sim/tools/microsoft_excel/write_v2.ts
deleted file mode 100644
index 25069f3fbd..0000000000
--- a/apps/sim/tools/microsoft_excel/write_v2.ts
+++ /dev/null
@@ -1,184 +0,0 @@
-import type {
-  MicrosoftExcelV2ToolParams,
-  MicrosoftExcelV2WriteResponse,
-} from '@/tools/microsoft_excel/types'
-import { getSpreadsheetWebUrl } from '@/tools/microsoft_excel/utils'
-import type { ToolConfig } from '@/tools/types'
-
-export const writeV2Tool: ToolConfig<MicrosoftExcelV2ToolParams, MicrosoftExcelV2WriteResponse> = {
-  id: 'microsoft_excel_write_v2',
-  name: 'Write to Microsoft Excel V2',
-  description: 'Write data to a specific sheet in a Microsoft Excel spreadsheet',
-  version: '2.0.0',
-
-  oauth: {
-    required: true,
-    provider: 'microsoft-excel',
-  },
-
-  params: {
-    accessToken: {
-      type: 'string',
-      required: true,
-      visibility: 'hidden',
-      description: 'The access token for the Microsoft Excel API',
-    },
-    spreadsheetId: {
-      type: 'string',
-      required: true,
-      visibility: 'user-only',
-      description: 'The ID of the spreadsheet to write to',
-    },
-    sheetName: {
-      type: 'string',
-      required: true,
-      visibility: 'user-or-llm',
-      description: 'The name of the sheet/tab to write to',
-    },
-    cellRange: {
-      type: 'string',
-      required: false,
-      visibility: 'user-or-llm',
-      description:
-        'The cell range to write to (e.g., "A1:D10", "A1"). Defaults to "A1" if not specified.',
-    },
-    values: {
-      type: 'array',
-      required: true,
-      visibility: 'user-or-llm',
-      description:
-        'The data to write as a 2D array (e.g. [["Name", "Age"], ["Alice", 30], ["Bob", 25]]) or array of objects.',
-    },
-    valueInputOption: {
-      type: 'string',
-      required: false,
-      visibility: 'hidden',
-      description: 'The format of the data to write',
-    },
-    includeValuesInResponse: {
-      type: 'boolean',
-      required: false,
-      visibility: 'hidden',
-      description: 'Whether to include the written values in the response',
-    },
-  },
-
-  request: {
-    url: (params) => {
-      const spreadsheetId = params.spreadsheetId?.trim()
-      if (!spreadsheetId) {
-        throw new Error('Spreadsheet ID is required')
-      }
-
-      const sheetName = params.sheetName?.trim()
-      if (!sheetName) {
-        throw new Error('Sheet name is required')
-      }
-
-      const cellRange = params.cellRange?.trim() || 'A1'
-      const encodedSheetName = encodeURIComponent(sheetName)
-      const encodedAddress = encodeURIComponent(cellRange)
-
-      const url = new URL(
-        `https://graph.microsoft.com/v1.0/me/drive/items/${spreadsheetId}/workbook/worksheets('${encodedSheetName}')/range(address='${encodedAddress}')`
-      )
-
-      const valueInputOption = params.valueInputOption || 'USER_ENTERED'
-      url.searchParams.append('valueInputOption', valueInputOption)
-
-      if (params.includeValuesInResponse) {
-        url.searchParams.append('includeValuesInResponse', 'true')
-      }
-
-      return url.toString()
-    },
-    method: 'PATCH',
-    headers: (params) => ({
-      Authorization: `Bearer ${params.accessToken}`,
-      'Content-Type': 'application/json',
-    }),
-    body: (params) => {
-      let processedValues: any = params.values || []
-
-      // Handle array of objects
-      if (
-        Array.isArray(processedValues) &&
-        processedValues.length > 0 &&
-        typeof processedValues[0] === 'object' &&
-        !Array.isArray(processedValues[0])
-      ) {
-        const allKeys = new Set<string>()
-        processedValues.forEach((obj: any) => {
-          if (obj && typeof obj === 'object') {
-            Object.keys(obj).forEach((key) => allKeys.add(key))
-          }
-        })
-        const headers = Array.from(allKeys)
-
-        const rows = processedValues.map((obj: any) => {
-          if (!obj || typeof obj !== 'object') {
-            return Array(headers.length).fill('')
-          }
-          return headers.map((key) => {
-            const value = obj[key]
-            if (value !== null && typeof value === 'object') {
-              return JSON.stringify(value)
-            }
-            return value === undefined ? '' : value
-          })
-        })
-
-        processedValues = [headers, ...rows]
-      }
-
-      const body: Record<string, any> = {
-        majorDimension: params.majorDimension || 'ROWS',
-        values: processedValues,
-      }
-
-      return body
-    },
-  },
-
-  transformResponse: async (response: Response, params?: MicrosoftExcelV2ToolParams) => {
-    const data = await response.json()
-
-    const urlParts = response.url.split('/drive/items/')
-    const spreadsheetId = urlParts[1]?.split('/')[0] || ''
-
-    const accessToken = params?.accessToken
-    if (!accessToken) {
-      throw new Error('Access token is required')
-    }
-    const webUrl = await getSpreadsheetWebUrl(spreadsheetId, accessToken)
-
-    return {
-      success: true,
-      output: {
-        updatedRange: data.address ?? null,
-        updatedRows: data.rowCount ?? 0,
-        updatedColumns: data.columnCount ?? 0,
-        updatedCells: (data.rowCount ?? 0) * (data.columnCount ?? 0),
-        metadata: {
-          spreadsheetId,
-          spreadsheetUrl: webUrl,
-        },
-      },
-    }
-  },
-
-  outputs: {
-    updatedRange: { type: 'string', description: 'Range of cells that were updated' },
-    updatedRows: { type: 'number', description: 'Number of rows updated' },
-    updatedColumns: { type: 'number', description: 'Number of columns updated' },
-    updatedCells: { type: 'number', description: 'Number of cells updated' },
-    metadata: {
-      type: 'json',
-      description: 'Spreadsheet metadata including ID and URL',
-      properties: {
-        spreadsheetId: { type: 'string', description: 'Microsoft Excel spreadsheet ID' },
-        spreadsheetUrl: { type: 'string', description: 'Spreadsheet URL' },
-      },
-    },
-  },
-}
diff --git a/apps/sim/tools/params-resolver.ts b/apps/sim/tools/params-resolver.ts
new file mode 100644
index 0000000000..641511af6f
--- /dev/null
+++ b/apps/sim/tools/params-resolver.ts
@@ -0,0 +1,46 @@
+import {
+  buildCanonicalIndex,
+  type CanonicalIndex,
+  evaluateSubBlockCondition,
+  getCanonicalValues,
+  isCanonicalPair,
+  resolveCanonicalMode,
+  type SubBlockCondition,
+} from '@/lib/workflows/subblocks/visibility'
+import type { SubBlockConfig as BlockSubBlockConfig } from '@/blocks/types'
+
+export {
+  buildCanonicalIndex,
+  type CanonicalIndex,
+  evaluateSubBlockCondition,
+  type SubBlockCondition,
+}
+
+export interface ToolParamContext {
+  blockType: string
+  subBlocks: BlockSubBlockConfig[]
+  canonicalIndex: CanonicalIndex
+  values: Record<string, unknown>
+}
+
+/**
+ * Build preview context values for selectors that need dependency resolution.
+ * Resolves canonical values so selectors get the correct credential/dependency values.
+ */
+export function buildPreviewContextValues(
+  params: Record<string, unknown>,
+  context: ToolParamContext
+): Record<string, unknown> {
+  const result: Record<string, unknown> = { ...params }
+
+  for (const [canonicalId, group] of Object.entries(context.canonicalIndex.groupsById)) {
+    if (isCanonicalPair(group)) {
+      const mode = resolveCanonicalMode(group, context.values)
+      const { basicValue, advancedValue } = getCanonicalValues(group, context.values)
+      result[canonicalId] =
+        mode === 'advanced' ? (advancedValue ?? basicValue) : (basicValue ?? advancedValue)
+    }
+  }
+
+  return result
+}
diff --git a/apps/sim/tools/params.ts b/apps/sim/tools/params.ts
index b50329423f..ee6f3076ad 100644
--- a/apps/sim/tools/params.ts
+++ b/apps/sim/tools/params.ts
@@ -1,11 +1,28 @@
 import { createLogger } from '@sim/logger'
 import { extractInputFieldsFromBlocks } from '@/lib/workflows/input-format'
+import {
+  evaluateSubBlockCondition,
+  type SubBlockCondition,
+} from '@/lib/workflows/subblocks/visibility'
+import type { SubBlockConfig as BlockSubBlockConfig } from '@/blocks/types'
+import { isEmptyTagValue } from '@/tools/shared/tags'
 import type { ParameterVisibility, ToolConfig } from '@/tools/types'
 import { getTool } from '@/tools/utils'
 
 const logger = createLogger('ToolsParams')
 type ToolParamDefinition = ToolConfig['params'][string]
 
+/**
+ * Checks if a value is non-empty (not undefined, null, or empty string)
+ */
+export function isNonEmpty(value: unknown): boolean {
+  return value !== undefined && value !== null && value !== ''
+}
+
+// ============================================================================
+// Tag/Value Parsing Utilities
+// ============================================================================
+
 export interface Option {
   label: string
   value: string
@@ -39,7 +56,13 @@ export interface UIComponentConfig {
   multiple?: boolean
   multiSelect?: boolean
   maxSize?: number
-  dependsOn?: string[]
+  dependsOn?: string[] | { all?: string[]; any?: string[] }
+  /** Canonical parameter ID if this is part of a canonical group */
+  canonicalParamId?: string
+  /** The mode of the source subblock (basic/advanced/both) */
+  mode?: 'basic' | 'advanced' | 'both' | 'trigger'
+  /** The actual subblock ID this config was derived from */
+  actualSubBlockId?: string
 }
 
 export interface SubBlockConfig {
@@ -113,12 +136,6 @@ export interface ToolWithParameters {
 
 let blockConfigCache: Record<string, BlockConfig> | null = null
 
-const workflowInputFieldsCache = new Map<
-  string,
-  { fields: Array<{ name: string; type: string }>; timestamp: number }
->()
-const WORKFLOW_CACHE_TTL = 5 * 60 * 1000 // 5 minutes
-
 function getBlockConfigurations(): Record<string, BlockConfig> {
   if (!blockConfigCache) {
     try {
@@ -136,13 +153,56 @@ function getBlockConfigurations(): Record<string, BlockConfig> {
   return blockConfigCache
 }
 
+function resolveSubBlockForParam(
+  paramId: string,
+  subBlocks: SubBlockConfig[],
+  valuesWithOperation: Record<string, unknown>,
+  paramType: string
+): BlockSubBlockConfig | undefined {
+  const blockSubBlocks = subBlocks as BlockSubBlockConfig[]
+
+  // First pass: find subblock with matching condition
+  let fallbackMatch: BlockSubBlockConfig | undefined
+
+  for (const sb of blockSubBlocks) {
+    const matches = sb.id === paramId || sb.canonicalParamId === paramId
+    if (!matches) continue
+
+    // Remember first match as fallback (for condition-based filtering in UI)
+    if (!fallbackMatch) fallbackMatch = sb
+
+    if (
+      !sb.condition ||
+      evaluateSubBlockCondition(sb.condition as SubBlockCondition, valuesWithOperation)
+    ) {
+      return sb
+    }
+  }
+
+  // Return fallback so its condition can be used for UI filtering
+  if (fallbackMatch) return fallbackMatch
+
+  // Check if boolean param is part of a checkbox-list
+  if (paramType === 'boolean') {
+    return blockSubBlocks.find(
+      (sb) =>
+        sb.type === 'checkbox-list' &&
+        Array.isArray(sb.options) &&
+        (sb.options as Array<{ id?: string }>).some((opt) => opt.id === paramId)
+    )
+  }
+
+  return undefined
+}
+
 /**
  * Gets all parameters for a tool, categorized by their usage
  * Also includes UI component information from block configurations
  */
 export function getToolParametersConfig(
   toolId: string,
-  blockType?: string
+  blockType?: string,
+  currentValues?: Record<string, unknown>
 ): ToolWithParameters | null {
   try {
     const toolConfig = getTool(toolId)
@@ -209,6 +269,17 @@ export function getToolParametersConfig(
       blockConfig = blockConfigs[blockType] || null
     }
 
+    // Build values for condition evaluation
+    // Operation should come from currentValues if provided, otherwise extract from toolId
+    const values = currentValues || {}
+    const valuesWithOperation = { ...values }
+    if (valuesWithOperation.operation === undefined) {
+      // Fallback: extract operation from tool ID (e.g., 'slack_message' -> 'message')
+      const parts = toolId.split('_')
+      valuesWithOperation.operation =
+        parts.length >= 3 ? parts.slice(2).join('_') : parts[parts.length - 1]
+    }
+
     // Convert tool params to our standard format with UI component info
     const allParameters: ToolParameterConfig[] = Object.entries(toolConfig.params).map(
       ([paramId, param]) => {
@@ -221,63 +292,21 @@ export function getToolParametersConfig(
           default: param.default,
         }
 
-        // Add UI component information from block config if available
         if (blockConfig) {
-          // For multi-operation tools, find the subblock that matches both the parameter ID
-          // and the current tool operation
-          let subBlock = blockConfig.subBlocks?.find((sb: SubBlockConfig) => {
-            if (sb.id !== paramId) return false
-
-            // If there's a condition, check if it matches the current tool
-            if (sb.condition && sb.condition.field === 'operation') {
-              // First try exact match with full tool ID
-              if (sb.condition.value === toolId) return true
-
-              // Then try extracting operation from tool ID
-              // For tools like 'google_calendar_quick_add', extract 'quick_add'
-              const parts = toolId.split('_')
-              if (parts.length >= 3) {
-                // Join everything after the provider prefix (e.g., 'google_calendar_')
-                const operation = parts.slice(2).join('_')
-                if (sb.condition.value === operation) return true
-              }
-
-              // Fallback to last part only
-              const operation = parts[parts.length - 1]
-              return sb.condition.value === operation
-            }
-
-            // If no condition, it's a global parameter (like apiKey)
-            return !sb.condition
-          })
-
-          // Fallback: if no operation-specific match, find any matching parameter
-          if (!subBlock) {
-            subBlock = blockConfig.subBlocks?.find((sb: SubBlockConfig) => sb.id === paramId)
-          }
-
-          // Special case: Check if this boolean parameter is part of a checkbox-list
-          if (!subBlock && param.type === 'boolean' && blockConfig) {
-            // Look for a checkbox-list that includes this parameter as an option
-            const checkboxListBlock = blockConfig.subBlocks?.find(
-              (sb: SubBlockConfig) =>
-                sb.type === 'checkbox-list' &&
-                Array.isArray(sb.options) &&
-                sb.options.some((opt: any) => opt.id === paramId)
-            )
-
-            if (checkboxListBlock) {
-              subBlock = checkboxListBlock
-            }
-          }
+          const subBlock = resolveSubBlockForParam(
+            paramId,
+            blockConfig.subBlocks || [],
+            valuesWithOperation,
+            param.type
+          )
 
           if (subBlock) {
             toolParam.uiComponent = {
               type: subBlock.type,
-              options: subBlock.options,
+              options: subBlock.options as Option[] | undefined,
               placeholder: subBlock.placeholder,
               password: subBlock.password,
-              condition: subBlock.condition,
+              condition: subBlock.condition as ComponentCondition | undefined,
               title: subBlock.title,
               value: subBlock.value,
               serviceId: subBlock.serviceId,
@@ -290,10 +319,13 @@ export function getToolParametersConfig(
               integer: subBlock.integer,
               language: subBlock.language,
               generationType: subBlock.generationType,
-              acceptedTypes: subBlock.acceptedTypes,
+              acceptedTypes: subBlock.acceptedTypes ? [subBlock.acceptedTypes] : undefined,
               multiple: subBlock.multiple,
               maxSize: subBlock.maxSize,
               dependsOn: subBlock.dependsOn,
+              canonicalParamId: subBlock.canonicalParamId,
+              mode: subBlock.mode,
+              actualSubBlockId: subBlock.id,
             }
           }
         }
@@ -396,20 +428,41 @@ export async function createLLMToolSchema(
 
   // Only include parameters that the LLM should/can provide
   for (const [paramId, param] of Object.entries(toolConfig.params)) {
+    // Check if this param has schema enrichment config
+    const enrichmentConfig = toolConfig.schemaEnrichment?.[paramId]
+
     // Special handling for workflow_executor's inputMapping parameter
     // Always include in LLM schema so LLM can provide dynamic input values
     // even if user has configured empty/partial inputMapping in the UI
     const isWorkflowInputMapping =
       toolConfig.id === 'workflow_executor' && paramId === 'inputMapping'
 
-    if (!isWorkflowInputMapping) {
-      const isUserProvided =
-        userProvidedParams[paramId] !== undefined &&
-        userProvidedParams[paramId] !== null &&
-        userProvidedParams[paramId] !== ''
+    // Parameters with enrichment config are treated specially:
+    // - Include them if dependency value is available (even if normally hidden)
+    // - Skip them if dependency value is not available
+    if (enrichmentConfig) {
+      const dependencyValue = userProvidedParams[enrichmentConfig.dependsOn] as string
+      if (!dependencyValue) {
+        continue
+      }
+
+      const propertySchema = buildParameterSchema(toolConfig.id, paramId, param)
+      const enrichedSchema = await enrichmentConfig.enrichSchema(dependencyValue)
+
+      if (enrichedSchema) {
+        Object.assign(propertySchema, enrichedSchema)
+        schema.properties[paramId] = propertySchema
+
+        if (param.required) {
+          schema.required.push(paramId)
+        }
+      }
+      continue
+    }
 
+    if (!isWorkflowInputMapping) {
       // Skip parameters that user has already provided
-      if (isUserProvided) {
+      if (isNonEmpty(userProvidedParams[paramId])) {
         continue
       }
 
@@ -479,18 +532,12 @@ async function applyDynamicSchemaForWorkflow(
 }
 
 /**
- * Helper function to fetch workflow input fields with caching
+ * Fetches workflow input fields from the API.
+ * No local caching - relies on React Query caching on the client side.
  */
 async function fetchWorkflowInputFields(
   workflowId: string
 ): Promise<Array<{ name: string; type: string }>> {
-  const cached = workflowInputFieldsCache.get(workflowId)
-  const now = Date.now()
-
-  if (cached && now - cached.timestamp < WORKFLOW_CACHE_TTL) {
-    return cached.fields
-  }
-
   try {
     const { buildAuthHeaders, buildAPIUrl } = await import('@/executor/utils/http')
 
@@ -503,10 +550,7 @@ async function fetchWorkflowInputFields(
     }
 
     const { data } = await response.json()
-    const fields = extractInputFieldsFromBlocks(data?.state?.blocks)
-    workflowInputFieldsCache.set(workflowId, { fields, timestamp: now })
-
-    return fields
+    return extractInputFieldsFromBlocks(data?.state?.blocks)
   } catch (error) {
     logger.error('Error fetching workflow input fields:', error)
     return []
@@ -591,8 +635,7 @@ export function deepMergeInputMapping(
 
   for (const [key, userValue] of Object.entries(parsedUserMapping)) {
     // Only override LLM value if user provided a non-empty value
-    // Note: Using strict inequality (!==) so 0 and false are correctly preserved
-    if (userValue !== undefined && userValue !== null && userValue !== '') {
+    if (isNonEmpty(userValue)) {
       merged[key] = userValue
     }
   }
@@ -612,11 +655,15 @@ export function mergeToolParameters(
   userProvidedParams: Record<string, unknown>,
   llmGeneratedParams: Record<string, unknown>
 ): Record<string, unknown> {
-  // Filter out empty strings from user-provided params
+  // Filter out empty and effectively-empty values from user-provided params
   // so that cleared fields don't override LLM values
   const filteredUserParams: Record<string, unknown> = {}
   for (const [key, value] of Object.entries(userProvidedParams)) {
-    if (value !== undefined && value !== null && value !== '') {
+    if (isNonEmpty(value)) {
+      // Skip tag-based params if they're effectively empty (only default/unfilled entries)
+      if ((key === 'documentTags' || key === 'tagFilters') && isEmptyTagValue(value)) {
+        continue
+      }
       filteredUserParams[key] = value
     }
   }
@@ -664,11 +711,7 @@ export function filterSchemaForLLM(
 
   // Remove user-provided parameters from the schema
   Object.keys(userProvidedParams).forEach((paramKey) => {
-    if (
-      userProvidedParams[paramKey] !== undefined &&
-      userProvidedParams[paramKey] !== null &&
-      userProvidedParams[paramKey] !== ''
-    ) {
+    if (isNonEmpty(userProvidedParams[paramKey])) {
       delete filteredProperties[paramKey]
       const reqIndex = filteredRequired.indexOf(paramKey)
       if (reqIndex > -1) {
diff --git a/apps/sim/tools/polymarket/get_event.ts b/apps/sim/tools/polymarket/get_event.ts
index 0371360973..c1dd865127 100644
--- a/apps/sim/tools/polymarket/get_event.ts
+++ b/apps/sim/tools/polymarket/get_event.ts
@@ -28,12 +28,14 @@ export const polymarketGetEventTool: ToolConfig<
       type: 'string',
       required: false,
       description: 'The event ID. Required if slug is not provided.',
+      visibility: 'user-or-llm',
     },
     slug: {
       type: 'string',
       required: false,
       description:
         'The event slug (e.g., "2024-presidential-election"). Required if eventId is not provided.',
+      visibility: 'user-or-llm',
     },
   },
 
diff --git a/apps/sim/tools/polymarket/get_events.ts b/apps/sim/tools/polymarket/get_events.ts
index 6735573f9d..b603948ffc 100644
--- a/apps/sim/tools/polymarket/get_events.ts
+++ b/apps/sim/tools/polymarket/get_events.ts
@@ -30,31 +30,37 @@ export const polymarketGetEventsTool: ToolConfig<
       type: 'string',
       required: false,
       description: 'Filter by closed status (true/false). Use false for active events only.',
+      visibility: 'user-or-llm',
     },
     order: {
       type: 'string',
       required: false,
       description: 'Sort field (e.g., volume, liquidity, startDate, endDate, createdAt)',
+      visibility: 'user-or-llm',
     },
     ascending: {
       type: 'string',
       required: false,
       description: 'Sort direction (true for ascending, false for descending)',
+      visibility: 'user-or-llm',
     },
     tagId: {
       type: 'string',
       required: false,
       description: 'Filter by tag ID',
+      visibility: 'user-or-llm',
     },
     limit: {
       type: 'string',
       required: false,
       description: 'Number of results per page (max 50)',
+      visibility: 'user-or-llm',
     },
     offset: {
       type: 'string',
       required: false,
       description: 'Pagination offset (skip this many results)',
+      visibility: 'user-or-llm',
     },
   },
 
diff --git a/apps/sim/tools/polymarket/get_last_trade_price.ts b/apps/sim/tools/polymarket/get_last_trade_price.ts
index cb12f81bb2..3280e0f03c 100644
--- a/apps/sim/tools/polymarket/get_last_trade_price.ts
+++ b/apps/sim/tools/polymarket/get_last_trade_price.ts
@@ -26,6 +26,7 @@ export const polymarketGetLastTradePriceTool: ToolConfig<
       type: 'string',
       required: true,
       description: 'The CLOB token ID (from market clobTokenIds)',
+      visibility: 'user-or-llm',
     },
   },
 
diff --git a/apps/sim/tools/polymarket/get_market.ts b/apps/sim/tools/polymarket/get_market.ts
index 7b69d8ba80..1c4e9c27bc 100644
--- a/apps/sim/tools/polymarket/get_market.ts
+++ b/apps/sim/tools/polymarket/get_market.ts
@@ -28,12 +28,14 @@ export const polymarketGetMarketTool: ToolConfig<
       type: 'string',
       required: false,
       description: 'The market ID. Required if slug is not provided.',
+      visibility: 'user-or-llm',
     },
     slug: {
       type: 'string',
       required: false,
       description:
         'The market slug (e.g., "will-trump-win"). Required if marketId is not provided.',
+      visibility: 'user-or-llm',
     },
   },
 
diff --git a/apps/sim/tools/polymarket/get_markets.ts b/apps/sim/tools/polymarket/get_markets.ts
index fa15e69553..2183113ed5 100644
--- a/apps/sim/tools/polymarket/get_markets.ts
+++ b/apps/sim/tools/polymarket/get_markets.ts
@@ -30,31 +30,37 @@ export const polymarketGetMarketsTool: ToolConfig<
       type: 'string',
       required: false,
       description: 'Filter by closed status (true/false). Use false for active markets only.',
+      visibility: 'user-or-llm',
     },
     order: {
       type: 'string',
       required: false,
       description: 'Sort field (e.g., volumeNum, liquidityNum, startDate, endDate, createdAt)',
+      visibility: 'user-or-llm',
     },
     ascending: {
       type: 'string',
       required: false,
       description: 'Sort direction (true for ascending, false for descending)',
+      visibility: 'user-or-llm',
     },
     tagId: {
       type: 'string',
       required: false,
       description: 'Filter by tag ID',
+      visibility: 'user-or-llm',
     },
     limit: {
       type: 'string',
       required: false,
       description: 'Number of results per page (max 50)',
+      visibility: 'user-or-llm',
     },
     offset: {
       type: 'string',
       required: false,
       description: 'Pagination offset (skip this many results)',
+      visibility: 'user-or-llm',
     },
   },
 
diff --git a/apps/sim/tools/polymarket/get_midpoint.ts b/apps/sim/tools/polymarket/get_midpoint.ts
index 85dd64408a..7ea9abc1ad 100644
--- a/apps/sim/tools/polymarket/get_midpoint.ts
+++ b/apps/sim/tools/polymarket/get_midpoint.ts
@@ -26,6 +26,7 @@ export const polymarketGetMidpointTool: ToolConfig<
       type: 'string',
       required: true,
       description: 'The CLOB token ID (from market clobTokenIds)',
+      visibility: 'user-or-llm',
     },
   },
 
diff --git a/apps/sim/tools/polymarket/get_orderbook.ts b/apps/sim/tools/polymarket/get_orderbook.ts
index 890a5c01b9..90a95d9b6d 100644
--- a/apps/sim/tools/polymarket/get_orderbook.ts
+++ b/apps/sim/tools/polymarket/get_orderbook.ts
@@ -27,6 +27,7 @@ export const polymarketGetOrderbookTool: ToolConfig<
       type: 'string',
       required: true,
       description: 'The CLOB token ID (from market clobTokenIds)',
+      visibility: 'user-or-llm',
     },
   },
 
diff --git a/apps/sim/tools/polymarket/get_positions.ts b/apps/sim/tools/polymarket/get_positions.ts
index 3f164f6954..bbeda19094 100644
--- a/apps/sim/tools/polymarket/get_positions.ts
+++ b/apps/sim/tools/polymarket/get_positions.ts
@@ -28,11 +28,13 @@ export const polymarketGetPositionsTool: ToolConfig<
       type: 'string',
       required: true,
       description: 'User wallet address',
+      visibility: 'user-or-llm',
     },
     market: {
       type: 'string',
       required: false,
       description: 'Optional market ID to filter positions',
+      visibility: 'user-or-llm',
     },
   },
 
diff --git a/apps/sim/tools/polymarket/get_price.ts b/apps/sim/tools/polymarket/get_price.ts
index c5c56924bc..8506c51011 100644
--- a/apps/sim/tools/polymarket/get_price.ts
+++ b/apps/sim/tools/polymarket/get_price.ts
@@ -27,11 +27,13 @@ export const polymarketGetPriceTool: ToolConfig<
       type: 'string',
       required: true,
       description: 'The CLOB token ID (from market clobTokenIds)',
+      visibility: 'user-or-llm',
     },
     side: {
       type: 'string',
       required: true,
       description: 'Order side: buy or sell',
+      visibility: 'user-or-llm',
     },
   },
 
diff --git a/apps/sim/tools/polymarket/get_price_history.ts b/apps/sim/tools/polymarket/get_price_history.ts
index f3c3783284..e7ed1b3308 100644
--- a/apps/sim/tools/polymarket/get_price_history.ts
+++ b/apps/sim/tools/polymarket/get_price_history.ts
@@ -31,27 +31,32 @@ export const polymarketGetPriceHistoryTool: ToolConfig<
       type: 'string',
       required: true,
       description: 'The CLOB token ID (from market clobTokenIds)',
+      visibility: 'user-or-llm',
     },
     interval: {
       type: 'string',
       required: false,
       description:
         'Duration ending at current time (1m, 1h, 6h, 1d, 1w, max). Mutually exclusive with startTs/endTs.',
+      visibility: 'user-or-llm',
     },
     fidelity: {
       type: 'number',
       required: false,
       description: 'Data resolution in minutes (e.g., 60 for hourly)',
+      visibility: 'user-or-llm',
     },
     startTs: {
       type: 'number',
       required: false,
       description: 'Start timestamp (Unix seconds UTC)',
+      visibility: 'user-or-llm',
     },
     endTs: {
       type: 'number',
       required: false,
       description: 'End timestamp (Unix seconds UTC)',
+      visibility: 'user-or-llm',
     },
   },
 
diff --git a/apps/sim/tools/polymarket/get_series.ts b/apps/sim/tools/polymarket/get_series.ts
index 5a35a1285e..a3d528ecc6 100644
--- a/apps/sim/tools/polymarket/get_series.ts
+++ b/apps/sim/tools/polymarket/get_series.ts
@@ -25,11 +25,13 @@ export const polymarketGetSeriesTool: ToolConfig<
       type: 'string',
       required: false,
       description: 'Number of results per page (max 50)',
+      visibility: 'user-or-llm',
     },
     offset: {
       type: 'string',
       required: false,
       description: 'Pagination offset (skip this many results)',
+      visibility: 'user-or-llm',
     },
   },
 
diff --git a/apps/sim/tools/polymarket/get_series_by_id.ts b/apps/sim/tools/polymarket/get_series_by_id.ts
index f57b3c8674..4904a46f5b 100644
--- a/apps/sim/tools/polymarket/get_series_by_id.ts
+++ b/apps/sim/tools/polymarket/get_series_by_id.ts
@@ -27,6 +27,7 @@ export const polymarketGetSeriesByIdTool: ToolConfig<
       type: 'string',
       required: true,
       description: 'The series ID',
+      visibility: 'user-or-llm',
     },
   },
 
diff --git a/apps/sim/tools/polymarket/get_spread.ts b/apps/sim/tools/polymarket/get_spread.ts
index 707366893d..80c2c55197 100644
--- a/apps/sim/tools/polymarket/get_spread.ts
+++ b/apps/sim/tools/polymarket/get_spread.ts
@@ -27,6 +27,7 @@ export const polymarketGetSpreadTool: ToolConfig<
       type: 'string',
       required: true,
       description: 'The CLOB token ID (from market clobTokenIds)',
+      visibility: 'user-or-llm',
     },
   },
 
diff --git a/apps/sim/tools/polymarket/get_tags.ts b/apps/sim/tools/polymarket/get_tags.ts
index b0c5bcba32..1b492eaba2 100644
--- a/apps/sim/tools/polymarket/get_tags.ts
+++ b/apps/sim/tools/polymarket/get_tags.ts
@@ -23,11 +23,13 @@ export const polymarketGetTagsTool: ToolConfig<PolymarketGetTagsParams, Polymark
         type: 'string',
         required: false,
         description: 'Number of results per page (max 50)',
+        visibility: 'user-or-llm',
       },
       offset: {
         type: 'string',
         required: false,
         description: 'Pagination offset (skip this many results)',
+        visibility: 'user-or-llm',
       },
     },
 
diff --git a/apps/sim/tools/polymarket/get_tick_size.ts b/apps/sim/tools/polymarket/get_tick_size.ts
index ac7a5177a6..956c449300 100644
--- a/apps/sim/tools/polymarket/get_tick_size.ts
+++ b/apps/sim/tools/polymarket/get_tick_size.ts
@@ -26,6 +26,7 @@ export const polymarketGetTickSizeTool: ToolConfig<
       type: 'string',
       required: true,
       description: 'The CLOB token ID (from market clobTokenIds)',
+      visibility: 'user-or-llm',
     },
   },
 
diff --git a/apps/sim/tools/polymarket/get_trades.ts b/apps/sim/tools/polymarket/get_trades.ts
index e1afe13355..b3ff0160c3 100644
--- a/apps/sim/tools/polymarket/get_trades.ts
+++ b/apps/sim/tools/polymarket/get_trades.ts
@@ -28,21 +28,25 @@ export const polymarketGetTradesTool: ToolConfig<
       type: 'string',
       required: false,
       description: 'User wallet address to filter trades',
+      visibility: 'user-or-llm',
     },
     market: {
       type: 'string',
       required: false,
       description: 'Market ID to filter trades',
+      visibility: 'user-or-llm',
     },
     limit: {
       type: 'string',
       required: false,
       description: 'Number of results per page (max 50)',
+      visibility: 'user-or-llm',
     },
     offset: {
       type: 'string',
       required: false,
       description: 'Pagination offset (skip this many results)',
+      visibility: 'user-or-llm',
     },
   },
 
diff --git a/apps/sim/tools/polymarket/search.ts b/apps/sim/tools/polymarket/search.ts
index 044b8ce4f9..87a03ca41b 100644
--- a/apps/sim/tools/polymarket/search.ts
+++ b/apps/sim/tools/polymarket/search.ts
@@ -24,16 +24,19 @@ export const polymarketSearchTool: ToolConfig<PolymarketSearchParams, Polymarket
       type: 'string',
       required: true,
       description: 'Search query term',
+      visibility: 'user-or-llm',
     },
     limit: {
       type: 'string',
       required: false,
       description: 'Number of results per page (max 50)',
+      visibility: 'user-or-llm',
     },
     offset: {
       type: 'string',
       required: false,
       description: 'Pagination offset',
+      visibility: 'user-or-llm',
     },
   },
 
diff --git a/apps/sim/tools/qdrant/upsert_points.ts b/apps/sim/tools/qdrant/upsert_points.ts
index 8d3b6cf7ac..01dd5592e9 100644
--- a/apps/sim/tools/qdrant/upsert_points.ts
+++ b/apps/sim/tools/qdrant/upsert_points.ts
@@ -17,6 +17,7 @@ export const upsertPointsTool: ToolConfig<QdrantUpsertParams, QdrantResponse> =
     apiKey: {
       type: 'string',
       required: false,
+      visibility: 'user-only',
       description: 'Qdrant API key (optional)',
     },
     collection: {
diff --git a/apps/sim/tools/registry.ts b/apps/sim/tools/registry.ts
index d16bcc04cd..2a8088477e 100644
--- a/apps/sim/tools/registry.ts
+++ b/apps/sim/tools/registry.ts
@@ -233,18 +233,30 @@ import {
   githubAddLabelsV2Tool,
   githubCancelWorkflowRunTool,
   githubCancelWorkflowRunV2Tool,
+  githubCheckStarTool,
+  githubCheckStarV2Tool,
   githubCloseIssueTool,
   githubCloseIssueV2Tool,
   githubClosePRTool,
   githubClosePRV2Tool,
   githubCommentTool,
   githubCommentV2Tool,
+  githubCompareCommitsTool,
+  githubCompareCommitsV2Tool,
   githubCreateBranchTool,
   githubCreateBranchV2Tool,
+  githubCreateCommentReactionTool,
+  githubCreateCommentReactionV2Tool,
   githubCreateFileTool,
   githubCreateFileV2Tool,
+  githubCreateGistTool,
+  githubCreateGistV2Tool,
+  githubCreateIssueReactionTool,
+  githubCreateIssueReactionV2Tool,
   githubCreateIssueTool,
   githubCreateIssueV2Tool,
+  githubCreateMilestoneTool,
+  githubCreateMilestoneV2Tool,
   githubCreatePRTool,
   githubCreatePRV2Tool,
   githubCreateProjectTool,
@@ -253,22 +265,40 @@ import {
   githubCreateReleaseV2Tool,
   githubDeleteBranchTool,
   githubDeleteBranchV2Tool,
+  githubDeleteCommentReactionTool,
+  githubDeleteCommentReactionV2Tool,
   githubDeleteCommentTool,
   githubDeleteCommentV2Tool,
   githubDeleteFileTool,
   githubDeleteFileV2Tool,
+  githubDeleteGistTool,
+  githubDeleteGistV2Tool,
+  githubDeleteIssueReactionTool,
+  githubDeleteIssueReactionV2Tool,
+  githubDeleteMilestoneTool,
+  githubDeleteMilestoneV2Tool,
   githubDeleteProjectTool,
   githubDeleteProjectV2Tool,
   githubDeleteReleaseTool,
   githubDeleteReleaseV2Tool,
+  githubForkGistTool,
+  githubForkGistV2Tool,
+  githubForkRepoTool,
+  githubForkRepoV2Tool,
   githubGetBranchProtectionTool,
   githubGetBranchProtectionV2Tool,
   githubGetBranchTool,
   githubGetBranchV2Tool,
+  githubGetCommitTool,
+  githubGetCommitV2Tool,
   githubGetFileContentTool,
   githubGetFileContentV2Tool,
+  githubGetGistTool,
+  githubGetGistV2Tool,
   githubGetIssueTool,
   githubGetIssueV2Tool,
+  githubGetMilestoneTool,
+  githubGetMilestoneV2Tool,
   githubGetPRFilesTool,
   githubGetPRFilesV2Tool,
   githubGetProjectTool,
@@ -287,10 +317,18 @@ import {
   githubLatestCommitV2Tool,
   githubListBranchesTool,
   githubListBranchesV2Tool,
+  githubListCommitsTool,
+  githubListCommitsV2Tool,
+  githubListForksTool,
+  githubListForksV2Tool,
+  githubListGistsTool,
+  githubListGistsV2Tool,
   githubListIssueCommentsTool,
   githubListIssueCommentsV2Tool,
   githubListIssuesTool,
   githubListIssuesV2Tool,
+  githubListMilestonesTool,
+  githubListMilestonesV2Tool,
   githubListPRCommentsTool,
   githubListPRCommentsV2Tool,
   githubListPRsTool,
@@ -299,6 +337,8 @@ import {
   githubListProjectsV2Tool,
   githubListReleasesTool,
   githubListReleasesV2Tool,
+  githubListStargazersTool,
+  githubListStargazersV2Tool,
   githubListWorkflowRunsTool,
   githubListWorkflowRunsV2Tool,
   githubListWorkflowsTool,
@@ -315,16 +355,38 @@ import {
   githubRequestReviewersV2Tool,
   githubRerunWorkflowTool,
   githubRerunWorkflowV2Tool,
+  githubSearchCodeTool,
+  githubSearchCodeV2Tool,
+  githubSearchCommitsTool,
+  githubSearchCommitsV2Tool,
+  githubSearchIssuesTool,
+  githubSearchIssuesV2Tool,
+  githubSearchReposTool,
+  githubSearchReposV2Tool,
+  githubSearchUsersTool,
+  githubSearchUsersV2Tool,
+  githubStarGistTool,
+  githubStarGistV2Tool,
+  githubStarRepoTool,
+  githubStarRepoV2Tool,
   githubTriggerWorkflowTool,
   githubTriggerWorkflowV2Tool,
+  githubUnstarGistTool,
+  githubUnstarGistV2Tool,
+  githubUnstarRepoTool,
+  githubUnstarRepoV2Tool,
   githubUpdateBranchProtectionTool,
   githubUpdateBranchProtectionV2Tool,
   githubUpdateCommentTool,
   githubUpdateCommentV2Tool,
   githubUpdateFileTool,
   githubUpdateFileV2Tool,
+  githubUpdateGistTool,
+  githubUpdateGistV2Tool,
   githubUpdateIssueTool,
   githubUpdateIssueV2Tool,
+  githubUpdateMilestoneTool,
+  githubUpdateMilestoneV2Tool,
   githubUpdatePRTool,
   githubUpdatePRV2Tool,
   githubUpdateProjectTool,
@@ -383,40 +445,82 @@ import { googleSearchTool } from '@/tools/google'
 import {
   googleCalendarCreateTool,
   googleCalendarCreateV2Tool,
+  googleCalendarDeleteTool,
+  googleCalendarDeleteV2Tool,
   googleCalendarGetTool,
   googleCalendarGetV2Tool,
+  googleCalendarInstancesTool,
+  googleCalendarInstancesV2Tool,
   googleCalendarInviteTool,
   googleCalendarInviteV2Tool,
+  googleCalendarListCalendarsTool,
+  googleCalendarListCalendarsV2Tool,
   googleCalendarListTool,
   googleCalendarListV2Tool,
+  googleCalendarMoveTool,
+  googleCalendarMoveV2Tool,
   googleCalendarQuickAddTool,
   googleCalendarQuickAddV2Tool,
+  googleCalendarUpdateTool,
+  googleCalendarUpdateV2Tool,
 } from '@/tools/google_calendar'
 import { googleDocsCreateTool, googleDocsReadTool, googleDocsWriteTool } from '@/tools/google_docs'
 import {
+  googleDriveCopyTool,
   googleDriveCreateFolderTool,
+  googleDriveDeleteTool,
   googleDriveDownloadTool,
+  googleDriveGetAboutTool,
   googleDriveGetContentTool,
+  googleDriveGetFileTool,
+  googleDriveListPermissionsTool,
   googleDriveListTool,
+  googleDriveShareTool,
+  googleDriveTrashTool,
+  googleDriveUnshareTool,
+  googleDriveUntrashTool,
+  googleDriveUpdateTool,
   googleDriveUploadTool,
 } from '@/tools/google_drive'
-import { googleFormsGetResponsesTool } from '@/tools/google_form'
 import {
+  googleFormsBatchUpdateTool,
+  googleFormsCreateFormTool,
+  googleFormsCreateWatchTool,
+  googleFormsDeleteWatchTool,
+  googleFormsGetFormTool,
+  googleFormsGetResponsesTool,
+  googleFormsListWatchesTool,
+  googleFormsRenewWatchTool,
+  googleFormsSetPublishSettingsTool,
+} from '@/tools/google_forms'
+import {
+  googleGroupsAddAliasTool,
   googleGroupsAddMemberTool,
   googleGroupsCreateGroupTool,
   googleGroupsDeleteGroupTool,
   googleGroupsGetGroupTool,
   googleGroupsGetMemberTool,
+  googleGroupsGetSettingsTool,
   googleGroupsHasMemberTool,
+  googleGroupsListAliasesTool,
   googleGroupsListGroupsTool,
   googleGroupsListMembersTool,
+  googleGroupsRemoveAliasTool,
   googleGroupsRemoveMemberTool,
   googleGroupsUpdateGroupTool,
   googleGroupsUpdateMemberTool,
+  googleGroupsUpdateSettingsTool,
 } from '@/tools/google_groups'
 import {
   googleSheetsAppendTool,
   googleSheetsAppendV2Tool,
+  googleSheetsBatchClearV2Tool,
+  googleSheetsBatchGetV2Tool,
+  googleSheetsBatchUpdateV2Tool,
+  googleSheetsClearV2Tool,
+  googleSheetsCopySheetV2Tool,
+  googleSheetsCreateSpreadsheetV2Tool,
+  googleSheetsGetSpreadsheetV2Tool,
   googleSheetsReadTool,
   googleSheetsReadV2Tool,
   googleSheetsUpdateTool,
@@ -427,10 +531,17 @@ import {
 import {
   googleSlidesAddImageTool,
   googleSlidesAddSlideTool,
+  googleSlidesCreateShapeTool,
+  googleSlidesCreateTableTool,
   googleSlidesCreateTool,
+  googleSlidesDeleteObjectTool,
+  googleSlidesDuplicateObjectTool,
+  googleSlidesGetPageTool,
   googleSlidesGetThumbnailTool,
+  googleSlidesInsertTextTool,
   googleSlidesReadTool,
   googleSlidesReplaceAllTextTool,
+  googleSlidesUpdateSlidesPositionTool,
   googleSlidesWriteTool,
 } from '@/tools/google_slides'
 import {
@@ -2026,6 +2137,75 @@ export const tools: Record<string, ToolConfig> = {
   github_update_project_v2: githubUpdateProjectV2Tool,
   github_delete_project: githubDeleteProjectTool,
   github_delete_project_v2: githubDeleteProjectV2Tool,
+  // New GitHub tools - Search
+  github_search_code: githubSearchCodeTool,
+  github_search_code_v2: githubSearchCodeV2Tool,
+  github_search_commits: githubSearchCommitsTool,
+  github_search_commits_v2: githubSearchCommitsV2Tool,
+  github_search_issues: githubSearchIssuesTool,
+  github_search_issues_v2: githubSearchIssuesV2Tool,
+  github_search_repos: githubSearchReposTool,
+  github_search_repos_v2: githubSearchReposV2Tool,
+  github_search_users: githubSearchUsersTool,
+  github_search_users_v2: githubSearchUsersV2Tool,
+  // New GitHub tools - Commits
+  github_list_commits: githubListCommitsTool,
+  github_list_commits_v2: githubListCommitsV2Tool,
+  github_get_commit: githubGetCommitTool,
+  github_get_commit_v2: githubGetCommitV2Tool,
+  github_compare_commits: githubCompareCommitsTool,
+  github_compare_commits_v2: githubCompareCommitsV2Tool,
+  // New GitHub tools - Gists
+  github_create_gist: githubCreateGistTool,
+  github_create_gist_v2: githubCreateGistV2Tool,
+  github_get_gist: githubGetGistTool,
+  github_get_gist_v2: githubGetGistV2Tool,
+  github_list_gists: githubListGistsTool,
+  github_list_gists_v2: githubListGistsV2Tool,
+  github_update_gist: githubUpdateGistTool,
+  github_update_gist_v2: githubUpdateGistV2Tool,
+  github_delete_gist: githubDeleteGistTool,
+  github_delete_gist_v2: githubDeleteGistV2Tool,
+  github_fork_gist: githubForkGistTool,
+  github_fork_gist_v2: githubForkGistV2Tool,
+  github_star_gist: githubStarGistTool,
+  github_star_gist_v2: githubStarGistV2Tool,
+  github_unstar_gist: githubUnstarGistTool,
+  github_unstar_gist_v2: githubUnstarGistV2Tool,
+  // New GitHub tools - Forks
+  github_fork_repo: githubForkRepoTool,
+  github_fork_repo_v2: githubForkRepoV2Tool,
+  github_list_forks: githubListForksTool,
+  github_list_forks_v2: githubListForksV2Tool,
+  // New GitHub tools - Milestones
+  github_create_milestone: githubCreateMilestoneTool,
+  github_create_milestone_v2: githubCreateMilestoneV2Tool,
+  github_get_milestone: githubGetMilestoneTool,
+  github_get_milestone_v2: githubGetMilestoneV2Tool,
+  github_list_milestones: githubListMilestonesTool,
+  github_list_milestones_v2: githubListMilestonesV2Tool,
+  github_update_milestone: githubUpdateMilestoneTool,
+  github_update_milestone_v2: githubUpdateMilestoneV2Tool,
+  github_delete_milestone: githubDeleteMilestoneTool,
+  github_delete_milestone_v2: githubDeleteMilestoneV2Tool,
+  // New GitHub tools - Reactions
+  github_create_issue_reaction: githubCreateIssueReactionTool,
+  github_create_issue_reaction_v2: githubCreateIssueReactionV2Tool,
+  github_delete_issue_reaction: githubDeleteIssueReactionTool,
+  github_delete_issue_reaction_v2: githubDeleteIssueReactionV2Tool,
+  github_create_comment_reaction: githubCreateCommentReactionTool,
+  github_create_comment_reaction_v2: githubCreateCommentReactionV2Tool,
+  github_delete_comment_reaction: githubDeleteCommentReactionTool,
+  github_delete_comment_reaction_v2: githubDeleteCommentReactionV2Tool,
+  // New GitHub tools - Stars
+  github_star_repo: githubStarRepoTool,
+  github_star_repo_v2: githubStarRepoV2Tool,
+  github_unstar_repo: githubUnstarRepoTool,
+  github_unstar_repo_v2: githubUnstarRepoV2Tool,
+  github_check_star: githubCheckStarTool,
+  github_check_star_v2: githubCheckStarV2Tool,
+  github_list_stargazers: githubListStargazersTool,
+  github_list_stargazers_v2: githubListStargazersV2Tool,
   gitlab_list_projects: gitlabListProjectsTool,
   gitlab_get_project: gitlabGetProjectTool,
   gitlab_list_issues: gitlabListIssuesTool,
@@ -2103,11 +2283,21 @@ export const tools: Record<string, ToolConfig> = {
   reddit_edit: redditEditTool,
   reddit_delete: redditDeleteTool,
   reddit_subscribe: redditSubscribeTool,
+  google_drive_copy: googleDriveCopyTool,
+  google_drive_create_folder: googleDriveCreateFolderTool,
+  google_drive_delete: googleDriveDeleteTool,
+  google_drive_download: googleDriveDownloadTool,
+  google_drive_get_about: googleDriveGetAboutTool,
   google_drive_get_content: googleDriveGetContentTool,
+  google_drive_get_file: googleDriveGetFileTool,
   google_drive_list: googleDriveListTool,
+  google_drive_list_permissions: googleDriveListPermissionsTool,
+  google_drive_share: googleDriveShareTool,
+  google_drive_trash: googleDriveTrashTool,
+  google_drive_unshare: googleDriveUnshareTool,
+  google_drive_untrash: googleDriveUntrashTool,
+  google_drive_update: googleDriveUpdateTool,
   google_drive_upload: googleDriveUploadTool,
-  google_drive_download: googleDriveDownloadTool,
-  google_drive_create_folder: googleDriveCreateFolderTool,
   google_docs_read: googleDocsReadTool,
   google_docs_write: googleDocsWriteTool,
   google_docs_create: googleDocsCreateTool,
@@ -2119,6 +2309,13 @@ export const tools: Record<string, ToolConfig> = {
   google_sheets_write_v2: googleSheetsWriteV2Tool,
   google_sheets_update_v2: googleSheetsUpdateV2Tool,
   google_sheets_append_v2: googleSheetsAppendV2Tool,
+  google_sheets_clear_v2: googleSheetsClearV2Tool,
+  google_sheets_get_spreadsheet_v2: googleSheetsGetSpreadsheetV2Tool,
+  google_sheets_create_spreadsheet_v2: googleSheetsCreateSpreadsheetV2Tool,
+  google_sheets_batch_get_v2: googleSheetsBatchGetV2Tool,
+  google_sheets_batch_update_v2: googleSheetsBatchUpdateV2Tool,
+  google_sheets_batch_clear_v2: googleSheetsBatchClearV2Tool,
+  google_sheets_copy_sheet_v2: googleSheetsCopySheetV2Tool,
   google_slides_read: googleSlidesReadTool,
   google_slides_write: googleSlidesWriteTool,
   google_slides_create: googleSlidesCreateTool,
@@ -2126,6 +2323,13 @@ export const tools: Record<string, ToolConfig> = {
   google_slides_add_slide: googleSlidesAddSlideTool,
   google_slides_get_thumbnail: googleSlidesGetThumbnailTool,
   google_slides_add_image: googleSlidesAddImageTool,
+  google_slides_get_page: googleSlidesGetPageTool,
+  google_slides_delete_object: googleSlidesDeleteObjectTool,
+  google_slides_duplicate_object: googleSlidesDuplicateObjectTool,
+  google_slides_update_slides_position: googleSlidesUpdateSlidesPositionTool,
+  google_slides_create_table: googleSlidesCreateTableTool,
+  google_slides_create_shape: googleSlidesCreateShapeTool,
+  google_slides_insert_text: googleSlidesInsertTextTool,
   perplexity_chat: perplexityChatTool,
   perplexity_search: perplexitySearchTool,
   pulse_parser: pulseParserTool,
@@ -2509,15 +2713,33 @@ export const tools: Record<string, ToolConfig> = {
   microsoft_planner_update_task_details: microsoftPlannerUpdateTaskDetailsTool,
   google_calendar_create: googleCalendarCreateTool,
   google_calendar_create_v2: googleCalendarCreateV2Tool,
+  google_calendar_delete: googleCalendarDeleteTool,
+  google_calendar_delete_v2: googleCalendarDeleteV2Tool,
   google_calendar_get: googleCalendarGetTool,
   google_calendar_get_v2: googleCalendarGetV2Tool,
+  google_calendar_instances: googleCalendarInstancesTool,
+  google_calendar_instances_v2: googleCalendarInstancesV2Tool,
+  google_calendar_invite: googleCalendarInviteTool,
+  google_calendar_invite_v2: googleCalendarInviteV2Tool,
   google_calendar_list: googleCalendarListTool,
   google_calendar_list_v2: googleCalendarListV2Tool,
+  google_calendar_list_calendars: googleCalendarListCalendarsTool,
+  google_calendar_list_calendars_v2: googleCalendarListCalendarsV2Tool,
+  google_calendar_move: googleCalendarMoveTool,
+  google_calendar_move_v2: googleCalendarMoveV2Tool,
   google_calendar_quick_add: googleCalendarQuickAddTool,
   google_calendar_quick_add_v2: googleCalendarQuickAddV2Tool,
-  google_calendar_invite: googleCalendarInviteTool,
-  google_calendar_invite_v2: googleCalendarInviteV2Tool,
+  google_calendar_update: googleCalendarUpdateTool,
+  google_calendar_update_v2: googleCalendarUpdateV2Tool,
   google_forms_get_responses: googleFormsGetResponsesTool,
+  google_forms_get_form: googleFormsGetFormTool,
+  google_forms_create_form: googleFormsCreateFormTool,
+  google_forms_batch_update: googleFormsBatchUpdateTool,
+  google_forms_set_publish_settings: googleFormsSetPublishSettingsTool,
+  google_forms_create_watch: googleFormsCreateWatchTool,
+  google_forms_list_watches: googleFormsListWatchesTool,
+  google_forms_delete_watch: googleFormsDeleteWatchTool,
+  google_forms_renew_watch: googleFormsRenewWatchTool,
   workflow_executor: workflowExecutorTool,
   wealthbox_read_contact: wealthboxReadContactTool,
   wealthbox_write_contact: wealthboxWriteContactTool,
@@ -2567,17 +2789,22 @@ export const tools: Record<string, ToolConfig> = {
   google_vault_create_matters: createMattersTool,
   google_vault_list_matters: listMattersTool,
   google_vault_download_export_file: downloadExportFileTool,
-  google_groups_list_groups: googleGroupsListGroupsTool,
-  google_groups_get_group: googleGroupsGetGroupTool,
+  google_groups_add_alias: googleGroupsAddAliasTool,
+  google_groups_add_member: googleGroupsAddMemberTool,
   google_groups_create_group: googleGroupsCreateGroupTool,
-  google_groups_update_group: googleGroupsUpdateGroupTool,
   google_groups_delete_group: googleGroupsDeleteGroupTool,
-  google_groups_list_members: googleGroupsListMembersTool,
+  google_groups_get_group: googleGroupsGetGroupTool,
   google_groups_get_member: googleGroupsGetMemberTool,
-  google_groups_add_member: googleGroupsAddMemberTool,
+  google_groups_get_settings: googleGroupsGetSettingsTool,
+  google_groups_has_member: googleGroupsHasMemberTool,
+  google_groups_list_aliases: googleGroupsListAliasesTool,
+  google_groups_list_groups: googleGroupsListGroupsTool,
+  google_groups_list_members: googleGroupsListMembersTool,
+  google_groups_remove_alias: googleGroupsRemoveAliasTool,
   google_groups_remove_member: googleGroupsRemoveMemberTool,
+  google_groups_update_group: googleGroupsUpdateGroupTool,
   google_groups_update_member: googleGroupsUpdateMemberTool,
-  google_groups_has_member: googleGroupsHasMemberTool,
+  google_groups_update_settings: googleGroupsUpdateSettingsTool,
   qdrant_fetch_points: qdrantFetchTool,
   qdrant_search_vector: qdrantSearchTool,
   qdrant_upsert_points: qdrantUpsertTool,
diff --git a/apps/sim/tools/schema-enrichers.ts b/apps/sim/tools/schema-enrichers.ts
new file mode 100644
index 0000000000..d8e60fe598
--- /dev/null
+++ b/apps/sim/tools/schema-enrichers.ts
@@ -0,0 +1,125 @@
+import { createLogger } from '@sim/logger'
+
+const logger = createLogger('SchemaEnrichers')
+
+interface TagDefinition {
+  id: string
+  tagSlot: string
+  displayName: string
+  fieldType: string
+}
+
+/**
+ * Maps KB field types to JSON schema types
+ */
+function mapFieldTypeToSchemaType(fieldType: string): string {
+  switch (fieldType) {
+    case 'number':
+      return 'number'
+    case 'boolean':
+      return 'boolean'
+    default:
+      return 'string'
+  }
+}
+
+/**
+ * Fetches tag definitions from knowledge base
+ */
+async function fetchTagDefinitions(knowledgeBaseId: string): Promise<TagDefinition[]> {
+  try {
+    const { buildAuthHeaders, buildAPIUrl } = await import('@/executor/utils/http')
+
+    const headers = await buildAuthHeaders()
+    const url = buildAPIUrl(`/api/knowledge/${knowledgeBaseId}/tag-definitions`)
+
+    logger.info(`Fetching tag definitions for KB ${knowledgeBaseId} from ${url.toString()}`)
+
+    const response = await fetch(url.toString(), { headers })
+    if (!response.ok) {
+      logger.warn(`Failed to fetch tag definitions for KB ${knowledgeBaseId}: ${response.status}`)
+      return []
+    }
+
+    const result = await response.json()
+    const tagDefinitions = result.data || []
+    logger.info(`Found ${tagDefinitions.length} tag definitions for KB ${knowledgeBaseId}`)
+    return tagDefinitions
+  } catch (error) {
+    logger.error('Failed to fetch tag definitions:', error)
+    return []
+  }
+}
+
+/**
+ * Fetches KB tag definitions and builds a schema for LLM consumption.
+ * Returns an object schema where each property is a tag the LLM can set.
+ */
+export async function enrichKBTagsSchema(knowledgeBaseId: string): Promise<{
+  type: string
+  properties?: Record<string, { type: string; description?: string }>
+  description?: string
+  required?: string[]
+} | null> {
+  const tagDefinitions = await fetchTagDefinitions(knowledgeBaseId)
+
+  if (tagDefinitions.length === 0) {
+    return null
+  }
+
+  const properties: Record<string, { type: string; description?: string }> = {}
+  const tagDescriptions: string[] = []
+
+  for (const def of tagDefinitions) {
+    const schemaType = mapFieldTypeToSchemaType(def.fieldType)
+
+    properties[def.displayName] = {
+      type: schemaType,
+      description: `${def.fieldType} tag`,
+    }
+    tagDescriptions.push(`${def.displayName} (${def.fieldType})`)
+  }
+
+  return {
+    type: 'object',
+    properties,
+    description: `Document tags. Available tags: ${tagDescriptions.join(', ')}`,
+  }
+}
+
+/**
+ * Fetches KB tag definitions and builds a schema for tag filters.
+ * Returns an array schema where each item is a filter with tagName and tagValue.
+ */
+export async function enrichKBTagFiltersSchema(knowledgeBaseId: string): Promise<{
+  type: string
+  items?: Record<string, unknown>
+  description?: string
+} | null> {
+  const tagDefinitions = await fetchTagDefinitions(knowledgeBaseId)
+
+  if (tagDefinitions.length === 0) {
+    return null
+  }
+
+  const tagDescriptions = tagDefinitions.map((def) => `${def.displayName} (${def.fieldType})`)
+
+  return {
+    type: 'array',
+    items: {
+      type: 'object',
+      properties: {
+        tagName: {
+          type: 'string',
+          description: `Name of the tag to filter by. Available: ${tagDescriptions.join(', ')}`,
+        },
+        tagValue: {
+          type: 'string',
+          description: 'Value to filter by',
+        },
+      },
+      required: ['tagName', 'tagValue'],
+    },
+    description: `Tag filters for search. Available tags: ${tagDescriptions.join(', ')}`,
+  }
+}
diff --git a/apps/sim/tools/shared/table.ts b/apps/sim/tools/shared/table.ts
new file mode 100644
index 0000000000..c859c6fbd5
--- /dev/null
+++ b/apps/sim/tools/shared/table.ts
@@ -0,0 +1,38 @@
+import type { TableRow } from '@/tools/types'
+
+/**
+ * Transforms a table from the store format to a key-value object.
+ */
+export const transformTable = (
+  table: TableRow[] | Record<string, any> | string | null
+): Record<string, any> => {
+  if (!table) return {}
+
+  if (typeof table === 'string') {
+    try {
+      const parsed = JSON.parse(table) as TableRow[] | Record<string, any>
+      return transformTable(parsed)
+    } catch {
+      return {}
+    }
+  }
+
+  if (Array.isArray(table)) {
+    return table.reduce(
+      (acc, row) => {
+        if (row.cells?.Key && row.cells?.Value !== undefined) {
+          const value = row.cells.Value
+          acc[row.cells.Key] = value
+        }
+        return acc
+      },
+      {} as Record<string, any>
+    )
+  }
+
+  if (typeof table === 'object') {
+    return table
+  }
+
+  return {}
+}
diff --git a/apps/sim/tools/shared/tags.ts b/apps/sim/tools/shared/tags.ts
new file mode 100644
index 0000000000..60088dba3e
--- /dev/null
+++ b/apps/sim/tools/shared/tags.ts
@@ -0,0 +1,168 @@
+import type { StructuredFilter } from '@/lib/knowledge/types'
+
+/**
+ * Document tag entry format used in create_document tool.
+ */
+export interface DocumentTagEntry {
+  tagName: string
+  value: string
+}
+
+/**
+ * Tag filter entry format used in search tool.
+ */
+export interface TagFilterEntry {
+  tagName: string
+  tagSlot?: string
+  tagValue: string | number | boolean
+  fieldType?: string
+  operator?: string
+  valueTo?: string | number
+}
+
+/**
+ * Checks if a tag value is effectively empty (unfilled/default entry).
+ */
+function isEmptyTagEntry(entry: Record<string, unknown>): boolean {
+  if (!entry.tagName || (typeof entry.tagName === 'string' && entry.tagName.trim() === '')) {
+    return true
+  }
+  return false
+}
+
+/**
+ * Checks if a tag-based value is effectively empty (only contains default/unfilled entries).
+ */
+export function isEmptyTagValue(value: unknown): boolean {
+  if (!value) return true
+
+  if (typeof value === 'string') {
+    try {
+      const parsed = JSON.parse(value)
+      if (!Array.isArray(parsed)) return false
+      if (parsed.length === 0) return true
+      return parsed.every((entry: Record<string, unknown>) => isEmptyTagEntry(entry))
+    } catch {
+      return false
+    }
+  }
+
+  if (Array.isArray(value)) {
+    if (value.length === 0) return true
+    return value.every((entry: Record<string, unknown>) => isEmptyTagEntry(entry))
+  }
+
+  if (typeof value === 'object' && value !== null) {
+    const entries = Object.entries(value)
+    if (entries.length === 0) return true
+    return entries.every(([, val]) => val === undefined || val === null || val === '')
+  }
+
+  return false
+}
+
+/**
+ * Filters valid document tags from an array, removing empty entries.
+ */
+function filterValidDocumentTags(tags: unknown[]): DocumentTagEntry[] {
+  return tags
+    .filter((entry): entry is Record<string, unknown> => {
+      if (typeof entry !== 'object' || entry === null) return false
+      const e = entry as Record<string, unknown>
+      if (!e.tagName || (typeof e.tagName === 'string' && e.tagName.trim() === '')) return false
+      if (e.value === undefined || e.value === null || e.value === '') return false
+      return true
+    })
+    .map((entry) => ({
+      tagName: String(entry.tagName),
+      value: String(entry.value),
+    }))
+}
+
+/**
+ * Parses document tags from various formats into a normalized array format.
+ */
+export function parseDocumentTags(value: unknown): DocumentTagEntry[] {
+  if (!value) return []
+
+  if (typeof value === 'object' && !Array.isArray(value) && value !== null) {
+    return Object.entries(value)
+      .filter(([tagName, tagValue]) => {
+        if (!tagName || tagName.trim() === '') return false
+        if (tagValue === undefined || tagValue === null || tagValue === '') return false
+        return true
+      })
+      .map(([tagName, tagValue]) => ({
+        tagName,
+        value: String(tagValue),
+      }))
+  }
+
+  if (typeof value === 'string') {
+    try {
+      const parsed = JSON.parse(value)
+      if (Array.isArray(parsed)) {
+        return filterValidDocumentTags(parsed)
+      }
+    } catch {
+      return []
+    }
+    return []
+  }
+
+  if (Array.isArray(value)) {
+    return filterValidDocumentTags(value)
+  }
+
+  return []
+}
+
+/**
+ * Parses tag filters from various formats into a normalized StructuredFilter array.
+ */
+export function parseTagFilters(value: unknown): StructuredFilter[] {
+  if (!value) return []
+
+  let tagFilters = value
+
+  if (typeof tagFilters === 'string') {
+    try {
+      tagFilters = JSON.parse(tagFilters)
+    } catch {
+      return []
+    }
+  }
+
+  if (!Array.isArray(tagFilters)) return []
+
+  return tagFilters
+    .filter((filter): filter is Record<string, unknown> => {
+      if (typeof filter !== 'object' || filter === null) return false
+      const f = filter as Record<string, unknown>
+      if (!f.tagName || (typeof f.tagName === 'string' && f.tagName.trim() === '')) return false
+      if (f.fieldType === 'boolean') {
+        return f.tagValue !== undefined
+      }
+      if (f.tagValue === undefined || f.tagValue === null) return false
+      if (typeof f.tagValue === 'string' && f.tagValue.trim().length === 0) return false
+      return true
+    })
+    .map((filter) => ({
+      tagName: filter.tagName as string,
+      tagSlot: (filter.tagSlot as string) || '',
+      fieldType: (filter.fieldType as string) || 'text',
+      operator: (filter.operator as string) || 'eq',
+      value: filter.tagValue as string | number | boolean,
+      valueTo: filter.valueTo as string | number | undefined,
+    }))
+}
+
+/**
+ * Converts parsed document tags to the format expected by the create document API.
+ */
+export function formatDocumentTagsForAPI(tags: DocumentTagEntry[]): { documentTagsData?: string } {
+  if (tags.length === 0) return {}
+  return {
+    documentTagsData: JSON.stringify(tags),
+  }
+}
diff --git a/apps/sim/tools/spotify/add_playlist_cover.ts b/apps/sim/tools/spotify/add_playlist_cover.ts
index 551958378e..c0b597e243 100644
--- a/apps/sim/tools/spotify/add_playlist_cover.ts
+++ b/apps/sim/tools/spotify/add_playlist_cover.ts
@@ -29,11 +29,13 @@ export const spotifyAddPlaylistCoverTool: ToolConfig<
     playlistId: {
       type: 'string',
       required: true,
+      visibility: 'user-or-llm',
       description: 'The Spotify playlist ID',
     },
     imageBase64: {
       type: 'string',
       required: true,
+      visibility: 'user-only',
       description: 'Base64-encoded JPEG image (max 256KB)',
     },
   },
diff --git a/apps/sim/tools/spotify/check_following.ts b/apps/sim/tools/spotify/check_following.ts
index c1bcca245c..36194608c0 100644
--- a/apps/sim/tools/spotify/check_following.ts
+++ b/apps/sim/tools/spotify/check_following.ts
@@ -29,11 +29,13 @@ export const spotifyCheckFollowingTool: ToolConfig<
     type: {
       type: 'string',
       required: true,
+      visibility: 'user-or-llm',
       description: 'Type to check: "artist" or "user"',
     },
     ids: {
       type: 'string',
       required: true,
+      visibility: 'user-or-llm',
       description: 'Comma-separated artist or user IDs (max 50)',
     },
   },
diff --git a/apps/sim/tools/spotify/check_playlist_followers.ts b/apps/sim/tools/spotify/check_playlist_followers.ts
index 973647563b..393e7b676e 100644
--- a/apps/sim/tools/spotify/check_playlist_followers.ts
+++ b/apps/sim/tools/spotify/check_playlist_followers.ts
@@ -29,11 +29,13 @@ export const spotifyCheckPlaylistFollowersTool: ToolConfig<
     playlistId: {
       type: 'string',
       required: true,
+      visibility: 'user-or-llm',
       description: 'The Spotify playlist ID',
     },
     userIds: {
       type: 'string',
       required: true,
+      visibility: 'user-or-llm',
       description: 'Comma-separated user IDs to check (max 5)',
     },
   },
diff --git a/apps/sim/tools/spotify/check_saved_albums.ts b/apps/sim/tools/spotify/check_saved_albums.ts
index 751d6260c1..44a369a542 100644
--- a/apps/sim/tools/spotify/check_saved_albums.ts
+++ b/apps/sim/tools/spotify/check_saved_albums.ts
@@ -28,6 +28,7 @@ export const spotifyCheckSavedAlbumsTool: ToolConfig<
     albumIds: {
       type: 'string',
       required: true,
+      visibility: 'user-or-llm',
       description: 'Comma-separated album IDs (max 20)',
     },
   },
diff --git a/apps/sim/tools/spotify/check_saved_audiobooks.ts b/apps/sim/tools/spotify/check_saved_audiobooks.ts
index 2c14ebe01a..b64a65a745 100644
--- a/apps/sim/tools/spotify/check_saved_audiobooks.ts
+++ b/apps/sim/tools/spotify/check_saved_audiobooks.ts
@@ -28,6 +28,7 @@ export const spotifyCheckSavedAudiobooksTool: ToolConfig<
     audiobookIds: {
       type: 'string',
       required: true,
+      visibility: 'user-or-llm',
       description: 'Comma-separated audiobook IDs (max 50)',
     },
   },
diff --git a/apps/sim/tools/spotify/check_saved_episodes.ts b/apps/sim/tools/spotify/check_saved_episodes.ts
index 45027e1dd3..22116ce302 100644
--- a/apps/sim/tools/spotify/check_saved_episodes.ts
+++ b/apps/sim/tools/spotify/check_saved_episodes.ts
@@ -28,6 +28,7 @@ export const spotifyCheckSavedEpisodesTool: ToolConfig<
     episodeIds: {
       type: 'string',
       required: true,
+      visibility: 'user-or-llm',
       description: 'Comma-separated episode IDs (max 50)',
     },
   },
diff --git a/apps/sim/tools/spotify/check_saved_shows.ts b/apps/sim/tools/spotify/check_saved_shows.ts
index 22efd1e2fe..41e7a62fb8 100644
--- a/apps/sim/tools/spotify/check_saved_shows.ts
+++ b/apps/sim/tools/spotify/check_saved_shows.ts
@@ -28,6 +28,7 @@ export const spotifyCheckSavedShowsTool: ToolConfig<
     showIds: {
       type: 'string',
       required: true,
+      visibility: 'user-or-llm',
       description: 'Comma-separated show IDs (max 50)',
     },
   },
diff --git a/apps/sim/tools/spotify/follow_playlist.ts b/apps/sim/tools/spotify/follow_playlist.ts
index 62f2c6ea4d..51c35af257 100644
--- a/apps/sim/tools/spotify/follow_playlist.ts
+++ b/apps/sim/tools/spotify/follow_playlist.ts
@@ -29,11 +29,13 @@ export const spotifyFollowPlaylistTool: ToolConfig<
     playlistId: {
       type: 'string',
       required: true,
+      visibility: 'user-or-llm',
       description: 'The Spotify playlist ID',
     },
     public: {
       type: 'boolean',
       required: false,
+      visibility: 'user-only',
       default: true,
       description: 'Whether the playlist will be in public playlists',
     },
diff --git a/apps/sim/tools/spotify/get_audiobook.ts b/apps/sim/tools/spotify/get_audiobook.ts
index 5268432088..9d373251e9 100644
--- a/apps/sim/tools/spotify/get_audiobook.ts
+++ b/apps/sim/tools/spotify/get_audiobook.ts
@@ -40,11 +40,13 @@ export const spotifyGetAudiobookTool: ToolConfig<
     audiobookId: {
       type: 'string',
       required: true,
+      visibility: 'user-or-llm',
       description: 'The Spotify audiobook ID',
     },
     market: {
       type: 'string',
       required: false,
+      visibility: 'user-only',
       description: 'ISO country code for market',
     },
   },
diff --git a/apps/sim/tools/spotify/get_audiobook_chapters.ts b/apps/sim/tools/spotify/get_audiobook_chapters.ts
index 451a082ce1..9f50e2acb4 100644
--- a/apps/sim/tools/spotify/get_audiobook_chapters.ts
+++ b/apps/sim/tools/spotify/get_audiobook_chapters.ts
@@ -42,23 +42,27 @@ export const spotifyGetAudiobookChaptersTool: ToolConfig<
     audiobookId: {
       type: 'string',
       required: true,
+      visibility: 'user-or-llm',
       description: 'The Spotify audiobook ID',
     },
     limit: {
       type: 'number',
       required: false,
+      visibility: 'user-only',
       default: 20,
       description: 'Number of chapters to return (1-50)',
     },
     offset: {
       type: 'number',
       required: false,
+      visibility: 'user-only',
       default: 0,
       description: 'Index of first chapter to return',
     },
     market: {
       type: 'string',
       required: false,
+      visibility: 'user-only',
       description: 'ISO country code for market',
     },
   },
diff --git a/apps/sim/tools/spotify/get_audiobooks.ts b/apps/sim/tools/spotify/get_audiobooks.ts
index 3e5519b36d..fc93c69a40 100644
--- a/apps/sim/tools/spotify/get_audiobooks.ts
+++ b/apps/sim/tools/spotify/get_audiobooks.ts
@@ -38,11 +38,13 @@ export const spotifyGetAudiobooksTool: ToolConfig<
     audiobookIds: {
       type: 'string',
       required: true,
+      visibility: 'user-or-llm',
       description: 'Comma-separated audiobook IDs (max 50)',
     },
     market: {
       type: 'string',
       required: false,
+      visibility: 'user-only',
       description: 'ISO country code for market',
     },
   },
diff --git a/apps/sim/tools/spotify/get_episode.ts b/apps/sim/tools/spotify/get_episode.ts
index c6a0e373c1..48772fb3d5 100644
--- a/apps/sim/tools/spotify/get_episode.ts
+++ b/apps/sim/tools/spotify/get_episode.ts
@@ -37,11 +37,13 @@ export const spotifyGetEpisodeTool: ToolConfig<SpotifyGetEpisodeParams, SpotifyG
       episodeId: {
         type: 'string',
         required: true,
+        visibility: 'user-or-llm',
         description: 'The Spotify episode ID',
       },
       market: {
         type: 'string',
         required: false,
+        visibility: 'user-only',
         description: 'ISO country code for market',
       },
     },
diff --git a/apps/sim/tools/spotify/get_episodes.ts b/apps/sim/tools/spotify/get_episodes.ts
index 63555f0eec..fa1de2fce4 100644
--- a/apps/sim/tools/spotify/get_episodes.ts
+++ b/apps/sim/tools/spotify/get_episodes.ts
@@ -40,11 +40,13 @@ export const spotifyGetEpisodesTool: ToolConfig<
     episodeIds: {
       type: 'string',
       required: true,
+      visibility: 'user-or-llm',
       description: 'Comma-separated episode IDs (max 50)',
     },
     market: {
       type: 'string',
       required: false,
+      visibility: 'user-only',
       description: 'ISO country code for market',
     },
   },
diff --git a/apps/sim/tools/spotify/get_playlist_cover.ts b/apps/sim/tools/spotify/get_playlist_cover.ts
index 9650d5affa..b42d4ffe3e 100644
--- a/apps/sim/tools/spotify/get_playlist_cover.ts
+++ b/apps/sim/tools/spotify/get_playlist_cover.ts
@@ -34,6 +34,7 @@ export const spotifyGetPlaylistCoverTool: ToolConfig<
     playlistId: {
       type: 'string',
       required: true,
+      visibility: 'user-or-llm',
       description: 'The Spotify playlist ID',
     },
   },
diff --git a/apps/sim/tools/spotify/get_saved_albums.ts b/apps/sim/tools/spotify/get_saved_albums.ts
index d35023501a..ad9d46f5fd 100644
--- a/apps/sim/tools/spotify/get_saved_albums.ts
+++ b/apps/sim/tools/spotify/get_saved_albums.ts
@@ -45,18 +45,21 @@ export const spotifyGetSavedAlbumsTool: ToolConfig<
     limit: {
       type: 'number',
       required: false,
+      visibility: 'user-only',
       default: 20,
       description: 'Number of albums to return (1-50)',
     },
     offset: {
       type: 'number',
       required: false,
+      visibility: 'user-only',
       default: 0,
       description: 'Index of first album to return',
     },
     market: {
       type: 'string',
       required: false,
+      visibility: 'user-only',
       description: 'ISO country code for market',
     },
   },
diff --git a/apps/sim/tools/spotify/get_saved_audiobooks.ts b/apps/sim/tools/spotify/get_saved_audiobooks.ts
index fcb7b83deb..9679c87ae5 100644
--- a/apps/sim/tools/spotify/get_saved_audiobooks.ts
+++ b/apps/sim/tools/spotify/get_saved_audiobooks.ts
@@ -43,12 +43,14 @@ export const spotifyGetSavedAudiobooksTool: ToolConfig<
     limit: {
       type: 'number',
       required: false,
+      visibility: 'user-only',
       default: 20,
       description: 'Number of audiobooks to return (1-50)',
     },
     offset: {
       type: 'number',
       required: false,
+      visibility: 'user-only',
       default: 0,
       description: 'Index of first audiobook to return',
     },
diff --git a/apps/sim/tools/spotify/get_saved_episodes.ts b/apps/sim/tools/spotify/get_saved_episodes.ts
index a9dec882e5..f28cb7c785 100644
--- a/apps/sim/tools/spotify/get_saved_episodes.ts
+++ b/apps/sim/tools/spotify/get_saved_episodes.ts
@@ -45,18 +45,21 @@ export const spotifyGetSavedEpisodesTool: ToolConfig<
     limit: {
       type: 'number',
       required: false,
+      visibility: 'user-only',
       default: 20,
       description: 'Number of episodes to return (1-50)',
     },
     offset: {
       type: 'number',
       required: false,
+      visibility: 'user-only',
       default: 0,
       description: 'Index of first episode to return',
     },
     market: {
       type: 'string',
       required: false,
+      visibility: 'user-only',
       description: 'ISO country code for market',
     },
   },
diff --git a/apps/sim/tools/spotify/get_saved_shows.ts b/apps/sim/tools/spotify/get_saved_shows.ts
index e0b9cf6f85..c342ca590e 100644
--- a/apps/sim/tools/spotify/get_saved_shows.ts
+++ b/apps/sim/tools/spotify/get_saved_shows.ts
@@ -43,12 +43,14 @@ export const spotifyGetSavedShowsTool: ToolConfig<
     limit: {
       type: 'number',
       required: false,
+      visibility: 'user-only',
       default: 20,
       description: 'Number of shows to return (1-50)',
     },
     offset: {
       type: 'number',
       required: false,
+      visibility: 'user-only',
       default: 0,
       description: 'Index of first show to return',
     },
diff --git a/apps/sim/tools/spotify/get_show.ts b/apps/sim/tools/spotify/get_show.ts
index 66e58445a7..199366b33e 100644
--- a/apps/sim/tools/spotify/get_show.ts
+++ b/apps/sim/tools/spotify/get_show.ts
@@ -36,11 +36,13 @@ export const spotifyGetShowTool: ToolConfig<SpotifyGetShowParams, SpotifyGetShow
     showId: {
       type: 'string',
       required: true,
+      visibility: 'user-or-llm',
       description: 'The Spotify show ID',
     },
     market: {
       type: 'string',
       required: false,
+      visibility: 'user-only',
       description: 'ISO country code for market',
     },
   },
diff --git a/apps/sim/tools/spotify/get_show_episodes.ts b/apps/sim/tools/spotify/get_show_episodes.ts
index 9c290cd384..20a83ebe08 100644
--- a/apps/sim/tools/spotify/get_show_episodes.ts
+++ b/apps/sim/tools/spotify/get_show_episodes.ts
@@ -43,23 +43,27 @@ export const spotifyGetShowEpisodesTool: ToolConfig<
     showId: {
       type: 'string',
       required: true,
+      visibility: 'user-or-llm',
       description: 'The Spotify show ID',
     },
     limit: {
       type: 'number',
       required: false,
+      visibility: 'user-only',
       default: 20,
       description: 'Number of episodes to return (1-50)',
     },
     offset: {
       type: 'number',
       required: false,
+      visibility: 'user-only',
       default: 0,
       description: 'Index of first episode to return',
     },
     market: {
       type: 'string',
       required: false,
+      visibility: 'user-only',
       description: 'ISO country code for market',
     },
   },
diff --git a/apps/sim/tools/spotify/get_shows.ts b/apps/sim/tools/spotify/get_shows.ts
index 99ff862b65..46309aadd1 100644
--- a/apps/sim/tools/spotify/get_shows.ts
+++ b/apps/sim/tools/spotify/get_shows.ts
@@ -35,11 +35,13 @@ export const spotifyGetShowsTool: ToolConfig<SpotifyGetShowsParams, SpotifyGetSh
     showIds: {
       type: 'string',
       required: true,
+      visibility: 'user-or-llm',
       description: 'Comma-separated show IDs (max 50)',
     },
     market: {
       type: 'string',
       required: false,
+      visibility: 'user-only',
       description: 'ISO country code for market',
     },
   },
diff --git a/apps/sim/tools/spotify/get_user_profile.ts b/apps/sim/tools/spotify/get_user_profile.ts
index 43a47930dd..c156cb90e2 100644
--- a/apps/sim/tools/spotify/get_user_profile.ts
+++ b/apps/sim/tools/spotify/get_user_profile.ts
@@ -34,6 +34,7 @@ export const spotifyGetUserProfileTool: ToolConfig<
     userId: {
       type: 'string',
       required: true,
+      visibility: 'user-or-llm',
       description: 'The Spotify user ID',
     },
   },
diff --git a/apps/sim/tools/spotify/remove_saved_albums.ts b/apps/sim/tools/spotify/remove_saved_albums.ts
index fe5274dec5..906afebd5f 100644
--- a/apps/sim/tools/spotify/remove_saved_albums.ts
+++ b/apps/sim/tools/spotify/remove_saved_albums.ts
@@ -28,6 +28,7 @@ export const spotifyRemoveSavedAlbumsTool: ToolConfig<
     albumIds: {
       type: 'string',
       required: true,
+      visibility: 'user-or-llm',
       description: 'Comma-separated album IDs (max 20)',
     },
   },
diff --git a/apps/sim/tools/spotify/remove_saved_audiobooks.ts b/apps/sim/tools/spotify/remove_saved_audiobooks.ts
index 58518e548c..2723d3e254 100644
--- a/apps/sim/tools/spotify/remove_saved_audiobooks.ts
+++ b/apps/sim/tools/spotify/remove_saved_audiobooks.ts
@@ -28,6 +28,7 @@ export const spotifyRemoveSavedAudiobooksTool: ToolConfig<
     audiobookIds: {
       type: 'string',
       required: true,
+      visibility: 'user-or-llm',
       description: 'Comma-separated audiobook IDs (max 50)',
     },
   },
diff --git a/apps/sim/tools/spotify/remove_saved_episodes.ts b/apps/sim/tools/spotify/remove_saved_episodes.ts
index 62af650827..e336fb260b 100644
--- a/apps/sim/tools/spotify/remove_saved_episodes.ts
+++ b/apps/sim/tools/spotify/remove_saved_episodes.ts
@@ -28,6 +28,7 @@ export const spotifyRemoveSavedEpisodesTool: ToolConfig<
     episodeIds: {
       type: 'string',
       required: true,
+      visibility: 'user-or-llm',
       description: 'Comma-separated episode IDs (max 50)',
     },
   },
diff --git a/apps/sim/tools/spotify/remove_saved_shows.ts b/apps/sim/tools/spotify/remove_saved_shows.ts
index f12da679b9..0a3d99f24c 100644
--- a/apps/sim/tools/spotify/remove_saved_shows.ts
+++ b/apps/sim/tools/spotify/remove_saved_shows.ts
@@ -28,6 +28,7 @@ export const spotifyRemoveSavedShowsTool: ToolConfig<
     showIds: {
       type: 'string',
       required: true,
+      visibility: 'user-or-llm',
       description: 'Comma-separated show IDs (max 50)',
     },
   },
diff --git a/apps/sim/tools/spotify/reorder_playlist_items.ts b/apps/sim/tools/spotify/reorder_playlist_items.ts
index f0287088ac..4564b63517 100644
--- a/apps/sim/tools/spotify/reorder_playlist_items.ts
+++ b/apps/sim/tools/spotify/reorder_playlist_items.ts
@@ -34,27 +34,32 @@ export const spotifyReorderPlaylistItemsTool: ToolConfig<
     playlistId: {
       type: 'string',
       required: true,
+      visibility: 'user-or-llm',
       description: 'The Spotify playlist ID',
     },
     range_start: {
       type: 'number',
       required: true,
+      visibility: 'user-or-llm',
       description: 'Start index of items to reorder',
     },
     insert_before: {
       type: 'number',
       required: true,
+      visibility: 'user-or-llm',
       description: 'Index to insert items before',
     },
     range_length: {
       type: 'number',
       required: false,
+      visibility: 'user-only',
       default: 1,
       description: 'Number of items to reorder',
     },
     snapshot_id: {
       type: 'string',
       required: false,
+      visibility: 'user-only',
       description: 'Playlist snapshot ID for concurrency control',
     },
   },
diff --git a/apps/sim/tools/spotify/replace_playlist_items.ts b/apps/sim/tools/spotify/replace_playlist_items.ts
index 0bd278e24d..c66a90d48c 100644
--- a/apps/sim/tools/spotify/replace_playlist_items.ts
+++ b/apps/sim/tools/spotify/replace_playlist_items.ts
@@ -31,11 +31,13 @@ export const spotifyReplacePlaylistItemsTool: ToolConfig<
     playlistId: {
       type: 'string',
       required: true,
+      visibility: 'user-or-llm',
       description: 'The Spotify playlist ID',
     },
     uris: {
       type: 'string',
       required: true,
+      visibility: 'user-or-llm',
       description: 'Comma-separated Spotify URIs (max 100)',
     },
   },
diff --git a/apps/sim/tools/spotify/save_albums.ts b/apps/sim/tools/spotify/save_albums.ts
index 414967a363..a131b61340 100644
--- a/apps/sim/tools/spotify/save_albums.ts
+++ b/apps/sim/tools/spotify/save_albums.ts
@@ -26,6 +26,7 @@ export const spotifySaveAlbumsTool: ToolConfig<SpotifySaveAlbumsParams, SpotifyS
       albumIds: {
         type: 'string',
         required: true,
+        visibility: 'user-or-llm',
         description: 'Comma-separated album IDs (max 20)',
       },
     },
diff --git a/apps/sim/tools/spotify/save_audiobooks.ts b/apps/sim/tools/spotify/save_audiobooks.ts
index e9d028e5ef..a19efc6f9b 100644
--- a/apps/sim/tools/spotify/save_audiobooks.ts
+++ b/apps/sim/tools/spotify/save_audiobooks.ts
@@ -28,6 +28,7 @@ export const spotifySaveAudiobooksTool: ToolConfig<
     audiobookIds: {
       type: 'string',
       required: true,
+      visibility: 'user-or-llm',
       description: 'Comma-separated audiobook IDs (max 50)',
     },
   },
diff --git a/apps/sim/tools/spotify/save_episodes.ts b/apps/sim/tools/spotify/save_episodes.ts
index 4669bd3087..7b1579fa12 100644
--- a/apps/sim/tools/spotify/save_episodes.ts
+++ b/apps/sim/tools/spotify/save_episodes.ts
@@ -28,6 +28,7 @@ export const spotifySaveEpisodesTool: ToolConfig<
     episodeIds: {
       type: 'string',
       required: true,
+      visibility: 'user-or-llm',
       description: 'Comma-separated episode IDs (max 50)',
     },
   },
diff --git a/apps/sim/tools/spotify/save_shows.ts b/apps/sim/tools/spotify/save_shows.ts
index a6c2b196a0..e09f5f8cc2 100644
--- a/apps/sim/tools/spotify/save_shows.ts
+++ b/apps/sim/tools/spotify/save_shows.ts
@@ -25,6 +25,7 @@ export const spotifySaveShowsTool: ToolConfig<SpotifySaveShowsParams, SpotifySav
     showIds: {
       type: 'string',
       required: true,
+      visibility: 'user-or-llm',
       description: 'Comma-separated show IDs (max 50)',
     },
   },
diff --git a/apps/sim/tools/spotify/unfollow_playlist.ts b/apps/sim/tools/spotify/unfollow_playlist.ts
index b1d40d017a..2785fcb158 100644
--- a/apps/sim/tools/spotify/unfollow_playlist.ts
+++ b/apps/sim/tools/spotify/unfollow_playlist.ts
@@ -28,6 +28,7 @@ export const spotifyUnfollowPlaylistTool: ToolConfig<
     playlistId: {
       type: 'string',
       required: true,
+      visibility: 'user-or-llm',
       description: 'The Spotify playlist ID',
     },
   },
diff --git a/apps/sim/tools/spotify/update_playlist.ts b/apps/sim/tools/spotify/update_playlist.ts
index b654981b4f..31f062ffed 100644
--- a/apps/sim/tools/spotify/update_playlist.ts
+++ b/apps/sim/tools/spotify/update_playlist.ts
@@ -31,21 +31,25 @@ export const spotifyUpdatePlaylistTool: ToolConfig<
     playlistId: {
       type: 'string',
       required: true,
+      visibility: 'user-or-llm',
       description: 'The Spotify playlist ID',
     },
     name: {
       type: 'string',
       required: false,
+      visibility: 'user-or-llm',
       description: 'New name for the playlist',
     },
     description: {
       type: 'string',
       required: false,
+      visibility: 'user-or-llm',
       description: 'New description for the playlist',
     },
     public: {
       type: 'boolean',
       required: false,
+      visibility: 'user-only',
       description: 'Whether the playlist should be public',
     },
   },
diff --git a/apps/sim/tools/types.ts b/apps/sim/tools/types.ts
index b307cb9d74..593a38875d 100644
--- a/apps/sim/tools/types.ts
+++ b/apps/sim/tools/types.ts
@@ -110,6 +110,12 @@ export interface ToolConfig<P = any, R = any> {
    * If provided, this will be called instead of making an HTTP request.
    */
   directExecution?: (params: P) => Promise<ToolResponse>
+
+  /**
+   * Optional dynamic schema enrichment for specific params.
+   * Maps param IDs to their enrichment configuration.
+   */
+  schemaEnrichment?: Record<string, SchemaEnrichmentConfig>
 }
 
 export interface TableRow {
@@ -137,3 +143,19 @@ export interface ToolFileData {
   url?: string // URL to download file from
   size?: number
 }
+
+/**
+ * Configuration for dynamically enriching a parameter's schema at runtime.
+ * Used when a parameter's schema depends on runtime values (e.g., KB tags, workflow inputs).
+ */
+export interface SchemaEnrichmentConfig {
+  /** The param ID that this enrichment depends on (e.g., 'knowledgeBaseId', 'workflowId') */
+  dependsOn: string
+  /** Function to fetch and build dynamic schema based on the dependency value */
+  enrichSchema: (dependencyValue: string) => Promise<{
+    type: string
+    properties?: Record<string, { type: string; description?: string }>
+    description?: string
+    required?: string[]
+  } | null>
+}
diff --git a/apps/sim/tools/utils.test.ts b/apps/sim/tools/utils.test.ts
index 5f776ec55b..5eae3eb767 100644
--- a/apps/sim/tools/utils.test.ts
+++ b/apps/sim/tools/utils.test.ts
@@ -1,5 +1,6 @@
 import { createMockFetch, loggerMock } from '@sim/testing'
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+import { transformTable } from '@/tools/shared/table'
 import type { ToolConfig } from '@/tools/types'
 import {
   createCustomToolRequestBody,
@@ -7,7 +8,6 @@ import {
   executeRequest,
   formatRequestParams,
   getClientEnvVars,
-  transformTable,
   validateRequiredParametersAfterMerge,
 } from '@/tools/utils'
 
@@ -91,6 +91,25 @@ describe('transformTable', () => {
       enabled: false,
     })
   })
+
+  it.concurrent('should parse JSON string inputs and transform rows', () => {
+    const table = [
+      { id: '1', cells: { Key: 'city', Value: 'SF' } },
+      { id: '2', cells: { Key: 'temp', Value: 64 } },
+    ]
+    const result = transformTable(JSON.stringify(table))
+
+    expect(result).toEqual({
+      city: 'SF',
+      temp: 64,
+    })
+  })
+
+  it.concurrent('should parse JSON string object inputs', () => {
+    const result = transformTable(JSON.stringify({ a: 1, b: 'two' }))
+
+    expect(result).toEqual({ a: 1, b: 'two' })
+  })
 })
 
 describe('formatRequestParams', () => {
diff --git a/apps/sim/tools/utils.ts b/apps/sim/tools/utils.ts
index fe067e2198..9e09d90c5a 100644
--- a/apps/sim/tools/utils.ts
+++ b/apps/sim/tools/utils.ts
@@ -5,7 +5,7 @@ import { useCustomToolsStore } from '@/stores/custom-tools'
 import { useEnvironmentStore } from '@/stores/settings/environment'
 import { extractErrorMessage } from '@/tools/error-extractors'
 import { tools } from '@/tools/registry'
-import type { TableRow, ToolConfig, ToolResponse } from '@/tools/types'
+import type { ToolConfig, ToolResponse } from '@/tools/types'
 
 const logger = createLogger('ToolsUtils')
 
@@ -70,30 +70,6 @@ export function resolveToolId(toolName: string): string {
   return toolName
 }
 
-/**
- * Transforms a table from the store format to a key-value object
- * @param table Array of table rows from the store
- * @returns Record of key-value pairs
- */
-export const transformTable = (table: TableRow[] | null): Record<string, any> => {
-  if (!table) return {}
-
-  return table.reduce(
-    (acc, row) => {
-      if (row.cells?.Key && row.cells?.Value !== undefined) {
-        // Extract the Value cell as is - it should already be properly resolved
-        // by the InputResolver based on variable type (number, string, boolean etc.)
-        const value = row.cells.Value
-
-        // Store the correctly typed value in the result object
-        acc[row.cells.Key] = value
-      }
-      return acc
-    },
-    {} as Record<string, any>
-  )
-}
-
 interface RequestParams {
   url: string
   method: string
diff --git a/apps/sim/tools/workflow/executor.test.ts b/apps/sim/tools/workflow/executor.test.ts
index 8ad3bca43e..14b4261904 100644
--- a/apps/sim/tools/workflow/executor.test.ts
+++ b/apps/sim/tools/workflow/executor.test.ts
@@ -16,10 +16,42 @@ describe('workflowExecutorTool', () => {
       expect(result).toEqual({
         input: { firstName: 'John', lastName: 'Doe', age: 30 },
         triggerType: 'api',
+        useDraftState: true,
+      })
+    })
+
+    it.concurrent('should use deployed state when isDeployedContext is true', () => {
+      const params = {
+        workflowId: 'test-workflow-id',
+        inputMapping: { name: 'Test' },
+        _context: { isDeployedContext: true },
+      }
+
+      const result = buildBody(params)
+
+      expect(result).toEqual({
+        input: { name: 'Test' },
+        triggerType: 'api',
         useDraftState: false,
       })
     })
 
+    it.concurrent('should use draft state when isDeployedContext is false', () => {
+      const params = {
+        workflowId: 'test-workflow-id',
+        inputMapping: { name: 'Test' },
+        _context: { isDeployedContext: false },
+      }
+
+      const result = buildBody(params)
+
+      expect(result).toEqual({
+        input: { name: 'Test' },
+        triggerType: 'api',
+        useDraftState: true,
+      })
+    })
+
     it.concurrent('should parse JSON string inputMapping (UI-provided via tool-input)', () => {
       const params = {
         workflowId: 'test-workflow-id',
@@ -31,7 +63,7 @@ describe('workflowExecutorTool', () => {
       expect(result).toEqual({
         input: { firstName: 'John', lastName: 'Doe' },
         triggerType: 'api',
-        useDraftState: false,
+        useDraftState: true,
       })
     })
 
@@ -46,7 +78,7 @@ describe('workflowExecutorTool', () => {
       expect(result).toEqual({
         input: { user: { name: 'John', email: 'john@example.com' }, count: 5 },
         triggerType: 'api',
-        useDraftState: false,
+        useDraftState: true,
       })
     })
 
@@ -61,7 +93,7 @@ describe('workflowExecutorTool', () => {
       expect(result).toEqual({
         input: { tags: ['a', 'b', 'c'], ids: [1, 2, 3] },
         triggerType: 'api',
-        useDraftState: false,
+        useDraftState: true,
       })
     })
 
@@ -76,7 +108,7 @@ describe('workflowExecutorTool', () => {
       expect(result).toEqual({
         input: {},
         triggerType: 'api',
-        useDraftState: false,
+        useDraftState: true,
       })
     })
 
@@ -91,7 +123,7 @@ describe('workflowExecutorTool', () => {
       expect(result).toEqual({
         input: {},
         triggerType: 'api',
-        useDraftState: false,
+        useDraftState: true,
       })
     })
 
@@ -106,7 +138,7 @@ describe('workflowExecutorTool', () => {
       expect(result).toEqual({
         input: {},
         triggerType: 'api',
-        useDraftState: false,
+        useDraftState: true,
       })
     })
 
@@ -121,7 +153,7 @@ describe('workflowExecutorTool', () => {
       expect(result).toEqual({
         input: {},
         triggerType: 'api',
-        useDraftState: false,
+        useDraftState: true,
       })
     })
 
@@ -136,7 +168,7 @@ describe('workflowExecutorTool', () => {
       expect(result).toEqual({
         input: {},
         triggerType: 'api',
-        useDraftState: false,
+        useDraftState: true,
       })
     })
 
@@ -151,7 +183,7 @@ describe('workflowExecutorTool', () => {
       expect(result).toEqual({
         input: {},
         triggerType: 'api',
-        useDraftState: false,
+        useDraftState: true,
       })
     })
 
@@ -166,7 +198,7 @@ describe('workflowExecutorTool', () => {
       expect(result).toEqual({
         input: { message: 'Hello\nWorld', path: 'C:\\Users' },
         triggerType: 'api',
-        useDraftState: false,
+        useDraftState: true,
       })
     })
 
@@ -181,7 +213,7 @@ describe('workflowExecutorTool', () => {
       expect(result).toEqual({
         input: { greeting: 'こんにちは', emoji: '👋' },
         triggerType: 'api',
-        useDraftState: false,
+        useDraftState: true,
       })
     })
 
@@ -196,7 +228,7 @@ describe('workflowExecutorTool', () => {
       expect(result).toEqual({
         input: { data: '{"nested": "json"}' },
         triggerType: 'api',
-        useDraftState: false,
+        useDraftState: true,
       })
     })
   })
diff --git a/apps/sim/tools/workflow/executor.ts b/apps/sim/tools/workflow/executor.ts
index 036769eb71..894908309d 100644
--- a/apps/sim/tools/workflow/executor.ts
+++ b/apps/sim/tools/workflow/executor.ts
@@ -42,10 +42,12 @@ export const workflowExecutorTool: ToolConfig<
           inputData = {}
         }
       }
+      // Use draft state for manual runs (not deployed), deployed state for deployed runs
+      const isDeployedContext = params._context?.isDeployedContext
       return {
         input: inputData,
         triggerType: 'api',
-        useDraftState: false,
+        useDraftState: !isDeployedContext,
       }
     },
   },
diff --git a/apps/sim/tools/workflow/types.ts b/apps/sim/tools/workflow/types.ts
index b0f4339d64..f567093124 100644
--- a/apps/sim/tools/workflow/types.ts
+++ b/apps/sim/tools/workflow/types.ts
@@ -4,6 +4,13 @@ export interface WorkflowExecutorParams {
   workflowId: string
   /** Can be a JSON string (from tool-input UI) or an object (from LLM args) */
   inputMapping?: Record<string, any> | string
+  /** Execution context passed by handlers */
+  _context?: {
+    workflowId?: string
+    workspaceId?: string
+    executionId?: string
+    isDeployedContext?: boolean
+  }
 }
 
 export interface WorkflowExecutorResponse extends ToolResponse {