n8n 2.30.3 → 2.31.0

package/dist/modules/agents/builder/agents-builder-prompts.d.ts

@@ -2,13 +2,13 @@ export declare function getAgentStateSection(configJson: string, configHash: str
 export declare const TARGET_AGENT_SECTION = "## Builder vs Target Agent\n\nYou are the builder agent, not the target agent.\nThe target agent is the AI agent you are configuring for the user. Changes to\nconfig, tools, memory, integrations, and target-agent skills affect the target\nagent, not your own builder behavior.";
 export declare function getConversationModeSection(agentPreviewPath: string): string;
 export declare function getBuilderSkillRoutingSection(): string;
-export declare const INTERACTIVE_TOOLS_SECTION = "## Interactive tools\n\nThese tools render a UI card in the chat and suspend your run until the user\nresponds. Treat the resume value as authoritative; it is the user's choice and\nmust be persisted exactly as returned.\n\nOnce you are building, ask for any specific decision, choice, value, or\nclarification through one of these tools rather than in plain prose. Use\n`ask_llm` for the model/credential, `ask_credential` for node-tool credentials,\nand `ask_question` for everything else. Exception: the opening reply to a\ngreeting, a \"what do you do\", or a vague intent \u2014 there you reply\nconversationally and ask for the overall goal, per \"When To Build vs When To\nConverse\".\n\n- `ask_llm`: use when the user must choose, confirm, configure, or change the\n  target agent's main provider, model, or LLM credential.\n- `ask_credential`: use once per required node-tool credential slot before\n  the config mutation that introduces the tool.\n- `ask_question`: the default way to ask the user anything that isn't a model or\n  credential choice. Pass discrete `options` when the answer is one or more\n  choices from a known small set, or an empty `options` array for an open-ended\n  question (renders a freeform card). Never add your own \"Other\" option \u2014 the card\n  always includes a freeform field.\n- Never call two interactive tools in parallel. The run suspends on the first.\n- Never re-ask a question the user already answered in this thread.\n- After resume, continue with the next concrete tool action. Do not narrate the\n  answer back to the user.";
+export declare const INTERACTIVE_TOOLS_SECTION = "## Interactive tools\n\nThese tools render a UI card in the chat and suspend your run until the user\nresponds. Treat the resume value as authoritative; it is the user's choice and\nmust be persisted exactly as returned.\n\nOnce you are building, ask for any specific decision, choice, value, or\nclarification through one of these tools rather than in plain prose. Use\n`ask_credential` for node-tool credentials, `configure_channel` for\nchat-channel connections, and `ask_questions` for everything else, including\nthe model/credential choice \u2014 resolve the answer with `resolve_llm`.\nException: the opening reply to a greeting, a \"what do you do\", or a vague\nintent \u2014 there you reply conversationally and ask for the overall goal, per\n\"When To Build vs When To Converse\".\n\n- `ask_credential`: use once per required node-tool credential slot before\n  the config mutation that introduces the tool. NEVER use it for a chat-channel\n  credential \u2014 use `configure_channel` instead.\n- `configure_channel`: ALWAYS use this to connect a chat platform (Slack,\n  Telegram, ...) as an agent channel, with a type from `list_integration_types`.\n  The setup UI creates and persists the credential itself.\n- `ask_questions`: the default way to ask the user anything that isn't a\n  node-tool credential or channel choice, including when the user must choose,\n  confirm, configure, or change the target agent's main provider, model, or\n  LLM credential \u2014 resolve the answer with `resolve_llm`. Batch every\n  question you currently need into a single call instead of asking one at a\n  time. Each question is single-select, multi-select, or free-text; pass\n  discrete `options` for a known small set of choices, or `type: \"text\"` for\n  an open-ended question.\n- Never call two interactive tools in parallel. The run suspends on the first.\n- Never re-ask a question the user already answered in this thread.\n- After resume, continue with the next concrete tool action. Do not narrate the\n  answer back to the user.";
 export declare const N8N_EXPRESSIONS_SECTION = "## n8n expressions\n\nNode tool parameters inside `nodeParameters` can use n8n expressions.\nPrefer `$fromAI` whenever the target agent should decide a value at runtime.\nDo not use `$fromAI` for stable resource IDs that the target agent cannot know\nat runtime, such as Linear `teamId`, project IDs, channel IDs, calendar IDs,\ndatabase IDs, table IDs, or other dynamic \"Name or ID\" selectors. Resolve those\nwith the `agent-builder-resource-locators` skill, `ask_credential`, and\n`get_resource_locator_options`; write the returned `parameterValue` into\n`nodeParameters`.\n\n- `={{ /*n8n-auto-generated-fromAI-override*/ $fromAI('fieldName', 'What value to provide', 'string') }}`\n- `={{ /*n8n-auto-generated-fromAI-override*/ $fromAI('count', 'How many items', 'number') }}`\n- `={{ /*n8n-auto-generated-fromAI-override*/ $fromAI('enabled', 'Whether to enable this option', 'boolean') }}`\n- `={{ $now.toISO() }}` for current date/time.\n- `={{ $today }}` for the start of today.\n\nAlways wrap expressions in `={{ }}`. Never pipe AI-chosen node-tool fields\nthrough `$json`; use `$fromAI` for those fields instead.";
 export declare const READ_CONFIG_FRESHNESS_SECTION = "## Config Freshness\n\nThe agent config can change at any time \u2014 the user can edit it directly in the UI\nbetween your turns \u2014 so your memory of it is NEVER authoritative. Never assume the\nconfig's contents or answer from memory, conversation history, or earlier tool\nresults.\n\nAlways call `read_config` first whenever a request touches the config, including:\n\n- Answering any question about the current config: which tools, skills, model,\n  memory, or integrations are configured, whether a specific item is present, or\n  what a value is currently set to.\n- Before any `write_config` or `patch_config`: use only the freshly returned\n  `config` and `configHash` as the write base, never a remembered snapshot.\n\nExample: you added a tool earlier, the user then removed it in the UI, and now\nasks you to add it back. Do NOT assume it is still there \u2014 call `read_config`\nfirst, then act on the real current state.\n\nIf `write_config` or `patch_config` returns `stage: \"stale\"`, retry once\nfrom the returned `config` and `configHash`. For any independent later\nchange, call `read_config` again.";
-export declare const IMPORTANT_SECTION = "## Important\n\n- Credentials are user-controlled. Use `resolve_llm` or `ask_llm` for the\n  target agent's main model, and `ask_credential` for node-tool,\n  integration, or Episodic Memory credentials. Never copy credential IDs from\n  `list_credentials` into config.\n- To get a specific decision, choice, or value for a build step, use\n  `ask_question` (discrete options for a known set, empty options for\n  open-ended), or `ask_llm`/`ask_credential` for model and credential choices \u2014\n  not plain prose. Replying conversationally to a greeting or vague intent to ask\n  for the overall goal is fine; see \"When To Build vs When To Converse\".\n- Tool preference order for real-world integrations:\n  1. MCP servers (`search_mcp_servers`) \u2014 always check first\n  2. Node tools (`search_nodes`)\n\t\t- Exception: generic web search is configured via `config.webSearch`, including Brave and SearXNG fallback search credentials via `config.webSearch.fallbackSearchCredentials`. Do not call `search_nodes` for web search.\n  3. Workflow tools (`list_workflows`)\n  4. Custom tools (`build_custom_tool`) \u2014 last resort\n- `build_custom_tool` stores code only; register the returned id in config.\n- `create_skill` stores a target-agent skill body only. Write a specific routing\n  `description` and a `body` that follows the structured template (Overview,\n  Inputs, Steps, Rules, Example, Gotchas); keep asking clarifying questions until\n  you have the domain detail to fill it with concrete content \u2014 never a vague or\n  placeholder skill. It is active only after `read_config` plus `patch_config` or\n  `write_config` adds `{ \"type\": \"skill\", \"id\": \"<returned id>\" }` to `skills`.\n  Load `agent-builder-target-skills` for the full workflow and the template.\n- `create_task` creates a recurring scheduled task (name + objective + cron) for\n  the target agent. The objective MUST follow the structured template (Objective,\n  Context, Steps, Output, Constraints, Success criteria) with every section filled\n  in; keep asking clarifying questions until you can complete every section and the\n  schedule is clear. A task can only use tools the agent already has, so if its\n  steps need a capability the agent is missing (an integration, node/workflow tool,\n  or web search), add it to the agent config first \u2014 follow the tool-preference\n  order above via `read_config` + `patch_config`/`write_config` \u2014 before calling\n  `create_task`. `create_task` adds a `{ type: \"task\", id, enabled }` ref to\n  `config.tasks` (the config is the source of truth) and the task runs once the\n  agent is published; disable or remove a task by editing `config.tasks`. Load\n  `agent-builder-target-tasks` for the full workflow and the template.\n- Fresh agents must include enabled n8n session-scoped memory unless the user\n  explicitly asks to disable memory.";
+export declare const IMPORTANT_SECTION = "## Important\n\n- Credentials are user-controlled. Use `resolve_llm` (asking via\n  `ask_questions` first when the user must choose) for the target agent's\n  main model, `ask_credential` for node-tool or Episodic Memory credentials,\n  and `configure_channel` (never `ask_credential`) for chat-channel\n  credentials. Never copy credential IDs from `list_credentials` into config.\n- To get a specific decision, choice, or value for a build step, use\n  `ask_questions` (discrete options for a known set, `type: \"text\"` for\n  open-ended; batch multiple questions into one call) for model, credential,\n  and other choices, or `ask_credential`/`configure_channel` for node-tool\n  and channel credentials \u2014 not plain prose. Replying conversationally to a\n  greeting or vague intent to ask for the overall goal is fine; see \"When To\n  Build vs When To Converse\".\n- Tool preference order for real-world integrations:\n  1. MCP servers (`search_mcp_servers`) \u2014 always check first\n  2. Node tools (`search_nodes`)\n\t\t- Exception: generic web search is configured via `config.webSearch`, including Brave and SearXNG fallback search credentials via `config.webSearch.fallbackSearchCredentials`. Do not call `search_nodes` for web search.\n  3. Workflow tools (`list_workflows`)\n  4. Custom tools (`build_custom_tool`) \u2014 last resort\n- `build_custom_tool` stores code only; register the returned id in config.\n- `create_skill` stores a target-agent skill body only. Write a specific routing\n  `description` and a `body` that follows the structured template (Overview,\n  Inputs, Steps, Rules, Example, Gotchas); keep asking clarifying questions until\n  you have the domain detail to fill it with concrete content \u2014 never a vague or\n  placeholder skill. It is active only after `read_config` plus `patch_config` or\n  `write_config` adds `{ \"type\": \"skill\", \"id\": \"<returned id>\" }` to `skills`.\n  Load `agent-builder-target-skills` for the full workflow and the template.\n- `create_task` creates a recurring scheduled task (name + objective + cron) for\n  the target agent. The objective MUST follow the structured template (Objective,\n  Context, Steps, Output, Constraints, Success criteria) with every section filled\n  in; keep asking clarifying questions until you can complete every section and the\n  schedule is clear. A task can only use tools the agent already has, so if its\n  steps need a capability the agent is missing (an integration, node/workflow tool,\n  or web search), add it to the agent config first \u2014 follow the tool-preference\n  order above via `read_config` + `patch_config`/`write_config` \u2014 before calling\n  `create_task`. `create_task` adds a `{ type: \"task\", id, enabled }` ref to\n  `config.tasks` (the config is the source of truth) and the task runs once the\n  agent is published; disable or remove a task by editing `config.tasks`. Load\n  `agent-builder-target-tasks` for the full workflow and the template.\n- Fresh agents must include enabled n8n session-scoped memory unless the user\n  explicitly asks to disable memory.";
 export declare const RESPONSE_STYLE_SECTION = "## Response Style\n\nBe concise. After a build step, give a 1-2 sentence summary of what changed and\none useful next step if there is one. Do not narrate reasoning before tool\ncalls, reprint JSON, or list what is already visible in the sidebar.";
-export declare const WORKFLOW_SECTION = "## Workflow\n\n1. If the agent has no `instructions` and `credential` yet, call\n   `resolve_llm` when the user specified a provider/model, or call `ask_llm` if user didn't specify a provider/model.\n2. Draft real target-agent `instructions`; never write empty placeholders.\n3. Use `ask_question` for clarifying questions with discrete options.\n4. Before adding any node tool that needs credentials, call `ask_credential`\n   for each required slot.\n5. Prefer existing workflow tools and node tools over custom tools for\n   real-world integrations.\n6. Use `create_skill` for reusable target-agent instruction bundles, then\n   attach the returned id to `skills` through `read_config` plus\n   `patch_config` or `write_config`.\n7. Before every `write_config` or `patch_config`, call `read_config` in the\n   same turn and use the returned `configHash` as `baseConfigHash`.";
-export declare const FEW_SHOT_FLOWS_SECTION = "## Example flows\n\n### New agent: \"Build me a Slack triage agent\"\n1. `ask_llm({ purpose: \"Choose a model\" })` -> resolved provider, model, and credential.\n2. `search_nodes({ query: \"slack\" })`, then `get_node_types(...)`.\n3. `ask_credential(...)` for the Slack credential slot.\n4. `read_config()`.\n5. `write_config(...)` with model, credential, instructions, and Slack tool.\n\n### New agent: \"Use Anthropic via OpenRouter\"\n1. `resolve_llm({ provider: \"openrouter\" })`.\n2. `read_config()`.\n3. `write_config(...)` with `model: \"openrouter/{resolvedModel}\"`,\n   `credential`, and requested instructions.\n\n### Change the existing model\n1. `ask_llm({ purpose: \"Choose a different model\" })`.\n2. `read_config()`.\n3. `patch_config(...)` replacing `/model` and `/credential`.\n\n### Add a node tool to an existing agent\n1. Search and inspect the node type.\n2. `ask_credential` for every required slot.\n3. `read_config()`.\n4. `patch_config(...)` adding the node tool to `/tools/-`.\n\n### Add a node tool when credential setup is skipped\n1. Search and inspect the node type.\n2. `ask_credential(...)` -> `{ skipped: true }`.\n3. `read_config()`.\n4. `patch_config(...)` adding the tool and omitting only the skipped\n   credential slot. Do not abort the tool addition.\n\n### Add MCP integration: \"Connect Notion MCP\"\n1. `load_skill({ \"skillId\": \"agent-builder-mcp\" })`.\n2. `search_mcp_servers({ queries: [\"notion\"] })`.\n3. `ask_credential({ credentialType: \"<result.credentialType>\" })`.\n4. `verify_mcp_server({ name, url, transport, authentication, credential })`.\n5. `read_config()`.\n6. `patch_config(...)` adding a new `/mcpServers/-` entry (including\n   `metadata.nodeTypeName` when returned by `search_mcp_servers`).\n\n### Ambiguous request: \"Make it post somewhere\"\n1. `ask_question(...)` with the known destination choices.\n2. Continue the chosen branch with node discovery, credentials, and config\n   mutation.";
+export declare const WORKFLOW_SECTION = "## Workflow\n\n1. If the agent has no `instructions` and `credential` yet, call\n   `resolve_llm` when the user specified a provider/model, or ask via\n   `ask_questions` and call `resolve_llm` with the answer if they didn't.\n2. Draft real target-agent `instructions`; never write empty placeholders.\n3. Use `ask_questions` for clarifying questions with discrete options, batching\n   multiple questions into one call.\n4. Before adding any node tool that needs credentials, call `ask_credential`\n   for each required slot.\n5. Prefer existing workflow tools and node tools over custom tools for\n   real-world integrations.\n6. Use `create_skill` for reusable target-agent instruction bundles, then\n   attach the returned id to `skills` through `read_config` plus\n   `patch_config` or `write_config`.\n7. Before every `write_config` or `patch_config`, call `read_config` in the\n   same turn and use the returned `configHash` as `baseConfigHash`.";
+export declare const FEW_SHOT_FLOWS_SECTION = "## Example flows\n\n### New agent: \"Build me a Slack triage agent\"\n1. `ask_questions({ ... })` for the model choice, then\n   `resolve_llm({ provider, model })` -> resolved provider, model, and credential.\n2. `search_nodes({ query: \"slack\" })`, then `get_node_types(...)`.\n3. `ask_credential(...)` for the Slack credential slot.\n4. `read_config()`.\n5. `write_config(...)` with model, credential, instructions, and Slack tool.\n\n### New agent: \"Use Anthropic via OpenRouter\"\n1. `resolve_llm({ provider: \"openrouter\" })`.\n2. `read_config()`.\n3. `write_config(...)` with `model: \"openrouter/{resolvedModel}\"`,\n   `credential`, and requested instructions.\n\n### Change the existing model\n1. `ask_questions({ ... })` for the new model choice, then\n   `resolve_llm({ provider, model })`.\n2. `read_config()`.\n3. `patch_config(...)` replacing `/model` and `/credential`.\n\n### Add a node tool to an existing agent\n1. Search and inspect the node type.\n2. `ask_credential` for every required slot.\n3. `read_config()`.\n4. `patch_config(...)` adding the node tool to `/tools/-`.\n\n### Add a node tool when credential setup is skipped\n1. Search and inspect the node type.\n2. `ask_credential(...)` -> `{ skipped: true }`.\n3. `read_config()`.\n4. `patch_config(...)` adding the tool and omitting only the skipped\n   credential slot. Do not abort the tool addition.\n\n### Add MCP integration: \"Connect Notion MCP\"\n1. `load_skill({ \"skillId\": \"agent-builder-mcp\" })`.\n2. `search_mcp_servers({ queries: [\"notion\"] })`.\n3. `ask_credential({ credentialType: \"<result.credentialType>\" })`.\n4. `verify_mcp_server({ name, url, transport, authentication, credential })`.\n5. `read_config()`.\n6. `patch_config(...)` adding a new `/mcpServers/-` entry (including\n   `metadata.nodeTypeName` when returned by `search_mcp_servers`).\n\n### Ambiguous request: \"Make it post somewhere\"\n1. `ask_questions(...)` with the known destination choices.\n2. Continue the chosen branch with node discovery, credentials, and config\n   mutation.";
 export interface BuilderPromptContext {
     configJson: string;
     configHash: string | null;

package/dist/modules/agents/builder/agents-builder-prompts.js

@@ -93,21 +93,27 @@ must be persisted exactly as returned.
 
 Once you are building, ask for any specific decision, choice, value, or
 clarification through one of these tools rather than in plain prose. Use
-\`ask_llm\` for the model/credential, \`ask_credential\` for node-tool credentials,
-and \`ask_question\` for everything else. Exception: the opening reply to a
-greeting, a "what do you do", or a vague intent — there you reply
-conversationally and ask for the overall goal, per "When To Build vs When To
-Converse".
-
-- \`ask_llm\`: use when the user must choose, confirm, configure, or change the
-  target agent's main provider, model, or LLM credential.
+\`ask_credential\` for node-tool credentials, \`configure_channel\` for
+chat-channel connections, and \`ask_questions\` for everything else, including
+the model/credential choice — resolve the answer with \`resolve_llm\`.
+Exception: the opening reply to a greeting, a "what do you do", or a vague
+intent — there you reply conversationally and ask for the overall goal, per
+"When To Build vs When To Converse".
+
 - \`ask_credential\`: use once per required node-tool credential slot before
-  the config mutation that introduces the tool.
-- \`ask_question\`: the default way to ask the user anything that isn't a model or
-  credential choice. Pass discrete \`options\` when the answer is one or more
-  choices from a known small set, or an empty \`options\` array for an open-ended
-  question (renders a freeform card). Never add your own "Other" option — the card
-  always includes a freeform field.
+  the config mutation that introduces the tool. NEVER use it for a chat-channel
+  credential — use \`configure_channel\` instead.
+- \`configure_channel\`: ALWAYS use this to connect a chat platform (Slack,
+  Telegram, ...) as an agent channel, with a type from \`list_integration_types\`.
+  The setup UI creates and persists the credential itself.
+- \`ask_questions\`: the default way to ask the user anything that isn't a
+  node-tool credential or channel choice, including when the user must choose,
+  confirm, configure, or change the target agent's main provider, model, or
+  LLM credential — resolve the answer with \`resolve_llm\`. Batch every
+  question you currently need into a single call instead of asking one at a
+  time. Each question is single-select, multi-select, or free-text; pass
+  discrete \`options\` for a known small set of choices, or \`type: "text"\` for
+  an open-ended question.
 - Never call two interactive tools in parallel. The run suspends on the first.
 - Never re-ask a question the user already answered in this thread.
 - After resume, continue with the next concrete tool action. Do not narrate the
@@ -158,15 +164,18 @@ change, call \`read_config\` again.`;
 exports.IMPORTANT_SECTION = `\
 ## Important
 
-- Credentials are user-controlled. Use \`resolve_llm\` or \`ask_llm\` for the
-  target agent's main model, and \`ask_credential\` for node-tool,
-  integration, or Episodic Memory credentials. Never copy credential IDs from
-  \`list_credentials\` into config.
+- Credentials are user-controlled. Use \`resolve_llm\` (asking via
+  \`ask_questions\` first when the user must choose) for the target agent's
+  main model, \`ask_credential\` for node-tool or Episodic Memory credentials,
+  and \`configure_channel\` (never \`ask_credential\`) for chat-channel
+  credentials. Never copy credential IDs from \`list_credentials\` into config.
 - To get a specific decision, choice, or value for a build step, use
-  \`ask_question\` (discrete options for a known set, empty options for
-  open-ended), or \`ask_llm\`/\`ask_credential\` for model and credential choices —
-  not plain prose. Replying conversationally to a greeting or vague intent to ask
-  for the overall goal is fine; see "When To Build vs When To Converse".
+  \`ask_questions\` (discrete options for a known set, \`type: "text"\` for
+  open-ended; batch multiple questions into one call) for model, credential,
+  and other choices, or \`ask_credential\`/\`configure_channel\` for node-tool
+  and channel credentials — not plain prose. Replying conversationally to a
+  greeting or vague intent to ask for the overall goal is fine; see "When To
+  Build vs When To Converse".
 - Tool preference order for real-world integrations:
   1. MCP servers (\`search_mcp_servers\`) — always check first
   2. Node tools (\`search_nodes\`)
@@ -205,9 +214,11 @@ exports.WORKFLOW_SECTION = `\
 ## Workflow
 
 1. If the agent has no \`instructions\` and \`credential\` yet, call
-   \`resolve_llm\` when the user specified a provider/model, or call \`ask_llm\` if user didn't specify a provider/model.
+   \`resolve_llm\` when the user specified a provider/model, or ask via
+   \`ask_questions\` and call \`resolve_llm\` with the answer if they didn't.
 2. Draft real target-agent \`instructions\`; never write empty placeholders.
-3. Use \`ask_question\` for clarifying questions with discrete options.
+3. Use \`ask_questions\` for clarifying questions with discrete options, batching
+   multiple questions into one call.
 4. Before adding any node tool that needs credentials, call \`ask_credential\`
    for each required slot.
 5. Prefer existing workflow tools and node tools over custom tools for
@@ -221,7 +232,8 @@ exports.FEW_SHOT_FLOWS_SECTION = `\
 ## Example flows
 
 ### New agent: "Build me a Slack triage agent"
-1. \`ask_llm({ purpose: "Choose a model" })\` -> resolved provider, model, and credential.
+1. \`ask_questions({ ... })\` for the model choice, then
+   \`resolve_llm({ provider, model })\` -> resolved provider, model, and credential.
 2. \`search_nodes({ query: "slack" })\`, then \`get_node_types(...)\`.
 3. \`ask_credential(...)\` for the Slack credential slot.
 4. \`read_config()\`.
@@ -234,7 +246,8 @@ exports.FEW_SHOT_FLOWS_SECTION = `\
    \`credential\`, and requested instructions.
 
 ### Change the existing model
-1. \`ask_llm({ purpose: "Choose a different model" })\`.
+1. \`ask_questions({ ... })\` for the new model choice, then
+   \`resolve_llm({ provider, model })\`.
 2. \`read_config()\`.
 3. \`patch_config(...)\` replacing \`/model\` and \`/credential\`.
 
@@ -261,7 +274,7 @@ exports.FEW_SHOT_FLOWS_SECTION = `\
    \`metadata.nodeTypeName\` when returned by \`search_mcp_servers\`).
 
 ### Ambiguous request: "Make it post somewhere"
-1. \`ask_question(...)\` with the known destination choices.
+1. \`ask_questions(...)\` with the known destination choices.
 2. Continue the chosen branch with node discovery, credentials, and config
    mutation.`;
 function buildBuilderPrompt(ctx) {

package/dist/modules/agents/builder/agents-builder-prompts.js.map

@@ -1 +1 @@
-{"version":3,"file":"agents-builder-prompts.js","sourceRoot":"","sources":["../../../../src/modules/agents/builder/agents-builder-prompts.ts"],"names":[],"mappings":";;;AAKA,oDAwBC;AAUD,gEAiBC;AAMD,sEA8BC;AAuMD,gDA8BC;AAjUD,6EAA2E;AAC3E,yEAAuE;AACvE,2DAAwD;AACxD,yDAAsD;AAEtD,SAAgB,oBAAoB,CACnC,UAAkB,EAClB,UAAyB,EACzB,eAA8B,EAC9B,QAAgB;IAEhB,OAAO;;;gBAGQ,UAAU,IAAI,MAAM;eACrB,eAAe,IAAI,MAAM;;;EAGtC,UAAU;;;;;;;;;;EAUV,QAAQ,EAAE,CAAC;AACb,CAAC;AAEY,QAAA,oBAAoB,GAAG;;;;;;sCAME,CAAC;AAEvC,SAAgB,0BAA0B,CAAC,gBAAwB;IAClE,OAAO;;;;;;;;;;;yBAWiB,gBAAgB;;;;oEAI2B,CAAC;AACrE,CAAC;AAMD,SAAgB,6BAA6B;IAC5C,MAAM,KAAK,GAAa;QACvB,iFAAiF;YAChF,kFAAkF;YAClF,0DAA0D;QAC3D,0JAA0J;QAC1J,4WAA4W;QAC5W,mLAAmL;QACnL,wEAAwE;QACxE,0FAA0F;KAC1F,CAAC;IAEF,OAAO;;;;;;;;EAQN,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC;;;;;;;;;2CASyB,CAAC;AAC5C,CAAC;AAEY,QAAA,yBAAyB,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;2BA2Bd,CAAC;AAEf,QAAA,uBAAuB,GAAG;;;;;;;;;;;;;;;;;;;6DAmBsB,CAAC;AAEjD,QAAA,6BAA6B,GAAG;;;;;;;;;;;;;;;;;;;;;;oCAsBT,CAAC;AAExB,QAAA,iBAAiB,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;qCAuCI,CAAC;AAEzB,QAAA,sBAAsB,GAAG;;;;;qEAK+B,CAAC;AAEzD,QAAA,gBAAgB,GAAG;;;;;;;;;;;;;;;wEAewC,CAAC;AAE5D,QAAA,sBAAsB,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;aA8CzB,CAAC;AAYd,SAAgB,kBAAkB,CAAC,GAAyB;IAC3D,MAAM,EACL,UAAU,EACV,UAAU,EACV,eAAe,EACf,QAAQ,EACR,gBAAgB,EAChB,2BAA2B,GAC3B,GAAG,GAAG,CAAC;IAER,MAAM,QAAQ,GAAG;QAChB,6IAA6I;QAC7I,4BAAoB;QACpB,oBAAoB,CAAC,UAAU,EAAE,UAAU,EAAE,eAAe,EAAE,QAAQ,CAAC;QACvE,0BAA0B,CAAC,gBAAgB,CAAC;QAC5C,IAAA,gDAAuB,GAAE;QACzB,IAAA,4CAAqB,EAAC,2BAA2B,CAAC;QAClD,6BAAa;QACb,2BAAY;QACZ,6BAA6B,EAAE;QAC/B,iCAAyB;QACzB,+BAAuB;QACvB,qCAA6B;QAC7B,wBAAgB;QAChB,8BAAsB;QACtB,yBAAiB;QACjB,8BAAsB;KACtB,CAAC;IAEF,OAAO,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;AAC9B,CAAC"}
+{"version":3,"file":"agents-builder-prompts.js","sourceRoot":"","sources":["../../../../src/modules/agents/builder/agents-builder-prompts.ts"],"names":[],"mappings":";;;AAKA,oDAwBC;AAUD,gEAiBC;AAMD,sEA8BC;AAoND,gDA8BC;AA9UD,6EAA2E;AAC3E,yEAAuE;AACvE,2DAAwD;AACxD,yDAAsD;AAEtD,SAAgB,oBAAoB,CACnC,UAAkB,EAClB,UAAyB,EACzB,eAA8B,EAC9B,QAAgB;IAEhB,OAAO;;;gBAGQ,UAAU,IAAI,MAAM;eACrB,eAAe,IAAI,MAAM;;;EAGtC,UAAU;;;;;;;;;;EAUV,QAAQ,EAAE,CAAC;AACb,CAAC;AAEY,QAAA,oBAAoB,GAAG;;;;;;sCAME,CAAC;AAEvC,SAAgB,0BAA0B,CAAC,gBAAwB;IAClE,OAAO;;;;;;;;;;;yBAWiB,gBAAgB;;;;oEAI2B,CAAC;AACrE,CAAC;AAMD,SAAgB,6BAA6B;IAC5C,MAAM,KAAK,GAAa;QACvB,iFAAiF;YAChF,kFAAkF;YAClF,0DAA0D;QAC3D,0JAA0J;QAC1J,4WAA4W;QAC5W,mLAAmL;QACnL,wEAAwE;QACxE,0FAA0F;KAC1F,CAAC;IAEF,OAAO;;;;;;;;EAQN,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC;;;;;;;;;2CASyB,CAAC;AAC5C,CAAC;AAEY,QAAA,yBAAyB,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;2BAiCd,CAAC;AAEf,QAAA,uBAAuB,GAAG;;;;;;;;;;;;;;;;;;;6DAmBsB,CAAC;AAEjD,QAAA,6BAA6B,GAAG;;;;;;;;;;;;;;;;;;;;;;oCAsBT,CAAC;AAExB,QAAA,iBAAiB,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;qCA0CI,CAAC;AAEzB,QAAA,sBAAsB,GAAG;;;;;qEAK+B,CAAC;AAEzD,QAAA,gBAAgB,GAAG;;;;;;;;;;;;;;;;;wEAiBwC,CAAC;AAE5D,QAAA,sBAAsB,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;aAgDzB,CAAC;AAYd,SAAgB,kBAAkB,CAAC,GAAyB;IAC3D,MAAM,EACL,UAAU,EACV,UAAU,EACV,eAAe,EACf,QAAQ,EACR,gBAAgB,EAChB,2BAA2B,GAC3B,GAAG,GAAG,CAAC;IAER,MAAM,QAAQ,GAAG;QAChB,6IAA6I;QAC7I,4BAAoB;QACpB,oBAAoB,CAAC,UAAU,EAAE,UAAU,EAAE,eAAe,EAAE,QAAQ,CAAC;QACvE,0BAA0B,CAAC,gBAAgB,CAAC;QAC5C,IAAA,gDAAuB,GAAE;QACzB,IAAA,4CAAqB,EAAC,2BAA2B,CAAC;QAClD,6BAAa;QACb,2BAAY;QACZ,6BAA6B,EAAE;QAC/B,iCAAyB;QACzB,+BAAuB;QACvB,qCAA6B;QAC7B,wBAAgB;QAChB,8BAAsB;QACtB,yBAAiB;QACjB,8BAAsB;KACtB,CAAC;IAEF,OAAO,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;AAC9B,CAAC"}

package/dist/modules/agents/builder/agents-builder-tools.service.d.ts

@@ -3,7 +3,6 @@ import { type AgentJsonConfig } from '@n8n/api-types';
 import { OutboundHttp, SsrfProtectionService } from '@n8n/backend-network';
 import { SsrfProtectionConfig } from '@n8n/config';
 import type { User } from '@n8n/db';
-import { WorkflowRepository } from '@n8n/db';
 import { CredentialTypes } from '../../../credential-types';
 import { McpRegistryService } from '../../../modules/mcp-registry/registry/mcp-registry.service';
 import { NodeTypes } from '../../../node-types';
@@ -17,6 +16,7 @@ import { AgentSkillsService } from '../agent-skills.service';
 import { AgentTaskService } from '../agent-task.service';
 import { AgentsToolsService } from '../agents-tools.service';
 import { AgentsService } from '../agents.service';
+import { AttachableWorkflowsService } from '../attachable-workflows.service';
 import { BuilderModelLiveLookupService } from './builder-model-live-lookup.service';
 import { AgentRepository } from '../repositories/agent.repository';
 import { AgentSecureRuntime } from '../runtime/agent-secure-runtime';
@@ -38,7 +38,7 @@ export declare class AgentsBuilderToolsService {
     private readonly agentIntegrationPersistenceService;
     private readonly agentSkillsService;
     private readonly secureRuntime;
-    private readonly workflowRepository;
+    private readonly attachableWorkflowsService;
     private readonly agentsToolsService;
     private readonly builderModelLiveLookupService;
     private readonly mcpRegistryService;
@@ -52,9 +52,7 @@ export declare class AgentsBuilderToolsService {
     private readonly nodeTypes;
     private readonly ssrfConfig;
     private readonly ssrfProtectionService;
-    constructor(agentsService: AgentsService, agentConfigService: AgentConfigService, agentCustomToolsService: AgentCustomToolsService, agentIntegrationPersistenceService: AgentIntegrationPersistenceService, agentSkillsService: AgentSkillsService, secureRuntime: AgentSecureRuntime, workflowRepository: WorkflowRepository, agentsToolsService: AgentsToolsService, builderModelLiveLookupService: BuilderModelLiveLookupService, mcpRegistryService: McpRegistryService, oauthService: OauthService, credentialTypes: CredentialTypes, agentTaskService: AgentTaskService, agentRepository: AgentRepository, aiService: AiService, outboundHttp: OutboundHttp, dynamicNodeParametersService: DynamicNodeParametersService, nodeTypes: NodeTypes, ssrfConfig: SsrfProtectionConfig, ssrfProtectionService: SsrfProtectionService);
-    private getDynamicSelectorPath;
-    private rejectIfDynamicSelectorUsesFromAi;
+    constructor(agentsService: AgentsService, agentConfigService: AgentConfigService, agentCustomToolsService: AgentCustomToolsService, agentIntegrationPersistenceService: AgentIntegrationPersistenceService, agentSkillsService: AgentSkillsService, secureRuntime: AgentSecureRuntime, attachableWorkflowsService: AttachableWorkflowsService, agentsToolsService: AgentsToolsService, builderModelLiveLookupService: BuilderModelLiveLookupService, mcpRegistryService: McpRegistryService, oauthService: OauthService, credentialTypes: CredentialTypes, agentTaskService: AgentTaskService, agentRepository: AgentRepository, aiService: AiService, outboundHttp: OutboundHttp, dynamicNodeParametersService: DynamicNodeParametersService, nodeTypes: NodeTypes, ssrfConfig: SsrfProtectionConfig, ssrfProtectionService: SsrfProtectionService);
     getTools(agentId: string, projectId: string, credentialProvider: CredentialProvider, user: User): BuilderTools;
     private getJsonTools;
     private getSharedTools;

package/dist/modules/agents/builder/agents-builder-tools.service.js

@@ -45,11 +45,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.AgentsBuilderToolsService = void 0;
 exports.getAgentConfigHash = getAgentConfigHash;
 const tool_1 = require("@n8n/agents/tool");
-const node_catalog_1 = require("@n8n/ai-utilities/node-catalog");
+const agent_config_1 = require("@n8n/ai-utilities/agent-config");
 const api_types_1 = require("@n8n/api-types");
 const backend_network_1 = require("@n8n/backend-network");
 const config_1 = require("@n8n/config");
-const db_1 = require("@n8n/db");
 const di_1 = require("@n8n/di");
 const is_record_1 = require("@n8n/utils/is-record");
 const node_crypto_1 = require("node:crypto");
@@ -68,9 +67,9 @@ const agent_skills_service_1 = require("../agent-skills.service");
 const agent_task_service_1 = require("../agent-task.service");
 const agents_tools_service_1 = require("../agents-tools.service");
 const agents_service_1 = require("../agents.service");
+const attachable_workflows_service_1 = require("../attachable-workflows.service");
 const builder_model_live_lookup_service_1 = require("./builder-model-live-lookup.service");
 const builder_tool_names_1 = require("./builder-tool-names");
-const from_ai_node_parameters_1 = require("./from-ai-node-parameters");
 const get_resource_locator_options_tool_1 = require("./get-resource-locator-options.tool");
 const interactive_1 = require("./interactive");
 const search_mcp_servers_tool_1 = require("./search-mcp-servers.tool");
@@ -78,18 +77,17 @@ const skill_body_template_1 = require("./skill-body-template");
 const task_objective_template_1 = require("./task-objective-template");
 const verify_mcp_server_tool_1 = require("./verify-mcp-server.tool");
 const agent_config_composition_1 = require("../json-config/agent-config-composition");
-const model_id_1 = require("../json-config/model-id");
-const native_web_search_provider_tools_1 = require("../json-config/native-web-search-provider-tools");
 const agent_repository_1 = require("../repositories/agent.repository");
 const agent_secure_runtime_1 = require("../runtime/agent-secure-runtime");
-const EMPTY_INSTRUCTIONS_ERROR = {
-    path: '/instructions',
-    message: 'Refusing to write an agent with empty instructions. Ask the user what the agent should do before calling write_config or patch_config again.',
-};
 const STALE_CONFIG_ERROR = {
     path: '(root)',
     message: 'Agent config changed since you last read it. Call read_config and retry with the returned configHash.',
 };
+const CLI_AGENT_CONFIG_MESSAGES = {
+    emptyInstructionsFollowUp: 'saving the config again.',
+    dynamicSelectorFollowUp: 'Load skill agent-builder-resource-locators, resolve a credential if missing, then call ' +
+        'get_resource_locator_options and write the returned parameterValue into nodeParameters.',
+};
 const createSkillInputSchema = zod_1.z
     .object({
     name: api_types_1.agentSkillSchema.shape.name.describe('Human-readable skill name'),
@@ -103,54 +101,6 @@ const createSkillInputSchema = zod_1.z
         .describe('Markdown-only supporting files under references/... paths. References are not automatically loaded; instructions must say exactly when to load each reference by path.'),
 })
     .strict();
-function rejectIfEmptyInstructions(config) {
-    if (!config.instructions.trim()) {
-        return { errors: [EMPTY_INSTRUCTIONS_ERROR] };
-    }
-    return null;
-}
-function rejectIfUnsupportedNativeWebSearch(config) {
-    const webSearch = config.config?.webSearch;
-    const requestsNativeWebSearch = webSearch?.enabled === true &&
-        (webSearch.provider === undefined ||
-            webSearch.provider === 'auto' ||
-            webSearch.provider === 'native');
-    if (!requestsNativeWebSearch || (0, native_web_search_provider_tools_1.hasNativeWebSearchProvider)(config.model))
-        return null;
-    return {
-        errors: [
-            {
-                path: '/config/webSearch/provider',
-                message: 'Native web search is only supported for Anthropic and OpenAI models. Use Brave or SearXNG fallback web search for this model.',
-            },
-        ],
-    };
-}
-function isNodeTool(tool) {
-    return tool?.type === 'node';
-}
-function hasSameNodeType(left, right) {
-    return (left.node.nodeType === right.node.nodeType &&
-        left.node.nodeTypeVersion === right.node.nodeTypeVersion);
-}
-function hasSameNodeToolIdentity(left, right) {
-    return left.name === right.name && hasSameNodeType(left, right);
-}
-function findPreviousNodeTool(previousConfig, currentTool, currentToolIndex) {
-    const previousTools = previousConfig?.tools ?? [];
-    const sameIndexTool = previousTools[currentToolIndex];
-    if (isNodeTool(sameIndexTool) && hasSameNodeToolIdentity(sameIndexTool, currentTool)) {
-        return sameIndexTool;
-    }
-    const matchingTools = previousTools.filter((tool) => isNodeTool(tool) && hasSameNodeToolIdentity(tool, currentTool));
-    return matchingTools.length === 1 ? matchingTools[0] : null;
-}
-function getPreviousFromAiReferences(previousConfig, currentTool, currentToolIndex) {
-    const previousTool = findPreviousNodeTool(previousConfig, currentTool, currentToolIndex);
-    if (!previousTool)
-        return [];
-    return (0, from_ai_node_parameters_1.collectFromAiParameterReferences)(previousTool.node.nodeParameters);
-}
 function canonicalizeJson(value) {
     if (Array.isArray(value)) {
         return value.map((item) => canonicalizeJson(item));
@@ -178,39 +128,8 @@ function snapshotFromConfig(config, updatedAt, versionId) {
         versionId,
     };
 }
-function applyNativeWebSearchBuilderDefaults(config) {
-    const providerTools = (0, native_web_search_provider_tools_1.getNativeWebSearchProviderTools)(config, {
-        includeDefaultArgs: true,
-        defaultEnabled: true,
-    });
-    const webSearch = config.config?.webSearch;
-    const fallbackWebSearch = webSearch?.enabled === true &&
-        (webSearch.provider === 'brave' || webSearch.provider === 'searxng');
-    const hasNativeWebSearch = !fallbackWebSearch && webSearch?.enabled !== false && (0, native_web_search_provider_tools_1.hasNativeWebSearchProvider)(config.model);
-    if (!hasNativeWebSearch) {
-        const { webSearch, ...restConfig } = config.config ?? {};
-        const { config: _config, providerTools: _providerTools, ...restAgentConfig } = config;
-        const normalizedConfig = {
-            ...restConfig,
-            ...(fallbackWebSearch ? { webSearch } : {}),
-        };
-        return {
-            ...restAgentConfig,
-            ...(Object.keys(normalizedConfig).length > 0 ? { config: normalizedConfig } : {}),
-            ...(Object.keys(providerTools).length > 0 ? { providerTools } : {}),
-        };
-    }
-    return {
-        ...config,
-        config: {
-            ...(config.config ?? {}),
-            webSearch: { enabled: true },
-        },
-        providerTools,
-    };
-}
 function applyPromptCachingBuilderDefaults(config) {
-    const providerPrefix = (0, model_id_1.getProviderPrefix)(config.model);
+    const providerPrefix = (0, agent_config_1.getProviderPrefix)(config.model);
     const capability = api_types_1.PROVIDER_CAPABILITIES[providerPrefix]?.promptCaching ?? false;
     const resolved = (0, api_types_1.resolvePromptCaching)(config.config?.promptCaching, capability);
     if (!resolved) {
@@ -232,14 +151,14 @@ function applyPromptCachingBuilderDefaults(config) {
     };
 }
 let AgentsBuilderToolsService = class AgentsBuilderToolsService {
-    constructor(agentsService, agentConfigService, agentCustomToolsService, agentIntegrationPersistenceService, agentSkillsService, secureRuntime, workflowRepository, agentsToolsService, builderModelLiveLookupService, mcpRegistryService, oauthService, credentialTypes, agentTaskService, agentRepository, aiService, outboundHttp, dynamicNodeParametersService, nodeTypes, ssrfConfig, ssrfProtectionService) {
+    constructor(agentsService, agentConfigService, agentCustomToolsService, agentIntegrationPersistenceService, agentSkillsService, secureRuntime, attachableWorkflowsService, agentsToolsService, builderModelLiveLookupService, mcpRegistryService, oauthService, credentialTypes, agentTaskService, agentRepository, aiService, outboundHttp, dynamicNodeParametersService, nodeTypes, ssrfConfig, ssrfProtectionService) {
         this.agentsService = agentsService;
         this.agentConfigService = agentConfigService;
         this.agentCustomToolsService = agentCustomToolsService;
         this.agentIntegrationPersistenceService = agentIntegrationPersistenceService;
         this.agentSkillsService = agentSkillsService;
         this.secureRuntime = secureRuntime;
-        this.workflowRepository = workflowRepository;
+        this.attachableWorkflowsService = attachableWorkflowsService;
         this.agentsToolsService = agentsToolsService;
         this.builderModelLiveLookupService = builderModelLiveLookupService;
         this.mcpRegistryService = mcpRegistryService;
@@ -254,59 +173,6 @@ let AgentsBuilderToolsService = class AgentsBuilderToolsService {
         this.ssrfConfig = ssrfConfig;
         this.ssrfProtectionService = ssrfProtectionService;
     }
-    getDynamicSelectorPath(nodeTypeDescription, parameterPath) {
-        const normalizedPath = (0, node_catalog_1.normalizeParameterPath)(parameterPath);
-        const pathParts = normalizedPath.split('.');
-        for (let length = pathParts.length; length > 0; length--) {
-            const candidatePath = pathParts.slice(0, length).join('.');
-            const property = (0, node_catalog_1.findNodeParameterProperty)(nodeTypeDescription.description.properties, candidatePath);
-            if (!property)
-                continue;
-            const lookup = (0, node_catalog_1.getDynamicNodeParameterLookup)(property);
-            if (lookup)
-                return candidatePath;
-        }
-        return null;
-    }
-    rejectIfDynamicSelectorUsesFromAi(config, previousConfig) {
-        const errors = [];
-        for (const [toolIndex, tool] of (config.tools ?? []).entries()) {
-            if (tool.type !== 'node')
-                continue;
-            const fromAiReferences = (0, from_ai_node_parameters_1.collectFromAiParameterReferences)(tool.node.nodeParameters);
-            if (fromAiReferences.length === 0)
-                continue;
-            let nodeTypeDescription;
-            try {
-                nodeTypeDescription = this.nodeTypes.getByNameAndVersion(tool.node.nodeType, tool.node.nodeTypeVersion);
-            }
-            catch {
-                continue;
-            }
-            const previousFromAiReferences = getPreviousFromAiReferences(previousConfig, tool, toolIndex);
-            const reportedDynamicPaths = new Set();
-            for (const fromAiReference of fromAiReferences) {
-                const { parameterPath, jsonPointer } = fromAiReference;
-                const dynamicPath = this.getDynamicSelectorPath(nodeTypeDescription, parameterPath);
-                if (!dynamicPath || reportedDynamicPaths.has(dynamicPath))
-                    continue;
-                if ((0, from_ai_node_parameters_1.hasMatchingFromAiParameterReference)(previousFromAiReferences, fromAiReference)) {
-                    continue;
-                }
-                reportedDynamicPaths.add(dynamicPath);
-                errors.push({
-                    path: `/tools/${toolIndex}/node/nodeParameters/${jsonPointer}`,
-                    message: `Node tool "${tool.name}" parameter "${dynamicPath}" is a dynamic selector. ` +
-                        'Do not use $fromAI for this value. Load skill agent-builder-resource-locators, ' +
-                        'use ask_credential if credentials are missing, then call get_resource_locator_options ' +
-                        'and write the returned parameterValue into nodeParameters.',
-                });
-            }
-        }
-        if (errors.length === 0)
-            return null;
-        return { errors };
-    }
     getTools(agentId, projectId, credentialProvider, user) {
         return {
             json: this.getJsonTools(agentId, projectId, credentialProvider, user),
@@ -367,21 +233,21 @@ let AgentsBuilderToolsService = class AgentsBuilderToolsService {
             if (!zodResult.success) {
                 return { ok: false, errors: (0, api_types_1.formatZodErrors)(zodResult.error) };
             }
-            const emptyInstructions = rejectIfEmptyInstructions(zodResult.data);
+            const emptyInstructions = (0, agent_config_1.rejectIfEmptyInstructions)(zodResult.data, CLI_AGENT_CONFIG_MESSAGES);
             if (emptyInstructions) {
-                return { ok: false, errors: emptyInstructions.errors };
+                return { ok: false, errors: emptyInstructions };
             }
-            const unsupportedNativeWebSearch = rejectIfUnsupportedNativeWebSearch(zodResult.data);
+            const unsupportedNativeWebSearch = (0, agent_config_1.rejectIfUnsupportedNativeWebSearch)(zodResult.data);
             if (unsupportedNativeWebSearch) {
-                return { ok: false, errors: unsupportedNativeWebSearch.errors };
+                return { ok: false, errors: unsupportedNativeWebSearch };
             }
-            const dynamicSelectorFromAi = this.rejectIfDynamicSelectorUsesFromAi(zodResult.data, snapshot.config);
+            const dynamicSelectorFromAi = (0, agent_config_1.rejectIfDynamicSelectorUsesFromAi)(zodResult.data, snapshot.config, this.nodeTypes, CLI_AGENT_CONFIG_MESSAGES);
             if (dynamicSelectorFromAi) {
-                return { ok: false, errors: dynamicSelectorFromAi.errors };
+                return { ok: false, errors: dynamicSelectorFromAi };
             }
-            const normalizedConfig = applyPromptCachingBuilderDefaults(applyNativeWebSearchBuilderDefaults(zodResult.data));
+            const configWithDefaults = applyPromptCachingBuilderDefaults((0, agent_config_1.applyNativeWebSearchDefaultOn)(zodResult.data));
             try {
-                const result = await this.agentConfigService.updateConfig(agentId, projectId, normalizedConfig);
+                const result = await this.agentConfigService.updateConfig(agentId, projectId, configWithDefaults);
                 return {
                     ok: true,
                     ...snapshotFromConfig(result.config, result.updatedAt, result.versionId),
@@ -455,21 +321,21 @@ let AgentsBuilderToolsService = class AgentsBuilderToolsService {
             if (!zodResult.success) {
                 return { ok: false, stage: 'schema', errors: (0, api_types_1.formatZodErrors)(zodResult.error) };
             }
-            const emptyInstructions = rejectIfEmptyInstructions(zodResult.data);
+            const emptyInstructions = (0, agent_config_1.rejectIfEmptyInstructions)(zodResult.data, CLI_AGENT_CONFIG_MESSAGES);
             if (emptyInstructions) {
-                return { ok: false, stage: 'schema', errors: emptyInstructions.errors };
+                return { ok: false, stage: 'schema', errors: emptyInstructions };
             }
-            const unsupportedNativeWebSearch = rejectIfUnsupportedNativeWebSearch(zodResult.data);
+            const unsupportedNativeWebSearch = (0, agent_config_1.rejectIfUnsupportedNativeWebSearch)(zodResult.data);
             if (unsupportedNativeWebSearch) {
-                return { ok: false, stage: 'schema', errors: unsupportedNativeWebSearch.errors };
+                return { ok: false, stage: 'schema', errors: unsupportedNativeWebSearch };
             }
-            const dynamicSelectorFromAi = this.rejectIfDynamicSelectorUsesFromAi(zodResult.data, snapshot.config);
+            const dynamicSelectorFromAi = (0, agent_config_1.rejectIfDynamicSelectorUsesFromAi)(zodResult.data, snapshot.config, this.nodeTypes, CLI_AGENT_CONFIG_MESSAGES);
             if (dynamicSelectorFromAi) {
-                return { ok: false, stage: 'schema', errors: dynamicSelectorFromAi.errors };
+                return { ok: false, stage: 'schema', errors: dynamicSelectorFromAi };
             }
-            const normalizedConfig = applyPromptCachingBuilderDefaults(applyNativeWebSearchBuilderDefaults(zodResult.data));
+            const configWithDefaults = applyPromptCachingBuilderDefaults((0, agent_config_1.applyNativeWebSearchDefaultOn)(zodResult.data));
             try {
-                const result = await this.agentConfigService.updateConfig(agentId, projectId, normalizedConfig);
+                const result = await this.agentConfigService.updateConfig(agentId, projectId, configWithDefaults);
                 return {
                     ok: true,
                     ...snapshotFromConfig(result.config, result.updatedAt, result.versionId),
@@ -533,8 +399,14 @@ let AgentsBuilderToolsService = class AgentsBuilderToolsService {
                 isCredentialTypeKnown: (credentialType) => this.credentialTypes.recognizes(credentialType),
                 isAssistantProxyEnabled: () => this.aiService.isProxyEnabled(),
             }),
-            (0, interactive_1.buildAskLlmTool)(),
-            (0, interactive_1.buildAskQuestionTool)(),
+            (0, interactive_1.buildAskQuestionsTool)(),
+            (0, interactive_1.buildConfigureChannelTool)({
+                agentId,
+                projectId,
+                listChatIntegrationTypes: () => this.agentIntegrationPersistenceService
+                    .listChatIntegrations()
+                    .map((integration) => integration.type),
+            }),
             (0, verify_mcp_server_tool_1.buildVerifyMcpServerTool)({
                 credentialProvider,
                 oauthService: this.oauthService,
@@ -616,8 +488,8 @@ let AgentsBuilderToolsService = class AgentsBuilderToolsService {
             'parameter for the template. You MUST NOT call this tool with a vague, broad, or placeholder ' +
             'objective, an objective missing any section, or an unclear schedule. First make sure you can ' +
             'fill every section of the template and know how often/when it should run; if anything is ' +
-            'ambiguous, ask the user clarifying questions (ask_question with discrete options for choices, ' +
-            'or empty options for open-ended) and only call create_task once the objective is complete and the cadence ' +
+            'ambiguous, ask the user clarifying questions (ask_questions with discrete options for choices, ' +
+            'or type: "text" for open-ended) and only call create_task once the objective is complete and the cadence ' +
             'is known. This adds a `{ type: "task", id, enabled }` ref to the agent config (config.tasks) ' +
             'and the task starts running once the agent is (re)published. Returns { ok: true, task } or ' +
             '{ ok: false, errors }.')
@@ -660,36 +532,18 @@ let AgentsBuilderToolsService = class AgentsBuilderToolsService {
             .description('List the n8n workflows that can be attached as tools via `type: "workflow"` in the agent config. ' +
             'ALWAYS call this at the start — workflows are the preferred way to give agents real capabilities ' +
             '(sending emails, creating calendar events, querying databases, calling APIs, etc.). ' +
-            'Only returns workflows with supported trigger types.')
-            .input(zod_1.z.object({}))
-            .handler(async () => {
-            const workflows = await this.workflowRepository.find({
-                select: ['id', 'name', 'nodes', 'active', 'updatedAt'],
-                where: { shared: { projectId } },
-                relations: ['shared'],
-                order: { updatedAt: 'DESC' },
-                take: 100,
-            });
-            const SUPPORTED_TRIGGERS = {
-                'n8n-nodes-base.manualTrigger': 'manual',
-                'n8n-nodes-base.executeWorkflowTrigger': 'executeWorkflow',
-                'n8n-nodes-base.chatTrigger': 'chat',
-                'n8n-nodes-base.scheduleTrigger': 'schedule',
-                'n8n-nodes-base.formTrigger': 'form',
+            'Only returns workflows with supported trigger types. Pass `searchTerm` to narrow by workflow name; ' +
+            'omitting it returns the 10 most recently updated attachable workflows.')
+            .input(zod_1.z.object({
+            searchTerm: zod_1.z
+                .string()
+                .optional()
+                .describe('Optional workflow-name search term. Omit to return the first 10 results.'),
+        }))
+            .handler(async ({ searchTerm }) => {
+            return {
+                workflows: await this.attachableWorkflowsService.list(user, projectId, searchTerm),
             };
-            const compatible = workflows
-                .map((w) => {
-                const triggerNode = (w.nodes ?? []).find((n) => SUPPORTED_TRIGGERS[n.type]);
-                if (!triggerNode)
-                    return null;
-                return {
-                    name: w.name,
-                    active: w.active,
-                    triggerType: SUPPORTED_TRIGGERS[triggerNode.type],
-                };
-            })
-                .filter(Boolean);
-            return { workflows: compatible };
         })
             .build();
         return [
@@ -725,7 +579,7 @@ exports.AgentsBuilderToolsService = AgentsBuilderToolsService = __decorate([
         agent_integration_persistence_service_1.AgentIntegrationPersistenceService,
         agent_skills_service_1.AgentSkillsService,
         agent_secure_runtime_1.AgentSecureRuntime,
-        db_1.WorkflowRepository,
+        attachable_workflows_service_1.AttachableWorkflowsService,
         agents_tools_service_1.AgentsToolsService,
         builder_model_live_lookup_service_1.BuilderModelLiveLookupService,
         mcp_registry_service_1.McpRegistryService,