takt 0.2.2 → 0.3.0

package/resources/global/en/workflows/magi.yaml

@@ -8,7 +8,6 @@
 #   {step_iteration} - Per-step iteration count (how many times THIS step has been executed)
 #   {task}           - Original user request
 #   {previous_response} - Output from the previous step
-#   {git_diff}       - Current uncommitted changes (git diff)
 #   {user_inputs}    - Accumulated user inputs during workflow
 #   {report_dir}     - Report directory name (e.g., "20250126-143052-task-summary")
 
@@ -19,15 +18,22 @@ max_iterations: 5
 
 steps:
   - name: melchior
-    agent: ~/.takt/agents/magi/melchior.md
+    agent: ../agents/magi/melchior.md
     allowed_tools:
       - Read
       - Glob
       - Grep
       - WebSearch
       - WebFetch
-    status_rules_prompt: |
+    instruction_template: |
+      # MAGI System Initiated
 
+      ## Matter for Deliberation
+      {task}
+
+      ## Instructions
+      You are MELCHIOR-1 of the MAGI System.
+      Analyze the above from the perspective of a scientist/engineer and render your judgment.
 
       ## Output Format
 
@@ -44,29 +50,31 @@ steps:
 
       Reason: {Reason for approval}
       ```
-    instruction_template: |
-      # MAGI System Initiated
-
-      ## Matter for Deliberation
-      {task}
-
-      ## Instructions
-      You are MELCHIOR-1 of the MAGI System.
-      Analyze the above from the perspective of a scientist/engineer and render your judgment.
-    transitions:
-      - condition: always
-        next_step: balthasar
+    rules:
+      - condition: Judgment completed
+        next: balthasar
 
   - name: balthasar
-    agent: ~/.takt/agents/magi/balthasar.md
+    agent: ../agents/magi/balthasar.md
     allowed_tools:
       - Read
       - Glob
       - Grep
       - WebSearch
       - WebFetch
-    status_rules_prompt: |
+    instruction_template: |
+      # MAGI System Continuing
 
+      ## Matter for Deliberation
+      {task}
+
+      ## MELCHIOR-1's Judgment
+      {previous_response}
+
+      ## Instructions
+      You are BALTHASAR-2 of the MAGI System.
+      Analyze the above from the perspective of a nurturer and render your judgment.
+      Consider MELCHIOR's judgment as reference, but make your own independent assessment.
 
       ## Output Format
 
@@ -83,34 +91,33 @@ steps:
 
       Reason: {Reason for approval}
       ```
-    instruction_template: |
-      # MAGI System Continuing
-
-      ## Matter for Deliberation
-      {task}
-
-      ## MELCHIOR-1's Judgment
-      {previous_response}
-
-      ## Instructions
-      You are BALTHASAR-2 of the MAGI System.
-      Analyze the above from the perspective of a nurturer and render your judgment.
-      Consider MELCHIOR's judgment as reference, but make your own independent assessment.
     pass_previous_response: true
-    transitions:
-      - condition: always
-        next_step: casper
+    rules:
+      - condition: Judgment completed
+        next: casper
 
   - name: casper
-    agent: ~/.takt/agents/magi/casper.md
+    agent: ../agents/magi/casper.md
     allowed_tools:
       - Read
       - Glob
       - Grep
       - WebSearch
       - WebFetch
-    status_rules_prompt: |
+    instruction_template: |
+      # MAGI System Final Deliberation
+
+      ## Matter for Deliberation
+      {task}
+
+      ## Previous Judgments
+      {previous_response}
+
+      ## Instructions
+      You are CASPER-3 of the MAGI System.
+      Analyze the above from a practical/realistic perspective and render your judgment.
 
+      **Finally, tally the judgments from all three and provide the final conclusion.**
 
       ## Output Format
 
@@ -137,21 +144,7 @@ steps:
 
       [Reasoning/Summary]
       ```
-    instruction_template: |
-      # MAGI System Final Deliberation
-
-      ## Matter for Deliberation
-      {task}
-
-      ## Previous Judgments
-      {previous_response}
-
-      ## Instructions
-      You are CASPER-3 of the MAGI System.
-      Analyze the above from a practical/realistic perspective and render your judgment.
-
-      **Finally, tally the judgments from all three and provide the final conclusion.**
     pass_previous_response: true
-    transitions:
-      - condition: always
-        next_step: COMPLETE
+    rules:
+      - condition: Final judgment completed
+        next: COMPLETE

package/resources/global/en/workflows/research.yaml

@@ -12,7 +12,6 @@
 #   {step_iteration} - Per-step iteration count (how many times THIS step has been executed)
 #   {task}           - Original user request
 #   {previous_response} - Output from the previous step
-#   {git_diff}       - Current uncommitted changes (git diff)
 #   {user_inputs}    - Accumulated user inputs during workflow
 #   {report_dir}     - Report directory name (e.g., "20250126-143052-task-summary")
 
@@ -23,37 +22,13 @@ max_iterations: 10
 
 steps:
   - name: plan
-    agent: ~/.takt/agents/research/planner.md
+    agent: ../agents/research/planner.md
     allowed_tools:
       - Read
       - Glob
       - Grep
       - WebSearch
       - WebFetch
-    status_rules_prompt: |
-
-
-      ## Output Format
-
-      | Situation | Tag |
-      |-----------|-----|
-      | Plan complete | `[PLANNER:DONE]` |
-      | Insufficient info | `[PLANNER:BLOCKED]` |
-
-      ### Output Examples
-
-      **DONE case:**
-      ```
-      [PLANNER:DONE]
-      ```
-
-      **BLOCKED case:**
-      ```
-      [PLANNER:BLOCKED]
-
-      Clarifications needed:
-      - {Question 1}
-      ```
     instruction_template: |
       ## Workflow Status
       - Iteration: {iteration}/{max_iterations} (workflow-wide)
@@ -77,43 +52,20 @@ steps:
       - If multiple interpretations exist, include all in the research scope
       - If there is feedback from Supervisor, incorporate it into the plan
     pass_previous_response: true
-    transitions:
-      - condition: done
-        next_step: dig
-      - condition: blocked
-        next_step: ABORT
+    rules:
+      - condition: Planning is complete
+        next: dig
+      - condition: Insufficient information to create a plan
+        next: ABORT
 
   - name: dig
-    agent: ~/.takt/agents/research/digger.md
+    agent: ../agents/research/digger.md
     allowed_tools:
       - Read
       - Glob
       - Grep
       - WebSearch
       - WebFetch
-    status_rules_prompt: |
-
-
-      ## Output Format
-
-      | Situation | Tag |
-      |-----------|-----|
-      | Research complete | `[DIGGER:DONE]` |
-      | Unable to research | `[DIGGER:BLOCKED]` |
-
-      ### Output Examples
-
-      **DONE case:**
-      ```
-      [DIGGER:DONE]
-      ```
-
-      **BLOCKED case:**
-      ```
-      [DIGGER:BLOCKED]
-
-      Reason: {Why research was not possible}
-      ```
     instruction_template: |
       ## Workflow Status
       - Iteration: {iteration}/{max_iterations} (workflow-wide)
@@ -142,53 +94,20 @@ steps:
       - Codebase search
       - File reading
     pass_previous_response: true
-    transitions:
-      - condition: done
-        next_step: supervise
-      - condition: blocked
-        next_step: ABORT
+    rules:
+      - condition: Research is complete
+        next: supervise
+      - condition: Unable to conduct research
+        next: ABORT
 
   - name: supervise
-    agent: ~/.takt/agents/research/supervisor.md
+    agent: ../agents/research/supervisor.md
     allowed_tools:
       - Read
       - Glob
       - Grep
       - WebSearch
       - WebFetch
-    status_rules_prompt: |
-
-
-      ## Judgment Criteria
-
-      | Situation | Judgment |
-      |-----------|----------|
-      | Research results sufficient | APPROVE |
-      | Research results insufficient | REJECT |
-
-      ## Output Format
-
-      | Situation | Tag |
-      |-----------|-----|
-      | Research complete, results sufficient | `[SUPERVISOR:APPROVE]` |
-      | Insufficient, restart from planning | `[SUPERVISOR:REJECT]` |
-
-      ### Output Examples
-
-      **APPROVE case:**
-      ```
-      [SUPERVISOR:APPROVE]
-
-      Research results adequately answer the original request.
-      ```
-
-      **REJECT case:**
-      ```
-      [SUPERVISOR:REJECT]
-
-      Missing:
-      - {Specific missing items}
-      ```
     instruction_template: |
       ## Workflow Status
       - Iteration: {iteration}/{max_iterations} (workflow-wide)
@@ -206,10 +125,10 @@ steps:
 
       **Important**: If there are issues, include specific instructions for the Planner.
     pass_previous_response: true
-    transitions:
-      - condition: approved
-        next_step: COMPLETE
-      - condition: rejected
-        next_step: plan
+    rules:
+      - condition: Research results adequately answer the original request
+        next: COMPLETE
+      - condition: Research results are insufficient and replanning is needed
+        next: plan
 
 initial_step: plan