v0.5.81: traces fix, additional confluence tools, azure anthropic support, opus 4.6

v0.5.80: lock feature, enterprise modules, time formatting consolidation, files, UX and UI improvements, longer timeouts
v0.5.79: longer MCP tools timeout, optimize loop/parallel regeneration, enrich.so integration
2026-02-10 06:35:01 -05:00 · 2026-02-05 11:28:54 -08:00 · 2026-02-04 18:27:05 -08:00 · 2026-01-31 21:57:56 -08:00 · 2026-01-31 13:48:22 -08:00 · 2026-01-30 14:57:17 -08:00
204 changed files with 1397 additions and 17576 deletions
--- a/apps/docs/components/icons.tsx
+++ b/apps/docs/components/icons.tsx
@@ -1131,32 +1131,6 @@ export function AirtableIcon(props: SVGProps<SVGSVGElement>) {
  )
 }

-export function AirweaveIcon(props: SVGProps<SVGSVGElement>) {
-  return (
-    <svg
-      {...props}
-      width='143'
-      height='143'
-      viewBox='0 0 143 143'
-      fill='none'
-      xmlns='http://www.w3.org/2000/svg'
-    >
-      <path
-        d='M89.8854 128.872C79.9165 123.339 66.7502 115.146 60.5707 107.642L60.0432 107.018C58.7836 105.5 57.481 104.014 56.1676 102.593C51.9152 97.9641 47.3614 93.7978 42.646 90.2021C40.7405 88.7487 38.7704 87.3492 36.8111 86.0789C35.7991 85.4222 34.8302 84.8193 33.9151 84.2703C31.6221 82.903 28.8338 82.5263 26.2716 83.2476C23.8385 83.9366 21.89 85.5406 20.7596 87.7476C18.5634 92.0323 20.0814 97.3289 24.2046 99.805C27.5204 101.786 30.7608 104.111 33.8398 106.717C34.2381 107.05 34.3996 107.578 34.2596 108.062C33.1292 112.185 31.9989 118.957 31.5682 121.67C30.6424 127.429 33.4737 133.081 38.5982 135.751L38.7812 135.848C41.0204 137 43.6472 136.946 45.8219 135.697C47.9858 134.459 49.353 132.231 49.4822 129.733C49.536 128.657 49.6006 127.58 49.676 126.59C49.719 126.062 50.042 125.632 50.5264 125.459C50.6772 125.406 50.8494 125.373 51.0001 125.373C51.3554 125.373 51.6784 125.513 51.9475 125.782C56.243 130.185 60.8829 134.169 65.7167 137.625C70.3674 140.951 75.8686 142.706 81.639 142.706C83.7383 142.706 85.8376 142.469 87.8938 141.995L88.1199 141.942C90.9943 141.274 93.029 139.024 93.4488 136.085C93.8687 133.146 92.4476 130.315 89.8747 128.883H89.8639L89.8854 128.872Z'
-        fill='currentColor'
-      />
-      <path
-        d='M142.551 58.1747L142.529 58.0563C142.045 55.591 140.118 53.7069 137.598 53.2548C135.112 52.8134 132.754 53.8577 131.484 55.9893L131.408 56.1077C126.704 64.1604 120.061 71.6101 111.653 78.2956C109.446 80.0504 107.293 81.902 105.226 83.8075C103.644 85.2717 101.265 85.53 99.4452 84.4212C97.6474 83.3339 95.8495 82.1389 94.1055 80.8686C90.3268 78.1233 86.6772 74.9475 83.2753 71.4271C81.4989 69.597 79.798 67.6915 78.1939 65.7321C76.0408 63.1161 73.7477 60.5539 71.3685 58.1316C66.3195 52.9857 56.6089 45.9127 53.7453 43.878C53.3792 43.6304 53.1639 43.2428 53.0993 42.8014C53.0455 42.3601 53.1639 41.9509 53.4546 41.6064C55.274 39.4318 56.9965 37.1818 58.5683 34.921C60.2369 32.5311 60.786 29.6028 60.0862 26.8899C59.408 24.2523 57.6424 22.11 55.134 20.8827C50.9139 18.7942 45.8972 20.0968 43.2273 23.9293C40.8373 27.3636 38.0167 30.7332 34.8732 33.9306C34.5718 34.232 34.1304 34.3397 33.7213 34.1889C30.5239 33.1447 27.2296 32.2942 23.9461 31.659C23.7093 31.616 23.354 31.5514 22.9126 31.4975C16.4102 30.5286 10.1123 33.7798 7.21639 39.5717L7.1195 39.7548C6.18289 41.628 6.26902 43.8349 7.32405 45.6651C8.40061 47.5167 10.3277 48.701 12.4592 48.8194C13.4604 48.8732 14.4401 48.9378 15.3659 49.0024C15.7966 49.0347 16.1411 49.2823 16.3025 49.6914C16.4533 50.1112 16.3671 50.5419 16.0657 50.8541C12.147 54.8804 8.60515 59.1974 5.5262 63.6867C1.1446 70.0814 -0.481008 78.2095 1.08 85.9822L1.10154 86.1006C1.70441 89.0719 4.05131 91.2035 7.07644 91.5264C9.98315 91.8386 12.6099 90.3208 13.7619 87.6724L13.8265 87.5109C18.6925 75.8625 26.7559 65.5168 37.7907 56.7536C38.3182 56.3445 39.0072 56.28 39.567 56.5922C45.3373 59.768 50.8601 63.902 55.9738 68.8864C56.5982 69.4893 56.6089 70.5013 56.0168 71.1257C53.4761 73.8063 51.0862 76.6054 48.9115 79.469C47.2106 81.7083 47.5335 84.8949 49.6221 86.7358L53.3254 89.9977L53.2824 90.0409C53.8637 90.5576 54.445 91.0744 55.0264 91.5911L55.8123 92.194C56.9319 93.1844 58.3529 93.6365 59.8386 93.4858C61.3027 93.3351 62.67 92.56 63.5635 91.3758C65.1353 89.2873 66.8578 87.2525 68.6556 85.304C68.957 84.9702 69.3661 84.798 69.8075 84.7872C70.2705 84.7872 70.6257 84.9379 70.9164 85.2286C75.8147 90.0624 81.1114 94.3686 86.6772 97.9966C88.8626 99.4176 89.4978 102.26 88.1306 104.477C86.9248 106.448 85.7729 108.493 84.7179 110.539C83.5014 112.918 83.2968 115.738 84.1688 118.257C84.9978 120.68 86.7095 122.585 88.981 123.64C90.2514 124.232 91.5971 124.534 92.9859 124.534C96.5062 124.534 99.682 122.596 101.286 119.452C102.729 116.61 104.419 113.8 106.281 111.131C107.369 109.559 109.36 108.838 111.255 109.322C115.26 110.355 120.643 111.421 124.454 112.143C128.308 112.864 132.119 111.023 133.96 107.578L134.143 107.233C135.521 104.628 135.531 101.506 134.164 98.8901C132.786 96.2526 130.181 94.4655 127.21 94.121C126.478 94.0349 125.778 93.9488 125.11 93.8626C124.97 93.8411 124.852 93.8196 124.744 93.798L123.356 93.4751L124.357 92.4523C124.432 92.377 124.529 92.2801 124.658 92.194C128.771 88.8028 132.571 85.1963 135.962 81.4714C141.668 75.1951 144.122 66.4965 142.518 58.1747H142.529H142.551Z'
-        fill='currentColor'
-      />
-      <path
-        d='M56.6506 14.3371C65.5861 19.6338 77.4067 27.3743 82.9833 34.1674C83.64 34.9532 84.2967 35.7391 84.9534 36.4927C86.1591 37.8815 86.2991 39.8731 85.2979 41.4233C83.4892 44.2116 81.4115 46.9569 79.1399 49.5945C77.4713 51.5107 77.4067 54.3098 78.9785 56.2476L79.0431 56.323C79.2261 56.5598 79.4306 56.8074 79.6136 57.0442C81.2931 59.1758 83.0801 61.2213 84.9211 63.1375C85.9007 64.1603 87.2249 64.7309 88.6352 64.7309L88.7644 65.5275L88.7429 64.7309C90.207 64.6986 91.6173 64.0526 92.5969 62.933C94.8362 60.4031 96.9247 57.744 98.8302 55.0633C100.133 53.2224 102.63 52.8026 104.525 54.1052C106.463 55.4402 108.465 56.7105 110.457 57.8839C112.793 59.2511 115.614 59.5095 118.165 58.5621C120.749 57.604 122.762 55.5694 123.656 52.9533C125.055 48.9055 123.257 44.2547 119.382 41.9078C116.755 40.3145 114.15 38.5166 111.674 36.5788C110.382 35.5561 109.833 33.8767 110.296 32.2941C111.437 28.3001 112.481 23.1218 113.148 19.4831C113.837 15.7259 112.147 11.8826 108.939 9.94477L108.562 9.72944C105.871 8.12537 102.587 8.00696 99.7668 9.40649C96.9247 10.8168 95.03 13.5405 94.6855 16.6733L94.6639 16.867C94.6209 17.2546 94.384 17.5453 94.018 17.6637C93.652 17.7821 93.2859 17.6852 93.0168 17.4269C89.0012 13.1422 84.738 9.25576 80.3134 5.8646C74.3708 1.31075 66.7811 -0.583999 59.4928 0.675575L59.1805 0.729423C56.1124 1.2677 53.7547 3.60383 53.1949 6.68279C52.6351 9.72946 53.9915 12.7223 56.6722 14.3048H56.6614L56.6506 14.3371Z'
-        fill='currentColor'
-      />
-    </svg>
-  )
-}
-
 export function GoogleDocsIcon(props: SVGProps<SVGSVGElement>) {
  return (
    <svg
@@ -5462,24 +5436,3 @@ export function EnrichSoIcon(props: SVGProps<SVGSVGElement>) {
    </svg>
  )
 }
-
-export function AgentSkillsIcon(props: SVGProps<SVGSVGElement>) {
-  return (
-    <svg
-      {...props}
-      xmlns='http://www.w3.org/2000/svg'
-      width='16'
-      height='16'
-      viewBox='0 0 16 16'
-      fill='none'
-    >
-      <path
-        d='M8 1L14.0622 4.5V11.5L8 15L1.93782 11.5V4.5L8 1Z'
-        stroke='currentColor'
-        strokeWidth='1.5'
-        fill='none'
-      />
-      <path d='M8 4.5L11 6.25V9.75L8 11.5L5 9.75V6.25L8 4.5Z' fill='currentColor' />
-    </svg>
-  )
-}
--- a/apps/docs/components/ui/icon-mapping.ts
+++ b/apps/docs/components/ui/icon-mapping.ts
@@ -7,7 +7,6 @@ import {
  A2AIcon,
  AhrefsIcon,
  AirtableIcon,
-  AirweaveIcon,
  ApifyIcon,
  ApolloIcon,
  ArxivIcon,
@@ -142,7 +141,6 @@ export const blockTypeToIconMap: Record<string, IconComponent> = {
  a2a: A2AIcon,
  ahrefs: AhrefsIcon,
  airtable: AirtableIcon,
-  airweave: AirweaveIcon,
  apify: ApifyIcon,
  apollo: ApolloIcon,
  arxiv: ArxivIcon,
--- a/apps/docs/content/docs/en/meta.json
+++ b/apps/docs/content/docs/en/meta.json
@@ -10,7 +10,6 @@
    "connections",
    "mcp",
    "copilot",
-    "skills",
    "knowledgebase",
    "variables",
    "execution",
--- a/apps/docs/content/docs/en/skills/index.mdx
+++ b/apps/docs/content/docs/en/skills/index.mdx
@@ -1,134 +0,0 @@
---
-title: Agent Skills
---
-
-import { Callout } from 'fumadocs-ui/components/callout'
-
-Agent Skills are reusable packages of instructions that give your AI agents specialized capabilities. Based on the open [Agent Skills](https://agentskills.io) format, skills let you capture domain expertise, workflows, and best practices that agents can load on demand.
-
-## How Skills Work
-
-Skills use **progressive disclosure** to keep agent context lean:
-
-1. **Discovery** — Only skill names and descriptions are included in the agent's system prompt (~50-100 tokens each)
-2. **Activation** — When the agent decides a skill is relevant, it calls the `load_skill` tool to load the full instructions into context
-3. **Execution** — The agent follows the loaded instructions to complete the task
-
-This means you can attach many skills to an agent without bloating its context window. The agent only loads what it needs.
-
-## Creating Skills
-
-Go to **Settings** and select **Skills** under the Tools section.
-
-![Manage Skills](/static/skills/manage-skills.png)
-
-Click **Add** to create a new skill with three fields:
-
-| Field | Description |
-|-------|-------------|
-| **Name** | A kebab-case identifier (e.g. `sql-expert`, `code-reviewer`). Max 64 characters. |
-| **Description** | A short explanation of what the skill does and when to use it. This is what the agent reads to decide whether to activate the skill. Max 1024 characters. |
-| **Content** | The full skill instructions in markdown. This is loaded when the agent activates the skill. |
-
-<Callout type="info">
-  The description is critical — it's the only thing the agent sees before deciding to load a skill. Be specific about when and why the skill should be used.
-</Callout>
-
-### Writing Good Skill Content
-
-Skill content follows the same conventions as [SKILL.md files](https://agentskills.io/specification):
-
-```markdown
-# SQL Expert
-
-## When to use this skill
-Use when the user asks you to write, optimize, or debug SQL queries.
-
-## Instructions
-1. Always ask which database engine (PostgreSQL, MySQL, SQLite)
-2. Use CTEs over subqueries for readability
-3. Add index recommendations when relevant
-4. Explain query plans for optimization requests
-
-## Common Patterns
-...
-```
-
-**Recommended structure:**
- **When to use** — Specific triggers and scenarios
- **Instructions** — Step-by-step guidance with numbered lists
- **Examples** — Input/output samples showing expected behavior
- **Common Patterns** — Reusable approaches for frequent tasks
- **Edge Cases** — Gotchas and special considerations
-
-Keep skills focused and under 500 lines. If a skill grows too large, split it into multiple specialized skills.
-
-## Adding Skills to an Agent
-
-Open any **Agent** block and find the **Skills** dropdown below the tools section. Select the skills you want the agent to have access to.
-
-![Add Skill](/static/skills/add-skill.png)
-
-Selected skills appear as cards that you can click to edit or remove.
-
-### What Happens at Runtime
-
-When the workflow runs:
-
-1. The agent's system prompt includes an `<available_skills>` section listing each skill's name and description
-2. A `load_skill` tool is automatically added to the agent's available tools
-3. When the agent determines a skill is relevant to the current task, it calls `load_skill` with the skill name
-4. The full skill content is returned as a tool response, giving the agent detailed instructions
-
-This works across all supported LLM providers — the `load_skill` tool uses standard tool-calling, so no provider-specific configuration is needed.
-
-## Common Use Cases
-
-Skills are most valuable when agents need specialized knowledge or multi-step workflows:
-
-**Domain Expertise**
- `api-integration-expert` — Best practices for calling specific APIs (authentication, rate limiting, error handling)
- `data-transformation` — ETL patterns, data cleaning, and validation rules
- `code-reviewer` — Code review guidelines specific to your team's standards
-
-**Workflow Templates**
- `bug-investigation` — Step-by-step debugging methodology (reproduce → isolate → test → fix)
- `feature-implementation` — Development workflow from requirements to deployment
- `document-generator` — Templates and formatting rules for technical documentation
-
-**Company-Specific Knowledge**
- `our-architecture` — System architecture diagrams, service dependencies, and deployment processes
- `style-guide` — Brand guidelines, writing tone, UI/UX patterns
- `customer-onboarding` — Standard procedures and common customer questions
-
-**When to use skills vs. agent instructions:**
- Use **skills** for knowledge that applies across multiple workflows or changes frequently
- Use **agent instructions** for task-specific context that's unique to a single agent
-
-## Best Practices
-
-**Writing Effective Descriptions**
- **Be specific and keyword-rich** — Instead of "Helps with SQL", write "Write optimized SQL queries for PostgreSQL, MySQL, and SQLite, including index recommendations and query plan analysis"
- **Include activation triggers** — Mention specific words or phrases that should prompt the skill (e.g., "Use when the user mentions PDFs, forms, or document extraction")
- **Keep it under 200 words** — Agents scan descriptions quickly; make every word count
-
-**Skill Scope and Organization**
- **One skill per domain** — A focused `sql-expert` skill works better than a broad `database-everything` skill
- **Limit to 5-10 skills per agent** — More skills = more decision overhead; start small and add as needed
- **Split large skills** — If a skill exceeds 500 lines, break it into focused sub-skills
-
-**Content Structure**
- **Use markdown formatting** — Headers, lists, and code blocks help agents parse and follow instructions
- **Provide examples** — Show input/output pairs so agents understand expected behavior
- **Be explicit about edge cases** — Don't assume agents will infer special handling
-
-**Testing and Iteration**
- **Test activation** — Run your workflow and verify the agent loads the skill when expected
- **Check for false positives** — Make sure skills aren't activating when they shouldn't
- **Refine descriptions** — If a skill isn't loading when needed, add more keywords to the description
-
-## Learn More
-
- [Agent Skills specification](https://agentskills.io) — The open format for portable agent skills
- [Example skills](https://github.com/anthropics/skills) — Browse community skill examples
- [Best practices](https://agentskills.io/what-are-skills) — Writing effective skills
--- a/apps/docs/content/docs/en/tools/airweave.mdx
+++ b/apps/docs/content/docs/en/tools/airweave.mdx
@@ -1,67 +0,0 @@
---
-title: Airweave
-description: Search your synced data collections
---
-
-import { BlockInfoCard } from "@/components/ui/block-info-card"
-
-<BlockInfoCard 
-  type="airweave"
-  color="#6366F1"
-/>
-
-{/* MANUAL-CONTENT-START:intro */}
-[Airweave](https://airweave.ai/) is an AI-powered semantic search platform that helps you discover and retrieve knowledge across all your synced data sources. Built for modern teams, Airweave enables fast, relevant search results using neural, hybrid, or keyword-based strategies tailored to your needs.
-
-With Airweave, you can:
-
- **Search smarter**: Use natural language queries to uncover information stored across your connected tools and databases
- **Unify your data**: Seamlessly access content from sources like code, docs, chat, emails, cloud files, and more
- **Customize retrieval**: Select between hybrid (semantic + keyword), neural, or keyword search strategies for optimal results
- **Boost recall**: Expand search queries with AI to find more comprehensive answers
- **Rerank results using AI**: Prioritize the most relevant answers with powerful language models
- **Get instant answers**: Generate clear, AI-powered responses synthesized from your data
-
-In Sim, the Airweave integration empowers your agents to search, summarize, and extract insights from all your organization’s data via a single tool. Use Airweave to drive rich, contextual knowledge retrieval within your workflows—whether answering questions, generating summaries, or supporting dynamic decision-making.
-{/* MANUAL-CONTENT-END */}
-
-## Usage Instructions
-
-Search across your synced data sources using Airweave. Supports semantic search with hybrid, neural, or keyword retrieval strategies. Optionally generate AI-powered answers from search results.
-
-
-
-## Tools
-
-### `airweave_search`
-
-Search your synced data collections using Airweave. Supports semantic search with hybrid, neural, or keyword retrieval strategies. Optionally generate AI-powered answers from search results.
-
-#### Input
-
-| Parameter | Type | Required | Description |
-| --------- | ---- | -------- | ----------- |
-| `apiKey` | string | Yes | Airweave API Key for authentication |
-| `collectionId` | string | Yes | The readable ID of the collection to search |
-| `query` | string | Yes | The search query text |
-| `limit` | number | No | Maximum number of results to return \(default: 100\) |
-| `retrievalStrategy` | string | No | Retrieval strategy: hybrid \(default\), neural, or keyword |
-| `expandQuery` | boolean | No | Generate query variations to improve recall |
-| `rerank` | boolean | No | Reorder results for improved relevance using LLM |
-| `generateAnswer` | boolean | No | Generate a natural-language answer to the query |
-
-#### Output
-
-| Parameter | Type | Description |
-| --------- | ---- | ----------- |
-| `results` | array | Search results with content, scores, and metadata from your synced data |
-|   ↳ `entity_id` | string | Unique identifier for the search result entity |
-|   ↳ `source_name` | string | Name of the data source \(e.g., "GitHub", "Slack"\) |
-|   ↳ `md_content` | string | Markdown-formatted content of the result |
-|   ↳ `score` | number | Relevance score from the search |
-|   ↳ `metadata` | object | Additional metadata associated with the result |
-|   ↳ `breadcrumbs` | array | Navigation path to the result within its source |
-|   ↳ `url` | string | URL to the original content |
-| `completion` | string | AI-generated answer to the query \(when generateAnswer is enabled\) |
-
-
--- a/apps/docs/content/docs/en/tools/linear.mdx
+++ b/apps/docs/content/docs/en/tools/linear.mdx
@@ -320,7 +320,6 @@ Search for issues in Linear using full-text search
 | `teamId` | string | No | Filter by team ID |
 | `includeArchived` | boolean | No | Include archived issues in search results |
 | `first` | number | No | Number of results to return \(default: 50\) |
-| `after` | string | No | Cursor for pagination |

 #### Output

@@ -755,10 +754,6 @@ List all labels in Linear workspace or team
 |   ↳ `name` | string | Label name |
 |   ↳ `color` | string | Label color \(hex\) |
 |   ↳ `description` | string | Label description |
-|   ↳ `isGroup` | boolean | Whether this label is a group |
-|   ↳ `createdAt` | string | Creation timestamp \(ISO 8601\) |
-|   ↳ `updatedAt` | string | Last update timestamp \(ISO 8601\) |
-|   ↳ `archivedAt` | string | Archive timestamp \(ISO 8601\) |
 |   ↳ `team` | object | Team object |
 |     ↳ `id` | string | Team ID |
 |     ↳ `name` | string | Team name |
@@ -785,10 +780,6 @@ Create a new label in Linear
 |   ↳ `name` | string | Label name |
 |   ↳ `color` | string | Label color \(hex\) |
 |   ↳ `description` | string | Label description |
-|   ↳ `isGroup` | boolean | Whether this label is a group |
-|   ↳ `createdAt` | string | Creation timestamp \(ISO 8601\) |
-|   ↳ `updatedAt` | string | Last update timestamp \(ISO 8601\) |
-|   ↳ `archivedAt` | string | Archive timestamp \(ISO 8601\) |
 |   ↳ `team` | object | Team object |
 |     ↳ `id` | string | Team ID |
 |     ↳ `name` | string | Team name |
@@ -815,10 +806,6 @@ Update an existing label in Linear
 |   ↳ `name` | string | Label name |
 |   ↳ `color` | string | Label color \(hex\) |
 |   ↳ `description` | string | Label description |
-|   ↳ `isGroup` | boolean | Whether this label is a group |
-|   ↳ `createdAt` | string | Creation timestamp \(ISO 8601\) |
-|   ↳ `updatedAt` | string | Last update timestamp \(ISO 8601\) |
-|   ↳ `archivedAt` | string | Archive timestamp \(ISO 8601\) |
 |   ↳ `team` | object | Team object |
 |     ↳ `id` | string | Team ID |
 |     ↳ `name` | string | Team name |
@@ -862,13 +849,9 @@ List all workflow states (statuses) in Linear
 | `states` | array | Array of workflow states |
 |   ↳ `id` | string | State ID |
 |   ↳ `name` | string | State name \(e.g., "Todo", "In Progress"\) |
-|   ↳ `description` | string | State description |
-|   ↳ `type` | string | State type \(triage, backlog, unstarted, started, completed, canceled\) |
+|   ↳ `type` | string | State type \(unstarted, started, completed, canceled\) |
 |   ↳ `color` | string | State color \(hex\) |
 |   ↳ `position` | number | State position in workflow |
-|   ↳ `createdAt` | string | Creation timestamp \(ISO 8601\) |
-|   ↳ `updatedAt` | string | Last update timestamp \(ISO 8601\) |
-|   ↳ `archivedAt` | string | Archive timestamp \(ISO 8601\) |
 |   ↳ `team` | object | Team object |
 |     ↳ `id` | string | Team ID |
 |     ↳ `name` | string | Team name |
@@ -894,17 +877,11 @@ Create a new workflow state (status) in Linear
 | --------- | ---- | ----------- |
 | `state` | object | The created workflow state |
 |   ↳ `id` | string | State ID |
-|   ↳ `name` | string | State name \(e.g., "Todo", "In Progress"\) |
-|   ↳ `description` | string | State description |
-|   ↳ `type` | string | State type \(triage, backlog, unstarted, started, completed, canceled\) |
-|   ↳ `color` | string | State color \(hex\) |
-|   ↳ `position` | number | State position in workflow |
-|   ↳ `createdAt` | string | Creation timestamp \(ISO 8601\) |
-|   ↳ `updatedAt` | string | Last update timestamp \(ISO 8601\) |
-|   ↳ `archivedAt` | string | Archive timestamp \(ISO 8601\) |
-|   ↳ `team` | object | Team object |
-|     ↳ `id` | string | Team ID |
-|     ↳ `name` | string | Team name |
+|   ↳ `name` | string | State name |
+|   ↳ `type` | string | State type |
+|   ↳ `color` | string | State color |
+|   ↳ `position` | number | State position |
+|   ↳ `team` | object | Team this state belongs to |

 ### `linear_update_workflow_state`

@@ -926,17 +903,10 @@ Update an existing workflow state in Linear
 | --------- | ---- | ----------- |
 | `state` | object | The updated workflow state |
 |   ↳ `id` | string | State ID |
-|   ↳ `name` | string | State name \(e.g., "Todo", "In Progress"\) |
-|   ↳ `description` | string | State description |
-|   ↳ `type` | string | State type \(triage, backlog, unstarted, started, completed, canceled\) |
-|   ↳ `color` | string | State color \(hex\) |
-|   ↳ `position` | number | State position in workflow |
-|   ↳ `createdAt` | string | Creation timestamp \(ISO 8601\) |
-|   ↳ `updatedAt` | string | Last update timestamp \(ISO 8601\) |
-|   ↳ `archivedAt` | string | Archive timestamp \(ISO 8601\) |
-|   ↳ `team` | object | Team object |
-|     ↳ `id` | string | Team ID |
-|     ↳ `name` | string | Team name |
+|   ↳ `name` | string | State name |
+|   ↳ `type` | string | State type |
+|   ↳ `color` | string | State color |
+|   ↳ `position` | number | State position |

 ### `linear_list_cycles`

@@ -965,7 +935,6 @@ List cycles (sprints/iterations) in Linear
 |   ↳ `endsAt` | string | End date \(ISO 8601\) |
 |   ↳ `completedAt` | string | Completion date \(ISO 8601\) |
 |   ↳ `progress` | number | Progress percentage \(0-1\) |
-|   ↳ `createdAt` | string | Creation timestamp \(ISO 8601\) |
 |   ↳ `team` | object | Team object |
 |     ↳ `id` | string | Team ID |
 |     ↳ `name` | string | Team name |
@@ -992,7 +961,6 @@ Get a single cycle by ID from Linear
 |   ↳ `endsAt` | string | End date \(ISO 8601\) |
 |   ↳ `completedAt` | string | Completion date \(ISO 8601\) |
 |   ↳ `progress` | number | Progress percentage \(0-1\) |
-|   ↳ `createdAt` | string | Creation timestamp \(ISO 8601\) |
 |   ↳ `team` | object | Team object |
 |     ↳ `id` | string | Team ID |
 |     ↳ `name` | string | Team name |
@@ -1018,14 +986,9 @@ Create a new cycle (sprint/iteration) in Linear
 |   ↳ `id` | string | Cycle ID |
 |   ↳ `number` | number | Cycle number |
 |   ↳ `name` | string | Cycle name |
-|   ↳ `startsAt` | string | Start date \(ISO 8601\) |
-|   ↳ `endsAt` | string | End date \(ISO 8601\) |
-|   ↳ `completedAt` | string | Completion date \(ISO 8601\) |
-|   ↳ `progress` | number | Progress percentage \(0-1\) |
-|   ↳ `createdAt` | string | Creation timestamp \(ISO 8601\) |
-|   ↳ `team` | object | Team object |
-|     ↳ `id` | string | Team ID |
-|     ↳ `name` | string | Team name |
+|   ↳ `startsAt` | string | Start date |
+|   ↳ `endsAt` | string | End date |
+|   ↳ `team` | object | Team this cycle belongs to |

 ### `linear_get_active_cycle`

@@ -1045,14 +1008,10 @@ Get the currently active cycle for a team
 |   ↳ `id` | string | Cycle ID |
 |   ↳ `number` | number | Cycle number |
 |   ↳ `name` | string | Cycle name |
-|   ↳ `startsAt` | string | Start date \(ISO 8601\) |
-|   ↳ `endsAt` | string | End date \(ISO 8601\) |
-|   ↳ `completedAt` | string | Completion date \(ISO 8601\) |
-|   ↳ `progress` | number | Progress percentage \(0-1\) |
-|   ↳ `createdAt` | string | Creation timestamp \(ISO 8601\) |
-|   ↳ `team` | object | Team object |
-|     ↳ `id` | string | Team ID |
-|     ↳ `name` | string | Team name |
+|   ↳ `startsAt` | string | Start date |
+|   ↳ `endsAt` | string | End date |
+|   ↳ `progress` | number | Progress percentage |
+|   ↳ `team` | object | Team this cycle belongs to |

 ### `linear_create_attachment`

@@ -1375,12 +1334,8 @@ Create a new customer in Linear
 |   ↳ `domains` | array | Associated domains |
 |   ↳ `externalIds` | array | External IDs from other systems |
 |   ↳ `logoUrl` | string | Logo URL |
-|   ↳ `slugId` | string | Unique URL slug |
 |   ↳ `approximateNeedCount` | number | Number of customer needs |
-|   ↳ `revenue` | number | Annual revenue |
-|   ↳ `size` | number | Organization size |
 |   ↳ `createdAt` | string | Creation timestamp \(ISO 8601\) |
-|   ↳ `updatedAt` | string | Last update timestamp \(ISO 8601\) |
 |   ↳ `archivedAt` | string | Archive timestamp \(ISO 8601\) |

 ### `linear_list_customers`
@@ -1408,12 +1363,8 @@ List all customers in Linear
 |   ↳ `domains` | array | Associated domains |
 |   ↳ `externalIds` | array | External IDs from other systems |
 |   ↳ `logoUrl` | string | Logo URL |
-|   ↳ `slugId` | string | Unique URL slug |
 |   ↳ `approximateNeedCount` | number | Number of customer needs |
-|   ↳ `revenue` | number | Annual revenue |
-|   ↳ `size` | number | Organization size |
 |   ↳ `createdAt` | string | Creation timestamp \(ISO 8601\) |
-|   ↳ `updatedAt` | string | Last update timestamp \(ISO 8601\) |
 |   ↳ `archivedAt` | string | Archive timestamp \(ISO 8601\) |

 ### `linear_create_customer_request`
@@ -1529,12 +1480,8 @@ Get a single customer by ID in Linear
 |   ↳ `domains` | array | Associated domains |
 |   ↳ `externalIds` | array | External IDs from other systems |
 |   ↳ `logoUrl` | string | Logo URL |
-|   ↳ `slugId` | string | Unique URL slug |
 |   ↳ `approximateNeedCount` | number | Number of customer needs |
-|   ↳ `revenue` | number | Annual revenue |
-|   ↳ `size` | number | Organization size |
 |   ↳ `createdAt` | string | Creation timestamp \(ISO 8601\) |
-|   ↳ `updatedAt` | string | Last update timestamp \(ISO 8601\) |
 |   ↳ `archivedAt` | string | Archive timestamp \(ISO 8601\) |

 ### `linear_update_customer`
@@ -1566,12 +1513,8 @@ Update a customer in Linear
 |   ↳ `domains` | array | Associated domains |
 |   ↳ `externalIds` | array | External IDs from other systems |
 |   ↳ `logoUrl` | string | Logo URL |
-|   ↳ `slugId` | string | Unique URL slug |
 |   ↳ `approximateNeedCount` | number | Number of customer needs |
-|   ↳ `revenue` | number | Annual revenue |
-|   ↳ `size` | number | Organization size |
 |   ↳ `createdAt` | string | Creation timestamp \(ISO 8601\) |
-|   ↳ `updatedAt` | string | Last update timestamp \(ISO 8601\) |
 |   ↳ `archivedAt` | string | Archive timestamp \(ISO 8601\) |

 ### `linear_delete_customer`
@@ -1617,8 +1560,8 @@ Create a new customer status in Linear
 | --------- | ---- | -------- | ----------- |
 | `name` | string | Yes | Customer status name |
 | `color` | string | Yes | Status color \(hex code\) |
-| `description` | string | No | Status description |
 | `displayName` | string | No | Display name for the status |
+| `description` | string | No | Status description |
 | `position` | number | No | Position in status list |

 #### Output
@@ -1628,12 +1571,11 @@ Create a new customer status in Linear
 | `customerStatus` | object | The created customer status |
 |   ↳ `id` | string | Customer status ID |
 |   ↳ `name` | string | Status name |
+|   ↳ `displayName` | string | Display name |
 |   ↳ `description` | string | Status description |
 |   ↳ `color` | string | Status color \(hex\) |
 |   ↳ `position` | number | Position in list |
-|   ↳ `type` | string | Status type \(active, inactive\) |
 |   ↳ `createdAt` | string | Creation timestamp \(ISO 8601\) |
-|   ↳ `updatedAt` | string | Last updated timestamp \(ISO 8601\) |
 |   ↳ `archivedAt` | string | Archive timestamp \(ISO 8601\) |

 ### `linear_update_customer_status`
@@ -1647,8 +1589,8 @@ Update a customer status in Linear
 | `statusId` | string | Yes | Customer status ID to update |
 | `name` | string | No | Updated status name |
 | `color` | string | No | Updated status color |
-| `description` | string | No | Updated description |
 | `displayName` | string | No | Updated display name |
+| `description` | string | No | Updated description |
 | `position` | number | No | Updated position |

 #### Output
@@ -1656,15 +1598,6 @@ Update a customer status in Linear
 | Parameter | Type | Description |
 | --------- | ---- | ----------- |
 | `customerStatus` | object | The updated customer status |
-|   ↳ `id` | string | Customer status ID |
-|   ↳ `name` | string | Status name |
-|   ↳ `description` | string | Status description |
-|   ↳ `color` | string | Status color \(hex\) |
-|   ↳ `position` | number | Position in list |
-|   ↳ `type` | string | Status type \(active, inactive\) |
-|   ↳ `createdAt` | string | Creation timestamp \(ISO 8601\) |
-|   ↳ `updatedAt` | string | Last updated timestamp \(ISO 8601\) |
-|   ↳ `archivedAt` | string | Archive timestamp \(ISO 8601\) |

 ### `linear_delete_customer_status`

@@ -1690,25 +1623,19 @@ List all customer statuses in Linear

 | Parameter | Type | Required | Description |
 | --------- | ---- | -------- | ----------- |
-| `first` | number | No | Number of statuses to return \(default: 50\) |
-| `after` | string | No | Cursor for pagination |

 #### Output

 | Parameter | Type | Description |
 | --------- | ---- | ----------- |
-| `pageInfo` | object | Pagination information |
-|   ↳ `hasNextPage` | boolean | Whether there are more results |
-|   ↳ `endCursor` | string | Cursor for the next page |
 | `customerStatuses` | array | List of customer statuses |
 |   ↳ `id` | string | Customer status ID |
 |   ↳ `name` | string | Status name |
+|   ↳ `displayName` | string | Display name |
 |   ↳ `description` | string | Status description |
 |   ↳ `color` | string | Status color \(hex\) |
 |   ↳ `position` | number | Position in list |
-|   ↳ `type` | string | Status type \(active, inactive\) |
 |   ↳ `createdAt` | string | Creation timestamp \(ISO 8601\) |
-|   ↳ `updatedAt` | string | Last updated timestamp \(ISO 8601\) |
 |   ↳ `archivedAt` | string | Archive timestamp \(ISO 8601\) |

 ### `linear_create_customer_tier`
@@ -1784,16 +1711,11 @@ List all customer tiers in Linear

 | Parameter | Type | Required | Description |
 | --------- | ---- | -------- | ----------- |
-| `first` | number | No | Number of tiers to return \(default: 50\) |
-| `after` | string | No | Cursor for pagination |

 #### Output

 | Parameter | Type | Description |
 | --------- | ---- | ----------- |
-| `pageInfo` | object | Pagination information |
-|   ↳ `hasNextPage` | boolean | Whether there are more results |
-|   ↳ `endCursor` | string | Cursor for the next page |
 | `customerTiers` | array | List of customer tiers |
 |   ↳ `id` | string | Customer tier ID |
 |   ↳ `name` | string | Tier name |
@@ -1839,14 +1761,6 @@ Create a new project label in Linear
 | Parameter | Type | Description |
 | --------- | ---- | ----------- |
 | `projectLabel` | object | The created project label |
-|   ↳ `id` | string | Project label ID |
-|   ↳ `name` | string | Label name |
-|   ↳ `description` | string | Label description |
-|   ↳ `color` | string | Label color \(hex\) |
-|   ↳ `isGroup` | boolean | Whether this label is a group |
-|   ↳ `createdAt` | string | Creation timestamp \(ISO 8601\) |
-|   ↳ `updatedAt` | string | Last update timestamp \(ISO 8601\) |
-|   ↳ `archivedAt` | string | Archive timestamp \(ISO 8601\) |

 ### `linear_update_project_label`

@@ -1866,14 +1780,6 @@ Update a project label in Linear
 | Parameter | Type | Description |
 | --------- | ---- | ----------- |
 | `projectLabel` | object | The updated project label |
-|   ↳ `id` | string | Project label ID |
-|   ↳ `name` | string | Label name |
-|   ↳ `description` | string | Label description |
-|   ↳ `color` | string | Label color \(hex\) |
-|   ↳ `isGroup` | boolean | Whether this label is a group |
-|   ↳ `createdAt` | string | Creation timestamp \(ISO 8601\) |
-|   ↳ `updatedAt` | string | Last update timestamp \(ISO 8601\) |
-|   ↳ `archivedAt` | string | Archive timestamp \(ISO 8601\) |

 ### `linear_delete_project_label`

@@ -1900,25 +1806,12 @@ List all project labels in Linear
 | Parameter | Type | Required | Description |
 | --------- | ---- | -------- | ----------- |
 | `projectId` | string | No | Optional project ID to filter labels for a specific project |
-| `first` | number | No | Number of labels to return \(default: 50\) |
-| `after` | string | No | Cursor for pagination |

 #### Output

 | Parameter | Type | Description |
 | --------- | ---- | ----------- |
-| `pageInfo` | object | Pagination information |
-|   ↳ `hasNextPage` | boolean | Whether there are more results |
-|   ↳ `endCursor` | string | Cursor for the next page |
 | `projectLabels` | array | List of project labels |
-|   ↳ `id` | string | Project label ID |
-|   ↳ `name` | string | Label name |
-|   ↳ `description` | string | Label description |
-|   ↳ `color` | string | Label color \(hex\) |
-|   ↳ `isGroup` | boolean | Whether this label is a group |
-|   ↳ `createdAt` | string | Creation timestamp \(ISO 8601\) |
-|   ↳ `updatedAt` | string | Last update timestamp \(ISO 8601\) |
-|   ↳ `archivedAt` | string | Archive timestamp \(ISO 8601\) |

 ### `linear_add_label_to_project`

@@ -1974,16 +1867,6 @@ Create a new project milestone in Linear
 | Parameter | Type | Description |
 | --------- | ---- | ----------- |
 | `projectMilestone` | object | The created project milestone |
-|   ↳ `id` | string | Project milestone ID |
-|   ↳ `name` | string | Milestone name |
-|   ↳ `description` | string | Milestone description |
-|   ↳ `projectId` | string | Project ID |
-|   ↳ `targetDate` | string | Target date \(YYYY-MM-DD\) |
-|   ↳ `progress` | number | Progress percentage \(0-1\) |
-|   ↳ `sortOrder` | number | Sort order within the project |
-|   ↳ `status` | string | Milestone status \(done, next, overdue, unstarted\) |
-|   ↳ `createdAt` | string | Creation timestamp \(ISO 8601\) |
-|   ↳ `archivedAt` | string | Archive timestamp \(ISO 8601\) |

 ### `linear_update_project_milestone`

@@ -2003,16 +1886,6 @@ Update a project milestone in Linear
 | Parameter | Type | Description |
 | --------- | ---- | ----------- |
 | `projectMilestone` | object | The updated project milestone |
-|   ↳ `id` | string | Project milestone ID |
-|   ↳ `name` | string | Milestone name |
-|   ↳ `description` | string | Milestone description |
-|   ↳ `projectId` | string | Project ID |
-|   ↳ `targetDate` | string | Target date \(YYYY-MM-DD\) |
-|   ↳ `progress` | number | Progress percentage \(0-1\) |
-|   ↳ `sortOrder` | number | Sort order within the project |
-|   ↳ `status` | string | Milestone status \(done, next, overdue, unstarted\) |
-|   ↳ `createdAt` | string | Creation timestamp \(ISO 8601\) |
-|   ↳ `archivedAt` | string | Archive timestamp \(ISO 8601\) |

 ### `linear_delete_project_milestone`

@@ -2039,27 +1912,12 @@ List all milestones for a project in Linear
 | Parameter | Type | Required | Description |
 | --------- | ---- | -------- | ----------- |
 | `projectId` | string | Yes | Project ID to list milestones for |
-| `first` | number | No | Number of milestones to return \(default: 50\) |
-| `after` | string | No | Cursor for pagination |

 #### Output

 | Parameter | Type | Description |
 | --------- | ---- | ----------- |
-| `pageInfo` | object | Pagination information |
-|   ↳ `hasNextPage` | boolean | Whether there are more results |
-|   ↳ `endCursor` | string | Cursor for the next page |
 | `projectMilestones` | array | List of project milestones |
-|   ↳ `id` | string | Project milestone ID |
-|   ↳ `name` | string | Milestone name |
-|   ↳ `description` | string | Milestone description |
-|   ↳ `projectId` | string | Project ID |
-|   ↳ `targetDate` | string | Target date \(YYYY-MM-DD\) |
-|   ↳ `progress` | number | Progress percentage \(0-1\) |
-|   ↳ `sortOrder` | number | Sort order within the project |
-|   ↳ `status` | string | Milestone status \(done, next, overdue, unstarted\) |
-|   ↳ `createdAt` | string | Creation timestamp \(ISO 8601\) |
-|   ↳ `archivedAt` | string | Archive timestamp \(ISO 8601\) |

 ### `linear_create_project_status`

@@ -2081,16 +1939,6 @@ Create a new project status in Linear
 | Parameter | Type | Description |
 | --------- | ---- | ----------- |
 | `projectStatus` | object | The created project status |
-|   ↳ `id` | string | Project status ID |
-|   ↳ `name` | string | Status name |
-|   ↳ `description` | string | Status description |
-|   ↳ `color` | string | Status color \(hex\) |
-|   ↳ `indefinite` | boolean | Whether this status is indefinite |
-|   ↳ `position` | number | Position in list |
-|   ↳ `type` | string | Status type \(backlog, planned, started, paused, completed, canceled\) |
-|   ↳ `createdAt` | string | Creation timestamp \(ISO 8601\) |
-|   ↳ `updatedAt` | string | Last updated timestamp \(ISO 8601\) |
-|   ↳ `archivedAt` | string | Archive timestamp \(ISO 8601\) |

 ### `linear_update_project_status`

@@ -2112,16 +1960,6 @@ Update a project status in Linear
 | Parameter | Type | Description |
 | --------- | ---- | ----------- |
 | `projectStatus` | object | The updated project status |
-|   ↳ `id` | string | Project status ID |
-|   ↳ `name` | string | Status name |
-|   ↳ `description` | string | Status description |
-|   ↳ `color` | string | Status color \(hex\) |
-|   ↳ `indefinite` | boolean | Whether this status is indefinite |
-|   ↳ `position` | number | Position in list |
-|   ↳ `type` | string | Status type \(backlog, planned, started, paused, completed, canceled\) |
-|   ↳ `createdAt` | string | Creation timestamp \(ISO 8601\) |
-|   ↳ `updatedAt` | string | Last updated timestamp \(ISO 8601\) |
-|   ↳ `archivedAt` | string | Archive timestamp \(ISO 8601\) |

 ### `linear_delete_project_status`

@@ -2147,26 +1985,11 @@ List all project statuses in Linear

 | Parameter | Type | Required | Description |
 | --------- | ---- | -------- | ----------- |
-| `first` | number | No | Number of statuses to return \(default: 50\) |
-| `after` | string | No | Cursor for pagination |

 #### Output

 | Parameter | Type | Description |
 | --------- | ---- | ----------- |
-| `pageInfo` | object | Pagination information |
-|   ↳ `hasNextPage` | boolean | Whether there are more results |
-|   ↳ `endCursor` | string | Cursor for the next page |
 | `projectStatuses` | array | List of project statuses |
-|   ↳ `id` | string | Project status ID |
-|   ↳ `name` | string | Status name |
-|   ↳ `description` | string | Status description |
-|   ↳ `color` | string | Status color \(hex\) |
-|   ↳ `indefinite` | boolean | Whether this status is indefinite |
-|   ↳ `position` | number | Position in list |
-|   ↳ `type` | string | Status type \(backlog, planned, started, paused, completed, canceled\) |
-|   ↳ `createdAt` | string | Creation timestamp \(ISO 8601\) |
-|   ↳ `updatedAt` | string | Last updated timestamp \(ISO 8601\) |
-|   ↳ `archivedAt` | string | Archive timestamp \(ISO 8601\) |


--- a/apps/docs/content/docs/en/tools/meta.json
+++ b/apps/docs/content/docs/en/tools/meta.json
@@ -4,7 +4,6 @@
    "a2a",
    "ahrefs",
    "airtable",
-    "airweave",
    "apify",
    "apollo",
    "arxiv",
--- a/apps/docs/public/static/skills/add-skill.png
+++ b/apps/docs/public/static/skills/add-skill.png
--- a/apps/docs/public/static/skills/manage-skills.png
+++ b/apps/docs/public/static/skills/manage-skills.png
--- a/apps/sim/app/(home)/components/collaboration/collaboration.tsx
+++ b/apps/sim/app/(home)/components/collaboration/collaboration.tsx
@@ -1,16 +0,0 @@
-/**
- * Collaboration section — team workflows and real-time collaboration.
- *
- * SEO:
- * - `<section id="collaboration" aria-labelledby="collaboration-heading">`.
- * - `<h2 id="collaboration-heading">` for the section title.
- * - Product visuals use `<figure>` with `<figcaption>` and descriptive `alt` text.
- *
- * GEO:
- * - Name specific capabilities (version control, shared workspaces, RBAC, audit logs).
- * - Lead with a summary so AI can answer "Does Sim support team collaboration?".
- * - Reference "Sim" by name per capability ("Sim's real-time collaboration").
- */
-export default function Collaboration() {
-  return null
-}
--- a/apps/sim/app/(home)/components/enterprise/enterprise.tsx
+++ b/apps/sim/app/(home)/components/enterprise/enterprise.tsx
@@ -1,17 +0,0 @@
-/**
- * Enterprise section — compliance, scale, and security messaging.
- *
- * SEO:
- * - `<section id="enterprise" aria-labelledby="enterprise-heading">`.
- * - `<h2 id="enterprise-heading">` for the section title.
- * - Compliance certs (SOC2, HIPAA) as visible `<strong>` text.
- * - Enterprise CTA links to contact form via `<a>` with `rel="noopener noreferrer"`.
- *
- * GEO:
- * - Entity-rich: "Sim is SOC2 and HIPAA compliant" — not "We are compliant."
- * - `<ul>` checklist of features (SSO, RBAC, audit logs, SLA, on-premise deployment)
- *   as an atomic answer block for "What enterprise features does Sim offer?".
- */
-export default function Enterprise() {
-  return null
-}
--- a/apps/sim/app/(home)/components/features/features.tsx
+++ b/apps/sim/app/(home)/components/features/features.tsx
@@ -1,17 +0,0 @@
-/**
- * Features section — Sim's core product capabilities.
- *
- * SEO:
- * - `<section id="features" aria-labelledby="features-heading">`.
- * - `<h2 id="features-heading">` for the section title.
- * - Each feature: `<h3>` + `<p>` + `<ul>` capability list. Strict H2 -> H3 -> H4 hierarchy.
- * - Feature lists map to `WebApplication.featureList` in structured-data.tsx — keep in sync.
- *
- * GEO:
- * - Each feature block is independently extractable (atomic answer block pattern).
- * - Include specific numbers ("100+ integrations", "15+ AI providers", "SOC2 compliant").
- * - Always use "Sim" by name — never "the platform" or "our tool" (entity consistency).
- */
-export default function Features() {
-  return null
-}
--- a/apps/sim/app/(home)/components/footer/footer.tsx
+++ b/apps/sim/app/(home)/components/footer/footer.tsx
@@ -1,18 +0,0 @@
-/**
- * Landing page footer — navigation, legal links, and entity reinforcement.
- *
- * SEO:
- * - `<footer role="contentinfo">` with `<nav aria-label="Footer navigation">`.
- * - Link groups under semantic headings (`<h3>`). All links are `<Link>` or `<a>` with `href`.
- * - External links include `rel="noopener noreferrer"`.
- * - Legal links (Privacy, Terms) must be crawlable (trust signals).
- *
- * GEO:
- * - Include "Sim — Open-source AI agent workflow builder" as visible text (entity reinforcement).
- * - Social links (X, GitHub, LinkedIn, Discord) must match `sameAs` in structured-data.tsx.
- * - Link to all major pages: Docs, Pricing, Enterprise, Careers, Changelog (internal link graph).
- * - Display compliance badges (SOC2, HIPAA) and status page link as visible trust signals.
- */
-export default function Footer() {
-  return null
-}
--- a/apps/sim/app/(home)/components/hero/hero.tsx
+++ b/apps/sim/app/(home)/components/hero/hero.tsx
@@ -1,18 +0,0 @@
-/**
- * Hero section — above-the-fold value proposition.
- *
- * SEO:
- * - `<section id="hero" aria-labelledby="hero-heading">`.
- * - Contains the page's only `<h1>`. Text aligns with the `<title>` tag keyword.
- * - Subtitle `<p>` expands the H1 into a full sentence with the primary keyword.
- * - Primary CTA is a `<Link href="/signup">` (crawlable), not a `<button>`.
- * - Canvas/animations wrapped in `aria-hidden="true"` with a text alternative.
- *
- * GEO:
- * - H1 + subtitle answer "What is Sim?" in two sentences (answer-first pattern).
- * - First 150 chars of visible text explicitly name "Sim", "AI agent", "workflow builder".
- * - Include a `<p className="sr-only">` product summary (60-80 words) rich in entities.
- */
-export default function Hero() {
-  return null
-}
--- a/apps/sim/app/(home)/components/index.ts
+++ b/apps/sim/app/(home)/components/index.ts
@@ -1,23 +0,0 @@
-import Collaboration from '@/app/(home)/components/collaboration/collaboration'
-import Enterprise from '@/app/(home)/components/enterprise/enterprise'
-import Features from '@/app/(home)/components/features/features'
-import Footer from '@/app/(home)/components/footer/footer'
-import Hero from '@/app/(home)/components/hero/hero'
-import Navbar from '@/app/(home)/components/navbar/navbar'
-import Pricing from '@/app/(home)/components/pricing/pricing'
-import StructuredData from '@/app/(home)/components/structured-data'
-import Templates from '@/app/(home)/components/templates/templates'
-import Testimonials from '@/app/(home)/components/testimonials/testimonials'
-
-export {
-  Collaboration,
-  Enterprise,
-  Features,
-  Footer,
-  Hero,
-  Navbar,
-  Pricing,
-  StructuredData,
-  Templates,
-  Testimonials,
-}
--- a/apps/sim/app/(home)/components/navbar/navbar.tsx
+++ b/apps/sim/app/(home)/components/navbar/navbar.tsx
@@ -1,17 +0,0 @@
-/**
- * Landing page navigation bar.
- *
- * SEO:
- * - `<nav aria-label="Primary navigation">` with `itemScope itemType="https://schema.org/SiteNavigationElement"`.
- * - All routes use `<Link>` (crawlable). External links include `rel="noopener noreferrer"`.
- * - Logo link contains `<span className="sr-only">` with the brand name.
- * - Logo `<Image>` uses `priority` and `loading="eager"` (LCP element).
- *
- * GEO:
- * - "Sim" as the canonical entity name everywhere.
- * - Navigation items in semantic `<ul>/<li>` with descriptive anchor text.
- * - Descriptive `aria-label` on interactive elements for AI intent extraction.
- */
-export default function Navbar() {
-  return null
-}
--- a/apps/sim/app/(home)/components/pricing/pricing.tsx
+++ b/apps/sim/app/(home)/components/pricing/pricing.tsx
@@ -1,17 +0,0 @@
-/**
- * Pricing section — tiered pricing plans with feature comparison.
- *
- * SEO:
- * - `<section id="pricing" aria-labelledby="pricing-heading">`.
- * - `<h2 id="pricing-heading">` for the section title.
- * - Each tier: `<h3>` plan name + semantic `<ul>` feature list.
- * - Free tier CTA uses `<Link href="/signup">` (crawlable). Enterprise CTA uses `<a>`.
- *
- * GEO:
- * - Each plan has consistent structure: name, price, billing period, feature list.
- * - Lead with a summary: "Sim offers a free Community plan, $20/mo Pro, $40/mo Team, custom Enterprise."
- * - Prices must match the `Offer` items in structured-data.tsx exactly.
- */
-export default function Pricing() {
-  return null
-}
--- a/apps/sim/app/(home)/components/structured-data.tsx
+++ b/apps/sim/app/(home)/components/structured-data.tsx
@@ -1,222 +0,0 @@
-/**
- * JSON-LD structured data for the landing page.
- *
- * Renders a `<script type="application/ld+json">` with Schema.org markup.
- * Single source of truth for machine-readable page metadata.
- *
- * Schemas: Organization, WebSite, WebPage, BreadcrumbList, WebApplication, FAQPage.
- *
- * AI crawler behavior (2025-2026):
- * - Google AI Overviews / Bing Copilot parse JSON-LD from their search indexes.
- * - GPTBot indexes JSON-LD during crawling (92% of LLM crawlers parse JSON-LD first).
- * - Perplexity / Claude prioritize visible HTML over JSON-LD during direct fetch.
- * - All claims here must also appear as visible text on the page.
- *
- * Maintenance:
- * - Offer prices must match the Pricing component exactly.
- * - `sameAs` links must match the Footer social links.
- * - Do not add `aggregateRating` without real, verifiable review data.
- */
-export default function StructuredData() {
-  const structuredData = {
-    '@context': 'https://schema.org',
-    '@graph': [
-      {
-        '@type': 'Organization',
-        '@id': 'https://sim.ai/#organization',
-        name: 'Sim',
-        alternateName: 'Sim Studio',
-        description:
-          'Open-source AI agent workflow builder used by developers at trail-blazing startups to Fortune 500 companies',
-        url: 'https://sim.ai',
-        logo: {
-          '@type': 'ImageObject',
-          '@id': 'https://sim.ai/#logo',
-          url: 'https://sim.ai/logo/b&w/text/b&w.svg',
-          contentUrl: 'https://sim.ai/logo/b&w/text/b&w.svg',
-          width: 49.78314,
-          height: 24.276,
-          caption: 'Sim Logo',
-        },
-        image: { '@id': 'https://sim.ai/#logo' },
-        sameAs: [
-          'https://x.com/simdotai',
-          'https://github.com/simstudioai/sim',
-          'https://www.linkedin.com/company/simstudioai/',
-          'https://discord.gg/Hr4UWYEcTT',
-        ],
-        contactPoint: {
-          '@type': 'ContactPoint',
-          contactType: 'customer support',
-          availableLanguage: ['en'],
-        },
-      },
-      {
-        '@type': 'WebSite',
-        '@id': 'https://sim.ai/#website',
-        url: 'https://sim.ai',
-        name: 'Sim — AI Agent Workflow Builder',
-        description:
-          'Open-source AI agent workflow builder. 60,000+ developers build and deploy agentic workflows. SOC2 and HIPAA compliant.',
-        publisher: { '@id': 'https://sim.ai/#organization' },
-        inLanguage: 'en-US',
-      },
-      {
-        '@type': 'WebPage',
-        '@id': 'https://sim.ai/#webpage',
-        url: 'https://sim.ai',
-        name: 'Sim — Workflows for LLMs | Build AI Agent Workflows',
-        isPartOf: { '@id': 'https://sim.ai/#website' },
-        about: { '@id': 'https://sim.ai/#software' },
-        datePublished: '2024-01-01T00:00:00+00:00',
-        dateModified: new Date().toISOString(),
-        description:
-          'Build and deploy AI agent workflows with Sim. Visual drag-and-drop interface for creating powerful LLM-powered automations.',
-        breadcrumb: { '@id': 'https://sim.ai/#breadcrumb' },
-        inLanguage: 'en-US',
-        potentialAction: [{ '@type': 'ReadAction', target: ['https://sim.ai'] }],
-      },
-      {
-        '@type': 'BreadcrumbList',
-        '@id': 'https://sim.ai/#breadcrumb',
-        itemListElement: [
-          { '@type': 'ListItem', position: 1, name: 'Home', item: 'https://sim.ai' },
-        ],
-      },
-      {
-        '@type': 'WebApplication',
-        '@id': 'https://sim.ai/#software',
-        name: 'Sim — AI Agent Workflow Builder',
-        description:
-          'Open-source AI agent workflow builder used by 60,000+ developers. Build agentic workflows with visual drag-and-drop interface. SOC2 and HIPAA compliant. Integrate with 100+ apps.',
-        applicationCategory: 'DeveloperApplication',
-        operatingSystem: 'Web',
-        browserRequirements: 'Requires a modern browser with JavaScript enabled',
-        offers: [
-          {
-            '@type': 'Offer',
-            name: 'Community Plan',
-            price: '0',
-            priceCurrency: 'USD',
-            availability: 'https://schema.org/InStock',
-          },
-          {
-            '@type': 'Offer',
-            name: 'Pro Plan',
-            price: '20',
-            priceCurrency: 'USD',
-            priceSpecification: {
-              '@type': 'UnitPriceSpecification',
-              price: '20',
-              priceCurrency: 'USD',
-              unitText: 'MONTH',
-              billingIncrement: 1,
-            },
-            availability: 'https://schema.org/InStock',
-          },
-          {
-            '@type': 'Offer',
-            name: 'Team Plan',
-            price: '40',
-            priceCurrency: 'USD',
-            priceSpecification: {
-              '@type': 'UnitPriceSpecification',
-              price: '40',
-              priceCurrency: 'USD',
-              unitText: 'MONTH',
-              billingIncrement: 1,
-            },
-            availability: 'https://schema.org/InStock',
-          },
-        ],
-        featureList: [
-          'Visual workflow builder',
-          'Drag-and-drop interface',
-          '100+ integrations',
-          'AI model support (OpenAI, Anthropic, Google, xAI, Mistral, Perplexity)',
-          'Real-time collaboration',
-          'Version control',
-          'API access',
-          'Custom functions',
-          'Scheduled workflows',
-          'Event triggers',
-        ],
-        review: [
-          {
-            '@type': 'Review',
-            author: { '@type': 'Person', name: 'Hasan Toor' },
-            reviewBody:
-              'This startup just dropped the fastest way to build AI agents. This Figma-like canvas to build agents will blow your mind.',
-            url: 'https://x.com/hasantoxr/status/1912909502036525271',
-          },
-          {
-            '@type': 'Review',
-            author: { '@type': 'Person', name: 'nizzy' },
-            reviewBody:
-              'This is the zapier of agent building. I always believed that building agents and using AI should not be limited to technical people. I think this solves just that.',
-            url: 'https://x.com/nizzyabi/status/1907864421227180368',
-          },
-          {
-            '@type': 'Review',
-            author: { '@type': 'Organization', name: 'xyflow' },
-            reviewBody: 'A very good looking agent workflow builder and open source!',
-            url: 'https://x.com/xyflowdev/status/1909501499719438670',
-          },
-        ],
-      },
-      {
-        '@type': 'FAQPage',
-        '@id': 'https://sim.ai/#faq',
-        mainEntity: [
-          {
-            '@type': 'Question',
-            name: 'What is Sim?',
-            acceptedAnswer: {
-              '@type': 'Answer',
-              text: 'Sim is an open-source AI agent workflow builder used by 60,000+ developers at trail-blazing startups to Fortune 500 companies. It provides a visual drag-and-drop interface for building and deploying agentic workflows. Sim is SOC2 and HIPAA compliant.',
-            },
-          },
-          {
-            '@type': 'Question',
-            name: 'Which AI models does Sim support?',
-            acceptedAnswer: {
-              '@type': 'Answer',
-              text: 'Sim supports all major AI models including OpenAI (GPT-5, GPT-4o), Anthropic (Claude), Google (Gemini), xAI (Grok), Mistral, Perplexity, and many more. You can also connect to open-source models via Ollama.',
-            },
-          },
-          {
-            '@type': 'Question',
-            name: 'How much does Sim cost?',
-            acceptedAnswer: {
-              '@type': 'Answer',
-              text: 'Sim offers a free Community plan with $20 usage limit, a Pro plan at $20/month, a Team plan at $40/month, and custom Enterprise pricing. All plans include CLI/SDK access.',
-            },
-          },
-          {
-            '@type': 'Question',
-            name: 'Do I need coding skills to use Sim?',
-            acceptedAnswer: {
-              '@type': 'Answer',
-              text: 'No coding skills are required. Sim features a visual drag-and-drop interface that makes it easy to build AI workflows. However, developers can also use custom functions and the API for advanced use cases.',
-            },
-          },
-          {
-            '@type': 'Question',
-            name: 'What enterprise features does Sim offer?',
-            acceptedAnswer: {
-              '@type': 'Answer',
-              text: 'Sim offers SOC2 and HIPAA compliance, SSO/SAML authentication, role-based access control, audit logs, dedicated support, custom SLAs, and on-premise deployment options for enterprise customers.',
-            },
-          },
-        ],
-      },
-    ],
-  }
-
-  return (
-    <script
-      type='application/ld+json'
-      dangerouslySetInnerHTML={{ __html: JSON.stringify(structuredData) }}
-    />
-  )
-}
--- a/apps/sim/app/(home)/components/templates/templates.tsx
+++ b/apps/sim/app/(home)/components/templates/templates.tsx
@@ -1,16 +0,0 @@
-/**
- * Templates section — pre-built workflow templates and use cases.
- *
- * SEO:
- * - `<section id="templates" aria-labelledby="templates-heading">`.
- * - `<h2 id="templates-heading">` for the section title.
- * - Each template: `<article>` with `<h3>`, `<p>` description, `<Link>` to signup.
- *
- * GEO:
- * - Each card is an atomic answer block: `<h3>Name</h3><p>1-2 sentences</p><ul>Features</ul>`.
- * - Name specific integrations (Slack, Gmail, Pinecone) and AI models (GPT-5, Claude).
- * - Add `id` anchors per card (e.g., `id="template-slack-summarizer"`) for fragment citations.
- */
-export default function Templates() {
-  return null
-}
--- a/apps/sim/app/(home)/components/testimonials/testimonials.tsx
+++ b/apps/sim/app/(home)/components/testimonials/testimonials.tsx
@@ -1,18 +0,0 @@
-/**
- * Testimonials section — social proof via user quotes.
- *
- * SEO:
- * - `<section id="testimonials" aria-labelledby="testimonials-heading">`.
- * - `<h2 id="testimonials-heading">` for the section title.
- * - Each testimonial: `<blockquote cite="tweet-url">` with `<footer><cite>Author</cite></footer>`.
- * - Profile images use `loading="lazy"` (below the fold).
- *
- * GEO:
- * - Keep quote text as plain text in `<blockquote>` — not split across `<span>` elements.
- * - Include full author name + handle (LLMs weigh attributed quotes higher).
- * - Testimonials mentioning "Sim" by name carry more citation weight.
- * - Review data here aligns with `review` entries in structured-data.tsx.
- */
-export default function Testimonials() {
-  return null
-}
--- a/apps/sim/app/(home)/landing.tsx
+++ b/apps/sim/app/(home)/landing.tsx
@@ -1,51 +0,0 @@
-import {
-  Collaboration,
-  Enterprise,
-  Features,
-  Footer,
-  Hero,
-  Navbar,
-  Pricing,
-  StructuredData,
-  Templates,
-  Testimonials,
-} from '@/app/(home)/components'
-
-/**
- * Landing page root component.
- *
- * ## SEO Architecture
- * - Single `<h1>` inside Hero (only one per page).
- * - Heading hierarchy: H1 (Hero) -> H2 (each section) -> H3 (sub-items).
- * - Semantic landmarks: `<header>`, `<main>`, `<footer>`.
- * - Every `<section>` has an `id` for anchor linking and `aria-labelledby` for accessibility.
- * - `StructuredData` emits JSON-LD before any visible content.
- *
- * ## GEO Architecture
- * - Above-fold content (Navbar, Hero) is statically rendered (Server Components where possible)
- *   for immediate availability to AI crawlers.
- * - Section `id` attributes serve as fragment anchors for precise AI citations.
- * - Content ordering prioritizes answer-first patterns: definition (Hero) ->
- *   examples (Templates) -> capabilities (Features) -> social proof (Collaboration, Testimonials) ->
- *   pricing (Pricing) -> enterprise (Enterprise).
- */
-export default function Landing() {
-  return (
-    <>
-      <StructuredData />
-      <header>
-        <Navbar />
-      </header>
-      <main>
-        <Hero />
-        <Templates />
-        <Features />
-        <Collaboration />
-        <Pricing />
-        <Enterprise />
-        <Testimonials />
-      </main>
-      <Footer />
-    </>
-  )
-}
--- a/apps/sim/app/(home)/layout.tsx
+++ b/apps/sim/app/(home)/layout.tsx
@@ -1,87 +0,0 @@
-import type { Metadata } from 'next'
-import { martianMono } from '@/app/_styles/fonts/martian-mono/martian-mono'
-import { season } from '@/app/_styles/fonts/season/season'
-
-/**
- * SEO metadata for the landing page.
- *
- * - `title` contains the primary keyword and brand name.
- * - `description` is 150-160 chars, front-loaded with the value proposition.
- * - `openGraph` provides social sharing metadata with a dedicated OG image.
- * - `robots` ensures the landing page is fully indexable.
- * - `alternates.canonical` prevents duplicate content issues.
- *
- * GEO note: The description is written as a direct answer to "What is Sim?"
- * so LLMs can extract it as a cited definition.
- */
-export const metadata: Metadata = {
-  metadataBase: new URL('https://sim.ai'),
-  title: 'Sim — Workflows for LLMs | Build AI Agent Workflows',
-  description:
-    'Sim is an open-source AI agent workflow builder. Build and deploy agentic workflows with a visual drag-and-drop interface. 100+ integrations. SOC2 and HIPAA compliant.',
-  manifest: '/manifest.json',
-  icons: {
-    icon: '/favicon.ico',
-    apple: '/apple-icon.png',
-  },
-  openGraph: {
-    type: 'website',
-    locale: 'en_US',
-    url: 'https://sim.ai',
-    siteName: 'Sim',
-    title: 'Sim — Workflows for LLMs | Build AI Agent Workflows',
-    description:
-      'Open-source AI agent workflow builder used by 60,000+ developers. Visual drag-and-drop interface for building agentic workflows.',
-    images: [
-      {
-        url: '/og-image.png',
-        width: 1200,
-        height: 630,
-        alt: 'Sim — AI Agent Workflow Builder',
-      },
-    ],
-  },
-  twitter: {
-    card: 'summary_large_image',
-    site: '@simdotai',
-    creator: '@simdotai',
-    title: 'Sim — Workflows for LLMs',
-    description:
-      'Open-source AI agent workflow builder. Build and deploy agentic workflows with a visual drag-and-drop interface.',
-    images: ['/og-image.png'],
-  },
-  robots: {
-    index: true,
-    follow: true,
-    googleBot: {
-      index: true,
-      follow: true,
-      'max-video-preview': -1,
-      'max-image-preview': 'large',
-      'max-snippet': -1,
-    },
-  },
-  alternates: {
-    canonical: 'https://sim.ai',
-  },
-  other: {
-    'msapplication-TileColor': '#000000',
-    'theme-color': '#ffffff',
-  },
-}
-
-/**
- * Landing page layout.
- *
- * Applies landing-specific font CSS variables to the subtree:
- * - `--font-season` (Season Sans): Headings and display text
- * - `--font-martian-mono` (Martian Mono): Code snippets and technical accents
- *
- * These CSS variables are available to all child components via Tailwind classes
- * (`font-season`, `font-martian-mono`) or direct `var()` usage.
- *
- * The layout is a Server Component — no `'use client'` needed.
- */
-export default function HomeLayout({ children }: { children: React.ReactNode }) {
-  return <div className={`${season.variable} ${martianMono.variable}`}>{children}</div>
-}
--- a/apps/sim/app/_styles/fonts/martian-mono/martian-mono.ts
+++ b/apps/sim/app/_styles/fonts/martian-mono/martian-mono.ts
@@ -1,14 +0,0 @@
-import { Martian_Mono } from 'next/font/google'
-
-/**
- * Martian Mono font configuration
- * Monospaced variable font used for code snippets, technical content, and accent text
- * on the landing page. Supports weights 100-800.
- */
-export const martianMono = Martian_Mono({
-  subsets: ['latin'],
-  display: 'swap',
-  variable: '--font-martian-mono',
-  weight: 'variable',
-  fallback: ['ui-monospace', 'SFMono-Regular', 'Menlo', 'Monaco', 'Consolas', 'monospace'],
-})
--- a/apps/sim/app/api/a2a/agents/[agentId]/route.ts
+++ b/apps/sim/app/api/a2a/agents/[agentId]/route.ts
@@ -5,7 +5,7 @@ import { eq } from 'drizzle-orm'
 import { type NextRequest, NextResponse } from 'next/server'
 import { generateAgentCard, generateSkillsFromWorkflow } from '@/lib/a2a/agent-card'
 import type { AgentCapabilities, AgentSkill } from '@/lib/a2a/types'
-import { checkSessionOrInternalAuth } from '@/lib/auth/hybrid'
+import { checkHybridAuth } from '@/lib/auth/hybrid'
 import { getRedisClient } from '@/lib/core/config/redis'
 import { loadWorkflowFromNormalizedTables } from '@/lib/workflows/persistence/utils'
 import { checkWorkspaceAccess } from '@/lib/workspaces/permissions/utils'
@@ -40,7 +40,7 @@ export async function GET(request: NextRequest, { params }: { params: Promise<Ro
    }

    if (!agent.agent.isPublished) {
-      const auth = await checkSessionOrInternalAuth(request, { requireWorkflowId: false })
+      const auth = await checkHybridAuth(request, { requireWorkflowId: false })
      if (!auth.success) {
        return NextResponse.json({ error: 'Agent not published' }, { status: 404 })
      }
@@ -81,7 +81,7 @@ export async function PUT(request: NextRequest, { params }: { params: Promise<Ro
  const { agentId } = await params

  try {
-    const auth = await checkSessionOrInternalAuth(request, { requireWorkflowId: false })
+    const auth = await checkHybridAuth(request, { requireWorkflowId: false })
    if (!auth.success || !auth.userId) {
      return NextResponse.json({ error: 'Unauthorized' }, { status: 401 })
    }
@@ -151,7 +151,7 @@ export async function DELETE(request: NextRequest, { params }: { params: Promise
  const { agentId } = await params

  try {
-    const auth = await checkSessionOrInternalAuth(request, { requireWorkflowId: false })
+    const auth = await checkHybridAuth(request, { requireWorkflowId: false })
    if (!auth.success || !auth.userId) {
      return NextResponse.json({ error: 'Unauthorized' }, { status: 401 })
    }
@@ -189,7 +189,7 @@ export async function POST(request: NextRequest, { params }: { params: Promise<R
  const { agentId } = await params

  try {
-    const auth = await checkSessionOrInternalAuth(request, { requireWorkflowId: false })
+    const auth = await checkHybridAuth(request, { requireWorkflowId: false })
    if (!auth.success || !auth.userId) {
      logger.warn('A2A agent publish auth failed:', { error: auth.error, hasUserId: !!auth.userId })
      return NextResponse.json({ error: auth.error || 'Unauthorized' }, { status: 401 })
--- a/apps/sim/app/api/a2a/agents/route.ts
+++ b/apps/sim/app/api/a2a/agents/route.ts
@@ -13,7 +13,7 @@ import { v4 as uuidv4 } from 'uuid'
 import { generateSkillsFromWorkflow } from '@/lib/a2a/agent-card'
 import { A2A_DEFAULT_CAPABILITIES } from '@/lib/a2a/constants'
 import { sanitizeAgentName } from '@/lib/a2a/utils'
-import { checkSessionOrInternalAuth } from '@/lib/auth/hybrid'
+import { checkHybridAuth } from '@/lib/auth/hybrid'
 import { loadWorkflowFromNormalizedTables } from '@/lib/workflows/persistence/utils'
 import { hasValidStartBlockInState } from '@/lib/workflows/triggers/trigger-utils'
 import { getWorkspaceById } from '@/lib/workspaces/permissions/utils'
@@ -27,7 +27,7 @@ export const dynamic = 'force-dynamic'
 */
 export async function GET(request: NextRequest) {
  try {
-    const auth = await checkSessionOrInternalAuth(request, { requireWorkflowId: false })
+    const auth = await checkHybridAuth(request, { requireWorkflowId: false })
    if (!auth.success || !auth.userId) {
      return NextResponse.json({ error: 'Unauthorized' }, { status: 401 })
    }
@@ -87,7 +87,7 @@ export async function GET(request: NextRequest) {
 */
 export async function POST(request: NextRequest) {
  try {
-    const auth = await checkSessionOrInternalAuth(request, { requireWorkflowId: false })
+    const auth = await checkHybridAuth(request, { requireWorkflowId: false })
    if (!auth.success || !auth.userId) {
      return NextResponse.json({ error: 'Unauthorized' }, { status: 401 })
    }
--- a/apps/sim/app/api/auth/oauth/credentials/route.ts
+++ b/apps/sim/app/api/auth/oauth/credentials/route.ts
@@ -5,7 +5,7 @@ import { and, eq } from 'drizzle-orm'
 import { jwtDecode } from 'jwt-decode'
 import { type NextRequest, NextResponse } from 'next/server'
 import { z } from 'zod'
-import { checkSessionOrInternalAuth } from '@/lib/auth/hybrid'
+import { checkHybridAuth } from '@/lib/auth/hybrid'
 import { generateRequestId } from '@/lib/core/utils/request'
 import { evaluateScopeCoverage, type OAuthProvider, parseProvider } from '@/lib/oauth'
 import { getUserEntityPermissions } from '@/lib/workspaces/permissions/utils'
@@ -81,7 +81,7 @@ export async function GET(request: NextRequest) {
    const { provider: providerParam, workflowId, credentialId } = parseResult.data

    // Authenticate requester (supports session, API key, internal JWT)
-    const authResult = await checkSessionOrInternalAuth(request)
+    const authResult = await checkHybridAuth(request)
    if (!authResult.success || !authResult.userId) {
      logger.warn(`[${requestId}] Unauthenticated credentials request rejected`)
      return NextResponse.json({ error: 'User not authenticated' }, { status: 401 })
--- a/apps/sim/app/api/auth/oauth/token/route.test.ts
+++ b/apps/sim/app/api/auth/oauth/token/route.test.ts
@@ -12,7 +12,7 @@ describe('OAuth Token API Routes', () => {
  const mockRefreshTokenIfNeeded = vi.fn()
  const mockGetOAuthToken = vi.fn()
  const mockAuthorizeCredentialUse = vi.fn()
-  const mockCheckSessionOrInternalAuth = vi.fn()
+  const mockCheckHybridAuth = vi.fn()

  const mockLogger = createMockLogger()

@@ -42,7 +42,7 @@ describe('OAuth Token API Routes', () => {
    }))

    vi.doMock('@/lib/auth/hybrid', () => ({
-      checkSessionOrInternalAuth: mockCheckSessionOrInternalAuth,
+      checkHybridAuth: mockCheckHybridAuth,
    }))
  })

@@ -235,7 +235,7 @@ describe('OAuth Token API Routes', () => {

    describe('credentialAccountUserId + providerId path', () => {
      it('should reject unauthenticated requests', async () => {
-        mockCheckSessionOrInternalAuth.mockResolvedValueOnce({
+        mockCheckHybridAuth.mockResolvedValueOnce({
          success: false,
          error: 'Authentication required',
        })
@@ -255,8 +255,30 @@ describe('OAuth Token API Routes', () => {
        expect(mockGetOAuthToken).not.toHaveBeenCalled()
      })

+      it('should reject API key authentication', async () => {
+        mockCheckHybridAuth.mockResolvedValueOnce({
+          success: true,
+          authType: 'api_key',
+          userId: 'test-user-id',
+        })
+
+        const req = createMockRequest('POST', {
+          credentialAccountUserId: 'test-user-id',
+          providerId: 'google',
+        })
+
+        const { POST } = await import('@/app/api/auth/oauth/token/route')
+
+        const response = await POST(req)
+        const data = await response.json()
+
+        expect(response.status).toBe(401)
+        expect(data).toHaveProperty('error', 'User not authenticated')
+        expect(mockGetOAuthToken).not.toHaveBeenCalled()
+      })
+
      it('should reject internal JWT authentication', async () => {
-        mockCheckSessionOrInternalAuth.mockResolvedValueOnce({
+        mockCheckHybridAuth.mockResolvedValueOnce({
          success: true,
          authType: 'internal_jwt',
          userId: 'test-user-id',
@@ -278,7 +300,7 @@ describe('OAuth Token API Routes', () => {
      })

      it('should reject requests for other users credentials', async () => {
-        mockCheckSessionOrInternalAuth.mockResolvedValueOnce({
+        mockCheckHybridAuth.mockResolvedValueOnce({
          success: true,
          authType: 'session',
          userId: 'attacker-user-id',
@@ -300,7 +322,7 @@ describe('OAuth Token API Routes', () => {
      })

      it('should allow session-authenticated users to access their own credentials', async () => {
-        mockCheckSessionOrInternalAuth.mockResolvedValueOnce({
+        mockCheckHybridAuth.mockResolvedValueOnce({
          success: true,
          authType: 'session',
          userId: 'test-user-id',
@@ -323,7 +345,7 @@ describe('OAuth Token API Routes', () => {
      })

      it('should return 404 when credential not found for user', async () => {
-        mockCheckSessionOrInternalAuth.mockResolvedValueOnce({
+        mockCheckHybridAuth.mockResolvedValueOnce({
          success: true,
          authType: 'session',
          userId: 'test-user-id',
@@ -351,7 +373,7 @@ describe('OAuth Token API Routes', () => {
   */
  describe('GET handler', () => {
    it('should return access token successfully', async () => {
-      mockCheckSessionOrInternalAuth.mockResolvedValueOnce({
+      mockCheckHybridAuth.mockResolvedValueOnce({
        success: true,
        authType: 'session',
        userId: 'test-user-id',
@@ -380,7 +402,7 @@ describe('OAuth Token API Routes', () => {
      expect(response.status).toBe(200)
      expect(data).toHaveProperty('accessToken', 'fresh-token')

-      expect(mockCheckSessionOrInternalAuth).toHaveBeenCalled()
+      expect(mockCheckHybridAuth).toHaveBeenCalled()
      expect(mockGetCredential).toHaveBeenCalledWith(mockRequestId, 'credential-id', 'test-user-id')
      expect(mockRefreshTokenIfNeeded).toHaveBeenCalled()
    })
@@ -399,7 +421,7 @@ describe('OAuth Token API Routes', () => {
    })

    it('should handle authentication failure', async () => {
-      mockCheckSessionOrInternalAuth.mockResolvedValueOnce({
+      mockCheckHybridAuth.mockResolvedValueOnce({
        success: false,
        error: 'Authentication required',
      })
@@ -418,7 +440,7 @@ describe('OAuth Token API Routes', () => {
    })

    it('should handle credential not found', async () => {
-      mockCheckSessionOrInternalAuth.mockResolvedValueOnce({
+      mockCheckHybridAuth.mockResolvedValueOnce({
        success: true,
        authType: 'session',
        userId: 'test-user-id',
@@ -439,7 +461,7 @@ describe('OAuth Token API Routes', () => {
    })

    it('should handle missing access token', async () => {
-      mockCheckSessionOrInternalAuth.mockResolvedValueOnce({
+      mockCheckHybridAuth.mockResolvedValueOnce({
        success: true,
        authType: 'session',
        userId: 'test-user-id',
@@ -465,7 +487,7 @@ describe('OAuth Token API Routes', () => {
    })

    it('should handle token refresh failure', async () => {
-      mockCheckSessionOrInternalAuth.mockResolvedValueOnce({
+      mockCheckHybridAuth.mockResolvedValueOnce({
        success: true,
        authType: 'session',
        userId: 'test-user-id',
--- a/apps/sim/app/api/auth/oauth/token/route.ts
+++ b/apps/sim/app/api/auth/oauth/token/route.ts
@@ -2,7 +2,7 @@ import { createLogger } from '@sim/logger'
 import { type NextRequest, NextResponse } from 'next/server'
 import { z } from 'zod'
 import { authorizeCredentialUse } from '@/lib/auth/credential-access'
-import { checkSessionOrInternalAuth } from '@/lib/auth/hybrid'
+import { checkHybridAuth } from '@/lib/auth/hybrid'
 import { generateRequestId } from '@/lib/core/utils/request'
 import { getCredential, getOAuthToken, refreshTokenIfNeeded } from '@/app/api/auth/oauth/utils'

@@ -71,7 +71,7 @@ export async function POST(request: NextRequest) {
        providerId,
      })

-      const auth = await checkSessionOrInternalAuth(request, { requireWorkflowId: false })
+      const auth = await checkHybridAuth(request, { requireWorkflowId: false })
      if (!auth.success || auth.authType !== 'session' || !auth.userId) {
        logger.warn(`[${requestId}] Unauthorized request for credentialAccountUserId path`, {
          success: auth.success,
@@ -187,7 +187,7 @@ export async function GET(request: NextRequest) {
    const { credentialId } = parseResult.data

    // For GET requests, we only support session-based authentication
-    const auth = await checkSessionOrInternalAuth(request, { requireWorkflowId: false })
+    const auth = await checkHybridAuth(request, { requireWorkflowId: false })
    if (!auth.success || auth.authType !== 'session' || !auth.userId) {
      return NextResponse.json({ error: 'User not authenticated' }, { status: 401 })
    }
--- a/apps/sim/app/api/copilot/chat/route.ts
+++ b/apps/sim/app/api/copilot/chat/route.ts
@@ -285,14 +285,6 @@ export async function POST(req: NextRequest) {
          apiVersion: 'preview',
          endpoint: env.AZURE_OPENAI_ENDPOINT,
        }
-      } else if (providerEnv === 'azure-anthropic') {
-        providerConfig = {
-          provider: 'azure-anthropic',
-          model: envModel,
-          apiKey: env.AZURE_ANTHROPIC_API_KEY,
-          apiVersion: env.AZURE_ANTHROPIC_API_VERSION,
-          endpoint: env.AZURE_ANTHROPIC_ENDPOINT,
-        }
      } else if (providerEnv === 'vertex') {
        providerConfig = {
          provider: 'vertex',
--- a/apps/sim/app/api/files/delete/route.test.ts
+++ b/apps/sim/app/api/files/delete/route.test.ts
@@ -29,7 +29,7 @@ function setupFileApiMocks(
  }

  vi.doMock('@/lib/auth/hybrid', () => ({
-    checkSessionOrInternalAuth: vi.fn().mockResolvedValue({
+    checkHybridAuth: vi.fn().mockResolvedValue({
      success: authenticated,
      userId: authenticated ? 'test-user-id' : undefined,
      error: authenticated ? undefined : 'Unauthorized',
--- a/apps/sim/app/api/files/delete/route.ts
+++ b/apps/sim/app/api/files/delete/route.ts
@@ -1,7 +1,7 @@
 import { createLogger } from '@sim/logger'
 import type { NextRequest } from 'next/server'
 import { NextResponse } from 'next/server'
-import { checkSessionOrInternalAuth } from '@/lib/auth/hybrid'
+import { checkHybridAuth } from '@/lib/auth/hybrid'
 import type { StorageContext } from '@/lib/uploads/config'
 import { deleteFile, hasCloudStorage } from '@/lib/uploads/core/storage-service'
 import { extractStorageKey, inferContextFromKey } from '@/lib/uploads/utils/file-utils'
@@ -24,7 +24,7 @@ const logger = createLogger('FilesDeleteAPI')
 */
 export async function POST(request: NextRequest) {
  try {
-    const authResult = await checkSessionOrInternalAuth(request, { requireWorkflowId: false })
+    const authResult = await checkHybridAuth(request, { requireWorkflowId: false })

    if (!authResult.success || !authResult.userId) {
      logger.warn('Unauthorized file delete request', {
--- a/apps/sim/app/api/files/download/route.ts
+++ b/apps/sim/app/api/files/download/route.ts
@@ -1,6 +1,6 @@
 import { createLogger } from '@sim/logger'
 import { type NextRequest, NextResponse } from 'next/server'
-import { checkSessionOrInternalAuth } from '@/lib/auth/hybrid'
+import { checkHybridAuth } from '@/lib/auth/hybrid'
 import type { StorageContext } from '@/lib/uploads/config'
 import { hasCloudStorage } from '@/lib/uploads/core/storage-service'
 import { verifyFileAccess } from '@/app/api/files/authorization'
@@ -12,7 +12,7 @@ export const dynamic = 'force-dynamic'

 export async function POST(request: NextRequest) {
  try {
-    const authResult = await checkSessionOrInternalAuth(request, { requireWorkflowId: false })
+    const authResult = await checkHybridAuth(request, { requireWorkflowId: false })

    if (!authResult.success || !authResult.userId) {
      logger.warn('Unauthorized download URL request', {
--- a/apps/sim/app/api/files/parse/route.test.ts
+++ b/apps/sim/app/api/files/parse/route.test.ts
@@ -35,7 +35,7 @@ function setupFileApiMocks(
  }

  vi.doMock('@/lib/auth/hybrid', () => ({
-    checkInternalAuth: vi.fn().mockResolvedValue({
+    checkHybridAuth: vi.fn().mockResolvedValue({
      success: authenticated,
      userId: authenticated ? 'test-user-id' : undefined,
      error: authenticated ? undefined : 'Unauthorized',
--- a/apps/sim/app/api/files/parse/route.ts
+++ b/apps/sim/app/api/files/parse/route.ts
@@ -5,7 +5,7 @@ import path from 'path'
 import { createLogger } from '@sim/logger'
 import binaryExtensionsList from 'binary-extensions'
 import { type NextRequest, NextResponse } from 'next/server'
-import { checkInternalAuth } from '@/lib/auth/hybrid'
+import { checkHybridAuth } from '@/lib/auth/hybrid'
 import {
  secureFetchWithPinnedIP,
  validateUrlWithDNS,
@@ -66,7 +66,7 @@ export async function POST(request: NextRequest) {
  const startTime = Date.now()

  try {
-    const authResult = await checkInternalAuth(request, { requireWorkflowId: true })
+    const authResult = await checkHybridAuth(request, { requireWorkflowId: true })

    if (!authResult.success) {
      logger.warn('Unauthorized file parse request', {
--- a/apps/sim/app/api/files/serve/[...path]/route.test.ts
+++ b/apps/sim/app/api/files/serve/[...path]/route.test.ts
@@ -55,7 +55,7 @@ describe('File Serve API Route', () => {
    })

    vi.doMock('@/lib/auth/hybrid', () => ({
-      checkSessionOrInternalAuth: vi.fn().mockResolvedValue({
+      checkHybridAuth: vi.fn().mockResolvedValue({
        success: true,
        userId: 'test-user-id',
      }),
@@ -165,7 +165,7 @@ describe('File Serve API Route', () => {
    }))

    vi.doMock('@/lib/auth/hybrid', () => ({
-      checkSessionOrInternalAuth: vi.fn().mockResolvedValue({
+      checkHybridAuth: vi.fn().mockResolvedValue({
        success: true,
        userId: 'test-user-id',
      }),
@@ -226,7 +226,7 @@ describe('File Serve API Route', () => {
    }))

    vi.doMock('@/lib/auth/hybrid', () => ({
-      checkSessionOrInternalAuth: vi.fn().mockResolvedValue({
+      checkHybridAuth: vi.fn().mockResolvedValue({
        success: true,
        userId: 'test-user-id',
      }),
@@ -291,7 +291,7 @@ describe('File Serve API Route', () => {
    }))

    vi.doMock('@/lib/auth/hybrid', () => ({
-      checkSessionOrInternalAuth: vi.fn().mockResolvedValue({
+      checkHybridAuth: vi.fn().mockResolvedValue({
        success: true,
        userId: 'test-user-id',
      }),
@@ -350,7 +350,7 @@ describe('File Serve API Route', () => {
    for (const test of contentTypeTests) {
      it(`should serve ${test.ext} file with correct content type`, async () => {
        vi.doMock('@/lib/auth/hybrid', () => ({
-          checkSessionOrInternalAuth: vi.fn().mockResolvedValue({
+          checkHybridAuth: vi.fn().mockResolvedValue({
            success: true,
            userId: 'test-user-id',
          }),
--- a/apps/sim/app/api/files/serve/[...path]/route.ts
+++ b/apps/sim/app/api/files/serve/[...path]/route.ts
@@ -2,7 +2,7 @@ import { readFile } from 'fs/promises'
 import { createLogger } from '@sim/logger'
 import type { NextRequest } from 'next/server'
 import { NextResponse } from 'next/server'
-import { checkSessionOrInternalAuth } from '@/lib/auth/hybrid'
+import { checkHybridAuth } from '@/lib/auth/hybrid'
 import { CopilotFiles, isUsingCloudStorage } from '@/lib/uploads'
 import type { StorageContext } from '@/lib/uploads/config'
 import { downloadFile } from '@/lib/uploads/core/storage-service'
@@ -49,7 +49,7 @@ export async function GET(
      return await handleLocalFilePublic(fullPath)
    }

-    const authResult = await checkSessionOrInternalAuth(request, { requireWorkflowId: false })
+    const authResult = await checkHybridAuth(request, { requireWorkflowId: false })

    if (!authResult.success || !authResult.userId) {
      logger.warn('Unauthorized file access attempt', {
--- a/apps/sim/app/api/function/execute/route.ts
+++ b/apps/sim/app/api/function/execute/route.ts
@@ -845,8 +845,6 @@ export async function POST(req: NextRequest) {
      contextVariables,
      timeoutMs: timeout,
      requestId,
-      ownerKey: `user:${auth.userId}`,
-      ownerWeight: 1,
    })

    const executionTime = Date.now() - startTime
--- a/apps/sim/app/api/guardrails/validate/route.ts
+++ b/apps/sim/app/api/guardrails/validate/route.ts
@@ -23,16 +23,7 @@ export async function POST(request: NextRequest) {
      topK,
      model,
      apiKey,
-      azureEndpoint,
-      azureApiVersion,
-      vertexProject,
-      vertexLocation,
-      vertexCredential,
-      bedrockAccessKeyId,
-      bedrockSecretKey,
-      bedrockRegion,
      workflowId,
-      workspaceId,
      piiEntityTypes,
      piiMode,
      piiLanguage,
@@ -119,18 +110,7 @@ export async function POST(request: NextRequest) {
      topK,
      model,
      apiKey,
-      {
-        azureEndpoint,
-        azureApiVersion,
-        vertexProject,
-        vertexLocation,
-        vertexCredential,
-        bedrockAccessKeyId,
-        bedrockSecretKey,
-        bedrockRegion,
-      },
      workflowId,
-      workspaceId,
      piiEntityTypes,
      piiMode,
      piiLanguage,
@@ -198,18 +178,7 @@ async function executeValidation(
  topK: string | undefined,
  model: string,
  apiKey: string | undefined,
-  providerCredentials: {
-    azureEndpoint?: string
-    azureApiVersion?: string
-    vertexProject?: string
-    vertexLocation?: string
-    vertexCredential?: string
-    bedrockAccessKeyId?: string
-    bedrockSecretKey?: string
-    bedrockRegion?: string
-  },
  workflowId: string | undefined,
-  workspaceId: string | undefined,
  piiEntityTypes: string[] | undefined,
  piiMode: string | undefined,
  piiLanguage: string | undefined,
@@ -250,9 +219,7 @@ async function executeValidation(
      topK: topK ? Number.parseInt(topK) : 10, // Default topK is 10
      model: model,
      apiKey,
-      providerCredentials,
      workflowId,
-      workspaceId,
      requestId,
    })
  }
--- 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 { checkSessionOrInternalAuth } from '@/lib/auth/hybrid'
+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,11 +19,19 @@ export async function GET(req: NextRequest, { params }: { params: Promise<{ id:
  try {
    logger.info(`[${requestId}] Getting tag definitions for knowledge base ${knowledgeBaseId}`)

-    const auth = await checkSessionOrInternalAuth(req, { requireWorkflowId: false })
+    const auth = await checkHybridAuth(req, { requireWorkflowId: false })
    if (!auth.success) {
      return NextResponse.json({ error: auth.error || 'Unauthorized' }, { status: 401 })
    }

+    // 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)
@@ -56,11 +64,19 @@ export async function POST(req: NextRequest, { params }: { params: Promise<{ id:
  try {
    logger.info(`[${requestId}] Creating tag definition for knowledge base ${knowledgeBaseId}`)

-    const auth = await checkSessionOrInternalAuth(req, { requireWorkflowId: false })
+    const auth = await checkHybridAuth(req, { requireWorkflowId: false })
    if (!auth.success) {
      return NextResponse.json({ error: auth.error || 'Unauthorized' }, { status: 401 })
    }

+    // 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)
--- a/apps/sim/app/api/logs/execution/[executionId]/route.ts
+++ b/apps/sim/app/api/logs/execution/[executionId]/route.ts
@@ -8,7 +8,7 @@ import {
 import { createLogger } from '@sim/logger'
 import { and, eq, inArray } from 'drizzle-orm'
 import { type NextRequest, NextResponse } from 'next/server'
-import { checkSessionOrInternalAuth } from '@/lib/auth/hybrid'
+import { checkHybridAuth } from '@/lib/auth/hybrid'
 import { generateRequestId } from '@/lib/core/utils/request'
 import type { TraceSpan, WorkflowExecutionLog } from '@/lib/logs/types'

@@ -23,7 +23,7 @@ export async function GET(
  try {
    const { executionId } = await params

-    const authResult = await checkSessionOrInternalAuth(request, { requireWorkflowId: false })
+    const authResult = await checkHybridAuth(request, { requireWorkflowId: false })
    if (!authResult.success || !authResult.userId) {
      logger.warn(`[${requestId}] Unauthorized execution data access attempt for: ${executionId}`)
      return NextResponse.json(
--- a/apps/sim/app/api/memory/[id]/route.ts
+++ b/apps/sim/app/api/memory/[id]/route.ts
@@ -4,7 +4,7 @@ import { createLogger } from '@sim/logger'
 import { and, eq } from 'drizzle-orm'
 import { type NextRequest, NextResponse } from 'next/server'
 import { z } from 'zod'
-import { checkInternalAuth } from '@/lib/auth/hybrid'
+import { checkHybridAuth } from '@/lib/auth/hybrid'
 import { generateRequestId } from '@/lib/core/utils/request'
 import { checkWorkspaceAccess } from '@/lib/workspaces/permissions/utils'

@@ -36,7 +36,7 @@ async function validateMemoryAccess(
  requestId: string,
  action: 'read' | 'write'
 ): Promise<{ userId: string } | { error: NextResponse }> {
-  const authResult = await checkInternalAuth(request, { requireWorkflowId: false })
+  const authResult = await checkHybridAuth(request, { requireWorkflowId: false })
  if (!authResult.success || !authResult.userId) {
    logger.warn(`[${requestId}] Unauthorized memory ${action} attempt`)
    return {
--- a/apps/sim/app/api/memory/route.ts
+++ b/apps/sim/app/api/memory/route.ts
@@ -3,7 +3,7 @@ import { memory } from '@sim/db/schema'
 import { createLogger } from '@sim/logger'
 import { and, eq, isNull, like } from 'drizzle-orm'
 import { type NextRequest, NextResponse } from 'next/server'
-import { checkInternalAuth } from '@/lib/auth/hybrid'
+import { checkHybridAuth } from '@/lib/auth/hybrid'
 import { generateRequestId } from '@/lib/core/utils/request'
 import { checkWorkspaceAccess } from '@/lib/workspaces/permissions/utils'

@@ -16,7 +16,7 @@ export async function GET(request: NextRequest) {
  const requestId = generateRequestId()

  try {
-    const authResult = await checkInternalAuth(request)
+    const authResult = await checkHybridAuth(request)
    if (!authResult.success || !authResult.userId) {
      logger.warn(`[${requestId}] Unauthorized memory access attempt`)
      return NextResponse.json(
@@ -89,7 +89,7 @@ export async function POST(request: NextRequest) {
  const requestId = generateRequestId()

  try {
-    const authResult = await checkInternalAuth(request)
+    const authResult = await checkHybridAuth(request)
    if (!authResult.success || !authResult.userId) {
      logger.warn(`[${requestId}] Unauthorized memory creation attempt`)
      return NextResponse.json(
@@ -228,7 +228,7 @@ export async function DELETE(request: NextRequest) {
  const requestId = generateRequestId()

  try {
-    const authResult = await checkInternalAuth(request)
+    const authResult = await checkHybridAuth(request)
    if (!authResult.success || !authResult.userId) {
      logger.warn(`[${requestId}] Unauthorized memory deletion attempt`)
      return NextResponse.json(
--- a/apps/sim/app/api/permission-groups/[id]/route.ts
+++ b/apps/sim/app/api/permission-groups/[id]/route.ts
@@ -24,7 +24,6 @@ const configSchema = z.object({
  hideFilesTab: z.boolean().optional(),
  disableMcpTools: z.boolean().optional(),
  disableCustomTools: z.boolean().optional(),
-  disableSkills: z.boolean().optional(),
  hideTemplates: z.boolean().optional(),
  disableInvitations: z.boolean().optional(),
  hideDeployApi: z.boolean().optional(),
--- a/apps/sim/app/api/permission-groups/route.ts
+++ b/apps/sim/app/api/permission-groups/route.ts
@@ -25,7 +25,6 @@ const configSchema = z.object({
  hideFilesTab: z.boolean().optional(),
  disableMcpTools: z.boolean().optional(),
  disableCustomTools: z.boolean().optional(),
-  disableSkills: z.boolean().optional(),
  hideTemplates: z.boolean().optional(),
  disableInvitations: z.boolean().optional(),
  hideDeployApi: z.boolean().optional(),
--- a/apps/sim/app/api/skills/route.ts
+++ b/apps/sim/app/api/skills/route.ts
@@ -1,182 +0,0 @@
-import { db } from '@sim/db'
-import { skill } from '@sim/db/schema'
-import { createLogger } from '@sim/logger'
-import { and, desc, eq } from 'drizzle-orm'
-import { type NextRequest, NextResponse } from 'next/server'
-import { z } from 'zod'
-import { checkSessionOrInternalAuth } from '@/lib/auth/hybrid'
-import { generateRequestId } from '@/lib/core/utils/request'
-import { upsertSkills } from '@/lib/workflows/skills/operations'
-import { getUserEntityPermissions } from '@/lib/workspaces/permissions/utils'
-
-const logger = createLogger('SkillsAPI')
-
-const SkillSchema = z.object({
-  skills: z.array(
-    z.object({
-      id: z.string().optional(),
-      name: z
-        .string()
-        .min(1, 'Skill name is required')
-        .max(64)
-        .regex(/^[a-z0-9]+(-[a-z0-9]+)*$/, 'Name must be kebab-case (e.g. my-skill)'),
-      description: z.string().min(1, 'Description is required').max(1024),
-      content: z.string().min(1, 'Content is required').max(50000, 'Content is too large'),
-    })
-  ),
-  workspaceId: z.string().optional(),
-})
-
-/** GET - Fetch all skills for a workspace */
-export async function GET(request: NextRequest) {
-  const requestId = generateRequestId()
-  const searchParams = request.nextUrl.searchParams
-  const workspaceId = searchParams.get('workspaceId')
-
-  try {
-    const authResult = await checkSessionOrInternalAuth(request, { requireWorkflowId: false })
-    if (!authResult.success || !authResult.userId) {
-      logger.warn(`[${requestId}] Unauthorized skills access attempt`)
-      return NextResponse.json({ error: 'Unauthorized' }, { status: 401 })
-    }
-
-    const userId = authResult.userId
-
-    if (!workspaceId) {
-      logger.warn(`[${requestId}] Missing workspaceId`)
-      return NextResponse.json({ error: 'workspaceId is required' }, { status: 400 })
-    }
-
-    const userPermission = await getUserEntityPermissions(userId, 'workspace', workspaceId)
-    if (!userPermission) {
-      logger.warn(`[${requestId}] User ${userId} does not have access to workspace ${workspaceId}`)
-      return NextResponse.json({ error: 'Access denied' }, { status: 403 })
-    }
-
-    const result = await db
-      .select()
-      .from(skill)
-      .where(eq(skill.workspaceId, workspaceId))
-      .orderBy(desc(skill.createdAt))
-
-    return NextResponse.json({ data: result }, { status: 200 })
-  } catch (error) {
-    logger.error(`[${requestId}] Error fetching skills:`, error)
-    return NextResponse.json({ error: 'Failed to fetch skills' }, { status: 500 })
-  }
-}
-
-/** POST - Create or update skills */
-export async function POST(req: NextRequest) {
-  const requestId = generateRequestId()
-
-  try {
-    const authResult = await checkSessionOrInternalAuth(req, { requireWorkflowId: false })
-    if (!authResult.success || !authResult.userId) {
-      logger.warn(`[${requestId}] Unauthorized skills update attempt`)
-      return NextResponse.json({ error: 'Unauthorized' }, { status: 401 })
-    }
-
-    const userId = authResult.userId
-    const body = await req.json()
-
-    try {
-      const { skills, workspaceId } = SkillSchema.parse(body)
-
-      if (!workspaceId) {
-        logger.warn(`[${requestId}] Missing workspaceId in request body`)
-        return NextResponse.json({ error: 'workspaceId is required' }, { status: 400 })
-      }
-
-      const userPermission = await getUserEntityPermissions(userId, 'workspace', workspaceId)
-      if (!userPermission || (userPermission !== 'admin' && userPermission !== 'write')) {
-        logger.warn(
-          `[${requestId}] User ${userId} does not have write permission for workspace ${workspaceId}`
-        )
-        return NextResponse.json({ error: 'Write permission required' }, { status: 403 })
-      }
-
-      const resultSkills = await upsertSkills({
-        skills,
-        workspaceId,
-        userId,
-        requestId,
-      })
-
-      return NextResponse.json({ success: true, data: resultSkills })
-    } catch (validationError) {
-      if (validationError instanceof z.ZodError) {
-        logger.warn(`[${requestId}] Invalid skills data`, {
-          errors: validationError.errors,
-        })
-        return NextResponse.json(
-          { error: 'Invalid request data', details: validationError.errors },
-          { status: 400 }
-        )
-      }
-      if (validationError instanceof Error && validationError.message.includes('already exists')) {
-        return NextResponse.json({ error: validationError.message }, { status: 409 })
-      }
-      throw validationError
-    }
-  } catch (error) {
-    logger.error(`[${requestId}] Error updating skills`, error)
-    return NextResponse.json({ error: 'Failed to update skills' }, { status: 500 })
-  }
-}
-
-/** DELETE - Delete a skill by ID */
-export async function DELETE(request: NextRequest) {
-  const requestId = generateRequestId()
-  const searchParams = request.nextUrl.searchParams
-  const skillId = searchParams.get('id')
-  const workspaceId = searchParams.get('workspaceId')
-
-  try {
-    const authResult = await checkSessionOrInternalAuth(request, { requireWorkflowId: false })
-    if (!authResult.success || !authResult.userId) {
-      logger.warn(`[${requestId}] Unauthorized skill deletion attempt`)
-      return NextResponse.json({ error: 'Unauthorized' }, { status: 401 })
-    }
-
-    const userId = authResult.userId
-
-    if (!skillId) {
-      logger.warn(`[${requestId}] Missing skill ID for deletion`)
-      return NextResponse.json({ error: 'Skill ID is required' }, { status: 400 })
-    }
-
-    if (!workspaceId) {
-      logger.warn(`[${requestId}] Missing workspaceId for deletion`)
-      return NextResponse.json({ error: 'workspaceId is required' }, { status: 400 })
-    }
-
-    const userPermission = await getUserEntityPermissions(userId, 'workspace', workspaceId)
-    if (!userPermission || (userPermission !== 'admin' && userPermission !== 'write')) {
-      logger.warn(
-        `[${requestId}] User ${userId} does not have write permission for workspace ${workspaceId}`
-      )
-      return NextResponse.json({ error: 'Write permission required' }, { status: 403 })
-    }
-
-    const existingSkill = await db.select().from(skill).where(eq(skill.id, skillId)).limit(1)
-
-    if (existingSkill.length === 0) {
-      logger.warn(`[${requestId}] Skill not found: ${skillId}`)
-      return NextResponse.json({ error: 'Skill not found' }, { status: 404 })
-    }
-
-    if (existingSkill[0].workspaceId !== workspaceId) {
-      logger.warn(`[${requestId}] Skill ${skillId} does not belong to workspace ${workspaceId}`)
-      return NextResponse.json({ error: 'Skill not found' }, { status: 404 })
-    }
-
-    await db.delete(skill).where(and(eq(skill.id, skillId), eq(skill.workspaceId, workspaceId)))
-
-    logger.info(`[${requestId}] Deleted skill: ${skillId}`)
-    return NextResponse.json({ success: true })
-  } catch (error) {
-    logger.error(`[${requestId}] Error deleting skill:`, error)
-    return NextResponse.json({ error: 'Failed to delete skill' }, { status: 500 })
-  }
-}
--- a/apps/sim/app/api/tools/a2a/cancel-task/route.ts
+++ b/apps/sim/app/api/tools/a2a/cancel-task/route.ts
@@ -3,7 +3,7 @@ import { createLogger } from '@sim/logger'
 import { type NextRequest, NextResponse } from 'next/server'
 import { z } from 'zod'
 import { createA2AClient } from '@/lib/a2a/utils'
-import { checkSessionOrInternalAuth } from '@/lib/auth/hybrid'
+import { checkHybridAuth } from '@/lib/auth/hybrid'
 import { generateRequestId } from '@/lib/core/utils/request'

 const logger = createLogger('A2ACancelTaskAPI')
@@ -20,7 +20,7 @@ export async function POST(request: NextRequest) {
  const requestId = generateRequestId()

  try {
-    const authResult = await checkSessionOrInternalAuth(request, { requireWorkflowId: false })
+    const authResult = await checkHybridAuth(request, { requireWorkflowId: false })

    if (!authResult.success) {
      logger.warn(`[${requestId}] Unauthorized A2A cancel task attempt`)
--- a/apps/sim/app/api/tools/a2a/delete-push-notification/route.ts
+++ b/apps/sim/app/api/tools/a2a/delete-push-notification/route.ts
@@ -2,7 +2,7 @@ import { createLogger } from '@sim/logger'
 import { type NextRequest, NextResponse } from 'next/server'
 import { z } from 'zod'
 import { createA2AClient } from '@/lib/a2a/utils'
-import { checkSessionOrInternalAuth } from '@/lib/auth/hybrid'
+import { checkHybridAuth } from '@/lib/auth/hybrid'
 import { generateRequestId } from '@/lib/core/utils/request'

 export const dynamic = 'force-dynamic'
@@ -20,7 +20,7 @@ export async function POST(request: NextRequest) {
  const requestId = generateRequestId()

  try {
-    const authResult = await checkSessionOrInternalAuth(request, { requireWorkflowId: false })
+    const authResult = await checkHybridAuth(request, { requireWorkflowId: false })

    if (!authResult.success) {
      logger.warn(
--- a/apps/sim/app/api/tools/a2a/get-agent-card/route.ts
+++ b/apps/sim/app/api/tools/a2a/get-agent-card/route.ts
@@ -2,7 +2,7 @@ import { createLogger } from '@sim/logger'
 import { type NextRequest, NextResponse } from 'next/server'
 import { z } from 'zod'
 import { createA2AClient } from '@/lib/a2a/utils'
-import { checkSessionOrInternalAuth } from '@/lib/auth/hybrid'
+import { checkHybridAuth } from '@/lib/auth/hybrid'
 import { generateRequestId } from '@/lib/core/utils/request'

 export const dynamic = 'force-dynamic'
@@ -18,7 +18,7 @@ export async function POST(request: NextRequest) {
  const requestId = generateRequestId()

  try {
-    const authResult = await checkSessionOrInternalAuth(request, { requireWorkflowId: false })
+    const authResult = await checkHybridAuth(request, { requireWorkflowId: false })

    if (!authResult.success) {
      logger.warn(`[${requestId}] Unauthorized A2A get agent card attempt: ${authResult.error}`)
--- a/apps/sim/app/api/tools/a2a/get-push-notification/route.ts
+++ b/apps/sim/app/api/tools/a2a/get-push-notification/route.ts
@@ -2,7 +2,7 @@ import { createLogger } from '@sim/logger'
 import { type NextRequest, NextResponse } from 'next/server'
 import { z } from 'zod'
 import { createA2AClient } from '@/lib/a2a/utils'
-import { checkSessionOrInternalAuth } from '@/lib/auth/hybrid'
+import { checkHybridAuth } from '@/lib/auth/hybrid'
 import { generateRequestId } from '@/lib/core/utils/request'

 export const dynamic = 'force-dynamic'
@@ -19,7 +19,7 @@ export async function POST(request: NextRequest) {
  const requestId = generateRequestId()

  try {
-    const authResult = await checkSessionOrInternalAuth(request, { requireWorkflowId: false })
+    const authResult = await checkHybridAuth(request, { requireWorkflowId: false })

    if (!authResult.success) {
      logger.warn(
--- a/apps/sim/app/api/tools/a2a/get-task/route.ts
+++ b/apps/sim/app/api/tools/a2a/get-task/route.ts
@@ -3,7 +3,7 @@ import { createLogger } from '@sim/logger'
 import { type NextRequest, NextResponse } from 'next/server'
 import { z } from 'zod'
 import { createA2AClient } from '@/lib/a2a/utils'
-import { checkSessionOrInternalAuth } from '@/lib/auth/hybrid'
+import { checkHybridAuth } from '@/lib/auth/hybrid'
 import { generateRequestId } from '@/lib/core/utils/request'

 export const dynamic = 'force-dynamic'
@@ -21,7 +21,7 @@ export async function POST(request: NextRequest) {
  const requestId = generateRequestId()

  try {
-    const authResult = await checkSessionOrInternalAuth(request, { requireWorkflowId: false })
+    const authResult = await checkHybridAuth(request, { requireWorkflowId: false })

    if (!authResult.success) {
      logger.warn(`[${requestId}] Unauthorized A2A get task attempt: ${authResult.error}`)
--- a/apps/sim/app/api/tools/a2a/resubscribe/route.ts
+++ b/apps/sim/app/api/tools/a2a/resubscribe/route.ts
@@ -10,7 +10,7 @@ import { createLogger } from '@sim/logger'
 import { type NextRequest, NextResponse } from 'next/server'
 import { z } from 'zod'
 import { createA2AClient, extractTextContent, isTerminalState } from '@/lib/a2a/utils'
-import { checkSessionOrInternalAuth } from '@/lib/auth/hybrid'
+import { checkHybridAuth } from '@/lib/auth/hybrid'
 import { generateRequestId } from '@/lib/core/utils/request'

 const logger = createLogger('A2AResubscribeAPI')
@@ -27,7 +27,7 @@ export async function POST(request: NextRequest) {
  const requestId = generateRequestId()

  try {
-    const authResult = await checkSessionOrInternalAuth(request, { requireWorkflowId: false })
+    const authResult = await checkHybridAuth(request, { requireWorkflowId: false })

    if (!authResult.success) {
      logger.warn(`[${requestId}] Unauthorized A2A resubscribe attempt`)
--- a/apps/sim/app/api/tools/a2a/send-message/route.ts
+++ b/apps/sim/app/api/tools/a2a/send-message/route.ts
@@ -3,7 +3,7 @@ import { createLogger } from '@sim/logger'
 import { type NextRequest, NextResponse } from 'next/server'
 import { z } from 'zod'
 import { createA2AClient, extractTextContent, isTerminalState } from '@/lib/a2a/utils'
-import { checkSessionOrInternalAuth } from '@/lib/auth/hybrid'
+import { checkHybridAuth } from '@/lib/auth/hybrid'
 import { validateUrlWithDNS } from '@/lib/core/security/input-validation.server'
 import { generateRequestId } from '@/lib/core/utils/request'

@@ -32,7 +32,7 @@ export async function POST(request: NextRequest) {
  const requestId = generateRequestId()

  try {
-    const authResult = await checkSessionOrInternalAuth(request, { requireWorkflowId: false })
+    const authResult = await checkHybridAuth(request, { requireWorkflowId: false })

    if (!authResult.success) {
      logger.warn(`[${requestId}] Unauthorized A2A send message attempt: ${authResult.error}`)
--- a/apps/sim/app/api/tools/a2a/set-push-notification/route.ts
+++ b/apps/sim/app/api/tools/a2a/set-push-notification/route.ts
@@ -2,7 +2,7 @@ import { createLogger } from '@sim/logger'
 import { type NextRequest, NextResponse } from 'next/server'
 import { z } from 'zod'
 import { createA2AClient } from '@/lib/a2a/utils'
-import { checkSessionOrInternalAuth } from '@/lib/auth/hybrid'
+import { checkHybridAuth } from '@/lib/auth/hybrid'
 import { validateUrlWithDNS } from '@/lib/core/security/input-validation.server'
 import { generateRequestId } from '@/lib/core/utils/request'

@@ -22,7 +22,7 @@ export async function POST(request: NextRequest) {
  const requestId = generateRequestId()

  try {
-    const authResult = await checkSessionOrInternalAuth(request, { requireWorkflowId: false })
+    const authResult = await checkHybridAuth(request, { requireWorkflowId: false })

    if (!authResult.success) {
      logger.warn(`[${requestId}] Unauthorized A2A set push notification attempt`, {
--- a/apps/sim/app/api/users/me/usage-logs/route.ts
+++ b/apps/sim/app/api/users/me/usage-logs/route.ts
@@ -1,7 +1,7 @@
 import { createLogger } from '@sim/logger'
 import { type NextRequest, NextResponse } from 'next/server'
 import { z } from 'zod'
-import { checkSessionOrInternalAuth } from '@/lib/auth/hybrid'
+import { checkHybridAuth } from '@/lib/auth/hybrid'
 import { getUserUsageLogs, type UsageLogSource } from '@/lib/billing/core/usage-log'

 const logger = createLogger('UsageLogsAPI')
@@ -20,7 +20,7 @@ const QuerySchema = z.object({
 */
 export async function GET(req: NextRequest) {
  try {
-    const auth = await checkSessionOrInternalAuth(req, { requireWorkflowId: false })
+    const auth = await checkHybridAuth(req, { requireWorkflowId: false })

    if (!auth.success || !auth.userId) {
      return NextResponse.json({ error: 'Unauthorized' }, { status: 401 })
--- a/apps/sim/app/api/workflows/[id]/execute/route.ts
+++ b/apps/sim/app/api/workflows/[id]/execute/route.ts
@@ -325,11 +325,6 @@ export async function POST(req: NextRequest, { params }: { params: Promise<{ id:
      requestId
    )

-    // Client-side sessions and personal API keys bill/permission-check the
-    // authenticated user, not the workspace billed account.
-    const useAuthenticatedUserAsActor =
-      isClientSession || (auth.authType === 'api_key' && auth.apiKeyType === 'personal')
-
    const preprocessResult = await preprocessExecution({
      workflowId,
      userId,
@@ -339,7 +334,6 @@ export async function POST(req: NextRequest, { params }: { params: Promise<{ id:
      checkDeployment: !shouldUseDraftState,
      loggingSession,
      useDraftState: shouldUseDraftState,
-      useAuthenticatedUserAsActor,
    })

    if (!preprocessResult.success) {
--- a/apps/sim/app/workspace/[workspaceId]/logs/components/log-details/components/file-download/file-download.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/logs/components/log-details/components/file-download/file-download.tsx
@@ -74,7 +74,8 @@ function FileCard({ file, isExecutionFile = false, workspaceId }: FileCardProps)
      }

      if (isExecutionFile) {
-        const serveUrl = `/api/files/serve/${encodeURIComponent(file.key)}?context=execution`
+        const serveUrl =
+          file.url || `/api/files/serve/${encodeURIComponent(file.key)}?context=execution`
        window.open(serveUrl, '_blank')
        logger.info(`Opened execution file serve URL: ${serveUrl}`)
      } else {
@@ -87,12 +88,16 @@ function FileCard({ file, isExecutionFile = false, workspaceId }: FileCardProps)
          logger.warn(
            `Could not construct viewer URL for file: ${file.name}, falling back to serve URL`
          )
-          const serveUrl = `/api/files/serve/${encodeURIComponent(file.key)}?context=workspace`
+          const serveUrl =
+            file.url || `/api/files/serve/${encodeURIComponent(file.key)}?context=workspace`
          window.open(serveUrl, '_blank')
        }
      }
    } catch (error) {
      logger.error(`Failed to download file ${file.name}:`, error)
+      if (file.url) {
+        window.open(file.url, '_blank')
+      }
    } finally {
      setIsDownloading(false)
    }
@@ -193,7 +198,8 @@ export function FileDownload({
      }

      if (isExecutionFile) {
-        const serveUrl = `/api/files/serve/${encodeURIComponent(file.key)}?context=execution`
+        const serveUrl =
+          file.url || `/api/files/serve/${encodeURIComponent(file.key)}?context=execution`
        window.open(serveUrl, '_blank')
        logger.info(`Opened execution file serve URL: ${serveUrl}`)
      } else {
@@ -206,12 +212,16 @@ export function FileDownload({
          logger.warn(
            `Could not construct viewer URL for file: ${file.name}, falling back to serve URL`
          )
-          const serveUrl = `/api/files/serve/${encodeURIComponent(file.key)}?context=workspace`
+          const serveUrl =
+            file.url || `/api/files/serve/${encodeURIComponent(file.key)}?context=workspace`
          window.open(serveUrl, '_blank')
        }
      }
    } catch (error) {
      logger.error(`Failed to download file ${file.name}:`, error)
+      if (file.url) {
+        window.open(file.url, '_blank')
+      }
    } finally {
      setIsDownloading(false)
    }
--- a/apps/sim/app/workspace/[workspaceId]/logs/components/logs-toolbar/components/notifications/components/workflow-selector/workflow-selector.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/logs/components/logs-toolbar/components/notifications/components/workflow-selector/workflow-selector.tsx
@@ -89,7 +89,7 @@ export function WorkflowSelector({
            onMouseDown={(e) => handleRemove(e, w.id)}
          >
            {w.name}
-            <X className='!text-[var(--text-primary)] h-4 w-4 flex-shrink-0 opacity-50' />
+            <X className='h-3 w-3' />
          </Badge>
        ))}
        {selectedWorkflows.length > 2 && (
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/deploy/components/deploy-modal/components/api/api.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/deploy/components/deploy-modal/components/api/api.tsx
@@ -28,6 +28,7 @@ interface ApiDeployProps {
  deploymentInfo: WorkflowDeploymentInfo | null
  isLoading: boolean
  needsRedeployment: boolean
+  apiDeployError: string | null
  getInputFormatExample: (includeStreaming?: boolean) => string
  selectedStreamingOutputs: string[]
  onSelectedStreamingOutputsChange: (outputs: string[]) => void
@@ -62,6 +63,7 @@ export function ApiDeploy({
  deploymentInfo,
  isLoading,
  needsRedeployment,
+  apiDeployError,
  getInputFormatExample,
  selectedStreamingOutputs,
  onSelectedStreamingOutputsChange,
@@ -417,6 +419,12 @@ console.log(limits);`
  if (isLoading || !info) {
    return (
      <div className='space-y-[16px]'>
+        {apiDeployError && (
+          <div className='rounded-[4px] border border-destructive/30 bg-destructive/10 p-3 text-destructive text-sm'>
+            <div className='font-semibold'>API Deployment Error</div>
+            <div>{apiDeployError}</div>
+          </div>
+        )}
        <div>
          <Skeleton className='mb-[6.5px] h-[16px] w-[62px]' />
          <Skeleton className='h-[28px] w-[260px] rounded-[4px]' />
@@ -435,6 +443,13 @@ console.log(limits);`

  return (
    <div className='space-y-[16px]'>
+      {apiDeployError && (
+        <div className='rounded-[4px] border border-destructive/30 bg-destructive/10 p-3 text-destructive text-sm'>
+          <div className='font-semibold'>API Deployment Error</div>
+          <div>{apiDeployError}</div>
+        </div>
+      )}
+
      <div>
        <div className='mb-[6.5px] flex items-center justify-between'>
          <Label className='block pl-[2px] font-medium text-[13px] text-[var(--text-primary)]'>
--- 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
@@ -19,7 +19,6 @@ import {
 import { getBaseUrl } from '@/lib/core/utils/urls'
 import { getInputFormatExample as getInputFormatExampleUtil } from '@/lib/workflows/operations/deployment-utils'
 import { useUserPermissionsContext } from '@/app/workspace/[workspaceId]/providers/workspace-permissions-provider'
-import { runPreDeployChecks } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/deploy/hooks/use-predeploy-checks'
 import { CreateApiKeyModal } from '@/app/workspace/[workspaceId]/w/components/sidebar/components/settings-modal/components/api-keys/components'
 import { startsWithUuid } from '@/executor/constants'
 import { useA2AAgentByWorkflow } from '@/hooks/queries/a2a/agents'
@@ -39,7 +38,6 @@ import { useWorkspaceSettings } from '@/hooks/queries/workspace'
 import { usePermissionConfig } from '@/hooks/use-permission-config'
 import { useSettingsModalStore } from '@/stores/modals/settings/store'
 import { useWorkflowRegistry } from '@/stores/workflows/registry/store'
-import { mergeSubblockState } from '@/stores/workflows/utils'
 import { useWorkflowStore } from '@/stores/workflows/workflow/store'
 import type { WorkflowState } from '@/stores/workflows/workflow/types'
 import { A2aDeploy } from './components/a2a/a2a'
@@ -96,8 +94,8 @@ export function DeployModal({
  const workflowWorkspaceId = workflowMetadata?.workspaceId ?? null
  const [activeTab, setActiveTab] = useState<TabView>('general')
  const [chatSubmitting, setChatSubmitting] = useState(false)
-  const [deployError, setDeployError] = useState<string | null>(null)
-  const [deployWarnings, setDeployWarnings] = useState<string[]>([])
+  const [apiDeployError, setApiDeployError] = useState<string | null>(null)
+  const [apiDeployWarnings, setApiDeployWarnings] = useState<string[]>([])
  const [isChatFormValid, setIsChatFormValid] = useState(false)
  const [selectedStreamingOutputs, setSelectedStreamingOutputs] = useState<string[]>([])

@@ -227,8 +225,8 @@ export function DeployModal({
  useEffect(() => {
    if (open && workflowId) {
      setActiveTab('general')
-      setDeployError(null)
-      setDeployWarnings([])
+      setApiDeployError(null)
+      setApiDeployWarnings([])
    }
  }, [open, workflowId])

@@ -283,19 +281,19 @@ export function DeployModal({
  const onDeploy = useCallback(async () => {
    if (!workflowId) return

-    setDeployError(null)
-    setDeployWarnings([])
+    setApiDeployError(null)
+    setApiDeployWarnings([])

    try {
      const result = await deployMutation.mutateAsync({ workflowId, deployChatEnabled: false })
      if (result.warnings && result.warnings.length > 0) {
-        setDeployWarnings(result.warnings)
+        setApiDeployWarnings(result.warnings)
      }
      await refetchDeployedState()
    } catch (error: unknown) {
      logger.error('Error deploying workflow:', { error })
      const errorMessage = error instanceof Error ? error.message : 'Failed to deploy workflow'
-      setDeployError(errorMessage)
+      setApiDeployError(errorMessage)
    }
  }, [workflowId, deployMutation, refetchDeployedState])

@@ -303,12 +301,12 @@ export function DeployModal({
    async (version: number) => {
      if (!workflowId) return

-      setDeployWarnings([])
+      setApiDeployWarnings([])

      try {
        const result = await activateVersionMutation.mutateAsync({ workflowId, version })
        if (result.warnings && result.warnings.length > 0) {
-          setDeployWarnings(result.warnings)
+          setApiDeployWarnings(result.warnings)
        }
        await refetchDeployedState()
      } catch (error) {
@@ -334,40 +332,26 @@ export function DeployModal({
  const handleRedeploy = useCallback(async () => {
    if (!workflowId) return

-    setDeployError(null)
-    setDeployWarnings([])
-
-    const { blocks, edges, loops, parallels } = useWorkflowStore.getState()
-    const liveBlocks = mergeSubblockState(blocks, workflowId)
-    const checkResult = runPreDeployChecks({
-      blocks: liveBlocks,
-      edges,
-      loops,
-      parallels,
-      workflowId,
-    })
-    if (!checkResult.passed) {
-      setDeployError(checkResult.error || 'Pre-deploy validation failed')
-      return
-    }
+    setApiDeployError(null)
+    setApiDeployWarnings([])

    try {
      const result = await deployMutation.mutateAsync({ workflowId, deployChatEnabled: false })
      if (result.warnings && result.warnings.length > 0) {
-        setDeployWarnings(result.warnings)
+        setApiDeployWarnings(result.warnings)
      }
      await refetchDeployedState()
    } catch (error: unknown) {
      logger.error('Error redeploying workflow:', { error })
      const errorMessage = error instanceof Error ? error.message : 'Failed to redeploy workflow'
-      setDeployError(errorMessage)
+      setApiDeployError(errorMessage)
    }
  }, [workflowId, deployMutation, refetchDeployedState])

  const handleCloseModal = useCallback(() => {
    setChatSubmitting(false)
-    setDeployError(null)
-    setDeployWarnings([])
+    setApiDeployError(null)
+    setApiDeployWarnings([])
    onOpenChange(false)
  }, [onOpenChange])

@@ -499,23 +483,17 @@ export function DeployModal({
            </ModalTabsList>

            <ModalBody className='min-h-0 flex-1'>
-              {(deployError || deployWarnings.length > 0) && (
-                <div className='mb-3 flex flex-col gap-2'>
-                  {deployError && (
-                    <Badge variant='red' size='lg' dot className='max-w-full truncate'>
-                      {deployError}
-                    </Badge>
-                  )}
-                  {deployWarnings.map((warning, index) => (
-                    <Badge
-                      key={index}
-                      variant='amber'
-                      size='lg'
-                      dot
-                      className='max-w-full truncate'
-                    >
-                      {warning}
-                    </Badge>
+              {apiDeployError && (
+                <div className='mb-3 rounded-[4px] border border-destructive/30 bg-destructive/10 p-3 text-destructive text-sm'>
+                  <div className='font-semibold'>Deployment Error</div>
+                  <div>{apiDeployError}</div>
+                </div>
+              )}
+              {apiDeployWarnings.length > 0 && (
+                <div className='mb-3 rounded-[4px] border border-amber-500/30 bg-amber-500/10 p-3 text-amber-700 text-sm dark:text-amber-400'>
+                  <div className='font-semibold'>Deployment Warning</div>
+                  {apiDeployWarnings.map((warning, index) => (
+                    <div key={index}>{warning}</div>
                  ))}
                </div>
              )}
@@ -537,6 +515,7 @@ export function DeployModal({
                  deploymentInfo={deploymentInfo}
                  isLoading={isLoadingDeploymentInfo}
                  needsRedeployment={needsRedeployment}
+                  apiDeployError={apiDeployError}
                  getInputFormatExample={getInputFormatExample}
                  selectedStreamingOutputs={selectedStreamingOutputs}
                  onSelectedStreamingOutputsChange={setSelectedStreamingOutputs}
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/deploy/hooks/use-deployment.ts
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/deploy/hooks/use-deployment.ts
@@ -2,6 +2,9 @@ import { useCallback, useState } from 'react'
 import { createLogger } from '@sim/logger'
 import { useNotificationStore } from '@/stores/notifications'
 import { useWorkflowRegistry } from '@/stores/workflows/registry/store'
+import { mergeSubblockState } from '@/stores/workflows/utils'
+import { useWorkflowStore } from '@/stores/workflows/workflow/store'
+import { runPreDeployChecks } from './use-predeploy-checks'

 const logger = createLogger('useDeployment')

@@ -22,16 +25,36 @@ export function useDeployment({
  const [isDeploying, setIsDeploying] = useState(false)
  const setDeploymentStatus = useWorkflowRegistry((state) => state.setDeploymentStatus)
  const addNotification = useNotificationStore((state) => state.addNotification)
+  const blocks = useWorkflowStore((state) => state.blocks)
+  const edges = useWorkflowStore((state) => state.edges)
+  const loops = useWorkflowStore((state) => state.loops)
+  const parallels = useWorkflowStore((state) => state.parallels)

  /**
   * Handle deploy button click
   * First deploy: calls API to deploy, then opens modal on success
-   * Already deployed: opens modal directly (validation happens on Update in modal)
+   * Redeploy: validates client-side, then opens modal if valid
   */
  const handleDeployClick = useCallback(async () => {
    if (!workflowId) return { success: false, shouldOpenModal: false }

    if (isDeployed) {
+      const liveBlocks = mergeSubblockState(blocks, workflowId)
+      const checkResult = runPreDeployChecks({
+        blocks: liveBlocks,
+        edges,
+        loops,
+        parallels,
+        workflowId,
+      })
+      if (!checkResult.passed) {
+        addNotification({
+          level: 'error',
+          message: checkResult.error || 'Pre-deploy validation failed',
+          workflowId,
+        })
+        return { success: false, shouldOpenModal: false }
+      }
      return { success: true, shouldOpenModal: true }
    }

@@ -78,7 +101,17 @@ export function useDeployment({
    } finally {
      setIsDeploying(false)
    }
-  }, [workflowId, isDeployed, refetchDeployedState, setDeploymentStatus, addNotification])
+  }, [
+    workflowId,
+    isDeployed,
+    blocks,
+    edges,
+    loops,
+    parallels,
+    refetchDeployedState,
+    setDeploymentStatus,
+    addNotification,
+  ])

  return {
    isDeploying,
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/credential-selector/credential-selector.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/credential-selector/credential-selector.tsx
@@ -35,7 +35,6 @@ interface CredentialSelectorProps {
  disabled?: boolean
  isPreview?: boolean
  previewValue?: any | null
-  previewContextValues?: Record<string, unknown>
 }

 export function CredentialSelector({
@@ -44,7 +43,6 @@ export function CredentialSelector({
  disabled = false,
  isPreview = false,
  previewValue,
-  previewContextValues,
 }: CredentialSelectorProps) {
  const [showOAuthModal, setShowOAuthModal] = useState(false)
  const [editingValue, setEditingValue] = useState('')
@@ -69,11 +67,7 @@ export function CredentialSelector({
    canUseCredentialSets
  )

-  const { depsSatisfied, dependsOn } = useDependsOnGate(blockId, subBlock, {
-    disabled,
-    isPreview,
-    previewContextValues,
-  })
+  const { depsSatisfied, dependsOn } = useDependsOnGate(blockId, subBlock, { disabled, isPreview })
  const hasDependencies = dependsOn.length > 0

  const effectiveDisabled = disabled || (hasDependencies && !depsSatisfied)
--- 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
@@ -5,7 +5,6 @@ import { Tooltip } from '@/components/emcn'
 import { SelectorCombobox } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/selector-combobox/selector-combobox'
 import { useDependsOnGate } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/hooks/use-depends-on-gate'
 import { useSubBlockValue } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/hooks/use-sub-block-value'
-import { resolvePreviewContextValue } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/utils'
 import type { SubBlockConfig } from '@/blocks/types'
 import type { SelectorContext } from '@/hooks/selectors/types'

@@ -34,9 +33,7 @@ export function DocumentSelector({
    previewContextValues,
  })
  const [knowledgeBaseIdFromStore] = useSubBlockValue(blockId, 'knowledgeBaseId')
-  const knowledgeBaseIdValue = previewContextValues
-    ? resolvePreviewContextValue(previewContextValues.knowledgeBaseId)
-    : knowledgeBaseIdFromStore
+  const knowledgeBaseIdValue = previewContextValues?.knowledgeBaseId ?? knowledgeBaseIdFromStore
  const normalizedKnowledgeBaseId =
    typeof knowledgeBaseIdValue === 'string' && knowledgeBaseIdValue.trim().length > 0
      ? knowledgeBaseIdValue
--- 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
@@ -17,7 +17,6 @@ import { formatDisplayText } from '@/app/workspace/[workspaceId]/w/[workflowId]/
 import { TagDropdown } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/tag-dropdown/tag-dropdown'
 import { useSubBlockInput } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/hooks/use-sub-block-input'
 import { useSubBlockValue } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/hooks/use-sub-block-value'
-import { resolvePreviewContextValue } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/utils'
 import { useAccessibleReferencePrefixes } from '@/app/workspace/[workspaceId]/w/[workflowId]/hooks/use-accessible-reference-prefixes'
 import type { SubBlockConfig } from '@/blocks/types'
 import { useKnowledgeBaseTagDefinitions } from '@/hooks/kb/use-knowledge-base-tag-definitions'
@@ -78,9 +77,7 @@ export function DocumentTagEntry({
  })

  const [knowledgeBaseIdFromStore] = useSubBlockValue(blockId, 'knowledgeBaseId')
-  const knowledgeBaseIdValue = previewContextValues
-    ? resolvePreviewContextValue(previewContextValues.knowledgeBaseId)
-    : knowledgeBaseIdFromStore
+  const knowledgeBaseIdValue = previewContextValues?.knowledgeBaseId ?? knowledgeBaseIdFromStore
  const knowledgeBaseId =
    typeof knowledgeBaseIdValue === 'string' && knowledgeBaseIdValue.trim().length > 0
      ? knowledgeBaseIdValue
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/file-selector/file-selector-input.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/file-selector/file-selector-input.tsx
@@ -9,7 +9,6 @@ import { SelectorCombobox } from '@/app/workspace/[workspaceId]/w/[workflowId]/c
 import { useDependsOnGate } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/hooks/use-depends-on-gate'
 import { useForeignCredential } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/hooks/use-foreign-credential'
 import { useSubBlockValue } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/hooks/use-sub-block-value'
-import { resolvePreviewContextValue } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/utils'
 import { getBlock } from '@/blocks/registry'
 import type { SubBlockConfig } from '@/blocks/types'
 import { isDependency } from '@/blocks/utils'
@@ -63,56 +62,42 @@ export function FileSelectorInput({

  const [domainValueFromStore] = useSubBlockValue(blockId, 'domain')

-  const connectedCredential = previewContextValues
-    ? resolvePreviewContextValue(previewContextValues.credential)
-    : blockValues.credential
-  const domainValue = previewContextValues
-    ? resolvePreviewContextValue(previewContextValues.domain)
-    : domainValueFromStore
+  const connectedCredential = previewContextValues?.credential ?? blockValues.credential
+  const domainValue = previewContextValues?.domain ?? domainValueFromStore

  const teamIdValue = useMemo(
    () =>
-      previewContextValues
-        ? resolvePreviewContextValue(previewContextValues.teamId)
-        : resolveDependencyValue('teamId', blockValues, canonicalIndex, canonicalModeOverrides),
-    [previewContextValues, blockValues, canonicalIndex, canonicalModeOverrides]
+      previewContextValues?.teamId ??
+      resolveDependencyValue('teamId', blockValues, canonicalIndex, canonicalModeOverrides),
+    [previewContextValues?.teamId, blockValues, canonicalIndex, canonicalModeOverrides]
  )

  const siteIdValue = useMemo(
    () =>
-      previewContextValues
-        ? resolvePreviewContextValue(previewContextValues.siteId)
-        : resolveDependencyValue('siteId', blockValues, canonicalIndex, canonicalModeOverrides),
-    [previewContextValues, blockValues, canonicalIndex, canonicalModeOverrides]
+      previewContextValues?.siteId ??
+      resolveDependencyValue('siteId', blockValues, canonicalIndex, canonicalModeOverrides),
+    [previewContextValues?.siteId, blockValues, canonicalIndex, canonicalModeOverrides]
  )

  const collectionIdValue = useMemo(
    () =>
-      previewContextValues
-        ? resolvePreviewContextValue(previewContextValues.collectionId)
-        : resolveDependencyValue(
-            'collectionId',
-            blockValues,
-            canonicalIndex,
-            canonicalModeOverrides
-          ),
-    [previewContextValues, blockValues, canonicalIndex, canonicalModeOverrides]
+      previewContextValues?.collectionId ??
+      resolveDependencyValue('collectionId', blockValues, canonicalIndex, canonicalModeOverrides),
+    [previewContextValues?.collectionId, blockValues, canonicalIndex, canonicalModeOverrides]
  )

  const projectIdValue = useMemo(
    () =>
-      previewContextValues
-        ? resolvePreviewContextValue(previewContextValues.projectId)
-        : resolveDependencyValue('projectId', blockValues, canonicalIndex, canonicalModeOverrides),
-    [previewContextValues, blockValues, canonicalIndex, canonicalModeOverrides]
+      previewContextValues?.projectId ??
+      resolveDependencyValue('projectId', blockValues, canonicalIndex, canonicalModeOverrides),
+    [previewContextValues?.projectId, blockValues, canonicalIndex, canonicalModeOverrides]
  )

  const planIdValue = useMemo(
    () =>
-      previewContextValues
-        ? resolvePreviewContextValue(previewContextValues.planId)
-        : resolveDependencyValue('planId', blockValues, canonicalIndex, canonicalModeOverrides),
-    [previewContextValues, blockValues, canonicalIndex, canonicalModeOverrides]
+      previewContextValues?.planId ??
+      resolveDependencyValue('planId', blockValues, canonicalIndex, canonicalModeOverrides),
+    [previewContextValues?.planId, blockValues, canonicalIndex, canonicalModeOverrides]
  )

  const normalizedCredentialId =
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/folder-selector/components/folder-selector-input.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/folder-selector/components/folder-selector-input.tsx
@@ -6,7 +6,6 @@ import { SelectorCombobox } from '@/app/workspace/[workspaceId]/w/[workflowId]/c
 import { useDependsOnGate } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/hooks/use-depends-on-gate'
 import { useForeignCredential } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/hooks/use-foreign-credential'
 import { useSubBlockValue } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/hooks/use-sub-block-value'
-import { resolvePreviewContextValue } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/utils'
 import type { SubBlockConfig } from '@/blocks/types'
 import { resolveSelectorForSubBlock } from '@/hooks/selectors/resolution'
 import { useCollaborativeWorkflow } from '@/hooks/use-collaborative-workflow'
@@ -18,7 +17,6 @@ interface FolderSelectorInputProps {
  disabled?: boolean
  isPreview?: boolean
  previewValue?: any | null
-  previewContextValues?: Record<string, unknown>
 }

 export function FolderSelectorInput({
@@ -27,13 +25,9 @@ export function FolderSelectorInput({
  disabled = false,
  isPreview = false,
  previewValue,
-  previewContextValues,
 }: FolderSelectorInputProps) {
  const [storeValue] = useSubBlockValue(blockId, subBlock.id)
-  const [credentialFromStore] = useSubBlockValue(blockId, 'credential')
-  const connectedCredential = previewContextValues
-    ? resolvePreviewContextValue(previewContextValues.credential)
-    : credentialFromStore
+  const [connectedCredential] = useSubBlockValue(blockId, 'credential')
  const { collaborativeSetSubblockValue } = useCollaborativeWorkflow()
  const { activeWorkflowId } = useWorkflowRegistry()
  const [selectedFolderId, setSelectedFolderId] = useState<string>('')
@@ -53,11 +47,7 @@ export function FolderSelectorInput({
  )

  // Central dependsOn gating
-  const { finalDisabled } = useDependsOnGate(blockId, subBlock, {
-    disabled,
-    isPreview,
-    previewContextValues,
-  })
+  const { finalDisabled } = useDependsOnGate(blockId, subBlock, { disabled, isPreview })

  // Get the current value from the store or prop value if in preview mode
  useEffect(() => {
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/index.ts
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/index.ts
@@ -24,7 +24,6 @@ export { ResponseFormat } from './response/response-format'
 export { ScheduleInfo } from './schedule-info/schedule-info'
 export { SheetSelectorInput } from './sheet-selector/sheet-selector-input'
 export { ShortInput } from './short-input/short-input'
-export { SkillInput } from './skill-input/skill-input'
 export { SlackSelectorInput } from './slack-selector/slack-selector-input'
 export { SliderInput } from './slider-input/slider-input'
 export { InputFormat } from './starter/input-format'
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/input-mapping/input-mapping.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/input-mapping/input-mapping.tsx
@@ -7,7 +7,6 @@ import { formatDisplayText } from '@/app/workspace/[workspaceId]/w/[workflowId]/
 import { TagDropdown } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/tag-dropdown/tag-dropdown'
 import { useSubBlockInput } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/hooks/use-sub-block-input'
 import { useSubBlockValue } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/hooks/use-sub-block-value'
-import { resolvePreviewContextValue } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/utils'
 import { useAccessibleReferencePrefixes } from '@/app/workspace/[workspaceId]/w/[workflowId]/hooks/use-accessible-reference-prefixes'
 import { useWorkflowState } from '@/hooks/queries/workflows'

@@ -38,8 +37,6 @@ interface InputMappingProps {
  isPreview?: boolean
  previewValue?: Record<string, unknown>
  disabled?: boolean
-  /** Sub-block values from the preview context for resolving sibling sub-block values */
-  previewContextValues?: Record<string, unknown>
 }

 /**
@@ -53,13 +50,9 @@ export function InputMapping({
  isPreview = false,
  previewValue,
  disabled = false,
-  previewContextValues,
 }: InputMappingProps) {
  const [mapping, setMapping] = useSubBlockValue(blockId, subBlockId)
-  const [storeWorkflowId] = useSubBlockValue(blockId, 'workflowId')
-  const selectedWorkflowId = previewContextValues
-    ? resolvePreviewContextValue(previewContextValues.workflowId)
-    : storeWorkflowId
+  const [selectedWorkflowId] = useSubBlockValue(blockId, 'workflowId')

  const inputController = useSubBlockInput({
    blockId,
--- 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
@@ -17,7 +17,6 @@ import { type FilterFieldType, getOperatorsForFieldType } from '@/lib/knowledge/
 import { formatDisplayText } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/formatted-text'
 import { TagDropdown } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/tag-dropdown/tag-dropdown'
 import { useSubBlockInput } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/hooks/use-sub-block-input'
-import { resolvePreviewContextValue } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/utils'
 import { useAccessibleReferencePrefixes } from '@/app/workspace/[workspaceId]/w/[workflowId]/hooks/use-accessible-reference-prefixes'
 import type { SubBlockConfig } from '@/blocks/types'
 import { useKnowledgeBaseTagDefinitions } from '@/hooks/kb/use-knowledge-base-tag-definitions'
@@ -70,9 +69,7 @@ export function KnowledgeTagFilters({
  const overlayRefs = useRef<Record<string, HTMLDivElement>>({})

  const [knowledgeBaseIdFromStore] = useSubBlockValue(blockId, 'knowledgeBaseId')
-  const knowledgeBaseIdValue = previewContextValues
-    ? resolvePreviewContextValue(previewContextValues.knowledgeBaseId)
-    : knowledgeBaseIdFromStore
+  const knowledgeBaseIdValue = previewContextValues?.knowledgeBaseId ?? knowledgeBaseIdFromStore
  const knowledgeBaseId =
    typeof knowledgeBaseIdValue === 'string' && knowledgeBaseIdValue.trim().length > 0
      ? knowledgeBaseIdValue
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/mcp-dynamic-args/mcp-dynamic-args.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/mcp-dynamic-args/mcp-dynamic-args.tsx
@@ -6,7 +6,6 @@ import { cn } from '@/lib/core/utils/cn'
 import { LongInput } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/long-input/long-input'
 import { ShortInput } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/short-input/short-input'
 import { useSubBlockValue } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/hooks/use-sub-block-value'
-import { resolvePreviewContextValue } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/utils'
 import type { SubBlockConfig } from '@/blocks/types'
 import { useMcpTools } from '@/hooks/mcp/use-mcp-tools'
 import { formatParameterLabel } from '@/tools/params'
@@ -19,7 +18,6 @@ interface McpDynamicArgsProps {
  disabled?: boolean
  isPreview?: boolean
  previewValue?: any
-  previewContextValues?: Record<string, unknown>
 }

 /**
@@ -49,19 +47,12 @@ export function McpDynamicArgs({
  disabled = false,
  isPreview = false,
  previewValue,
-  previewContextValues,
 }: McpDynamicArgsProps) {
  const params = useParams()
  const workspaceId = params.workspaceId as string
  const { mcpTools, isLoading } = useMcpTools(workspaceId)
-  const [toolFromStore] = useSubBlockValue(blockId, 'tool')
-  const selectedTool = previewContextValues
-    ? resolvePreviewContextValue(previewContextValues.tool)
-    : toolFromStore
-  const [schemaFromStore] = useSubBlockValue(blockId, '_toolSchema')
-  const cachedSchema = previewContextValues
-    ? resolvePreviewContextValue(previewContextValues._toolSchema)
-    : schemaFromStore
+  const [selectedTool] = useSubBlockValue(blockId, 'tool')
+  const [cachedSchema] = useSubBlockValue(blockId, '_toolSchema')
  const [toolArgs, setToolArgs] = useSubBlockValue(blockId, subBlockId)

  const selectedToolConfig = mcpTools.find((tool) => tool.id === selectedTool)
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/mcp-server-modal/mcp-tool-selector.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/mcp-server-modal/mcp-tool-selector.tsx
@@ -4,7 +4,6 @@ import { useEffect, useMemo, useState } from 'react'
 import { useParams } from 'next/navigation'
 import { Combobox } from '@/components/emcn/components'
 import { useSubBlockValue } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/hooks/use-sub-block-value'
-import { resolvePreviewContextValue } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/utils'
 import type { SubBlockConfig } from '@/blocks/types'
 import { useMcpTools } from '@/hooks/mcp/use-mcp-tools'

@@ -14,7 +13,6 @@ interface McpToolSelectorProps {
  disabled?: boolean
  isPreview?: boolean
  previewValue?: string | null
-  previewContextValues?: Record<string, unknown>
 }

 export function McpToolSelector({
@@ -23,7 +21,6 @@ export function McpToolSelector({
  disabled = false,
  isPreview = false,
  previewValue,
-  previewContextValues,
 }: McpToolSelectorProps) {
  const params = useParams()
  const workspaceId = params.workspaceId as string
@@ -34,10 +31,7 @@ export function McpToolSelector({
  const [storeValue, setStoreValue] = useSubBlockValue(blockId, subBlock.id)
  const [, setSchemaCache] = useSubBlockValue(blockId, '_toolSchema')

-  const [serverFromStore] = useSubBlockValue(blockId, 'server')
-  const serverValue = previewContextValues
-    ? resolvePreviewContextValue(previewContextValues.server)
-    : serverFromStore
+  const [serverValue] = useSubBlockValue(blockId, 'server')

  const label = subBlock.placeholder || 'Select tool'

--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/project-selector/project-selector-input.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/project-selector/project-selector-input.tsx
@@ -9,7 +9,6 @@ import { SelectorCombobox } from '@/app/workspace/[workspaceId]/w/[workflowId]/c
 import { useDependsOnGate } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/hooks/use-depends-on-gate'
 import { useForeignCredential } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/hooks/use-foreign-credential'
 import { useSubBlockValue } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/hooks/use-sub-block-value'
-import { resolvePreviewContextValue } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/utils'
 import { getBlock } from '@/blocks/registry'
 import type { SubBlockConfig } from '@/blocks/types'
 import { resolveSelectorForSubBlock } from '@/hooks/selectors/resolution'
@@ -56,19 +55,14 @@ export function ProjectSelectorInput({
    return (workflowValues as Record<string, Record<string, unknown>>)[blockId] || {}
  })

-  const connectedCredential = previewContextValues
-    ? resolvePreviewContextValue(previewContextValues.credential)
-    : blockValues.credential
-  const jiraDomain = previewContextValues
-    ? resolvePreviewContextValue(previewContextValues.domain)
-    : jiraDomainFromStore
+  const connectedCredential = previewContextValues?.credential ?? blockValues.credential
+  const jiraDomain = previewContextValues?.domain ?? jiraDomainFromStore

  const linearTeamId = useMemo(
    () =>
-      previewContextValues
-        ? resolvePreviewContextValue(previewContextValues.teamId)
-        : resolveDependencyValue('teamId', blockValues, canonicalIndex, canonicalModeOverrides),
-    [previewContextValues, blockValues, canonicalIndex, canonicalModeOverrides]
+      previewContextValues?.teamId ??
+      resolveDependencyValue('teamId', blockValues, canonicalIndex, canonicalModeOverrides),
+    [previewContextValues?.teamId, blockValues, canonicalIndex, canonicalModeOverrides]
  )

  const serviceId = subBlock.serviceId || ''
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/sheet-selector/sheet-selector-input.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/sheet-selector/sheet-selector-input.tsx
@@ -8,7 +8,6 @@ import { buildCanonicalIndex, resolveDependencyValue } from '@/lib/workflows/sub
 import { SelectorCombobox } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/selector-combobox/selector-combobox'
 import { useDependsOnGate } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/hooks/use-depends-on-gate'
 import { useForeignCredential } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/hooks/use-foreign-credential'
-import { resolvePreviewContextValue } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/utils'
 import { getBlock } from '@/blocks/registry'
 import type { SubBlockConfig } from '@/blocks/types'
 import { resolveSelectorForSubBlock, type SelectorResolution } from '@/hooks/selectors/resolution'
@@ -67,12 +66,9 @@ export function SheetSelectorInput({
    [blockValues, canonicalIndex, canonicalModeOverrides]
  )

-  const connectedCredential = previewContextValues
-    ? resolvePreviewContextValue(previewContextValues.credential)
-    : connectedCredentialFromStore
+  const connectedCredential = previewContextValues?.credential ?? connectedCredentialFromStore
  const spreadsheetId = previewContextValues
-    ? (resolvePreviewContextValue(previewContextValues.spreadsheetId) ??
-      resolvePreviewContextValue(previewContextValues.manualSpreadsheetId))
+    ? (previewContextValues.spreadsheetId ?? previewContextValues.manualSpreadsheetId)
    : spreadsheetIdFromStore

  const normalizedCredentialId =
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/skill-input/skill-input.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/skill-input/skill-input.tsx
@@ -1,194 +0,0 @@
-'use client'
-
-import { useCallback, useMemo, useState } from 'react'
-import { Plus, XIcon } from 'lucide-react'
-import { useParams } from 'next/navigation'
-import { Combobox, type ComboboxOptionGroup } from '@/components/emcn'
-import { AgentSkillsIcon } from '@/components/icons'
-import { useSubBlockValue } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/hooks/use-sub-block-value'
-import { SkillModal } from '@/app/workspace/[workspaceId]/w/components/sidebar/components/settings-modal/components/skills/components/skill-modal'
-import type { SkillDefinition } from '@/hooks/queries/skills'
-import { useSkills } from '@/hooks/queries/skills'
-import { usePermissionConfig } from '@/hooks/use-permission-config'
-
-interface StoredSkill {
-  skillId: string
-  name?: string
-}
-
-interface SkillInputProps {
-  blockId: string
-  subBlockId: string
-  isPreview?: boolean
-  previewValue?: unknown
-  disabled?: boolean
-}
-
-export function SkillInput({
-  blockId,
-  subBlockId,
-  isPreview,
-  previewValue,
-  disabled,
-}: SkillInputProps) {
-  const params = useParams()
-  const workspaceId = params.workspaceId as string
-
-  const { config: permissionConfig } = usePermissionConfig()
-  const { data: workspaceSkills = [] } = useSkills(workspaceId)
-  const [value, setValue] = useSubBlockValue<StoredSkill[]>(blockId, subBlockId)
-  const [showCreateModal, setShowCreateModal] = useState(false)
-  const [editingSkill, setEditingSkill] = useState<SkillDefinition | null>(null)
-  const [open, setOpen] = useState(false)
-
-  const selectedSkills: StoredSkill[] = useMemo(() => {
-    if (isPreview && previewValue) {
-      return Array.isArray(previewValue) ? previewValue : []
-    }
-    return Array.isArray(value) ? value : []
-  }, [isPreview, previewValue, value])
-
-  const selectedIds = useMemo(() => new Set(selectedSkills.map((s) => s.skillId)), [selectedSkills])
-
-  const skillsDisabled = permissionConfig.disableSkills
-
-  const skillGroups = useMemo((): ComboboxOptionGroup[] => {
-    const groups: ComboboxOptionGroup[] = []
-
-    if (!skillsDisabled) {
-      groups.push({
-        items: [
-          {
-            label: 'Create Skill',
-            value: 'action-create-skill',
-            icon: Plus,
-            onSelect: () => {
-              setShowCreateModal(true)
-              setOpen(false)
-            },
-            disabled: isPreview,
-          },
-        ],
-      })
-    }
-
-    const availableSkills = workspaceSkills.filter((s) => !selectedIds.has(s.id))
-    if (!skillsDisabled && availableSkills.length > 0) {
-      groups.push({
-        section: 'Skills',
-        items: availableSkills.map((s) => {
-          return {
-            label: s.name,
-            value: `skill-${s.id}`,
-            icon: AgentSkillsIcon,
-            onSelect: () => {
-              const newSkills: StoredSkill[] = [...selectedSkills, { skillId: s.id, name: s.name }]
-              setValue(newSkills)
-              setOpen(false)
-            },
-          }
-        }),
-      })
-    }
-
-    return groups
-  }, [workspaceSkills, selectedIds, selectedSkills, setValue, isPreview, skillsDisabled])
-
-  const handleRemove = useCallback(
-    (skillId: string) => {
-      const newSkills = selectedSkills.filter((s) => s.skillId !== skillId)
-      setValue(newSkills)
-    },
-    [selectedSkills, setValue]
-  )
-
-  const handleSkillSaved = useCallback(() => {
-    setShowCreateModal(false)
-    setEditingSkill(null)
-  }, [])
-
-  const resolveSkillName = useCallback(
-    (stored: StoredSkill): string => {
-      const found = workspaceSkills.find((s) => s.id === stored.skillId)
-      return found?.name ?? stored.name ?? stored.skillId
-    },
-    [workspaceSkills]
-  )
-
-  return (
-    <>
-      <div className='w-full space-y-[8px]'>
-        <Combobox
-          options={[]}
-          groups={skillGroups}
-          placeholder='Add skill...'
-          disabled={disabled}
-          searchable
-          searchPlaceholder='Search skills...'
-          maxHeight={240}
-          emptyMessage='No skills found'
-          onOpenChange={setOpen}
-        />
-
-        {selectedSkills.length > 0 &&
-          selectedSkills.map((stored) => {
-            const fullSkill = workspaceSkills.find((s) => s.id === stored.skillId)
-            return (
-              <div
-                key={stored.skillId}
-                className='group relative flex flex-col overflow-hidden rounded-[4px] border border-[var(--border-1)] transition-all duration-200 ease-in-out'
-              >
-                <div
-                  className='flex cursor-pointer items-center justify-between gap-[8px] rounded-t-[4px] bg-[var(--surface-4)] px-[8px] py-[6.5px]'
-                  onClick={() => {
-                    if (fullSkill && !disabled && !isPreview) {
-                      setEditingSkill(fullSkill)
-                    }
-                  }}
-                >
-                  <div className='flex min-w-0 flex-1 items-center gap-[8px]'>
-                    <div
-                      className='flex h-[16px] w-[16px] flex-shrink-0 items-center justify-center rounded-[4px]'
-                      style={{ backgroundColor: '#e0e0e0' }}
-                    >
-                      <AgentSkillsIcon className='h-[10px] w-[10px] text-[#333]' />
-                    </div>
-                    <span className='truncate font-medium text-[13px] text-[var(--text-primary)]'>
-                      {resolveSkillName(stored)}
-                    </span>
-                  </div>
-                  <div className='flex flex-shrink-0 items-center gap-[8px]'>
-                    {!disabled && !isPreview && (
-                      <button
-                        type='button'
-                        onClick={(e) => {
-                          e.stopPropagation()
-                          handleRemove(stored.skillId)
-                        }}
-                        className='flex items-center justify-center text-[var(--text-tertiary)] transition-colors hover:text-[var(--text-primary)]'
-                        aria-label='Remove skill'
-                      >
-                        <XIcon className='h-[13px] w-[13px]' />
-                      </button>
-                    )}
-                  </div>
-                </div>
-              </div>
-            )
-          })}
-      </div>
-
-      <SkillModal
-        open={showCreateModal || !!editingSkill}
-        onOpenChange={(isOpen) => {
-          if (!isOpen) {
-            setShowCreateModal(false)
-            setEditingSkill(null)
-          }
-        }}
-        onSave={handleSkillSaved}
-        initialValues={editingSkill ?? undefined}
-      />
-    </>
-  )
-}
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/slack-selector/slack-selector-input.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/slack-selector/slack-selector-input.tsx
@@ -8,7 +8,6 @@ import { SelectorCombobox } from '@/app/workspace/[workspaceId]/w/[workflowId]/c
 import { useDependsOnGate } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/hooks/use-depends-on-gate'
 import { useForeignCredential } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/hooks/use-foreign-credential'
 import { useSubBlockValue } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/hooks/use-sub-block-value'
-import { resolvePreviewContextValue } from '@/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/utils'
 import type { SubBlockConfig } from '@/blocks/types'
 import type { SelectorContext, SelectorKey } from '@/hooks/selectors/types'

@@ -59,15 +58,9 @@ export function SlackSelectorInput({
  const [botToken] = useSubBlockValue(blockId, 'botToken')
  const [connectedCredential] = useSubBlockValue(blockId, 'credential')

-  const effectiveAuthMethod = previewContextValues
-    ? resolvePreviewContextValue(previewContextValues.authMethod)
-    : authMethod
-  const effectiveBotToken = previewContextValues
-    ? resolvePreviewContextValue(previewContextValues.botToken)
-    : botToken
-  const effectiveCredential = previewContextValues
-    ? resolvePreviewContextValue(previewContextValues.credential)
-    : connectedCredential
+  const effectiveAuthMethod = previewContextValues?.authMethod ?? authMethod
+  const effectiveBotToken = previewContextValues?.botToken ?? botToken
+  const effectiveCredential = previewContextValues?.credential ?? connectedCredential
  const [_selectedValue, setSelectedValue] = useState<string | null>(null)

  const serviceId = subBlock.serviceId || ''
--- 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
@@ -332,7 +332,6 @@ function FolderSelectorSyncWrapper({
          dependsOn: uiComponent.dependsOn,
        }}
        disabled={disabled}
-        previewContextValues={previewContextValues}
      />
    </GenericSyncWrapper>
  )
--- 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
@@ -32,7 +32,6 @@ import {
  ScheduleInfo,
  SheetSelectorInput,
  ShortInput,
-  SkillInput,
  SlackSelectorInput,
  SliderInput,
  Switch,
@@ -688,17 +687,6 @@ function SubBlockComponent({
          />
        )

-      case 'skill-input':
-        return (
-          <SkillInput
-            blockId={blockId}
-            subBlockId={config.id}
-            isPreview={isPreview}
-            previewValue={previewValue}
-            disabled={isDisabled}
-          />
-        )
-
      case 'checkbox-list':
        return (
          <CheckboxList
@@ -797,7 +785,6 @@ function SubBlockComponent({
            disabled={isDisabled}
            isPreview={isPreview}
            previewValue={previewValue}
-            previewContextValues={isPreview ? subBlockValues : undefined}
          />
        )

@@ -833,7 +820,6 @@ function SubBlockComponent({
            disabled={isDisabled}
            isPreview={isPreview}
            previewValue={previewValue}
-            previewContextValues={isPreview ? subBlockValues : undefined}
          />
        )

@@ -845,7 +831,6 @@ function SubBlockComponent({
            disabled={isDisabled}
            isPreview={isPreview}
            previewValue={previewValue}
-            previewContextValues={isPreview ? subBlockValues : undefined}
          />
        )

@@ -868,7 +853,6 @@ function SubBlockComponent({
            disabled={isDisabled}
            isPreview={isPreview}
            previewValue={previewValue as any}
-            previewContextValues={isPreview ? subBlockValues : undefined}
          />
        )

@@ -880,7 +864,6 @@ function SubBlockComponent({
            disabled={isDisabled}
            isPreview={isPreview}
            previewValue={previewValue as any}
-            previewContextValues={isPreview ? subBlockValues : undefined}
          />
        )

@@ -892,7 +875,6 @@ function SubBlockComponent({
            disabled={isDisabled}
            isPreview={isPreview}
            previewValue={previewValue as any}
-            previewContextValues={isPreview ? subBlockValues : undefined}
          />
        )

@@ -917,7 +899,6 @@ function SubBlockComponent({
            isPreview={isPreview}
            previewValue={previewValue as any}
            disabled={isDisabled}
-            previewContextValues={isPreview ? subBlockValues : undefined}
          />
        )

@@ -953,7 +934,6 @@ function SubBlockComponent({
            disabled={isDisabled}
            isPreview={isPreview}
            previewValue={previewValue}
-            previewContextValues={isPreview ? subBlockValues : undefined}
          />
        )

@@ -987,7 +967,6 @@ function SubBlockComponent({
            disabled={isDisabled}
            isPreview={isPreview}
            previewValue={previewValue as any}
-            previewContextValues={isPreview ? subBlockValues : undefined}
          />
        )

@@ -999,7 +978,6 @@ function SubBlockComponent({
            disabled={isDisabled}
            isPreview={isPreview}
            previewValue={previewValue}
-            previewContextValues={isPreview ? subBlockValues : undefined}
          />
        )

--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/utils.ts
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/utils.ts
@@ -1,18 +0,0 @@
-/**
- * Extracts the raw value from a preview context entry.
- *
- * @remarks
- * In the sub-block preview context, values are wrapped as `{ value: T }` objects
- * (the full sub-block state). In the tool-input preview context, values are already
- * raw. This function normalizes both cases to return the underlying value.
- *
- * @param raw - The preview context entry, which may be a raw value or a `{ value: T }` wrapper
- * @returns The unwrapped value, or `null` if the input is nullish
- */
-export function resolvePreviewContextValue(raw: unknown): unknown {
-  if (raw === null || raw === undefined) return null
-  if (typeof raw === 'object' && !Array.isArray(raw) && 'value' in raw) {
-    return (raw as Record<string, unknown>).value ?? null
-  }
-  return raw
-}
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/hooks/use-editor-subblock-layout.ts
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/hooks/use-editor-subblock-layout.ts
@@ -6,7 +6,6 @@ import {
  isSubBlockVisibleForMode,
 } from '@/lib/workflows/subblocks/visibility'
 import type { BlockConfig, SubBlockConfig, SubBlockType } from '@/blocks/types'
-import { usePermissionConfig } from '@/hooks/use-permission-config'
 import { useWorkflowDiffStore } from '@/stores/workflow-diff'
 import { mergeSubblockState } from '@/stores/workflows/utils'
 import { useWorkflowStore } from '@/stores/workflows/workflow/store'
@@ -36,7 +35,6 @@ export function useEditorSubblockLayout(
  const blockDataFromStore = useWorkflowStore(
    useCallback((state) => state.blocks?.[blockId]?.data, [blockId])
  )
-  const { config: permissionConfig } = usePermissionConfig()

  return useMemo(() => {
    // Guard against missing config or block selection
@@ -102,9 +100,6 @@ export function useEditorSubblockLayout(
    const visibleSubBlocks = (config.subBlocks || []).filter((block) => {
      if (block.hidden) return false

-      // Hide skill-input subblock when skills are disabled via permissions
-      if (block.type === 'skill-input' && permissionConfig.disableSkills) return false
-
      // Check required feature if specified - declarative feature gating
      if (!isSubBlockFeatureEnabled(block)) return false

@@ -154,6 +149,5 @@ export function useEditorSubblockLayout(
    activeWorkflowId,
    isSnapshotView,
    blockDataFromStore,
-    permissionConfig.disableSkills,
  ])
 }
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/terminal/terminal.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/terminal/terminal.tsx
@@ -1151,7 +1151,7 @@ export const Terminal = memo(function Terminal() {
      <aside
        ref={terminalRef}
        className={clsx(
-          'terminal-container fixed right-[var(--panel-width)] bottom-0 left-[var(--sidebar-width)] z-10 overflow-hidden border-[var(--border)] border-t bg-[var(--surface-1)]',
+          'terminal-container fixed right-[var(--panel-width)] bottom-0 left-[var(--sidebar-width)] z-10 overflow-hidden bg-[var(--surface-1)]',
          isToggling && 'transition-[height] duration-100 ease-out'
        )}
        onTransitionEnd={handleTransitionEnd}
@@ -1160,7 +1160,7 @@ export const Terminal = memo(function Terminal() {
        tabIndex={-1}
        aria-label='Terminal'
      >
-        <div className='relative flex h-full'>
+        <div className='relative flex h-full border-[var(--border)] border-t'>
          {/* Left Section - Logs */}
          <div
            className={clsx('flex flex-col', !selectedEntry && 'flex-1')}
--- 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
@@ -40,7 +40,6 @@ import { useCustomTools } from '@/hooks/queries/custom-tools'
 import { useMcpServers, useMcpToolsQuery } from '@/hooks/queries/mcp'
 import { useCredentialName } from '@/hooks/queries/oauth-credentials'
 import { useReactivateSchedule, useScheduleInfo } from '@/hooks/queries/schedules'
-import { useSkills } from '@/hooks/queries/skills'
 import { useDeployChildWorkflow } from '@/hooks/queries/workflows'
 import { useSelectorDisplayName } from '@/hooks/use-selector-display-name'
 import { useVariablesStore } from '@/stores/panel'
@@ -619,48 +618,6 @@ const SubBlockRow = memo(function SubBlockRow({
    return `${toolNames[0]}, ${toolNames[1]} +${toolNames.length - 2}`
  }, [subBlock?.type, rawValue, customTools, workspaceId])

-  /**
-   * Hydrates skill references to display names.
-   * Resolves skill IDs to their current names from the skills query.
-   */
-  const { data: workspaceSkills = [] } = useSkills(workspaceId || '')
-
-  const skillsDisplayValue = useMemo(() => {
-    if (subBlock?.type !== 'skill-input' || !Array.isArray(rawValue) || rawValue.length === 0) {
-      return null
-    }
-
-    interface StoredSkill {
-      skillId: string
-      name?: string
-    }
-
-    const skillNames = rawValue
-      .map((skill: StoredSkill) => {
-        if (!skill || typeof skill !== 'object') return null
-
-        // Priority 1: Resolve skill name from the skills query (fresh data)
-        if (skill.skillId) {
-          const foundSkill = workspaceSkills.find((s) => s.id === skill.skillId)
-          if (foundSkill?.name) return foundSkill.name
-        }
-
-        // Priority 2: Fall back to stored name (for deleted skills)
-        if (skill.name && typeof skill.name === 'string') return skill.name
-
-        // Priority 3: Use skillId as last resort
-        if (skill.skillId) return skill.skillId
-
-        return null
-      })
-      .filter((name): name is string => !!name)
-
-    if (skillNames.length === 0) return null
-    if (skillNames.length === 1) return skillNames[0]
-    if (skillNames.length === 2) return `${skillNames[0]}, ${skillNames[1]}`
-    return `${skillNames[0]}, ${skillNames[1]} +${skillNames.length - 2}`
-  }, [subBlock?.type, rawValue, workspaceSkills])
-
  const isPasswordField = subBlock?.password === true
  const maskedValue = isPasswordField && value && value !== '-' ? '•••' : null

@@ -670,7 +627,6 @@ const SubBlockRow = memo(function SubBlockRow({
    dropdownLabel ||
    variablesDisplayValue ||
    toolsDisplayValue ||
-    skillsDisplayValue ||
    knowledgeBaseDisplayName ||
    workflowSelectionName ||
    mcpServerDisplayName ||
--- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/hooks/use-workflow-execution.ts
+++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/hooks/use-workflow-execution.ts
@@ -491,13 +491,6 @@ export function useWorkflowExecution() {
        updateActiveBlocks(data.blockId, false)
        setBlockRunStatus(data.blockId, 'error')

-        executedBlockIds.add(data.blockId)
-        accumulatedBlockStates.set(data.blockId, {
-          output: { error: data.error },
-          executed: true,
-          executionTime: data.durationMs || 0,
-        })
-
        accumulatedBlockLogs.push(
          createBlockLogEntry(data, { success: false, output: {}, error: data.error })
        )
--- a/apps/sim/app/workspace/[workspaceId]/w/components/preview/components/preview-editor/preview-editor.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/components/preview/components/preview-editor/preview-editor.tsx
@@ -784,12 +784,8 @@ function PreviewEditorContent({
    ? childWorkflowSnapshotState
    : childWorkflowState
  const resolvedIsLoadingChildWorkflow = isExecutionMode ? false : isLoadingChildWorkflow
-  const isBlockNotExecuted = isExecutionMode && !executionData
  const isMissingChildWorkflow =
-    Boolean(childWorkflowId) &&
-    !isBlockNotExecuted &&
-    !resolvedIsLoadingChildWorkflow &&
-    !resolvedChildWorkflowState
+    Boolean(childWorkflowId) && !resolvedIsLoadingChildWorkflow && !resolvedChildWorkflowState

  /** Drills down into the child workflow or opens it in a new tab */
  const handleExpandChildWorkflow = useCallback(() => {
@@ -1196,7 +1192,7 @@ function PreviewEditorContent({
        <div ref={subBlocksRef} className='subblocks-section flex flex-1 flex-col overflow-hidden'>
          <div className='flex-1 overflow-y-auto overflow-x-hidden'>
            {/* Not Executed Banner - shown when in execution mode but block wasn't executed */}
-            {isBlockNotExecuted && (
+            {isExecutionMode && !executionData && (
              <div className='flex min-w-0 flex-col gap-[8px] overflow-hidden border-[var(--border)] border-b px-[12px] py-[10px]'>
                <div className='flex items-center justify-between'>
                  <Badge variant='gray-secondary' size='sm' dot>
@@ -1423,11 +1419,9 @@ function PreviewEditorContent({
                    ) : (
                      <div className='flex h-full items-center justify-center bg-[var(--surface-3)]'>
                        <span className='text-[13px] text-[var(--text-tertiary)]'>
-                          {isBlockNotExecuted
-                            ? 'Not Executed'
-                            : isMissingChildWorkflow
-                              ? DELETED_WORKFLOW_LABEL
-                              : 'Unable to load preview'}
+                          {isMissingChildWorkflow
+                            ? DELETED_WORKFLOW_LABEL
+                            : 'Unable to load preview'}
                        </span>
                      </div>
                    )}
--- a/apps/sim/app/workspace/[workspaceId]/w/components/preview/components/preview-workflow/preview-workflow.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/components/preview/components/preview-workflow/preview-workflow.tsx
@@ -349,15 +349,7 @@ export function PreviewWorkflow({
      if (block.type === 'loop' || block.type === 'parallel') {
        const isSelected = selectedBlockId === blockId
        const dimensions = calculateContainerDimensions(blockId, workflowState.blocks)
-
-        // Check for direct error on the subflow block itself (e.g., loop resolution errors)
-        // before falling back to children-derived status
-        const directExecution = blockExecutionMap.get(blockId)
-        const subflowExecutionStatus: ExecutionStatus | undefined =
-          directExecution?.status === 'error'
-            ? 'error'
-            : (getSubflowExecutionStatus(blockId) ??
-              (directExecution ? (directExecution.status as ExecutionStatus) : undefined))
+        const subflowExecutionStatus = getSubflowExecutionStatus(blockId)

        nodeArray.push({
          id: blockId,
--- a/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/settings-modal/components/index.ts
+++ b/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/settings-modal/components/index.ts
@@ -9,7 +9,6 @@ export { Files as FileUploads } from './files/files'
 export { General } from './general/general'
 export { Integrations } from './integrations/integrations'
 export { MCP } from './mcp/mcp'
-export { Skills } from './skills/skills'
 export { Subscription } from './subscription/subscription'
 export { TeamManagement } from './team-management/team-management'
 export { WorkflowMcpServers } from './workflow-mcp-servers/workflow-mcp-servers'
--- a/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/settings-modal/components/skills/components/skill-modal.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/settings-modal/components/skills/components/skill-modal.tsx
@@ -1,225 +0,0 @@
-'use client'
-
-import type { ChangeEvent } from 'react'
-import { useEffect, useMemo, useState } from 'react'
-import { useParams } from 'next/navigation'
-import {
-  Button,
-  Input,
-  Label,
-  Modal,
-  ModalBody,
-  ModalContent,
-  ModalFooter,
-  ModalHeader,
-  Textarea,
-} from '@/components/emcn'
-import type { SkillDefinition } from '@/hooks/queries/skills'
-import { useCreateSkill, useUpdateSkill } from '@/hooks/queries/skills'
-
-interface SkillModalProps {
-  open: boolean
-  onOpenChange: (open: boolean) => void
-  onSave: () => void
-  onDelete?: (skillId: string) => void
-  initialValues?: SkillDefinition
-}
-
-const KEBAB_CASE_REGEX = /^[a-z0-9]+(-[a-z0-9]+)*$/
-
-interface FieldErrors {
-  name?: string
-  description?: string
-  content?: string
-  general?: string
-}
-
-export function SkillModal({
-  open,
-  onOpenChange,
-  onSave,
-  onDelete,
-  initialValues,
-}: SkillModalProps) {
-  const params = useParams()
-  const workspaceId = params.workspaceId as string
-
-  const createSkill = useCreateSkill()
-  const updateSkill = useUpdateSkill()
-
-  const [name, setName] = useState('')
-  const [description, setDescription] = useState('')
-  const [content, setContent] = useState('')
-  const [errors, setErrors] = useState<FieldErrors>({})
-  const [saving, setSaving] = useState(false)
-
-  useEffect(() => {
-    if (open) {
-      if (initialValues) {
-        setName(initialValues.name)
-        setDescription(initialValues.description)
-        setContent(initialValues.content)
-      } else {
-        setName('')
-        setDescription('')
-        setContent('')
-      }
-      setErrors({})
-    }
-  }, [open, initialValues])
-
-  const hasChanges = useMemo(() => {
-    if (!initialValues) return true
-    return (
-      name !== initialValues.name ||
-      description !== initialValues.description ||
-      content !== initialValues.content
-    )
-  }, [name, description, content, initialValues])
-
-  const handleSave = async () => {
-    const newErrors: FieldErrors = {}
-
-    if (!name.trim()) {
-      newErrors.name = 'Name is required'
-    } else if (name.length > 64) {
-      newErrors.name = 'Name must be 64 characters or less'
-    } else if (!KEBAB_CASE_REGEX.test(name)) {
-      newErrors.name = 'Name must be kebab-case (e.g. my-skill)'
-    }
-
-    if (!description.trim()) {
-      newErrors.description = 'Description is required'
-    }
-
-    if (!content.trim()) {
-      newErrors.content = 'Content is required'
-    }
-
-    if (Object.keys(newErrors).length > 0) {
-      setErrors(newErrors)
-      return
-    }
-
-    setSaving(true)
-
-    try {
-      if (initialValues) {
-        await updateSkill.mutateAsync({
-          workspaceId,
-          skillId: initialValues.id,
-          updates: { name, description, content },
-        })
-      } else {
-        await createSkill.mutateAsync({
-          workspaceId,
-          skill: { name, description, content },
-        })
-      }
-      onSave()
-    } catch (error) {
-      const message =
-        error instanceof Error && error.message.includes('already exists')
-          ? error.message
-          : 'Failed to save skill. Please try again.'
-      setErrors({ general: message })
-    } finally {
-      setSaving(false)
-    }
-  }
-
-  return (
-    <Modal open={open} onOpenChange={onOpenChange}>
-      <ModalContent size='xl'>
-        <ModalHeader>{initialValues ? 'Edit Skill' : 'Create Skill'}</ModalHeader>
-        <ModalBody>
-          <div className='flex flex-col gap-[16px]'>
-            <div className='flex flex-col gap-[4px]'>
-              <Label htmlFor='skill-name' className='font-medium text-[13px]'>
-                Name
-              </Label>
-              <Input
-                id='skill-name'
-                placeholder='my-skill-name'
-                value={name}
-                onChange={(e) => {
-                  setName(e.target.value)
-                  if (errors.name || errors.general)
-                    setErrors((prev) => ({ ...prev, name: undefined, general: undefined }))
-                }}
-              />
-              {errors.name ? (
-                <p className='text-[12px] text-[var(--text-error)]'>{errors.name}</p>
-              ) : (
-                <span className='text-[11px] text-[var(--text-muted)]'>
-                  Lowercase letters, numbers, and hyphens (e.g. my-skill)
-                </span>
-              )}
-            </div>
-
-            <div className='flex flex-col gap-[4px]'>
-              <Label htmlFor='skill-description' className='font-medium text-[13px]'>
-                Description
-              </Label>
-              <Input
-                id='skill-description'
-                placeholder='What this skill does and when to use it...'
-                value={description}
-                onChange={(e) => {
-                  setDescription(e.target.value)
-                  if (errors.description || errors.general)
-                    setErrors((prev) => ({ ...prev, description: undefined, general: undefined }))
-                }}
-                maxLength={1024}
-              />
-              {errors.description && (
-                <p className='text-[12px] text-[var(--text-error)]'>{errors.description}</p>
-              )}
-            </div>
-
-            <div className='flex flex-col gap-[4px]'>
-              <Label htmlFor='skill-content' className='font-medium text-[13px]'>
-                Content
-              </Label>
-              <Textarea
-                id='skill-content'
-                placeholder='Skill instructions in markdown...'
-                value={content}
-                onChange={(e: ChangeEvent<HTMLTextAreaElement>) => {
-                  setContent(e.target.value)
-                  if (errors.content || errors.general)
-                    setErrors((prev) => ({ ...prev, content: undefined, general: undefined }))
-                }}
-                className='min-h-[200px] resize-y font-mono text-[13px]'
-              />
-              {errors.content && (
-                <p className='text-[12px] text-[var(--text-error)]'>{errors.content}</p>
-              )}
-            </div>
-
-            {errors.general && (
-              <p className='text-[12px] text-[var(--text-error)]'>{errors.general}</p>
-            )}
-          </div>
-        </ModalBody>
-        <ModalFooter className='items-center justify-between'>
-          {initialValues && onDelete ? (
-            <Button variant='destructive' onClick={() => onDelete(initialValues.id)}>
-              Delete
-            </Button>
-          ) : (
-            <div />
-          )}
-          <div className='flex gap-2'>
-            <Button variant='default' onClick={() => onOpenChange(false)}>
-              Cancel
-            </Button>
-            <Button variant='tertiary' onClick={handleSave} disabled={saving || !hasChanges}>
-              {saving ? 'Saving...' : initialValues ? 'Update' : 'Create'}
-            </Button>
-          </div>
-        </ModalFooter>
-      </ModalContent>
-    </Modal>
-  )
-}
--- a/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/settings-modal/components/skills/skills.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/settings-modal/components/skills/skills.tsx
@@ -1,219 +0,0 @@
-'use client'
-
-import { useState } from 'react'
-import { createLogger } from '@sim/logger'
-import { Plus, Search } from 'lucide-react'
-import { useParams } from 'next/navigation'
-import {
-  Button,
-  Input,
-  Modal,
-  ModalBody,
-  ModalContent,
-  ModalFooter,
-  ModalHeader,
-} from '@/components/emcn'
-import { Skeleton } from '@/components/ui'
-import { cn } from '@/lib/core/utils/cn'
-import { SkillModal } from '@/app/workspace/[workspaceId]/w/components/sidebar/components/settings-modal/components/skills/components/skill-modal'
-import type { SkillDefinition } from '@/hooks/queries/skills'
-import { useDeleteSkill, useSkills } from '@/hooks/queries/skills'
-
-const logger = createLogger('SkillsSettings')
-
-function SkillSkeleton() {
-  return (
-    <div className='flex items-center justify-between gap-[12px]'>
-      <div className='flex min-w-0 flex-col justify-center gap-[1px]'>
-        <Skeleton className='h-[14px] w-[100px]' />
-        <Skeleton className='h-[13px] w-[200px]' />
-      </div>
-      <div className='flex flex-shrink-0 items-center gap-[8px]'>
-        <Skeleton className='h-[30px] w-[40px] rounded-[4px]' />
-        <Skeleton className='h-[30px] w-[54px] rounded-[4px]' />
-      </div>
-    </div>
-  )
-}
-
-export function Skills() {
-  const params = useParams()
-  const workspaceId = params.workspaceId as string
-
-  const { data: skills = [], isLoading, error, refetch: refetchSkills } = useSkills(workspaceId)
-  const deleteSkillMutation = useDeleteSkill()
-
-  const [searchTerm, setSearchTerm] = useState('')
-  const [deletingSkills, setDeletingSkills] = useState<Set<string>>(new Set())
-  const [editingSkill, setEditingSkill] = useState<SkillDefinition | null>(null)
-  const [showAddForm, setShowAddForm] = useState(false)
-  const [skillToDelete, setSkillToDelete] = useState<{ id: string; name: string } | null>(null)
-  const [showDeleteDialog, setShowDeleteDialog] = useState(false)
-
-  const filteredSkills = skills.filter((s) => {
-    if (!searchTerm.trim()) return true
-    const searchLower = searchTerm.toLowerCase()
-    return (
-      s.name.toLowerCase().includes(searchLower) ||
-      s.description.toLowerCase().includes(searchLower)
-    )
-  })
-
-  const handleDeleteClick = (skillId: string) => {
-    const s = skills.find((sk) => sk.id === skillId)
-    if (!s) return
-
-    setSkillToDelete({ id: skillId, name: s.name })
-    setShowDeleteDialog(true)
-  }
-
-  const handleDeleteSkill = async () => {
-    if (!skillToDelete) return
-
-    setDeletingSkills((prev) => new Set(prev).add(skillToDelete.id))
-    setShowDeleteDialog(false)
-
-    try {
-      await deleteSkillMutation.mutateAsync({
-        workspaceId,
-        skillId: skillToDelete.id,
-      })
-      logger.info(`Deleted skill: ${skillToDelete.id}`)
-    } catch (error) {
-      logger.error('Error deleting skill:', error)
-    } finally {
-      setDeletingSkills((prev) => {
-        const next = new Set(prev)
-        next.delete(skillToDelete.id)
-        return next
-      })
-      setSkillToDelete(null)
-    }
-  }
-
-  const handleSkillSaved = () => {
-    setShowAddForm(false)
-    setEditingSkill(null)
-    refetchSkills()
-  }
-
-  const hasSkills = skills && skills.length > 0
-  const showEmptyState = !hasSkills && !showAddForm && !editingSkill
-  const showNoResults = searchTerm.trim() && filteredSkills.length === 0 && skills.length > 0
-
-  return (
-    <>
-      <div className='flex h-full flex-col gap-[16px]'>
-        <div className='flex items-center gap-[8px]'>
-          <div
-            className={cn(
-              'flex flex-1 items-center gap-[8px] rounded-[8px] border border-[var(--border)] bg-transparent px-[8px] py-[5px] transition-colors duration-100 dark:bg-[var(--surface-4)] dark:hover:border-[var(--border-1)] dark:hover:bg-[var(--surface-5)]',
-              isLoading && 'opacity-50'
-            )}
-          >
-            <Search
-              className='h-[14px] w-[14px] flex-shrink-0 text-[var(--text-tertiary)]'
-              strokeWidth={2}
-            />
-            <Input
-              placeholder='Search skills...'
-              value={searchTerm}
-              onChange={(e) => setSearchTerm(e.target.value)}
-              disabled={isLoading}
-              className='h-auto flex-1 border-0 bg-transparent p-0 font-base leading-none placeholder:text-[var(--text-tertiary)] focus-visible:ring-0 focus-visible:ring-offset-0 disabled:cursor-not-allowed disabled:opacity-100'
-            />
-          </div>
-          <Button onClick={() => setShowAddForm(true)} disabled={isLoading} variant='tertiary'>
-            <Plus className='mr-[6px] h-[13px] w-[13px]' />
-            Add
-          </Button>
-        </div>
-
-        <div className='min-h-0 flex-1 overflow-y-auto'>
-          {error ? (
-            <div className='flex h-full flex-col items-center justify-center gap-[8px]'>
-              <p className='text-[#DC2626] text-[11px] leading-tight dark:text-[#F87171]'>
-                {error instanceof Error ? error.message : 'Failed to load skills'}
-              </p>
-            </div>
-          ) : isLoading ? (
-            <div className='flex flex-col gap-[8px]'>
-              <SkillSkeleton />
-              <SkillSkeleton />
-              <SkillSkeleton />
-            </div>
-          ) : showEmptyState ? (
-            <div className='flex h-full items-center justify-center text-[13px] text-[var(--text-muted)]'>
-              Click "Add" above to get started
-            </div>
-          ) : (
-            <div className='flex flex-col gap-[8px]'>
-              {filteredSkills.map((s) => (
-                <div key={s.id} className='flex items-center justify-between gap-[12px]'>
-                  <div className='flex min-w-0 flex-col justify-center gap-[1px]'>
-                    <span className='truncate font-medium text-[14px]'>{s.name}</span>
-                    <p className='truncate text-[13px] text-[var(--text-muted)]'>{s.description}</p>
-                  </div>
-                  <div className='flex flex-shrink-0 items-center gap-[8px]'>
-                    <Button variant='default' onClick={() => setEditingSkill(s)}>
-                      Edit
-                    </Button>
-                    <Button
-                      variant='ghost'
-                      onClick={() => handleDeleteClick(s.id)}
-                      disabled={deletingSkills.has(s.id)}
-                    >
-                      {deletingSkills.has(s.id) ? 'Deleting...' : 'Delete'}
-                    </Button>
-                  </div>
-                </div>
-              ))}
-              {showNoResults && (
-                <div className='py-[16px] text-center text-[13px] text-[var(--text-muted)]'>
-                  No skills found matching "{searchTerm}"
-                </div>
-              )}
-            </div>
-          )}
-        </div>
-      </div>
-
-      <SkillModal
-        open={showAddForm || !!editingSkill}
-        onOpenChange={(open) => {
-          if (!open) {
-            setShowAddForm(false)
-            setEditingSkill(null)
-          }
-        }}
-        onSave={handleSkillSaved}
-        onDelete={(skillId) => {
-          setEditingSkill(null)
-          handleDeleteClick(skillId)
-        }}
-        initialValues={editingSkill ?? undefined}
-      />
-
-      <Modal open={showDeleteDialog} onOpenChange={setShowDeleteDialog}>
-        <ModalContent size='sm'>
-          <ModalHeader>Delete Skill</ModalHeader>
-          <ModalBody>
-            <p className='text-[12px] text-[var(--text-secondary)]'>
-              Are you sure you want to delete{' '}
-              <span className='font-medium text-[var(--text-primary)]'>{skillToDelete?.name}</span>?{' '}
-              <span className='text-[var(--text-error)]'>This action cannot be undone.</span>
-            </p>
-          </ModalBody>
-          <ModalFooter>
-            <Button variant='default' onClick={() => setShowDeleteDialog(false)}>
-              Cancel
-            </Button>
-            <Button variant='destructive' onClick={handleDeleteSkill}>
-              Delete
-            </Button>
-          </ModalFooter>
-        </ModalContent>
-      </Modal>
-    </>
-  )
-}
--- a/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/settings-modal/settings-modal.tsx
+++ b/apps/sim/app/workspace/[workspaceId]/w/components/sidebar/components/settings-modal/settings-modal.tsx
@@ -34,7 +34,7 @@ import {
  SModalSidebarSection,
  SModalSidebarSectionTitle,
 } from '@/components/emcn'
-import { AgentSkillsIcon, McpIcon } from '@/components/icons'
+import { McpIcon } from '@/components/icons'
 import { useSession } from '@/lib/auth/auth-client'
 import { getSubscriptionStatus } from '@/lib/billing/client'
 import { getEnv, isTruthy } from '@/lib/core/config/env'
@@ -52,7 +52,6 @@ import {
  General,
  Integrations,
  MCP,
-  Skills,
  Subscription,
  TeamManagement,
  WorkflowMcpServers,
@@ -94,7 +93,6 @@ type SettingsSection =
  | 'copilot'
  | 'mcp'
  | 'custom-tools'
-  | 'skills'
  | 'workflow-mcp-servers'
  | 'debug'

@@ -158,7 +156,6 @@ const allNavigationItems: NavigationItem[] = [
  },
  { id: 'integrations', label: 'Integrations', icon: Connections, section: 'tools' },
  { id: 'custom-tools', label: 'Custom Tools', icon: Wrench, section: 'tools' },
-  { id: 'skills', label: 'Skills', icon: AgentSkillsIcon, section: 'tools' },
  { id: 'mcp', label: 'MCP Tools', icon: McpIcon, section: 'tools' },
  { id: 'environment', label: 'Environment', icon: FolderCode, section: 'system' },
  { id: 'apikeys', label: 'API Keys', icon: Key, section: 'system' },
@@ -268,9 +265,6 @@ export function SettingsModal({ open, onOpenChange }: SettingsModalProps) {
      if (item.id === 'custom-tools' && permissionConfig.disableCustomTools) {
        return false
      }
-      if (item.id === 'skills' && permissionConfig.disableSkills) {
-        return false
-      }

      // Self-hosted override allows showing the item when not on hosted
      if (item.selfHostedOverride && !isHosted) {
@@ -562,7 +556,6 @@ export function SettingsModal({ open, onOpenChange }: SettingsModalProps) {
            {effectiveActiveSection === 'copilot' && <Copilot />}
            {effectiveActiveSection === 'mcp' && <MCP initialServerId={pendingMcpServerId} />}
            {effectiveActiveSection === 'custom-tools' && <CustomTools />}
-            {effectiveActiveSection === 'skills' && <Skills />}
            {effectiveActiveSection === 'workflow-mcp-servers' && <WorkflowMcpServers />}
            {effectiveActiveSection === 'debug' && <Debug />}
          </SModalMainBody>
--- a/apps/sim/background/webhook-execution.ts
+++ b/apps/sim/background/webhook-execution.ts
@@ -21,7 +21,6 @@ import { executeWorkflowCore } from '@/lib/workflows/executor/execution-core'
 import { PauseResumeManager } from '@/lib/workflows/executor/human-in-the-loop-manager'
 import { loadDeployedWorkflowState } from '@/lib/workflows/persistence/utils'
 import { getWorkflowById } from '@/lib/workflows/utils'
-import { getBlock } from '@/blocks'
 import { ExecutionSnapshot } from '@/executor/execution/snapshot'
 import type { ExecutionMetadata } from '@/executor/execution/types'
 import { hasExecutionResult } from '@/executor/utils/errors'
@@ -75,21 +74,8 @@ async function processTriggerFileOutputs(
        logger.error(`[${context.requestId}] Error processing ${currentPath}:`, error)
        processed[key] = val
      }
-    } else if (
-      outputDef &&
-      typeof outputDef === 'object' &&
-      (outputDef.type === 'object' || outputDef.type === 'json') &&
-      outputDef.properties
-    ) {
-      // Explicit object schema with properties - recurse into properties
-      processed[key] = await processTriggerFileOutputs(
-        val,
-        outputDef.properties,
-        context,
-        currentPath
-      )
    } else if (outputDef && typeof outputDef === 'object' && !outputDef.type) {
-      // Nested object in schema (flat pattern) - recurse with the nested schema
+      // Nested object in schema - recurse with the nested schema
      processed[key] = await processTriggerFileOutputs(val, outputDef, context, currentPath)
    } else {
      // Not a file output - keep as is
@@ -419,23 +405,11 @@ async function executeWebhookJobInternal(
        const rawSelectedTriggerId = triggerBlock?.subBlocks?.selectedTriggerId?.value
        const rawTriggerId = triggerBlock?.subBlocks?.triggerId?.value

-        let resolvedTriggerId = [rawSelectedTriggerId, rawTriggerId].find(
+        const resolvedTriggerId = [rawSelectedTriggerId, rawTriggerId].find(
          (candidate): candidate is string =>
            typeof candidate === 'string' && isTriggerValid(candidate)
        )

-        if (!resolvedTriggerId) {
-          const blockConfig = getBlock(triggerBlock.type)
-          if (blockConfig?.category === 'triggers' && isTriggerValid(triggerBlock.type)) {
-            resolvedTriggerId = triggerBlock.type
-          } else if (triggerBlock.triggerMode && blockConfig?.triggers?.enabled) {
-            const available = blockConfig.triggers?.available?.[0]
-            if (available && isTriggerValid(available)) {
-              resolvedTriggerId = available
-            }
-          }
-        }
-
        if (resolvedTriggerId) {
          const triggerConfig = getTrigger(resolvedTriggerId)

--- a/apps/sim/blocks/blocks.test.ts
+++ b/apps/sim/blocks/blocks.test.ts
@@ -1,5 +1,6 @@
 import { describe, expect, it, vi } from 'vitest'

+// Use the real registry module, not the global mock from vitest.setup.ts
 vi.unmock('@/blocks/registry')

 import { generateRouterPrompt } from '@/blocks/blocks/router'
@@ -14,7 +15,7 @@ import {
 } from '@/blocks/registry'
 import { AuthMode } from '@/blocks/types'

-describe.concurrent('Blocks Module', () => {
+describe('Blocks Module', () => {
  describe('Registry', () => {
    it('should have a non-empty registry of blocks', () => {
      expect(Object.keys(registry).length).toBeGreaterThan(0)
@@ -408,7 +409,6 @@ describe.concurrent('Blocks Module', () => {
        'workflow-input-mapper',
        'text',
        'router-input',
-        'skill-input',
      ]

      const blocks = getAllBlocks()
--- a/apps/sim/blocks/blocks/agent.ts
+++ b/apps/sim/blocks/blocks/agent.ts
@@ -1,10 +1,11 @@
 import { createLogger } from '@sim/logger'
 import { AgentIcon } from '@/components/icons'
+import { isHosted } from '@/lib/core/config/feature-flags'
 import type { BlockConfig } from '@/blocks/types'
 import { AuthMode } from '@/blocks/types'
-import { getApiKeyCondition } from '@/blocks/utils'
 import {
  getBaseModelProviders,
+  getHostedModels,
  getMaxTemperature,
  getProviderIcon,
  getReasoningEffortValuesForModel,
@@ -16,6 +17,15 @@ import {
  providers,
  supportsTemperature,
 } from '@/providers/utils'
+
+const getCurrentOllamaModels = () => {
+  return useProvidersStore.getState().providers.ollama.models
+}
+
+const getCurrentVLLMModels = () => {
+  return useProvidersStore.getState().providers.vllm.models
+}
+
 import { useProvidersStore } from '@/stores/providers'
 import type { ToolResponse } from '@/tools/types'

@@ -154,7 +164,6 @@ Return ONLY the JSON array.`,
      type: 'dropdown',
      placeholder: 'Select reasoning effort...',
      options: [
-        { label: 'auto', id: 'auto' },
        { label: 'low', id: 'low' },
        { label: 'medium', id: 'medium' },
        { label: 'high', id: 'high' },
@@ -164,12 +173,9 @@ Return ONLY the JSON array.`,
        const { useSubBlockStore } = await import('@/stores/workflows/subblock/store')
        const { useWorkflowRegistry } = await import('@/stores/workflows/registry/store')

-        const autoOption = { label: 'auto', id: 'auto' }
-
        const activeWorkflowId = useWorkflowRegistry.getState().activeWorkflowId
        if (!activeWorkflowId) {
          return [
-            autoOption,
            { label: 'low', id: 'low' },
            { label: 'medium', id: 'medium' },
            { label: 'high', id: 'high' },
@@ -182,7 +188,6 @@ Return ONLY the JSON array.`,

        if (!modelValue) {
          return [
-            autoOption,
            { label: 'low', id: 'low' },
            { label: 'medium', id: 'medium' },
            { label: 'high', id: 'high' },
@@ -192,16 +197,15 @@ Return ONLY the JSON array.`,
        const validOptions = getReasoningEffortValuesForModel(modelValue)
        if (!validOptions) {
          return [
-            autoOption,
            { label: 'low', id: 'low' },
            { label: 'medium', id: 'medium' },
            { label: 'high', id: 'high' },
          ]
        }

-        return [autoOption, ...validOptions.map((opt) => ({ label: opt, id: opt }))]
+        return validOptions.map((opt) => ({ label: opt, id: opt }))
      },
-      mode: 'advanced',
+      value: () => 'medium',
      condition: {
        field: 'model',
        value: MODELS_WITH_REASONING_EFFORT,
@@ -213,7 +217,6 @@ Return ONLY the JSON array.`,
      type: 'dropdown',
      placeholder: 'Select verbosity...',
      options: [
-        { label: 'auto', id: 'auto' },
        { label: 'low', id: 'low' },
        { label: 'medium', id: 'medium' },
        { label: 'high', id: 'high' },
@@ -223,12 +226,9 @@ Return ONLY the JSON array.`,
        const { useSubBlockStore } = await import('@/stores/workflows/subblock/store')
        const { useWorkflowRegistry } = await import('@/stores/workflows/registry/store')

-        const autoOption = { label: 'auto', id: 'auto' }
-
        const activeWorkflowId = useWorkflowRegistry.getState().activeWorkflowId
        if (!activeWorkflowId) {
          return [
-            autoOption,
            { label: 'low', id: 'low' },
            { label: 'medium', id: 'medium' },
            { label: 'high', id: 'high' },
@@ -241,7 +241,6 @@ Return ONLY the JSON array.`,

        if (!modelValue) {
          return [
-            autoOption,
            { label: 'low', id: 'low' },
            { label: 'medium', id: 'medium' },
            { label: 'high', id: 'high' },
@@ -251,16 +250,15 @@ Return ONLY the JSON array.`,
        const validOptions = getVerbosityValuesForModel(modelValue)
        if (!validOptions) {
          return [
-            autoOption,
            { label: 'low', id: 'low' },
            { label: 'medium', id: 'medium' },
            { label: 'high', id: 'high' },
          ]
        }

-        return [autoOption, ...validOptions.map((opt) => ({ label: opt, id: opt }))]
+        return validOptions.map((opt) => ({ label: opt, id: opt }))
      },
-      mode: 'advanced',
+      value: () => 'medium',
      condition: {
        field: 'model',
        value: MODELS_WITH_VERBOSITY,
@@ -272,7 +270,6 @@ Return ONLY the JSON array.`,
      type: 'dropdown',
      placeholder: 'Select thinking level...',
      options: [
-        { label: 'none', id: 'none' },
        { label: 'minimal', id: 'minimal' },
        { label: 'low', id: 'low' },
        { label: 'medium', id: 'medium' },
@@ -284,11 +281,12 @@ Return ONLY the JSON array.`,
        const { useSubBlockStore } = await import('@/stores/workflows/subblock/store')
        const { useWorkflowRegistry } = await import('@/stores/workflows/registry/store')

-        const noneOption = { label: 'none', id: 'none' }
-
        const activeWorkflowId = useWorkflowRegistry.getState().activeWorkflowId
        if (!activeWorkflowId) {
-          return [noneOption, { label: 'low', id: 'low' }, { label: 'high', id: 'high' }]
+          return [
+            { label: 'low', id: 'low' },
+            { label: 'high', id: 'high' },
+          ]
        }

        const workflowValues = useSubBlockStore.getState().workflowValues[activeWorkflowId]
@@ -296,17 +294,23 @@ Return ONLY the JSON array.`,
        const modelValue = blockValues?.model as string

        if (!modelValue) {
-          return [noneOption, { label: 'low', id: 'low' }, { label: 'high', id: 'high' }]
+          return [
+            { label: 'low', id: 'low' },
+            { label: 'high', id: 'high' },
+          ]
        }

        const validOptions = getThinkingLevelsForModel(modelValue)
        if (!validOptions) {
-          return [noneOption, { label: 'low', id: 'low' }, { label: 'high', id: 'high' }]
+          return [
+            { label: 'low', id: 'low' },
+            { label: 'high', id: 'high' },
+          ]
        }

-        return [noneOption, ...validOptions.map((opt) => ({ label: opt, id: opt }))]
+        return validOptions.map((opt) => ({ label: opt, id: opt }))
      },
-      mode: 'advanced',
+      value: () => 'high',
      condition: {
        field: 'model',
        value: MODELS_WITH_THINKING,
@@ -329,11 +333,11 @@ Return ONLY the JSON array.`,
      id: 'azureApiVersion',
      title: 'Azure API Version',
      type: 'short-input',
-      placeholder: 'Enter API version',
+      placeholder: '2024-07-01-preview',
      connectionDroppable: false,
      condition: {
        field: 'model',
-        value: [...providers['azure-openai'].models, ...providers['azure-anthropic'].models],
+        value: providers['azure-openai'].models,
      },
    },
    {
@@ -397,6 +401,12 @@ Return ONLY the JSON array.`,
        value: providers.bedrock.models,
      },
    },
+    {
+      id: 'tools',
+      title: 'Tools',
+      type: 'tool-input',
+      defaultValue: [],
+    },
    {
      id: 'apiKey',
      title: 'API Key',
@@ -405,19 +415,23 @@ Return ONLY the JSON array.`,
      password: true,
      connectionDroppable: false,
      required: true,
-      condition: getApiKeyCondition(),
-    },
-    {
-      id: 'tools',
-      title: 'Tools',
-      type: 'tool-input',
-      defaultValue: [],
-    },
-    {
-      id: 'skills',
-      title: 'Skills',
-      type: 'skill-input',
-      defaultValue: [],
+      // Hide API key for hosted models, Ollama models, vLLM models, Vertex models (uses OAuth), and Bedrock (uses AWS credentials)
+      condition: isHosted
+        ? {
+            field: 'model',
+            value: [...getHostedModels(), ...providers.vertex.models, ...providers.bedrock.models],
+            not: true, // Show for all models EXCEPT those listed
+          }
+        : () => ({
+            field: 'model',
+            value: [
+              ...getCurrentOllamaModels(),
+              ...getCurrentVLLMModels(),
+              ...providers.vertex.models,
+              ...providers.bedrock.models,
+            ],
+            not: true, // Show for all models EXCEPT Ollama, vLLM, Vertex, and Bedrock models
+          }),
    },
    {
      id: 'memoryType',
@@ -473,7 +487,6 @@ Return ONLY the JSON array.`,
      min: 0,
      max: 1,
      defaultValue: 0.3,
-      mode: 'advanced',
      condition: () => ({
        field: 'model',
        value: (() => {
@@ -491,7 +504,6 @@ Return ONLY the JSON array.`,
      min: 0,
      max: 2,
      defaultValue: 0.3,
-      mode: 'advanced',
      condition: () => ({
        field: 'model',
        value: (() => {
@@ -507,7 +519,6 @@ Return ONLY the JSON array.`,
      title: 'Max Output Tokens',
      type: 'short-input',
      placeholder: 'Enter max tokens (e.g., 4096)...',
-      mode: 'advanced',
    },
    {
      id: 'responseFormat',
@@ -698,7 +709,7 @@ Example 3 (Array Input):
    },
    model: { type: 'string', description: 'AI model to use' },
    apiKey: { type: 'string', description: 'Provider API key' },
-    azureEndpoint: { type: 'string', description: 'Azure endpoint URL' },
+    azureEndpoint: { type: 'string', description: 'Azure OpenAI endpoint URL' },
    azureApiVersion: { type: 'string', description: 'Azure API version' },
    vertexProject: { type: 'string', description: 'Google Cloud project ID for Vertex AI' },
    vertexLocation: { type: 'string', description: 'Google Cloud location for Vertex AI' },
@@ -758,7 +769,6 @@ Example 3 (Array Input):
      description: 'Thinking level for models with extended thinking (Anthropic Claude, Gemini 3)',
    },
    tools: { type: 'json', description: 'Available tools configuration' },
-    skills: { type: 'json', description: 'Selected skills configuration' },
  },
  outputs: {
    content: { type: 'string', description: 'Generated response content' },
--- a/apps/sim/blocks/blocks/airweave.ts
+++ b/apps/sim/blocks/blocks/airweave.ts
@@ -1,102 +0,0 @@
-import { AirweaveIcon } from '@/components/icons'
-import type { BlockConfig } from '@/blocks/types'
-import { AuthMode } from '@/blocks/types'
-import type { AirweaveSearchResponse } from '@/tools/airweave/types'
-
-export const AirweaveBlock: BlockConfig<AirweaveSearchResponse> = {
-  type: 'airweave',
-  name: 'Airweave',
-  description: 'Search your synced data collections',
-  authMode: AuthMode.ApiKey,
-  longDescription:
-    'Search across your synced data sources using Airweave. Supports semantic search with hybrid, neural, or keyword retrieval strategies. Optionally generate AI-powered answers from search results.',
-  docsLink: 'https://docs.airweave.ai',
-  category: 'tools',
-  bgColor: '#6366F1',
-  icon: AirweaveIcon,
-  subBlocks: [
-    {
-      id: 'collectionId',
-      title: 'Collection ID',
-      type: 'short-input',
-      placeholder: 'Enter your collection readable ID...',
-      required: true,
-    },
-    {
-      id: 'query',
-      title: 'Search Query',
-      type: 'long-input',
-      placeholder: 'Enter your search query...',
-      required: true,
-    },
-    {
-      id: 'limit',
-      title: 'Max Results',
-      type: 'dropdown',
-      options: [
-        { label: '10', id: '10' },
-        { label: '25', id: '25' },
-        { label: '50', id: '50' },
-        { label: '100', id: '100' },
-      ],
-      value: () => '25',
-    },
-    {
-      id: 'retrievalStrategy',
-      title: 'Retrieval Strategy',
-      type: 'dropdown',
-      options: [
-        { label: 'Hybrid (Default)', id: 'hybrid' },
-        { label: 'Neural', id: 'neural' },
-        { label: 'Keyword', id: 'keyword' },
-      ],
-      value: () => 'hybrid',
-    },
-    {
-      id: 'expandQuery',
-      title: 'Expand Query',
-      type: 'switch',
-      description: 'Generate query variations to improve recall',
-    },
-    {
-      id: 'rerank',
-      title: 'Rerank Results',
-      type: 'switch',
-      description: 'Reorder results for improved relevance using LLM',
-    },
-    {
-      id: 'generateAnswer',
-      title: 'Generate Answer',
-      type: 'switch',
-      description: 'Generate a natural-language answer from results',
-    },
-    {
-      id: 'apiKey',
-      title: 'API Key',
-      type: 'short-input',
-      placeholder: 'Enter your Airweave API key',
-      password: true,
-      required: true,
-    },
-  ],
-  tools: {
-    access: ['airweave_search'],
-  },
-  inputs: {
-    collectionId: { type: 'string', description: 'Airweave collection readable ID' },
-    query: { type: 'string', description: 'Search query text' },
-    apiKey: { type: 'string', description: 'Airweave API key' },
-    limit: { type: 'number', description: 'Maximum number of results' },
-    retrievalStrategy: {
-      type: 'string',
-      description: 'Retrieval strategy (hybrid/neural/keyword)',
-    },
-    expandQuery: { type: 'boolean', description: 'Generate query variations' },
-    rerank: { type: 'boolean', description: 'Rerank results with LLM' },
-    generateAnswer: { type: 'boolean', description: 'Generate AI answer' },
-  },
-  outputs: {
-    results: { type: 'json', description: 'Search results with content and metadata' },
-    completion: { type: 'string', description: 'AI-generated answer (when enabled)' },
-  },
-}
--- a/apps/sim/blocks/blocks/linear.ts
+++ b/apps/sim/blocks/blocks/linear.ts
@@ -810,29 +810,7 @@ Return ONLY the date string in YYYY-MM-DD format - no explanations, no quotes, n
      placeholder: 'Number of items to return (default: 50)',
      condition: {
        field: 'operation',
-        value: [
-          'linear_read_issues',
-          'linear_search_issues',
-          'linear_list_comments',
-          'linear_list_projects',
-          'linear_list_users',
-          'linear_list_teams',
-          'linear_list_labels',
-          'linear_list_workflow_states',
-          'linear_list_cycles',
-          'linear_list_attachments',
-          'linear_list_issue_relations',
-          'linear_list_favorites',
-          'linear_list_project_updates',
-          'linear_list_notifications',
-          'linear_list_customer_statuses',
-          'linear_list_customer_tiers',
-          'linear_list_customers',
-          'linear_list_customer_requests',
-          'linear_list_project_labels',
-          'linear_list_project_milestones',
-          'linear_list_project_statuses',
-        ],
+        value: ['linear_list_favorites'],
      },
    },
    // Pagination - After (for list operations)
@@ -843,29 +821,7 @@ Return ONLY the date string in YYYY-MM-DD format - no explanations, no quotes, n
      placeholder: 'Cursor for pagination',
      condition: {
        field: 'operation',
-        value: [
-          'linear_read_issues',
-          'linear_search_issues',
-          'linear_list_comments',
-          'linear_list_projects',
-          'linear_list_users',
-          'linear_list_teams',
-          'linear_list_labels',
-          'linear_list_workflow_states',
-          'linear_list_cycles',
-          'linear_list_attachments',
-          'linear_list_issue_relations',
-          'linear_list_favorites',
-          'linear_list_project_updates',
-          'linear_list_notifications',
-          'linear_list_customers',
-          'linear_list_customer_requests',
-          'linear_list_customer_statuses',
-          'linear_list_customer_tiers',
-          'linear_list_project_labels',
-          'linear_list_project_milestones',
-          'linear_list_project_statuses',
-        ],
+        value: ['linear_list_favorites'],
      },
    },
    // Project health (for project updates)
@@ -1097,6 +1053,28 @@ Return ONLY the description text - no explanations.`,
        value: ['linear_create_customer_request', 'linear_update_customer_request'],
      },
    },
+    // Pagination - first
+    {
+      id: 'first',
+      title: 'Limit',
+      type: 'short-input',
+      placeholder: 'Number of items (default: 50)',
+      condition: {
+        field: 'operation',
+        value: ['linear_list_customers', 'linear_list_customer_requests'],
+      },
+    },
+    // Pagination - after
+    {
+      id: 'after',
+      title: 'After Cursor',
+      type: 'short-input',
+      placeholder: 'Cursor for pagination',
+      condition: {
+        field: 'operation',
+        value: ['linear_list_customers', 'linear_list_customer_requests'],
+      },
+    },
    // Customer ID for get/update/delete/merge operations
    {
      id: 'customerIdTarget',
@@ -1515,8 +1493,6 @@ Return ONLY the date string in YYYY-MM-DD format - no explanations, no quotes, n
              teamId: effectiveTeamId || undefined,
              projectId: effectiveProjectId || undefined,
              includeArchived: params.includeArchived,
-              first: params.first ? Number(params.first) : undefined,
-              after: params.after,
            }

          case 'linear_get_issue':
@@ -1582,8 +1558,6 @@ Return ONLY the date string in YYYY-MM-DD format - no explanations, no quotes, n
              query: params.query.trim(),
              teamId: effectiveTeamId,
              includeArchived: params.includeArchived,
-              first: params.first ? Number(params.first) : undefined,
-              after: params.after,
            }

          case 'linear_add_label_to_issue':
@@ -1633,8 +1607,6 @@ Return ONLY the date string in YYYY-MM-DD format - no explanations, no quotes, n
            return {
              ...baseParams,
              issueId: params.issueId.trim(),
-              first: params.first ? Number(params.first) : undefined,
-              after: params.after,
            }

          case 'linear_list_projects':
@@ -1642,8 +1614,6 @@ Return ONLY the date string in YYYY-MM-DD format - no explanations, no quotes, n
              ...baseParams,
              teamId: effectiveTeamId,
              includeArchived: params.includeArchived,
-              first: params.first ? Number(params.first) : undefined,
-              after: params.after,
            }

          case 'linear_get_project':
@@ -1695,12 +1665,6 @@ Return ONLY the date string in YYYY-MM-DD format - no explanations, no quotes, n

          case 'linear_list_users':
          case 'linear_list_teams':
-            return {
-              ...baseParams,
-              first: params.first ? Number(params.first) : undefined,
-              after: params.after,
-            }
-
          case 'linear_get_viewer':
            return baseParams

@@ -1708,8 +1672,6 @@ Return ONLY the date string in YYYY-MM-DD format - no explanations, no quotes, n
            return {
              ...baseParams,
              teamId: effectiveTeamId,
-              first: params.first ? Number(params.first) : undefined,
-              after: params.after,
            }

          case 'linear_create_label':
@@ -1747,8 +1709,6 @@ Return ONLY the date string in YYYY-MM-DD format - no explanations, no quotes, n
            return {
              ...baseParams,
              teamId: effectiveTeamId,
-              first: params.first ? Number(params.first) : undefined,
-              after: params.after,
            }

          case 'linear_create_workflow_state':
@@ -1778,8 +1738,6 @@ Return ONLY the date string in YYYY-MM-DD format - no explanations, no quotes, n
            return {
              ...baseParams,
              teamId: effectiveTeamId,
-              first: params.first ? Number(params.first) : undefined,
-              after: params.after,
            }

          case 'linear_get_cycle':
@@ -1843,8 +1801,6 @@ Return ONLY the date string in YYYY-MM-DD format - no explanations, no quotes, n
            return {
              ...baseParams,
              issueId: params.issueId.trim(),
-              first: params.first ? Number(params.first) : undefined,
-              after: params.after,
            }

          case 'linear_update_attachment':
@@ -1884,8 +1840,6 @@ Return ONLY the date string in YYYY-MM-DD format - no explanations, no quotes, n
            return {
              ...baseParams,
              issueId: params.issueId.trim(),
-              first: params.first ? Number(params.first) : undefined,
-              after: params.after,
            }

          case 'linear_delete_issue_relation':
@@ -1932,16 +1886,10 @@ Return ONLY the date string in YYYY-MM-DD format - no explanations, no quotes, n
            return {
              ...baseParams,
              projectId: effectiveProjectId,
-              first: params.first ? Number(params.first) : undefined,
-              after: params.after,
            }

          case 'linear_list_notifications':
-            return {
-              ...baseParams,
-              first: params.first ? Number(params.first) : undefined,
-              after: params.after,
-            }
+            return baseParams

          case 'linear_update_notification':
            if (!params.notificationId?.trim()) {
@@ -2070,9 +2018,9 @@ Return ONLY the date string in YYYY-MM-DD format - no explanations, no quotes, n
            return {
              ...baseParams,
              name: params.statusName.trim(),
+              displayName: params.statusDisplayName?.trim() || params.statusName.trim(),
              color: params.statusColor.trim(),
              description: params.statusDescription?.trim() || undefined,
-              displayName: params.statusDisplayName?.trim() || undefined,
            }

          case 'linear_update_customer_status':
@@ -2083,9 +2031,9 @@ Return ONLY the date string in YYYY-MM-DD format - no explanations, no quotes, n
              ...baseParams,
              statusId: params.statusId.trim(),
              name: params.statusName?.trim() || undefined,
+              displayName: params.statusDisplayName?.trim() || undefined,
              color: params.statusColor?.trim() || undefined,
              description: params.statusDescription?.trim() || undefined,
-              displayName: params.statusDisplayName?.trim() || undefined,
            }

          case 'linear_delete_customer_status':
@@ -2098,11 +2046,7 @@ Return ONLY the date string in YYYY-MM-DD format - no explanations, no quotes, n
            }

          case 'linear_list_customer_statuses':
-            return {
-              ...baseParams,
-              first: params.first ? Number(params.first) : undefined,
-              after: params.after,
-            }
+            return baseParams

          // Customer Tier Operations
          case 'linear_create_customer_tier':
@@ -2140,11 +2084,7 @@ Return ONLY the date string in YYYY-MM-DD format - no explanations, no quotes, n
            }

          case 'linear_list_customer_tiers':
-            return {
-              ...baseParams,
-              first: params.first ? Number(params.first) : undefined,
-              after: params.after,
-            }
+            return baseParams

          // Project Management Operations
          case 'linear_delete_project':
@@ -2195,8 +2135,6 @@ Return ONLY the date string in YYYY-MM-DD format - no explanations, no quotes, n
            return {
              ...baseParams,
              projectId: effectiveProjectId || undefined,
-              first: params.first ? Number(params.first) : undefined,
-              after: params.after,
            }

          case 'linear_add_label_to_project':
@@ -2260,8 +2198,6 @@ Return ONLY the date string in YYYY-MM-DD format - no explanations, no quotes, n
            return {
              ...baseParams,
              projectId: params.projectIdForMilestone.trim(),
-              first: params.first ? Number(params.first) : undefined,
-              after: params.after,
            }

          // Project Status Operations
@@ -2309,11 +2245,7 @@ Return ONLY the date string in YYYY-MM-DD format - no explanations, no quotes, n
            }

          case 'linear_list_project_statuses':
-            return {
-              ...baseParams,
-              first: params.first ? Number(params.first) : undefined,
-              after: params.after,
-            }
+            return baseParams

          default:
            return baseParams
@@ -2389,9 +2321,9 @@ Return ONLY the date string in YYYY-MM-DD format - no explanations, no quotes, n
    // Customer status and tier inputs
    statusId: { type: 'string', description: 'Status identifier' },
    statusName: { type: 'string', description: 'Status name' },
+    statusDisplayName: { type: 'string', description: 'Status display name' },
    statusColor: { type: 'string', description: 'Status color in hex format' },
    statusDescription: { type: 'string', description: 'Status description' },
-    statusDisplayName: { type: 'string', description: 'Status display name' },
    tierId: { type: 'string', description: 'Tier identifier' },
    tierName: { type: 'string', description: 'Tier name' },
    tierDisplayName: { type: 'string', description: 'Tier display name' },
--- a/apps/sim/blocks/blocks/translate.ts
+++ b/apps/sim/blocks/blocks/translate.ts
@@ -76,9 +76,8 @@ export const TranslateBlock: BlockConfig = {
        vertexProject: params.vertexProject,
        vertexLocation: params.vertexLocation,
        vertexCredential: params.vertexCredential,
-        bedrockAccessKeyId: params.bedrockAccessKeyId,
-        bedrockSecretKey: params.bedrockSecretKey,
        bedrockRegion: params.bedrockRegion,
+        bedrockSecretKey: params.bedrockSecretKey,
      }),
    },
  },
--- a/apps/sim/blocks/blocks/workflow.ts
+++ b/apps/sim/blocks/blocks/workflow.ts
@@ -42,7 +42,6 @@ export const WorkflowBlock: BlockConfig = {
  outputs: {
    success: { type: 'boolean', description: 'Execution success status' },
    childWorkflowName: { type: 'string', description: 'Child workflow name' },
-    childWorkflowId: { type: 'string', description: 'Child workflow ID' },
    result: { type: 'json', description: 'Workflow execution result' },
    error: { type: 'string', description: 'Error message' },
    childTraceSpans: {
--- a/apps/sim/blocks/blocks/workflow_input.ts
+++ b/apps/sim/blocks/blocks/workflow_input.ts
@@ -41,7 +41,6 @@ export const WorkflowInputBlock: BlockConfig = {
  outputs: {
    success: { type: 'boolean', description: 'Execution success status' },
    childWorkflowName: { type: 'string', description: 'Child workflow name' },
-    childWorkflowId: { type: 'string', description: 'Child workflow ID' },
    result: { type: 'json', description: 'Workflow execution result' },
    error: { type: 'string', description: 'Error message' },
    childTraceSpans: {
--- a/apps/sim/blocks/registry.ts
+++ b/apps/sim/blocks/registry.ts
@@ -2,7 +2,6 @@ import { A2ABlock } from '@/blocks/blocks/a2a'
 import { AgentBlock } from '@/blocks/blocks/agent'
 import { AhrefsBlock } from '@/blocks/blocks/ahrefs'
 import { AirtableBlock } from '@/blocks/blocks/airtable'
-import { AirweaveBlock } from '@/blocks/blocks/airweave'
 import { ApiBlock } from '@/blocks/blocks/api'
 import { ApiTriggerBlock } from '@/blocks/blocks/api_trigger'
 import { ApifyBlock } from '@/blocks/blocks/apify'
@@ -168,7 +167,6 @@ export const registry: Record<string, BlockConfig> = {
  agent: AgentBlock,
  ahrefs: AhrefsBlock,
  airtable: AirtableBlock,
-  airweave: AirweaveBlock,
  api: ApiBlock,
  api_trigger: ApiTriggerBlock,
  apify: ApifyBlock,
--- a/apps/sim/blocks/types.ts
+++ b/apps/sim/blocks/types.ts
@@ -51,7 +51,6 @@ export type SubBlockType =
  | 'code' // Code editor
  | 'switch' // Toggle button
  | 'tool-input' // Tool configuration
-  | 'skill-input' // Skill selection for agent blocks
  | 'checkbox-list' // Multiple selection
  | 'grouped-checkbox-list' // Grouped, scrollable checkbox list with select all
  | 'condition-input' // Conditional logic
@@ -208,7 +207,7 @@ export interface SubBlockConfig {
          not?: boolean
        }
      }
-    | ((values?: Record<string, unknown>) => {
+    | (() => {
        field: string
        value: string | number | boolean | Array<string | number | boolean>
        not?: boolean
@@ -261,7 +260,7 @@ export interface SubBlockConfig {
          not?: boolean
        }
      }
-    | ((values?: Record<string, unknown>) => {
+    | (() => {
        field: string
        value: string | number | boolean | Array<string | number | boolean>
        not?: boolean
--- a/apps/sim/blocks/utils.ts
+++ b/apps/sim/blocks/utils.ts
@@ -1,6 +1,6 @@
 import { isHosted } from '@/lib/core/config/feature-flags'
 import type { BlockOutput, OutputFieldDefinition, SubBlockConfig } from '@/blocks/types'
-import { getHostedModels, getProviderFromModel, providers } from '@/providers/utils'
+import { getHostedModels, providers } from '@/providers/utils'
 import { useProvidersStore } from '@/stores/providers/store'

 /**
@@ -48,54 +48,11 @@ const getCurrentOllamaModels = () => {
  return useProvidersStore.getState().providers.ollama.models
 }

-function buildModelVisibilityCondition(model: string, shouldShow: boolean) {
-  if (!model) {
-    return { field: 'model', value: '__no_model_selected__' }
-  }
-
-  return shouldShow ? { field: 'model', value: model } : { field: 'model', value: model, not: true }
-}
-
-function shouldRequireApiKeyForModel(model: string): boolean {
-  const normalizedModel = model.trim().toLowerCase()
-  if (!normalizedModel) return false
-
-  const hostedModels = getHostedModels()
-  const isHostedModel = hostedModels.some(
-    (hostedModel) => hostedModel.toLowerCase() === normalizedModel
-  )
-  if (isHosted && isHostedModel) return false
-
-  if (normalizedModel.startsWith('vertex/') || normalizedModel.startsWith('bedrock/')) {
-    return false
-  }
-
-  if (normalizedModel.startsWith('vllm/')) {
-    return false
-  }
-
-  const currentOllamaModels = getCurrentOllamaModels()
-  if (currentOllamaModels.some((ollamaModel) => ollamaModel.toLowerCase() === normalizedModel)) {
-    return false
-  }
-
-  if (!isHosted) {
-    try {
-      const providerId = getProviderFromModel(model)
-      if (
-        providerId === 'ollama' ||
-        providerId === 'vllm' ||
-        providerId === 'vertex' ||
-        providerId === 'bedrock'
-      ) {
-        return false
-      }
-    } catch {
-      // If model resolution fails, fall through and require an API key.
-    }
-  }
-
-  return true
+/**
+ * Helper to get current vLLM models from store
+ */
+const getCurrentVLLMModels = () => {
+  return useProvidersStore.getState().providers.vllm.models
 }

 /**
@@ -103,16 +60,27 @@ function shouldRequireApiKeyForModel(model: string): boolean {
 * Handles hosted vs self-hosted environments and excludes providers that don't need API key.
 */
 export function getApiKeyCondition() {
-  return (values?: Record<string, unknown>) => {
-    const model = typeof values?.model === 'string' ? values.model : ''
-    const shouldShow = shouldRequireApiKeyForModel(model)
-    return buildModelVisibilityCondition(model, shouldShow)
-  }
+  return isHosted
+    ? {
+        field: 'model',
+        value: [...getHostedModels(), ...providers.vertex.models, ...providers.bedrock.models],
+        not: true,
+      }
+    : () => ({
+        field: 'model',
+        value: [
+          ...getCurrentOllamaModels(),
+          ...getCurrentVLLMModels(),
+          ...providers.vertex.models,
+          ...providers.bedrock.models,
+        ],
+        not: true,
+      })
 }

 /**
 * Returns the standard provider credential subblocks used by LLM-based blocks.
- * This includes: Vertex AI OAuth, API Key, Azure (OpenAI + Anthropic), Vertex AI config, and Bedrock config.
+ * This includes: Vertex AI OAuth, API Key, Azure OpenAI, Vertex AI config, and Bedrock config.
 *
 * Usage: Spread into your block's subBlocks array after block-specific fields
 */
@@ -143,25 +111,25 @@ export function getProviderCredentialSubBlocks(): SubBlockConfig[] {
    },
    {
      id: 'azureEndpoint',
-      title: 'Azure Endpoint',
+      title: 'Azure OpenAI Endpoint',
      type: 'short-input',
      password: true,
-      placeholder: 'https://your-resource.services.ai.azure.com',
+      placeholder: 'https://your-resource.openai.azure.com',
      connectionDroppable: false,
      condition: {
        field: 'model',
-        value: [...providers['azure-openai'].models, ...providers['azure-anthropic'].models],
+        value: providers['azure-openai'].models,
      },
    },
    {
      id: 'azureApiVersion',
      title: 'Azure API Version',
      type: 'short-input',
-      placeholder: 'Enter API version',
+      placeholder: '2024-07-01-preview',
      connectionDroppable: false,
      condition: {
        field: 'model',
-        value: [...providers['azure-openai'].models, ...providers['azure-anthropic'].models],
+        value: providers['azure-openai'].models,
      },
    },
    {
@@ -234,7 +202,7 @@ export function getProviderCredentialSubBlocks(): SubBlockConfig[] {
 */
 export const PROVIDER_CREDENTIAL_INPUTS = {
  apiKey: { type: 'string', description: 'Provider API key' },
-  azureEndpoint: { type: 'string', description: 'Azure endpoint URL' },
+  azureEndpoint: { type: 'string', description: 'Azure OpenAI endpoint URL' },
  azureApiVersion: { type: 'string', description: 'Azure API version' },
  vertexProject: { type: 'string', description: 'Google Cloud project ID for Vertex AI' },
  vertexLocation: { type: 'string', description: 'Google Cloud location for Vertex AI' },
--- a/apps/sim/components/icons.tsx
+++ b/apps/sim/components/icons.tsx
@@ -1131,32 +1131,6 @@ export function AirtableIcon(props: SVGProps<SVGSVGElement>) {
  )
 }

-export function AirweaveIcon(props: SVGProps<SVGSVGElement>) {
-  return (
-    <svg
-      {...props}
-      width='143'
-      height='143'
-      viewBox='0 0 143 143'
-      fill='none'
-      xmlns='http://www.w3.org/2000/svg'
-    >
-      <path
-        d='M89.8854 128.872C79.9165 123.339 66.7502 115.146 60.5707 107.642L60.0432 107.018C58.7836 105.5 57.481 104.014 56.1676 102.593C51.9152 97.9641 47.3614 93.7978 42.646 90.2021C40.7405 88.7487 38.7704 87.3492 36.8111 86.0789C35.7991 85.4222 34.8302 84.8193 33.9151 84.2703C31.6221 82.903 28.8338 82.5263 26.2716 83.2476C23.8385 83.9366 21.89 85.5406 20.7596 87.7476C18.5634 92.0323 20.0814 97.3289 24.2046 99.805C27.5204 101.786 30.7608 104.111 33.8398 106.717C34.2381 107.05 34.3996 107.578 34.2596 108.062C33.1292 112.185 31.9989 118.957 31.5682 121.67C30.6424 127.429 33.4737 133.081 38.5982 135.751L38.7812 135.848C41.0204 137 43.6472 136.946 45.8219 135.697C47.9858 134.459 49.353 132.231 49.4822 129.733C49.536 128.657 49.6006 127.58 49.676 126.59C49.719 126.062 50.042 125.632 50.5264 125.459C50.6772 125.406 50.8494 125.373 51.0001 125.373C51.3554 125.373 51.6784 125.513 51.9475 125.782C56.243 130.185 60.8829 134.169 65.7167 137.625C70.3674 140.951 75.8686 142.706 81.639 142.706C83.7383 142.706 85.8376 142.469 87.8938 141.995L88.1199 141.942C90.9943 141.274 93.029 139.024 93.4488 136.085C93.8687 133.146 92.4476 130.315 89.8747 128.883H89.8639L89.8854 128.872Z'
-        fill='currentColor'
-      />
-      <path
-        d='M142.551 58.1747L142.529 58.0563C142.045 55.591 140.118 53.7069 137.598 53.2548C135.112 52.8134 132.754 53.8577 131.484 55.9893L131.408 56.1077C126.704 64.1604 120.061 71.6101 111.653 78.2956C109.446 80.0504 107.293 81.902 105.226 83.8075C103.644 85.2717 101.265 85.53 99.4452 84.4212C97.6474 83.3339 95.8495 82.1389 94.1055 80.8686C90.3268 78.1233 86.6772 74.9475 83.2753 71.4271C81.4989 69.597 79.798 67.6915 78.1939 65.7321C76.0408 63.1161 73.7477 60.5539 71.3685 58.1316C66.3195 52.9857 56.6089 45.9127 53.7453 43.878C53.3792 43.6304 53.1639 43.2428 53.0993 42.8014C53.0455 42.3601 53.1639 41.9509 53.4546 41.6064C55.274 39.4318 56.9965 37.1818 58.5683 34.921C60.2369 32.5311 60.786 29.6028 60.0862 26.8899C59.408 24.2523 57.6424 22.11 55.134 20.8827C50.9139 18.7942 45.8972 20.0968 43.2273 23.9293C40.8373 27.3636 38.0167 30.7332 34.8732 33.9306C34.5718 34.232 34.1304 34.3397 33.7213 34.1889C30.5239 33.1447 27.2296 32.2942 23.9461 31.659C23.7093 31.616 23.354 31.5514 22.9126 31.4975C16.4102 30.5286 10.1123 33.7798 7.21639 39.5717L7.1195 39.7548C6.18289 41.628 6.26902 43.8349 7.32405 45.6651C8.40061 47.5167 10.3277 48.701 12.4592 48.8194C13.4604 48.8732 14.4401 48.9378 15.3659 49.0024C15.7966 49.0347 16.1411 49.2823 16.3025 49.6914C16.4533 50.1112 16.3671 50.5419 16.0657 50.8541C12.147 54.8804 8.60515 59.1974 5.5262 63.6867C1.1446 70.0814 -0.481008 78.2095 1.08 85.9822L1.10154 86.1006C1.70441 89.0719 4.05131 91.2035 7.07644 91.5264C9.98315 91.8386 12.6099 90.3208 13.7619 87.6724L13.8265 87.5109C18.6925 75.8625 26.7559 65.5168 37.7907 56.7536C38.3182 56.3445 39.0072 56.28 39.567 56.5922C45.3373 59.768 50.8601 63.902 55.9738 68.8864C56.5982 69.4893 56.6089 70.5013 56.0168 71.1257C53.4761 73.8063 51.0862 76.6054 48.9115 79.469C47.2106 81.7083 47.5335 84.8949 49.6221 86.7358L53.3254 89.9977L53.2824 90.0409C53.8637 90.5576 54.445 91.0744 55.0264 91.5911L55.8123 92.194C56.9319 93.1844 58.3529 93.6365 59.8386 93.4858C61.3027 93.3351 62.67 92.56 63.5635 91.3758C65.1353 89.2873 66.8578 87.2525 68.6556 85.304C68.957 84.9702 69.3661 84.798 69.8075 84.7872C70.2705 84.7872 70.6257 84.9379 70.9164 85.2286C75.8147 90.0624 81.1114 94.3686 86.6772 97.9966C88.8626 99.4176 89.4978 102.26 88.1306 104.477C86.9248 106.448 85.7729 108.493 84.7179 110.539C83.5014 112.918 83.2968 115.738 84.1688 118.257C84.9978 120.68 86.7095 122.585 88.981 123.64C90.2514 124.232 91.5971 124.534 92.9859 124.534C96.5062 124.534 99.682 122.596 101.286 119.452C102.729 116.61 104.419 113.8 106.281 111.131C107.369 109.559 109.36 108.838 111.255 109.322C115.26 110.355 120.643 111.421 124.454 112.143C128.308 112.864 132.119 111.023 133.96 107.578L134.143 107.233C135.521 104.628 135.531 101.506 134.164 98.8901C132.786 96.2526 130.181 94.4655 127.21 94.121C126.478 94.0349 125.778 93.9488 125.11 93.8626C124.97 93.8411 124.852 93.8196 124.744 93.798L123.356 93.4751L124.357 92.4523C124.432 92.377 124.529 92.2801 124.658 92.194C128.771 88.8028 132.571 85.1963 135.962 81.4714C141.668 75.1951 144.122 66.4965 142.518 58.1747H142.529H142.551Z'
-        fill='currentColor'
-      />
-      <path
-        d='M56.6506 14.3371C65.5861 19.6338 77.4067 27.3743 82.9833 34.1674C83.64 34.9532 84.2967 35.7391 84.9534 36.4927C86.1591 37.8815 86.2991 39.8731 85.2979 41.4233C83.4892 44.2116 81.4115 46.9569 79.1399 49.5945C77.4713 51.5107 77.4067 54.3098 78.9785 56.2476L79.0431 56.323C79.2261 56.5598 79.4306 56.8074 79.6136 57.0442C81.2931 59.1758 83.0801 61.2213 84.9211 63.1375C85.9007 64.1603 87.2249 64.7309 88.6352 64.7309L88.7644 65.5275L88.7429 64.7309C90.207 64.6986 91.6173 64.0526 92.5969 62.933C94.8362 60.4031 96.9247 57.744 98.8302 55.0633C100.133 53.2224 102.63 52.8026 104.525 54.1052C106.463 55.4402 108.465 56.7105 110.457 57.8839C112.793 59.2511 115.614 59.5095 118.165 58.5621C120.749 57.604 122.762 55.5694 123.656 52.9533C125.055 48.9055 123.257 44.2547 119.382 41.9078C116.755 40.3145 114.15 38.5166 111.674 36.5788C110.382 35.5561 109.833 33.8767 110.296 32.2941C111.437 28.3001 112.481 23.1218 113.148 19.4831C113.837 15.7259 112.147 11.8826 108.939 9.94477L108.562 9.72944C105.871 8.12537 102.587 8.00696 99.7668 9.40649C96.9247 10.8168 95.03 13.5405 94.6855 16.6733L94.6639 16.867C94.6209 17.2546 94.384 17.5453 94.018 17.6637C93.652 17.7821 93.2859 17.6852 93.0168 17.4269C89.0012 13.1422 84.738 9.25576 80.3134 5.8646C74.3708 1.31075 66.7811 -0.583999 59.4928 0.675575L59.1805 0.729423C56.1124 1.2677 53.7547 3.60383 53.1949 6.68279C52.6351 9.72946 53.9915 12.7223 56.6722 14.3048H56.6614L56.6506 14.3371Z'
-        fill='currentColor'
-      />
-    </svg>
-  )
-}
-
 export function GoogleDocsIcon(props: SVGProps<SVGSVGElement>) {
  return (
    <svg
@@ -5462,24 +5436,3 @@ export function EnrichSoIcon(props: SVGProps<SVGSVGElement>) {
    </svg>
  )
 }
-
-export function AgentSkillsIcon(props: SVGProps<SVGSVGElement>) {
-  return (
-    <svg
-      {...props}
-      xmlns='http://www.w3.org/2000/svg'
-      width='16'
-      height='16'
-      viewBox='0 0 16 16'
-      fill='none'
-    >
-      <path
-        d='M8 1L14.0622 4.5V11.5L8 15L1.93782 11.5V4.5L8 1Z'
-        stroke='currentColor'
-        strokeWidth='1.5'
-        fill='none'
-      />
-      <path d='M8 4.5L11 6.25V9.75L8 11.5L5 9.75V6.25L8 4.5Z' fill='currentColor' />
-    </svg>
-  )
-}
--- a/apps/sim/ee/access-control/components/access-control.tsx
+++ b/apps/sim/ee/access-control/components/access-control.tsx
@@ -367,12 +367,6 @@ export function AccessControl() {
        category: 'Tools',
        configKey: 'disableCustomTools' as const,
      },
-      {
-        id: 'disable-skills',
-        label: 'Skills',
-        category: 'Tools',
-        configKey: 'disableSkills' as const,
-      },
      {
        id: 'hide-trace-spans',
        label: 'Trace Spans',
@@ -956,7 +950,6 @@ export function AccessControl() {
                            !editingConfig?.hideFilesTab &&
                            !editingConfig?.disableMcpTools &&
                            !editingConfig?.disableCustomTools &&
-                            !editingConfig?.disableSkills &&
                            !editingConfig?.hideTraceSpans &&
                            !editingConfig?.disableInvitations &&
                            !editingConfig?.hideDeployApi &&
@@ -976,7 +969,6 @@ export function AccessControl() {
                                  hideFilesTab: allVisible,
                                  disableMcpTools: allVisible,
                                  disableCustomTools: allVisible,
-                                  disableSkills: allVisible,
                                  hideTraceSpans: allVisible,
                                  disableInvitations: allVisible,
                                  hideDeployApi: allVisible,
@@ -997,7 +989,6 @@ export function AccessControl() {
                        !editingConfig?.hideFilesTab &&
                        !editingConfig?.disableMcpTools &&
                        !editingConfig?.disableCustomTools &&
-                        !editingConfig?.disableSkills &&
                        !editingConfig?.hideTraceSpans &&
                        !editingConfig?.disableInvitations &&
                        !editingConfig?.hideDeployApi &&
--- a/Show More
+++ b/Show More