conductor-4-all 0.0.15 → 0.0.17

package/dist/index.cjs

@@ -140,6 +140,20 @@ async function loadTemplate(templatePath) {
   return (0, import_promises.readFile)(fullPath, "utf-8");
 }
 
+// src/generators/utils.ts
+function normalizeWorkflowFilename(fileName) {
+  if (process.platform !== "win32") {
+    return fileName;
+  }
+  return fileName.replace(/:/g, "_");
+}
+function normalizeWorkflowContent(content) {
+  if (process.platform !== "win32") {
+    return content;
+  }
+  return content.replace(/\bconductor:([a-zA-Z0-9_-]+)/g, "conductor_$1");
+}
+
 // src/generators/default/strategy.ts
 var { writeFile } = import_fs_extra.default;
 var DefaultContentStrategy = class {
@@ -152,19 +166,18 @@ var DefaultContentStrategy = class {
     let prompt = parsed.prompt;
     prompt = prompt.replace(/__\$\$CODE_AGENT_INSTALL_PATH\$\$__/g, installPath);
     const finalContent = substituteVariables(prompt, { agent_type: agentType });
-    if (parsed.description) {
-      return `---
+    const content = parsed.description ? `---
 description: ${parsed.description}
 ---
-${finalContent}`;
-    }
-    return finalContent;
+${finalContent}` : finalContent;
+    return normalizeWorkflowContent(content);
   }
 };
 var DefaultFileStrategy = class {
   async write(options) {
     const { targetDir, agentDir, commandsDir, commandName, extension, content } = options;
-    const fileName = `conductor:${commandName}${extension}`;
+    const rawFileName = `conductor:${commandName}${extension}`;
+    const fileName = normalizeWorkflowFilename(rawFileName);
     await writeFile((0, import_path2.join)(targetDir, agentDir, commandsDir, fileName), content);
   }
 };
@@ -193,8 +206,11 @@ var ConfigurableGenerator = class {
     if (!existsSync(targetDir)) {
       throw new Error(`Target directory does not exist: ${targetDir}`);
     }
-    const { agentDir, commandsDir, displayName } = this.config;
-    const setupFile = (0, import_path3.join)(targetDir, agentDir, commandsDir, "conductor:setup.md");
+    const { agentDir, commandsDir, displayName, extension, agentType } = this.config;
+    const setupExtension = extension ?? ".md";
+    const baseSetupFileName = agentType === "gemini" ? `setup${setupExtension}` : `conductor:setup${setupExtension}`;
+    const setupFileName = normalizeWorkflowFilename(baseSetupFileName);
+    const setupFile = (0, import_path3.join)(targetDir, agentDir, commandsDir, setupFileName);
     const conductorPath = (0, import_path3.join)(targetDir, agentDir, "conductor");
     if (existsSync(conductorPath) && existsSync(setupFile)) {
       throw new Error(`Conductor (${displayName}) is already installed in: ${targetDir}`);
@@ -223,7 +239,7 @@ var ConfigurableGenerator = class {
     if (protocolFilename) {
       try {
         const protocolSource = (0, import_path3.join)(templateRoot, "GEMINI.md");
-        const protocolDest = (0, import_path3.join)(targetDir, protocolFilename);
+        const protocolDest = (0, import_path3.join)(process.cwd(), protocolFilename);
         if (existsSync(protocolSource)) {
           let shouldCopy = true;
           if (existsSync(protocolDest)) {
@@ -457,7 +473,8 @@ var ClineContentStrategy = class {
     prompt = prompt.replace(/__\$\$CODE_AGENT_INSTALL_PATH\$\$__/g, installPath);
     const finalContent = substituteVariables(prompt, { agent_type: agentType });
     const title = commandName ? commandName.charAt(0).toUpperCase() + commandName.slice(1) : "Command";
-    return `# Conductor ${title}${parsed.description ? "\n\n" + parsed.description + "\n\n" : "\n\n"}${finalContent}`;
+    const content = `# Conductor ${title}${parsed.description ? "\n\n" + parsed.description + "\n\n" : "\n\n"}${finalContent}`;
+    return normalizeWorkflowContent(content);
   }
 };
 var clineContentStrategy = new ClineContentStrategy();
@@ -498,13 +515,15 @@ var GeminiContentStrategy = class {
       return null;
     }
     const content = templateContent.replace(/__\$\$CODE_AGENT_INSTALL_PATH\$\$__/g, installPath);
-    return substituteVariables(content, { agent_type: agentType });
+    const substituted = substituteVariables(content, { agent_type: agentType });
+    return normalizeWorkflowContent(substituted);
   }
 };
 var GeminiFileStrategy = class {
   async write(options) {
     const { targetDir, agentDir, commandsDir, commandName, extension, content } = options;
-    const fileName = `${commandName}${extension}`;
+    const rawFileName = `${commandName}${extension}`;
+    const fileName = normalizeWorkflowFilename(rawFileName);
     await writeFile3((0, import_path4.join)(targetDir, agentDir, commandsDir, fileName), content);
   }
 };

package/dist/index.js

@@ -113,6 +113,20 @@ async function loadTemplate(templatePath) {
   return readFile(fullPath, "utf-8");
 }
 
+// src/generators/utils.ts
+function normalizeWorkflowFilename(fileName) {
+  if (process.platform !== "win32") {
+    return fileName;
+  }
+  return fileName.replace(/:/g, "_");
+}
+function normalizeWorkflowContent(content) {
+  if (process.platform !== "win32") {
+    return content;
+  }
+  return content.replace(/\bconductor:([a-zA-Z0-9_-]+)/g, "conductor_$1");
+}
+
 // src/generators/default/strategy.ts
 var { writeFile } = fs;
 var DefaultContentStrategy = class {
@@ -125,19 +139,18 @@ var DefaultContentStrategy = class {
     let prompt = parsed.prompt;
     prompt = prompt.replace(/__\$\$CODE_AGENT_INSTALL_PATH\$\$__/g, installPath);
     const finalContent = substituteVariables(prompt, { agent_type: agentType });
-    if (parsed.description) {
-      return `---
+    const content = parsed.description ? `---
 description: ${parsed.description}
 ---
-${finalContent}`;
-    }
-    return finalContent;
+${finalContent}` : finalContent;
+    return normalizeWorkflowContent(content);
   }
 };
 var DefaultFileStrategy = class {
   async write(options) {
     const { targetDir, agentDir, commandsDir, commandName, extension, content } = options;
-    const fileName = `conductor:${commandName}${extension}`;
+    const rawFileName = `conductor:${commandName}${extension}`;
+    const fileName = normalizeWorkflowFilename(rawFileName);
     await writeFile(join2(targetDir, agentDir, commandsDir, fileName), content);
   }
 };
@@ -166,8 +179,11 @@ var ConfigurableGenerator = class {
     if (!existsSync(targetDir)) {
       throw new Error(`Target directory does not exist: ${targetDir}`);
     }
-    const { agentDir, commandsDir, displayName } = this.config;
-    const setupFile = join3(targetDir, agentDir, commandsDir, "conductor:setup.md");
+    const { agentDir, commandsDir, displayName, extension, agentType } = this.config;
+    const setupExtension = extension ?? ".md";
+    const baseSetupFileName = agentType === "gemini" ? `setup${setupExtension}` : `conductor:setup${setupExtension}`;
+    const setupFileName = normalizeWorkflowFilename(baseSetupFileName);
+    const setupFile = join3(targetDir, agentDir, commandsDir, setupFileName);
     const conductorPath = join3(targetDir, agentDir, "conductor");
     if (existsSync(conductorPath) && existsSync(setupFile)) {
       throw new Error(`Conductor (${displayName}) is already installed in: ${targetDir}`);
@@ -196,7 +212,7 @@ var ConfigurableGenerator = class {
     if (protocolFilename) {
       try {
         const protocolSource = join3(templateRoot, "GEMINI.md");
-        const protocolDest = join3(targetDir, protocolFilename);
+        const protocolDest = join3(process.cwd(), protocolFilename);
         if (existsSync(protocolSource)) {
           let shouldCopy = true;
           if (existsSync(protocolDest)) {
@@ -430,7 +446,8 @@ var ClineContentStrategy = class {
     prompt = prompt.replace(/__\$\$CODE_AGENT_INSTALL_PATH\$\$__/g, installPath);
     const finalContent = substituteVariables(prompt, { agent_type: agentType });
     const title = commandName ? commandName.charAt(0).toUpperCase() + commandName.slice(1) : "Command";
-    return `# Conductor ${title}${parsed.description ? "\n\n" + parsed.description + "\n\n" : "\n\n"}${finalContent}`;
+    const content = `# Conductor ${title}${parsed.description ? "\n\n" + parsed.description + "\n\n" : "\n\n"}${finalContent}`;
+    return normalizeWorkflowContent(content);
   }
 };
 var clineContentStrategy = new ClineContentStrategy();
@@ -471,13 +488,15 @@ var GeminiContentStrategy = class {
       return null;
     }
     const content = templateContent.replace(/__\$\$CODE_AGENT_INSTALL_PATH\$\$__/g, installPath);
-    return substituteVariables(content, { agent_type: agentType });
+    const substituted = substituteVariables(content, { agent_type: agentType });
+    return normalizeWorkflowContent(substituted);
   }
 };
 var GeminiFileStrategy = class {
   async write(options) {
     const { targetDir, agentDir, commandsDir, commandName, extension, content } = options;
-    const fileName = `${commandName}${extension}`;
+    const rawFileName = `${commandName}${extension}`;
+    const fileName = normalizeWorkflowFilename(rawFileName);
     await writeFile3(join4(targetDir, agentDir, commandsDir, fileName), content);
   }
 };

package/dist/templates/commands/implement.toml

@@ -35,13 +35,29 @@ CRITICAL: You must validate the success of every tool call. If any tool call fai
 4.  **Select Track:**
     -   **If a track name was provided:**
         1.  Perform an exact, case-insensitive match for the provided name against the track descriptions you parsed.
-        2.  If a unique match is found, confirm the selection with the user: "I found track '<track_description>'. Is this correct?"
-        3.  If no match is found, or if the match is ambiguous, inform the user and ask for clarification. Suggest the next available track as below.
+        2.  If a unique match is found, immediately call the `ask_user` tool to confirm the selection (do not repeat the question in the chat):
+            - **questions:**
+                - **header:** "Confirm"
+                - **question:** "I found track '<track_description>'. Is this correct?"
+                - **type:** "yesno"
+        3.  If no match is found, or if the match is ambiguous, immediately call the `ask_user` tool to inform the user and request the correct track name (do not repeat the question in the chat):
+            - **questions:**
+                - **header:** "Clarify"
+                - **question:** "I couldn't find a unique track matching the name you provided. Did you mean '<next_available_track>'? Or please type the exact track name."
+                - **type:** "text"
     -   **If no track name was provided (or if the previous step failed):**
         1.  **Identify Next Track:** Find the first track in the parsed tracks file that is NOT marked as `[x] Completed`.
         2.  **If a next track is found:**
-            -   Announce: "No track name provided. Automatically selecting the next incomplete track: '<track_description>'."
-            -   Proceed with this track.
+            -   Immediately call the `ask_user` tool to confirm the selection (do not repeat the question in the chat):
+                - **questions:**
+                    - **header:** "Next Track"
+                    - **question:** "No track name provided. Would you like to proceed with the next incomplete track: '<track_description>'?"
+                    - **type:** "yesno"
+            -   If confirmed, proceed with this track. Otherwise, immediately call the `ask_user` tool to request the correct track name (do not repeat the question in the chat):
+                - **questions:**
+                    - **header:** "Clarify"
+                    - **question:** "Please type the exact name of the track you would like to implement."
+                    - **type:** "text"
         3.  **If no incomplete tracks are found:**
             -   Announce: "No incomplete tracks found in the tracks file. All tasks are completed!"
             -   Halt the process and await further user instructions.
@@ -71,6 +87,7 @@ CRITICAL: You must validate the success of every tool call. If any tool call fai
     b. **Iterate Through Tasks:** You MUST now loop through each task in the track's **Implementation Plan** one by one.
     c. **For Each Task, You MUST:**
         i. **Defer to Workflow:** The **Workflow** file is the **single source of truth** for the entire task lifecycle. You MUST now read and execute the procedures defined in the "Task Workflow" section of the **Workflow** file you have in your context. Follow its steps for implementation, testing, and committing precisely.
+           - **CRITICAL:** Every human-in-the-loop interaction, confirmation, or request for feedback mentioned in the **Workflow** (e.g., manual verification plans or guidance on persistent failures) MUST be conducted using the `ask_user` tool.
 
 5.  **Finalize Track:**
     -   After all tasks in the track's local **Implementation Plan** are completed, you MUST update the track's status in the **Tracks Registry**.
@@ -99,31 +116,49 @@ CRITICAL: You must validate the success of every tool call. If any tool call fai
     a.  **Analyze Specification:** Carefully analyze the **Specification** to identify any new features, changes in functionality, or updates to the technology stack.
     b.  **Update Product Definition:**
         i. **Condition for Update:** Based on your analysis, you MUST determine if the completed feature or bug fix significantly impacts the description of the product itself.
-        ii. **Propose and Confirm Changes:** If an update is needed, generate the proposed changes. Then, present them to the user for confirmation:
-            > "Based on the completed track, I propose the following updates to the **Product Definition**:"
-            > ```diff
-            > [Proposed changes here, ideally in a diff format]
-            > ```
-            > "Do you approve these changes? (yes/no)"
+        ii. **Propose and Confirm Changes:** If an update is needed:
+            -   **Announce:** Briefly state that updates are proposed. Do NOT repeat the request to review in the chat.
+            -   **Ask for Approval:** Use the `ask_user` tool to request confirmation. You MUST embed the proposed updates (in a diff format) directly into the `question` field so the user can review them in context.
+                - **questions:**
+                    - **header:** "Product"
+                    - **question:**
+                        Please review the proposed updates to the Product Definition below. Do you approve?
+
+                        ---
+
+                        <Insert Proposed product.md Updates/Diff Here>
+                    - **type:** "yesno"
         iii. **Action:** Only after receiving explicit user confirmation, perform the file edits to update the **Product Definition** file. Keep a record of whether this file was changed.
     c.  **Update Tech Stack:**
         i. **Condition for Update:** Similarly, you MUST determine if significant changes in the technology stack are detected as a result of the completed track.
-        ii. **Propose and Confirm Changes:** If an update is needed, generate the proposed changes. Then, present them to the user for confirmation:
-            > "Based on the completed track, I propose the following updates to the **Tech Stack**:"
-            > ```diff
-            > [Proposed changes here, ideally in a diff format]
-            > ```
-            > "Do you approve these changes? (yes/no)"
+        ii. **Propose and Confirm Changes:** If an update is needed:
+            -   **Announce:** Briefly state that updates are proposed. Do NOT repeat the request to review in the chat.
+            -   **Ask for Approval:** Use the `ask_user` tool to request confirmation. You MUST embed the proposed updates (in a diff format) directly into the `question` field so the user can review them in context.
+                - **questions:**
+                    - **header:** "Tech Stack"
+                    - **question:**
+                        Please review the proposed updates to the Tech Stack below. Do you approve?
+
+                        ---
+
+                        <Insert Proposed tech-stack.md Updates/Diff Here>
+                    - **type:** "yesno"
         iii. **Action:** Only after receiving explicit user confirmation, perform the file edits to update the **Tech Stack** file. Keep a record of whether this file was changed.
     d. **Update Product Guidelines (Strictly Controlled):**
         i. **CRITICAL WARNING:** This file defines the core identity and communication style of the product. It should be modified with extreme caution and ONLY in cases of significant strategic shifts, such as a product rebrand or a fundamental change in user engagement philosophy. Routine feature updates or bug fixes should NOT trigger changes to this file.
         ii. **Condition for Update:** You may ONLY propose an update to this file if the track's **Specification** explicitly describes a change that directly impacts branding, voice, tone, or other core product guidelines.
-        iii. **Propose and Confirm Changes:** If the conditions are met, you MUST generate the proposed changes and present them to the user with a clear warning:
-            > "WARNING: The completed track suggests a change to the core **Product Guidelines**. This is an unusual step. Please review carefully:"
-            > ```diff
-            > [Proposed changes here, ideally in a diff format]
-            > ```
-            > "Do you approve these critical changes to the **Product Guidelines**? (yes/no)"
+        iii. **Propose and Confirm Changes:** If the conditions are met:
+            -   **Announce:** Briefly state that updates are proposed. Do NOT repeat the request to review in the chat.
+            -   **Ask for Approval:** Use the `ask_user` tool to request confirmation. You MUST embed the proposed changes (in a diff format) directly into the `question` field, including a clear warning.
+                - **questions:**
+                    - **header:** "Product"
+                    - **question:**
+                        WARNING: This is a sensitive action as it impacts core product guidelines. Please review the proposed changes below. Do you approve these critical changes?
+
+                        ---
+
+                        <Insert Proposed product-guidelines.md Updates/Diff Here>
+                    - **type:** "yesno"
         iv. **Action:** Only after receiving explicit user confirmation, perform the file edits. Keep a record of whether this file was changed.
 
 6.  **Final Report:** Announce the completion of the synchronization process and provide a summary of the actions taken.
@@ -146,34 +181,41 @@ CRITICAL: You must validate the success of every tool call. If any tool call fai
 
 1.  **Execution Trigger:** This protocol MUST only be executed after the current track has been successfully implemented and the `SYNCHRONIZE PROJECT DOCUMENTATION` step is complete.
 
-2.  **Ask for User Choice:** You MUST prompt the user with the available options for the completed track.
-    > "Track '<track_description>' is now complete. What would you like to do?
-    > A.  **Review (Recommended):** Run the review command to verify changes before finalizing.
-    > B.  **Archive:** Move the track's folder to `conductor/archive/` and remove it from the tracks file.
-    > C.  **Delete:** Permanently delete the track's folder and remove it from the tracks file.
-    > D.  **Skip:** Do nothing and leave it in the tracks file.
-    > Please enter the option of your choice (A, B, C, or D)."
+2.  **Ask for User Choice:** Immediately call the `ask_user` tool to prompt the user (do not repeat the question in the chat):
+    - **questions:**
+        - **header:** "Track Cleanup"
+        - **question:** "Track '<track_description>' is now complete. What would you like to do?"
+        - **type:** "choice"
+        - **multiSelect:** false
+        - **options:**
+            - Label: "Review", Description: "Run the review command to verify changes before finalizing."
+            - Label: "Archive", Description: "Move the track's folder to `conductor/archive/` and remove it from the tracks file."
+            - Label: "Delete", Description: "Permanently delete the track's folder and remove it from the tracks file."
+            - Label: "Skip", Description: "Do nothing and leave it in the tracks file."
 
 3.  **Handle User Response:**
-    *   **If user chooses "A" (Review):**
+    *   **If user chooses "Review":**
         *   Announce: "Please run `/conductor:review` to verify your changes. You will be able to archive or delete the track after the review."
-    *   **If user chooses "B" (Archive):**
+    *   **If user chooses "Archive":**
         i.   **Create Archive Directory:** Check for the existence of `conductor/archive/`. If it does not exist, create it.
         ii.  **Archive Track Folder:** Move the track's folder from its current location (resolved via the **Tracks Directory**) to `conductor/archive/<track_id>`.
         iii. **Remove from Tracks File:** Read the content of the **Tracks Registry** file, remove the entire section for the completed track (the part that starts with `---` and contains the track description), and write the modified content back to the file.
         iv.  **Commit Changes:** Stage the **Tracks Registry** file and `conductor/archive/`. Commit with the message `chore(conductor): Archive track '<track_description>'`.
         v.   **Announce Success:** Announce: "Track '<track_description>' has been successfully archived."
-    *   **If user chooses "C" (Delete):**
-        i. **CRITICAL WARNING:** Before proceeding, you MUST ask for a final confirmation due to the irreversible nature of the action.
-            > "WARNING: This will permanently delete the track folder and all its contents. This action cannot be undone. Are you sure you want to proceed? (yes/no)"
+    *   **If user chooses "Delete":**
+        i. **CRITICAL WARNING:** Before proceeding, immediately call the `ask_user` tool to ask for final confirmation (do not repeat the warning in the chat):
+            - **questions:**
+                - **header:** "Confirm"
+                - **question:** "WARNING: This will permanently delete the track folder and all its contents. This action cannot be undone. Are you sure?"
+                - **type:** "yesno"
         ii. **Handle Confirmation:**
             - **If 'yes'**:
                 a. **Delete Track Folder:** Resolve the **Tracks Directory** and permanently delete the track's folder from `<Tracks Directory>/<track_id>`.
                 b. **Remove from Tracks File:** Read the content of the **Tracks Registry** file, remove the entire section for the completed track, and write the modified content back to the file.
                 c. **Commit Changes:** Stage the **Tracks Registry** file and the deletion of the track directory. Commit with the message `chore(conductor): Delete track '<track_description>'`.
                 d. **Announce Success:** Announce: "Track '<track_description>' has been permanently deleted."
-            - **If 'no' (or anything else)**:
+            - **If 'no'**:
                 a. **Announce Cancellation:** Announce: "Deletion cancelled. The track has not been changed."
-    *   **If user chooses "D" (Skip) or provides any other input:**
+    *   **If user chooses "Skip":**
         *   Announce: "Okay, the completed track will remain in your tracks file for now."
-"""
+"""

package/dist/templates/commands/newTrack.toml

@@ -30,8 +30,12 @@ CRITICAL: You must validate the success of every tool call. If any tool call fai
 1.  **Load Project Context:** Read and understand the content of the project documents (**Product Definition**, **Tech Stack**, etc.) resolved via the **Universal File Resolution Protocol**.
 2.  **Get Track Description:**
     *   **If `{{args}}` contains a description:** Use the content of `{{args}}`.
-    *   **If `{{args}}` is empty:** Ask the user:
-        > "Please provide a brief description of the track (feature, bug fix, chore, etc.) you wish to start."
+    *   **If `{{args}}` is empty:** Ask the user using the `ask_user` tool (do not repeat the question in the chat):
+        - **questions:**
+            - **header:** "Description"
+            - **type:** "text"
+            - **question:** "Please provide a brief description of the track (feature, bug fix, chore, etc.) you wish to start."
+            - **placeholder:** "e.g., Implement user authentication"
         Await the user's response and use it as the track description.
 3.  **Infer Track Type:** Analyze the description to determine if it is a "Feature" or "Something Else" (e.g., Bug, Chore, Refactor). Do NOT ask the user to classify it.
 
@@ -40,48 +44,57 @@ CRITICAL: You must validate the success of every tool call. If any tool call fai
 1.  **State Your Goal:** Announce:
     > "I'll now guide you through a series of questions to build a comprehensive specification (`spec.md`) for this track."
 
-2.  **Questioning Phase:** Ask a series of questions to gather details for the `spec.md`. Tailor questions based on the track type (Feature or Other).
-    *   **CRITICAL:** You MUST ask these questions sequentially (one by one). Do not ask multiple questions in a single turn. Wait for the user's response after each question.
+2.  **Questioning Phase:** Ask a series of questions to gather details for the `spec.md` using the `ask_user` tool. You must batch up to 4 related questions in a single tool call to streamline the process. Tailor questions based on the track type (Feature or Other).
+    *   **CRITICAL:** Wait for the user's response after each `ask_user` tool call.
     *   **General Guidelines:**
         *   Refer to information in **Product Definition**, **Tech Stack**, etc., to ask context-aware questions.
         *   Provide a brief explanation and clear examples for each question.
-        *   **Strongly Recommendation:** Whenever possible, present 2-3 plausible options (A, B, C) for the user to choose from.
-        *   **Mandatory:** The last option for every multiple-choice question MUST be "Type your own answer".
-        
+        *   **Strongly Recommendation:** Whenever possible, present 2-3 plausible options for the user to choose from.
+
         *   **1. Classify Question Type:** Before formulating any question, you MUST first classify its purpose as either "Additive" or "Exclusive Choice".
             *   Use **Additive** for brainstorming and defining scope (e.g., users, goals, features, project guidelines). These questions allow for multiple answers.
             *   Use **Exclusive Choice** for foundational, singular commitments (e.g., selecting a primary technology, a specific workflow rule). These questions require a single answer.
-
-        *   **2. Formulate the Question:** Based on the classification, you MUST adhere to the following:
-            *   **Strongly Recommended:** Whenever possible, present 2-3 plausible options (A, B, C) for the user to choose from.
-            *   **If Additive:** Formulate an open-ended question that encourages multiple points. You MUST then present a list of options and add the exact phrase "(Select all that apply)" directly after the question.
-            *   **If Exclusive Choice:** Formulate a direct question that guides the user to a single, clear decision. You MUST NOT add "(Select all that apply)".
+        
+        *   **2. Formulate the Question:** Use the `ask_user` tool: Adhere to the following for each question in the `questions` array:
+            - **header:** Very short label (max 16 chars).
+            - **type:** "choice", "text", or "yesno".
+            - **multiSelect:** (Required for type: "choice") Set to `true` for multi-select (additive) or `false` for single-choice (exclusive).
+            - **options:** (Required for type: "choice") Provide 2-4 options, each with a `label` and `description`. Note that "Other" is automatically added.
+            - **placeholder:** (For type: "text") Provide a hint.
 
         *   **3. Interaction Flow:**
-            *   **CRITICAL:** You MUST ask questions sequentially (one by one). Do not ask multiple questions in a single turn. Wait for the user's response after each question.
-            *   The last option for every multiple-choice question MUST be "Type your own answer".
-            *   Confirm your understanding by summarizing before moving on to the next question or section..
+            *   Wait for the user's response after each `ask_user` tool call.
+            *   If the user selects "Other", use a subsequent `ask_user` tool call with `type: "text"` to get their input if necessary.
+            *   Confirm your understanding by summarizing before moving on to drafting.
 
     *   **If FEATURE:**
-        *   **Ask 3-5 relevant questions** to clarify the feature request.
+        *   **Ask 3-4 relevant questions** to clarify the feature request using the `ask_user` tool.
         *   Examples include clarifying questions about the feature, how it should be implemented, interactions, inputs/outputs, etc.
         *   Tailor the questions to the specific feature request (e.g., if the user didn't specify the UI, ask about it; if they didn't specify the logic, ask about it).
 
     *   **If SOMETHING ELSE (Bug, Chore, etc.):**
-        *   **Ask 2-3 relevant questions** to obtain necessary details.
+        *   **Ask 2-3 relevant questions** to obtain necessary details using the `ask_user` tool.
         *   Examples include reproduction steps for bugs, specific scope for chores, or success criteria.
         *   Tailor the questions to the specific request.
 
 3.  **Draft `spec.md`:** Once sufficient information is gathered, draft the content for the track's `spec.md` file, including sections like Overview, Functional Requirements, Non-Functional Requirements (if any), Acceptance Criteria, and Out of Scope.
 
-4.  **User Confirmation:** Present the drafted `spec.md` content to the user for review and approval.
-    > "I've drafted the specification for this track. Please review the following:"
-    >
-    > ```markdown
-    > [Drafted spec.md content here]
-    > ```
-    >
-    > "Does this accurately capture the requirements? Please suggest any changes or confirm."
+4.  **User Confirmation:**
+    -   **Announce:** Briefly state that the draft is ready (e.g., "Draft generated."). Do NOT repeat the request to "review" or "approve" in the chat.
+    -   **Ask for Approval:** Use the `ask_user` tool to request confirmation. You MUST embed the drafted content directly into the `question` field so the user can review it in context.
+        - **questions:**
+            - **header:** "Confirm Spec"
+            - **question:**
+                Please review the drafted Specification below. Does this accurately capture the requirements?
+
+                ---
+
+                <Insert Drafted spec.md Content Here>
+            - **type:** "choice"
+            - **multiSelect:** false
+            - **options:**
+                - Label: "Approve", Description: "The specification looks correct, proceed to planning."
+                - Label: "Revise", Description: "I want to make changes to the requirements."
     Await user feedback and revise the `spec.md` content until confirmed.
 
 ### 2.3 Interactive Plan Generation (`plan.md`)
@@ -99,14 +112,22 @@ CRITICAL: You must validate the success of every tool call. If any tool call fai
         - Sub-task: `    - [ ] ...`
     *   **CRITICAL: Inject Phase Completion Tasks.** Determine if a "Phase Completion Verification and Checkpointing Protocol" is defined in the **Workflow**. If this protocol exists, then for each **Phase** that you generate in `plan.md`, you MUST append a final meta-task to that phase. The format for this meta-task is: `- [ ] Task: Conductor - User Manual Verification '<Phase Name>' (Protocol in workflow.md)`.
 
-3.  **User Confirmation:** Present the drafted `plan.md` to the user for review and approval.
-    > "I've drafted the implementation plan. Please review the following:"
-    >
-    > ```markdown
-    > [Drafted plan.md content here]
-    > ```
-    >
-    > "Does this plan look correct and cover all the necessary steps based on the spec and our workflow? Please suggest any changes or confirm."
+3.  **User Confirmation:**
+    -   **Announce:** Briefly state that the draft is ready (e.g., "Draft generated."). Do NOT repeat the request to "review" or "approve" in the chat.
+    -   **Ask for Approval:** Use the `ask_user` tool to request confirmation. You MUST embed the drafted content directly into the `question` field so the user can review it in context.
+        - **questions:**
+            - **header:** "Confirm Plan"
+            - **question:**
+                Please review the drafted Implementation Plan below. Does this look correct and cover all the necessary steps?
+
+                ---
+
+                <Insert Drafted plan.md Content Here>
+            - **type:** "choice"
+            - **multiSelect:** false
+            - **options:**
+                - Label: "Approve", Description: "The plan looks solid, proceed to implementation."
+                - Label: "Revise", Description: "I want to modify the implementation steps."
     Await user feedback and revise the `plan.md` content until confirmed.
 
 ### 2.4 Create Track Artifacts and Update Main Plan
@@ -148,7 +169,10 @@ CRITICAL: You must validate the success of every tool call. If any tool call fai
         *Link: [./<Relative Track Path>/](./<Relative Track Path>/)*
         ```
         (Replace `<Relative Track Path>` with the path to the track directory relative to the **Tracks Registry** file location.)
-7.  **Announce Completion:** Inform the user:
+7.  **Commit Code Changes:**
+    -   **Announce:** Inform the user you are committing the **Tracks Registry** changes.
+    -   **Commit Changes:** Stage the **Tracks Registry** files and commit with the message `chore(conductor): Add new track '<track_description>'`.
+8.  **Announce Completion:** Inform the user:
     > "New track '<track_id>' has been created and added to the tracks file. You can now start implementation by running `/conductor:implement`."
 
 """

package/dist/templates/commands/revert.toml

@@ -37,42 +37,35 @@ CRITICAL: You must validate the success of every tool call. If any tool call fai
 
     *   **PATH A: Direct Confirmation**
         1.  Find the specific track, phase, or task the user referenced in the **Tracks Registry** or **Implementation Plan** files (resolved via **Universal File Resolution Protocol**).
-        2.  Ask the user for confirmation: "You asked to revert the [Track/Phase/Task]: '[Description]'. Is this correct?".
-            - **Structure:**
-                A) Yes
-                B) No
-        3.  If "yes", establish this as the `target_intent` and proceed to Phase 2. If "no", ask clarifying questions to find the correct item to revert.
+        2.  Immediately call the `ask_user` tool to confirm the selection (do not repeat the question in the chat):
+            - **questions:**
+                - **header:** "Confirm"
+                - **question:** "You asked to revert the [Track/Phase/Task]: '[Description]'. Is this correct?"
+                - **type:** "yesno"
+        3.  If "yes", establish this as the `target_intent` and proceed to Phase 2. If "no", immediately call the `ask_user` tool to ask clarifying questions (do not repeat the question in the chat):
+            - **questions:**
+                - **header:** "Clarify"
+                - **question:** "I'm sorry, I misunderstood. Please describe the Track, Phase, or Task you would like to revert."
+                - **type:** "text"
 
     *   **PATH B: Guided Selection Menu**
         1.  **Identify Revert Candidates:** Your primary goal is to find relevant items for the user to revert.
             *   **Scan All Plans:** You MUST read the **Tracks Registry** and every track's **Implementation Plan** (resolved via **Universal File Resolution Protocol** using the track's index file).
-            *   **Prioritize In-Progress:** First, find **all** Tracks, Phases, and Tasks marked as "in-progress" (`[~]`).
-            *   **Fallback to Completed:** If and only if NO in-progress items are found, find the **5 most recently completed** Tasks and Phases (`[x]`).
-        2.  **Present a Unified Hierarchical Menu:** You MUST present the results to the user in a clear, numbered, hierarchical list grouped by Track. The introductory text MUST change based on the context.
-            *   **Example when in-progress items are found:**
-                > "I found multiple in-progress items. Please choose which one to revert:
-                >
-                > Track: track_20251208_user_profile
-                >   1) [Phase] Implement Backend API
-                >   2) [Task] Update user model
-                >
-                > 3) A different Track, Task, or Phase."
-            *   **Example when showing recently completed items:**
-                > "No items are in progress. Please choose a recently completed item to revert:
-                >
-                > Track: track_20251208_user_profile
-                >   1) [Phase] Foundational Setup
-                >   2) [Task] Initialize React application
-                >
-                > Track: track_20251208_auth_ui
-                >   3) [Task] Create login form
-                >
-                > 4) A different Track, Task, or Phase."
+            *   **Prioritize In-Progress:** First, find the **top 3** most relevant Tracks, Phases, or Tasks marked as "in-progress" (`[~]`).
+            *   **Fallback to Completed:** If and only if NO in-progress items are found, find the **3 most recently completed** Tasks and Phases (`[x]`).
+        2.  **Present a Unified Hierarchical Menu:** Immediately call the `ask_user` tool to present the results (do not list them in the chat first):
+            - **questions:**
+                - **header:** "Select Item"
+                - **question:** "I found multiple in-progress items (or recently completed items). Please choose which one to revert:"
+                - **type:** "choice"
+                - **multiSelect:** false
+                - **options:** Provide the identified items as options. Group them by Track in the description if possible. **CRITICAL:** You MUST limit this array to a maximum of 4 items. 
+                    - **Example Option Label:** "[Task] Update user model", **Description:** "Track: track_20251208_user_profile"
+                    - **Example Option Label:** "[Phase] Implement Backend", **Description:** "Track: track_20251208_user_profile"
+                    - **Note:** The "Other" option is automatically added by the tool.
         3.  **Process User's Choice:**
-            *   If the user's response is **A** or **B**, set this as the `target_intent` and proceed directly to Phase 2.
-            *   If the user's response is **C** or another value that does not match A or B, you must engage in a dialogue to find the correct target. Ask clarifying questions like:
-                * "What is the name or ID of the track you are looking for?"
-                * "Can you describe the task you want to revert?"
+            *   If the user selects a specific item from the list, set this as the `target_intent` and proceed directly to Phase 2.
+            *   If the user selects "Other" (automatically added for "choice") or the explicit "Other" option provided, you must engage in a dialogue to find the correct target using `ask_user` tool with a single question of `type: "text"` in the `questions` array.
                 * Once a target is identified, loop back to Path A for final confirmation.
 
 4.  **Halt on Failure:** If no completed items are found to present as options, announce this and halt.
@@ -112,11 +105,23 @@ CRITICAL: You must validate the success of every tool call. If any tool call fai
     > `  - <sha_plan_commit> ('conductor(plan): Mark task complete')`
     > *   **Action:** I will run `git revert` on these commits in reverse order.
 
-2.  **Final Go/No-Go:** Ask for final confirmation: "**Do you want to proceed? (yes/no)**".
-    - **Structure:**
-        A) Yes
-        B) No
-    3.  If "yes", proceed to Phase 4. If "no", ask clarifying questions to get the correct plan for revert.
+2.  **Final Go/No-Go:** Immediately call the `ask_user` tool to ask for final confirmation (do not repeat the question in the chat):
+    - **questions:**
+        - **header:** "Confirm Plan"
+        - **question:** "Do you want to proceed with the drafted plan?"
+        - **type:** "choice"
+        - **multiSelect:** false
+        - **options:**
+            - Label: "Approve", Description: "Proceed with the revert actions."
+            - Label: "Revise", Description: "I want to change the revert plan."
+
+3.  **Process User Choice:**
+    - If "Approve", proceed to Phase 4.
+    - If "Revise", immediately call the `ask_user` tool to get the correct plan (do not repeat the question in the chat):
+        - **questions:**
+            - **header:** "Revise"
+            - **question:** "Please describe the changes needed for the revert plan."
+            - **type:** "text"
 
 ---