From 079bcc98d405bf01b08d330013fc40e14020acec Mon Sep 17 00:00:00 2001 From: sidtheone Date: Sat, 28 Feb 2026 13:54:52 +0100 Subject: [PATCH] fix: update remaining src files and remove duplicate RULE lines from merge - Apply explicit {interaction_style} variable reference to handler-action, handler-exec, handler-workflow, agent-command-header, and workflow.xml - Remove old duplicate RULE lines left over from merge conflict resolution in 10 template files (default-task/tool, rovodev, opencode-workflow*, gemini-agent/task/tool/workflow/workflow-yaml) Co-Authored-By: Claude Opus 4.6 --- src/core/tasks/workflow.xml | 2 +- src/utility/agent-components/agent-command-header.md | 2 +- src/utility/agent-components/handler-action.txt | 2 +- src/utility/agent-components/handler-exec.txt | 2 +- src/utility/agent-components/handler-workflow.txt | 2 +- tools/cli/installers/lib/ide/templates/combined/default-task.md | 2 -- tools/cli/installers/lib/ide/templates/combined/default-tool.md | 2 -- .../cli/installers/lib/ide/templates/combined/gemini-agent.toml | 2 -- .../cli/installers/lib/ide/templates/combined/gemini-task.toml | 1 - .../cli/installers/lib/ide/templates/combined/gemini-tool.toml | 1 - .../lib/ide/templates/combined/gemini-workflow-yaml.toml | 1 - .../installers/lib/ide/templates/combined/gemini-workflow.toml | 1 - .../lib/ide/templates/combined/opencode-workflow-yaml.md | 1 - .../installers/lib/ide/templates/combined/opencode-workflow.md | 1 - tools/cli/installers/lib/ide/templates/combined/rovodev.md | 2 -- 15 files changed, 5 insertions(+), 19 deletions(-) diff --git a/src/core/tasks/workflow.xml b/src/core/tasks/workflow.xml index 67d1ee023..6966a96a4 100644 --- a/src/core/tasks/workflow.xml +++ b/src/core/tasks/workflow.xml @@ -2,7 +2,7 @@ Execute given workflow by loading its configuration, following instructions, and producing output - RULE: When interaction_style is "structured", EVERY question to the user MUST use the native question tool. No exceptions. No inline prompts. When interaction_style is "open", ask questions naturally in conversation. + RULE: Check your stored {interaction_style} session variable from activation step 2. When its value is "structured", EVERY question to the user MUST use the native question tool. No exceptions. No inline prompts. When {interaction_style} is "open", ask questions naturally in conversation. If you cannot determine {interaction_style}, default to structured mode. Always read COMPLETE files - NEVER use offset/limit when reading any workflow related files Instructions are MANDATORY - either as file path, steps or embedded list in YAML, XML or markdown Execute ALL steps in instructions IN EXACT ORDER diff --git a/src/utility/agent-components/agent-command-header.md b/src/utility/agent-components/agent-command-header.md index fd4abc1a5..4e419412b 100644 --- a/src/utility/agent-components/agent-command-header.md +++ b/src/utility/agent-components/agent-command-header.md @@ -1,3 +1,3 @@ You must fully embody this agent's persona and follow all activation instructions, steps and rules exactly as specified. NEVER break character until given an exit command. -RULE: When interaction_style is "structured", EVERY question to the user MUST call the AskUserQuestion tool. Do NOT write questions as plain text. No exceptions. +RULE: Check your stored {interaction_style} session variable from activation step 2. When its value is "structured", EVERY question to the user MUST call the AskUserQuestion tool. Do NOT write questions as plain text. No exceptions. If you cannot determine {interaction_style}, default to structured mode. diff --git a/src/utility/agent-components/handler-action.txt b/src/utility/agent-components/handler-action.txt index da21fa426..83201af70 100644 --- a/src/utility/agent-components/handler-action.txt +++ b/src/utility/agent-components/handler-action.txt @@ -1,5 +1,5 @@ When menu item has: action="#id" → Find prompt with id="id" in current agent XML, follow its content When menu item has: action="text" → Follow the text directly as an inline instruction - RULE: When interaction_style is "structured", ALL questions to the user MUST use the AskUserQuestion tool. No plain text prompts. + RULE: Check your stored {interaction_style} session variable from activation step 2. When its value is "structured", ALL questions to the user MUST use the AskUserQuestion tool. No plain text prompts. If you cannot determine {interaction_style}, default to structured mode. \ No newline at end of file diff --git a/src/utility/agent-components/handler-exec.txt b/src/utility/agent-components/handler-exec.txt index 03276dbee..39aa46ce6 100644 --- a/src/utility/agent-components/handler-exec.txt +++ b/src/utility/agent-components/handler-exec.txt @@ -3,5 +3,5 @@ 1. Read fully and follow the file at that path 2. Process the complete file and follow all instructions within it 3. If there is data="some/path/data-foo.md" with the same item, pass that data path to the executed file as context. - 4. RULE: When interaction_style is "structured", ALL questions to the user MUST use the AskUserQuestion tool. No plain text prompts. + 4. RULE: Check your stored {interaction_style} session variable from activation step 2. When its value is "structured", ALL questions to the user MUST use the AskUserQuestion tool. No plain text prompts. If you cannot determine {interaction_style}, default to structured mode. \ No newline at end of file diff --git a/src/utility/agent-components/handler-workflow.txt b/src/utility/agent-components/handler-workflow.txt index c7d677117..252830491 100644 --- a/src/utility/agent-components/handler-workflow.txt +++ b/src/utility/agent-components/handler-workflow.txt @@ -7,5 +7,5 @@ 4. Follow workflow.xml instructions precisely following all steps 5. Save outputs after completing EACH workflow step (never batch multiple steps together) 6. If workflow.yaml path is "todo", inform user the workflow hasn't been implemented yet - 7. RULE: When interaction_style is "structured", ALL questions to the user MUST use the AskUserQuestion tool. No plain text prompts. + 7. RULE: Check your stored {interaction_style} session variable from activation step 2. When its value is "structured", ALL questions to the user MUST use the AskUserQuestion tool. No plain text prompts. If you cannot determine {interaction_style}, default to structured mode. \ No newline at end of file diff --git a/tools/cli/installers/lib/ide/templates/combined/default-task.md b/tools/cli/installers/lib/ide/templates/combined/default-task.md index 752161ac8..8950cd0e7 100644 --- a/tools/cli/installers/lib/ide/templates/combined/default-task.md +++ b/tools/cli/installers/lib/ide/templates/combined/default-task.md @@ -10,5 +10,3 @@ RULE: Check your stored {interaction_style} session variable from activation ste Read the entire task file at: {project-root}/{{bmadFolderName}}/{{path}} Follow all instructions in the task file exactly as written. - -RULE: When interaction_style is "structured", EVERY question to the user MUST call the AskUserQuestion tool. Do NOT write questions as plain text. No exceptions. diff --git a/tools/cli/installers/lib/ide/templates/combined/default-tool.md b/tools/cli/installers/lib/ide/templates/combined/default-tool.md index b5bf9735f..e9ddd7d41 100644 --- a/tools/cli/installers/lib/ide/templates/combined/default-tool.md +++ b/tools/cli/installers/lib/ide/templates/combined/default-tool.md @@ -10,5 +10,3 @@ RULE: Check your stored {interaction_style} session variable from activation ste Read the entire tool file at: {project-root}/{{bmadFolderName}}/{{path}} Follow all instructions in the tool file exactly as written. - -RULE: When interaction_style is "structured", EVERY question to the user MUST call the AskUserQuestion tool. Do NOT write questions as plain text. No exceptions. diff --git a/tools/cli/installers/lib/ide/templates/combined/gemini-agent.toml b/tools/cli/installers/lib/ide/templates/combined/gemini-agent.toml index 03187bf44..6e09ba186 100644 --- a/tools/cli/installers/lib/ide/templates/combined/gemini-agent.toml +++ b/tools/cli/installers/lib/ide/templates/combined/gemini-agent.toml @@ -10,8 +10,6 @@ PRE-FLIGHT CHECKLIST: RULE: Check your stored {interaction_style} session variable from activation step 2. When its value is "structured", EVERY question to the user MUST call the ask_user tool unless the workflow or user explicitly requests free-form input. If you cannot determine {interaction_style}, default to structured mode. -RULE: When interaction_style is "structured", EVERY question to the user MUST use structured options with a numbered list. No exceptions. - Only after all checks are complete, greet the user by name and display the menu. Acknowledge this checklist is complete in your first response. diff --git a/tools/cli/installers/lib/ide/templates/combined/gemini-task.toml b/tools/cli/installers/lib/ide/templates/combined/gemini-task.toml index cfe5c3669..8a6092366 100644 --- a/tools/cli/installers/lib/ide/templates/combined/gemini-task.toml +++ b/tools/cli/installers/lib/ide/templates/combined/gemini-task.toml @@ -6,7 +6,6 @@ TASK INSTRUCTIONS: 1. LOAD the task file from {project-root}/{{bmadFolderName}}/{{path}} 2. READ its entire contents 3. FOLLOW every instruction precisely as specified -4. RULE: When interaction_style is "structured", EVERY question to the user MUST use structured options with a numbered list. No exceptions. RULE: Check your stored {interaction_style} session variable from activation step 2. When its value is "structured", EVERY question to the user MUST call the ask_user tool unless the workflow or user explicitly requests free-form input. If you cannot determine {interaction_style}, default to structured mode. diff --git a/tools/cli/installers/lib/ide/templates/combined/gemini-tool.toml b/tools/cli/installers/lib/ide/templates/combined/gemini-tool.toml index 0fa09e249..b550822b0 100644 --- a/tools/cli/installers/lib/ide/templates/combined/gemini-tool.toml +++ b/tools/cli/installers/lib/ide/templates/combined/gemini-tool.toml @@ -6,7 +6,6 @@ TOOL INSTRUCTIONS: 1. LOAD the tool file from {project-root}/{{bmadFolderName}}/{{path}} 2. READ its entire contents 3. FOLLOW every instruction precisely as specified -4. RULE: When interaction_style is "structured", EVERY question to the user MUST use structured options with a numbered list. No exceptions. RULE: Check your stored {interaction_style} session variable from activation step 2. When its value is "structured", EVERY question to the user MUST call the ask_user tool unless the workflow or user explicitly requests free-form input. If you cannot determine {interaction_style}, default to structured mode. diff --git a/tools/cli/installers/lib/ide/templates/combined/gemini-workflow-yaml.toml b/tools/cli/installers/lib/ide/templates/combined/gemini-workflow-yaml.toml index cff87a977..d725ddafd 100644 --- a/tools/cli/installers/lib/ide/templates/combined/gemini-workflow-yaml.toml +++ b/tools/cli/installers/lib/ide/templates/combined/gemini-workflow-yaml.toml @@ -11,7 +11,6 @@ CRITICAL: This is a structured YAML workflow. Follow these steps precisely: - Dependencies between steps 3. EXECUTE each step in order 4. VALIDATE outputs before proceeding to next step -5. RULE: When interaction_style is "structured", EVERY question to the user MUST use structured options with a numbered list. No exceptions. RULE: Check your stored {interaction_style} session variable from activation step 2. When its value is "structured", EVERY question to the user MUST call the ask_user tool unless the workflow or user explicitly requests free-form input. If you cannot determine {interaction_style}, default to structured mode. diff --git a/tools/cli/installers/lib/ide/templates/combined/gemini-workflow.toml b/tools/cli/installers/lib/ide/templates/combined/gemini-workflow.toml index 4c38f76f4..d8d810146 100644 --- a/tools/cli/installers/lib/ide/templates/combined/gemini-workflow.toml +++ b/tools/cli/installers/lib/ide/templates/combined/gemini-workflow.toml @@ -9,7 +9,6 @@ WORKFLOW INSTRUCTIONS: 2. READ its entire contents 3. FOLLOW every step precisely as specified 4. DO NOT skip or modify any steps -5. RULE: When interaction_style is "structured", EVERY question to the user MUST use structured options with a numbered list. No exceptions. RULE: Check your stored {interaction_style} session variable from activation step 2. When its value is "structured", EVERY question to the user MUST call the ask_user tool unless the workflow or user explicitly requests free-form input. If you cannot determine {interaction_style}, default to structured mode. diff --git a/tools/cli/installers/lib/ide/templates/combined/opencode-workflow-yaml.md b/tools/cli/installers/lib/ide/templates/combined/opencode-workflow-yaml.md index dd7661cd8..e1b3d3f30 100644 --- a/tools/cli/installers/lib/ide/templates/combined/opencode-workflow-yaml.md +++ b/tools/cli/installers/lib/ide/templates/combined/opencode-workflow-yaml.md @@ -12,7 +12,6 @@ WORKFLOW INSTRUCTIONS: 2. READ its entire contents 3. FOLLOW every step precisely as specified 4. DO NOT skip or modify any steps -5. RULE: When interaction_style is "structured", EVERY question to the user MUST use structured options with a numbered list. No exceptions. RULE: Check your stored {interaction_style} session variable from activation step 2. When its value is "structured", EVERY question to the user MUST call the `question` tool unless the workflow or user explicitly requests free-form input. If you cannot determine {interaction_style}, default to structured mode. diff --git a/tools/cli/installers/lib/ide/templates/combined/opencode-workflow.md b/tools/cli/installers/lib/ide/templates/combined/opencode-workflow.md index dd7661cd8..e1b3d3f30 100644 --- a/tools/cli/installers/lib/ide/templates/combined/opencode-workflow.md +++ b/tools/cli/installers/lib/ide/templates/combined/opencode-workflow.md @@ -12,7 +12,6 @@ WORKFLOW INSTRUCTIONS: 2. READ its entire contents 3. FOLLOW every step precisely as specified 4. DO NOT skip or modify any steps -5. RULE: When interaction_style is "structured", EVERY question to the user MUST use structured options with a numbered list. No exceptions. RULE: Check your stored {interaction_style} session variable from activation step 2. When its value is "structured", EVERY question to the user MUST call the `question` tool unless the workflow or user explicitly requests free-form input. If you cannot determine {interaction_style}, default to structured mode. diff --git a/tools/cli/installers/lib/ide/templates/combined/rovodev.md b/tools/cli/installers/lib/ide/templates/combined/rovodev.md index deb3d7f7b..8d546a7ca 100644 --- a/tools/cli/installers/lib/ide/templates/combined/rovodev.md +++ b/tools/cli/installers/lib/ide/templates/combined/rovodev.md @@ -9,5 +9,3 @@ RULE: Check your stored {interaction_style} session variable from activation ste Read the entire workflow file at: {project-root}/{{bmadFolderName}}/{{workflow_path}} Follow all instructions in the workflow file exactly as written. - -RULE: When interaction_style is "structured", EVERY question to the user MUST use structured options with a numbered list. No exceptions.