conductor-init 1.3.2 → 1.3.3

package/dist/conductor/commands/conductor/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"
 
 ---
 

package/dist/conductor/commands/conductor/review.toml

@@ -41,9 +41,22 @@ CRITICAL: You must validate the success of every tool call. If any tool call fai
 2.  **Auto-Detect Scope:**
     -   If no input, read the **Tracks Registry**.
     -   Look for a track marked as `[~] In Progress`.
-    -   If one exists, ask the user: "Do you want to review the in-progress track '<track_name>'? (yes/no)"
-    -   If no track is in progress, or user says "no", ask: "What would you like to review? (Enter a track name, or typing 'current' for uncommitted changes)"
-3.  **Confirm Scope:** Ensure you and the user agree on what is being reviewed.
+    -   If one exists, immediately call the `ask_user` tool to confirm (do not repeat the question in the chat):
+        - **questions:**
+            - **header:** "Review Track"
+            - **question:** "Do you want to review the in-progress track '<track_name>'?"
+            - **type:** "yesno"
+    -   If no track is in progress, or user says "no", immediately call the `ask_user` tool to ask for the scope (do not repeat the question in the chat):
+        - **questions:**
+            - **header:** "Select Scope"
+            - **question:** "What would you like to review?"
+            - **type:** "text"
+            - **placeholder:** "Enter track name, or 'current' for uncommitted changes"
+3.  **Confirm Scope:** Ensure you and the user agree on what is being reviewed by immediately calling the `ask_user` tool (do not repeat the question in the chat):
+    - **questions:**
+        - **header:** "Confirm Scope"
+        - **question:** "I will review: '<identified_scope>'. Is this correct?"
+        - **type:** "yesno"
 
 ### 2.2 Retrieve Context
 1.  **Load Project Context:**
@@ -61,7 +74,11 @@ CRITICAL: You must validate the success of every tool call. If any tool call fai
             -   Run `git diff <revision_range>` to get the full context in one go.
             -   Proceed to "Analyze and Verify".
         -   **Large Changes (> 300 lines):**
-            -   **Announce:** "Use 'Iterative Review Mode' due to change size."
+            -   **Confirm:** Immediately call the `ask_user` tool to confirm before proceeding with a large review (do not repeat the question in the chat):
+                - **questions:**
+                    - **header:** "Large Review"
+                    - **question:** "This review involves >300 lines of changes. I will use 'Iterative Review Mode' which may take longer. Proceed?"
+                    - **type:** "yesno"
             -   **List Files:** Run `git diff --name-only <revision_range>`.
             -   **Iterate:** For each source file (ignore locks/assets):
                 1.  Run `git diff <revision_range> -- <file_path>`.
@@ -114,48 +131,103 @@ CRITICAL: You must validate the success of every tool call. If any tool call fai
 ---
 
 ## 3.0 COMPLETION PHASE
-1.  **Review Decision:**
-    -   **Determine Recommendation and announce it to the user:**
-        -   If **Critical** or **High** issues found:
-            > "I recommend we fix the important issues I found before moving forward."
-        -   If only **Medium/Low** issues found:
-            > "The changes look good overall, but I have a few suggestions to improve them."
-        -   If no issues found:
-            > "Everything looks great! I don't see any issues."
-    -   **Action:**
-        -   **If issues found:** Ask:
-            > "Do you want me to apply the suggested fixes, fix them manually yourself, or proceed to complete the track?
-            > A. **Apply Fixes:** Automatically apply the suggested code changes.
-            > B. **Manual Fix:** Stop so you can fix issues yourself.
-            > C. **Complete Track:** Ignore warnings and proceed to cleanup.
-            > Please enter your choice (A, B, or C)."
-            -   **If "A" (Apply Fixes):** Apply the code modifications suggested in the findings using file editing tools. Then Proceed to next step.
-            -   **If "B" (Manual Fix):** Terminate operation to allow user to edit code.
-            -   **If "C" (Complete Track):** Proceed to the next step.
-        -   **If no issues found:** Proceed to the next step.
-
-2.  **Track Cleanup:**
-    **PROTOCOL: Offer to archive or delete the reviewed track.**
-
-    a.  **Context Check:** If you are NOT reviewing a specific track (e.g., just reviewing current changes without a track context), SKIP this entire section.
-
-    b.  **Ask for User Choice:**
-        > "Review complete. What would you like to do with track '<track_name>'?
-        > A.  **Archive:** Move to `conductor/archive/` and update registry.
-        > B.  **Delete:** Permanently remove from system.
-        > C.  **Skip:** Leave as is.
-        > Please enter your choice (A, B, or C)."
-
-    c.  **Handle User Response:**
-        *   **If "A" (Archive):**
-            i.   **Setup:** Ensure `conductor/archive/` exists.
-            ii.  **Move:** Move track folder to `conductor/archive/<track_id>`.
-            iii. **Update Registry:** Remove track section from **Tracks Registry**.
-            iv.  **Commit:** Stage registry and archive. Commit: `chore(conductor): Archive track '<track_name>'`.
-            v.   **Announce:** "Track '<track_name>' archived."
-        *   **If "B" (Delete):**
-            i.   **Confirm:** "WARNING: Irreversible deletion. Proceed? (yes/no)"
-            ii.  **If yes:** Delete track folder, remove from **Tracks Registry**, commit (`chore(conductor): Delete track '<track_name>'`), announce success.
-            iii. **If no:** Cancel.
-        *   **If "C" (Skip):** Leave track as is.
+
+### 3.1 Review Decision
+1.  **Determine Recommendation and announce it to the user:**
+    -   If **Critical** or **High** issues found:
+        - Announce: "I recommend we fix the important issues I found before moving forward."
+    -   If only **Medium/Low** issues found:
+        - Announce: "The changes look good overall, but I have a few suggestions to improve them."
+    -   If no issues found:
+        - Announce: "Everything looks great! I don't see any issues."
+2.  **Action:**
+    -   **If issues found:** Immediately call the `ask_user` tool (do not repeat the question in the chat):
+        - **questions:**
+            - **header:** "Decision"
+            - **question:** "How would you like to proceed with the findings?"
+            - **type:** "choice"
+            - **multiSelect:** false
+            - **options:**
+                - Label: "Apply Fixes", Description: "Automatically apply the suggested code changes."
+                - Label: "Manual Fix", Description: "Stop so you can fix issues yourself."
+                - Label: "Complete Track", Description: "Ignore warnings and proceed to cleanup."
+        -   **If "Apply Fixes":** Apply the code modifications suggested in the findings using file editing tools. Then Proceed to next step.
+        -   **If "Manual Fix":** Terminate operation to allow user to edit code.
+        -   **If "Complete Track":** Proceed to the next step.
+    -   **If no issues found:** Proceed to the next step.
+
+### 3.2 Commit Review Changes
+**PROTOCOL: Ensure all review-related changes are committed and tracked in the plan.**
+
+1.  **Check for Changes:** Use `git status --porcelain` to check for any uncommitted changes (staged or unstaged) in the repository.
+2.  **Condition for Action:**
+    -   If NO changes are detected, proceed to '3.3 Track Cleanup'.
+    -   If changes are detected:
+        a. **Check for Track Context:**
+            - If you are NOT reviewing a specific track (i.e., you don't have a `plan.md` in context), immediately call the `ask_user` tool (do not repeat the question in the chat):
+                - **questions:**
+                    - **header:** "Commit Changes"
+                    - **question:** "I've detected uncommitted changes. Should I commit them?"
+                    - **type:** "yesno"
+                - If 'yes', stage all changes and commit with `fix(conductor): Apply review suggestions <brief description of changes>`.
+                - Proceed to '3.3 Track Cleanup'.
+        b. **Handle Track-Specific Changes:**
+            i.   **Confirm with User:** Immediately call the `ask_user` tool (do not repeat the question in the chat):
+                - **questions:**
+                    - **header:** "Commit & Track"
+                    - **question:** "I've detected uncommitted changes from the review process. Should I commit these and update the track's plan?"
+                    - **type:** "yesno"
+            ii.  **If Yes:**
+                 - **Update Plan (Add Review Task):**
+                   - Read the track's `plan.md`.
+                   - Append a new phase (if it doesn't exist) and task to the end of the file.
+                   - **Format:**
+                     ```markdown
+                     ## Phase: Review Fixes
+                     - [~] Task: Apply review suggestions
+                     ```
+                 - **Commit Code:**
+                   - Stage all code changes related to the track (excluding `plan.md`).
+                   - Commit with message: `fix(conductor): Apply review suggestions for track '<track_name>'`.
+                 - **Record SHA:**
+                   - Get the short SHA (first 7 characters) of the commit.
+                   - Update the task in `plan.md` to: `- [x] Task: Apply review suggestions <sha>`.
+                 - **Commit Plan Update:**
+                   - Stage `plan.md`.
+                   - Commit with message: `conductor(plan): Mark task 'Apply review suggestions' as complete`.
+                 - **Announce Success:** "Review changes committed and tracked in the plan."
+            iii. **If No:** Skip the commit and plan update. Proceed to '3.3 Track Cleanup'.
+
+### 3.3 Track Cleanup
+**PROTOCOL: Offer to archive or delete the reviewed track.**
+
+1.  **Context Check:** If you are NOT reviewing a specific track (e.g., just reviewing current changes without a track context), SKIP this entire section.
+
+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:** "Review complete. What would you like to do with track '<track_name>'?"
+        - **type:** "choice"
+        - **multiSelect:** false
+        - **options:**
+            - 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 "Archive":**
+        i.   **Setup:** Ensure `conductor/archive/` exists.
+        ii.  **Move:** Move track folder to `conductor/archive/<track_id>`.
+        iii. **Update Registry:** Remove track section from **Tracks Registry**.
+        iv.  **Commit:** Stage registry and archive. Commit: `chore(conductor): Archive track '<track_name>'`.
+        v.   **Announce:** "Track '<track_name>' archived."
+    *   **If "Delete":**
+        i.   **Confirm:** 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 is an irreversible deletion. Do you want to proceed?"
+                - **type:** "yesno"
+        ii.  **If yes:** Delete track folder, remove from **Tracks Registry**, commit (`chore(conductor): Delete track '<track_name>'`), announce success.
+        iii. **If no:** Cancel.
+    *   **If "Skip":** Leave track as is.
 """