spets 0.1.66 → 0.1.68

package/dist/index.js

@@ -930,8 +930,8 @@ function buildClarifyPrompt(params) {
   const parts = [];
   parts.push("# Clarify Phase");
   parts.push("");
-  parts.push("Your task is to identify any questions that need user input before generating the document.");
-  parts.push("Do NOT generate the document yet - only generate questions if needed.");
+  parts.push("Your task is to identify decisions that need user input before proceeding.");
+  parts.push("Do NOT generate the document yet - only identify decision points.");
   parts.push("");
   parts.push("## Task Information");
   parts.push("");
@@ -943,71 +943,63 @@ function buildClarifyPrompt(params) {
   parts.push("");
   parts.push(params.gatheredContext);
   parts.push("");
-  if (params.previousQA && params.previousQA.length > 0) {
-    const unresolvedEntries = params.previousQA.filter((e) => !e.question.resolved);
-    const resolvedEntries = params.previousQA.filter((e) => e.question.resolved);
-    if (unresolvedEntries.length > 0) {
-      parts.push("## Unresolved Questions");
-      parts.push("");
-      parts.push("The user indicated confusion on these questions. Re-ask with a clearer explanation:");
-      parts.push("");
-      for (const entry of unresolvedEntries) {
-        parts.push(`**Original Question:** ${entry.question.question}`);
-        if (entry.question.context) {
-          parts.push(`Context: ${entry.question.context}`);
-        }
-        parts.push(`**User Response:** "${entry.answer.answer}"`);
-        parts.push("");
-        parts.push("\u2192 Re-ask this question with simpler language, concrete examples, or more context.");
-        parts.push("");
-      }
-    }
-    if (resolvedEntries.length > 0) {
-      parts.push("## Previous Questions & Answers");
-      parts.push("");
-      for (const entry of resolvedEntries) {
-        parts.push(`**Q: ${entry.question.question}**`);
-        if (entry.question.context) {
-          parts.push(`Context: ${entry.question.context}`);
-        }
-        parts.push(`A: ${entry.answer.answer}`);
-        parts.push("");
+  const hasPreviousDecisions = params.previousDecisions && params.previousDecisions.length > 0;
+  if (hasPreviousDecisions) {
+    parts.push("## Previous Decisions");
+    parts.push("");
+    for (const entry of params.previousDecisions) {
+      const selectedOption = entry.decision.options.find((o) => o.id === entry.answer.selectedOptionId);
+      const label = entry.answer.selectedOptionId === "ai" ? `AI recommendation (${entry.decision.aiRecommendation?.optionId})` : selectedOption?.label || entry.answer.selectedOptionId;
+      parts.push(`**${entry.decision.decision}**: ${label}`);
+      if (entry.answer.customInput) {
+        parts.push(`  Custom input: ${entry.answer.customInput}`);
       }
-      parts.push("**Rules:**");
-      parts.push('- If user said "you decide" or "\uC54C\uC544\uC11C \uD574" \u2192 use your judgment and move on');
-      parts.push("- If user asked for options \u2192 provide options for that specific topic only");
-      parts.push("- Do NOT ask about topics already answered, even with different wording");
-      parts.push("- When in doubt, proceed rather than ask again");
       parts.push("");
     }
+    parts.push("Based on these decisions, identify any remaining decision points.");
+    parts.push("Do NOT re-ask about decisions already made.");
+    parts.push("");
+  } else {
+    parts.push("## Your Task");
+    parts.push("");
+    parts.push("Identify decision points where:");
+    parts.push("1. Multiple valid approaches exist");
+    parts.push("2. User preference matters");
+    parts.push("3. Tradeoffs need to be considered");
+    parts.push("");
   }
-  parts.push("## Consider These Questions");
-  parts.push("");
-  parts.push("1. Is the task description clear enough to proceed?");
-  parts.push("2. Are there multiple valid approaches that need user decision?");
-  parts.push("3. Are there ambiguities that could lead to wrong implementation?");
-  parts.push("4. Are there missing requirements or constraints?");
-  parts.push("");
   parts.push("## Output Format");
   parts.push("");
-  parts.push("Output a JSON object with questions array:");
+  parts.push("For each decision, provide options with descriptions and tradeoffs.");
+  parts.push('Always include "ai" as the last option with your recommendation.');
   parts.push("");
   parts.push("```json");
   parts.push("{");
-  parts.push('  "questions": [');
+  parts.push('  "ready": false,');
+  parts.push('  "decisions": [');
   parts.push("    {");
-  parts.push('      "id": "q1",');
-  parts.push('      "question": "Your specific question?",');
-  parts.push('      "context": "Why this matters for the document",');
-  parts.push('      "options": ["Option A", "Option B"]  // optional');
+  parts.push('      "id": "d1",');
+  parts.push('      "decision": "What needs to be decided",');
+  parts.push('      "why": "Why this decision matters",');
+  parts.push('      "options": [');
+  parts.push('        { "id": "opt1", "label": "Option A", "description": "...", "tradeoffs": "..." },');
+  parts.push('        { "id": "opt2", "label": "Option B", "description": "...", "tradeoffs": "..." },');
+  parts.push('        { "id": "ai", "label": "Let AI decide", "description": "AI chooses based on context", "recommendation": "opt1", "reason": "..." }');
+  parts.push("      ]");
   parts.push("    }");
   parts.push("  ]");
   parts.push("}");
   parts.push("```");
   parts.push("");
-  parts.push('If no questions are needed, return: `{"questions": []}`');
+  parts.push("If all clear to proceed:");
+  parts.push("```json");
+  parts.push('{ "ready": true, "decisions": [], "summary": "How we will proceed" }');
+  parts.push("```");
   parts.push("");
-  parts.push("**Important:** Output ONLY the JSON, no other text.");
+  parts.push("**Important:**");
+  parts.push("- Output ONLY the JSON, no other text.");
+  parts.push("- Every decision MUST have at least 2 concrete options with descriptions and tradeoffs.");
+  parts.push('- Every decision MUST include "ai" option as the last choice.');
   parts.push("");
   return parts.join("\n");
 }
@@ -1406,7 +1398,7 @@ var Orchestrator = class {
     };
   }
   /**
-   * Phase 2: Question generation
+   * Phase 2: Decision identification
    */
   responsePhaseClarify(state) {
     const prompt = buildClarifyPrompt({
@@ -1414,7 +1406,9 @@ var Orchestrator = class {
       step: state.currentStep,
       description: state.description,
       gatheredContext: state.exploreOutput ? JSON.stringify(state.exploreOutput) : "",
+      previousDecisions: state.decisionHistory,
       previousQA: state.qaHistory,
+      // Legacy support
       cwd: this.cwd
     });
     return {
@@ -1425,7 +1419,9 @@ var Orchestrator = class {
       description: state.description,
       prompt,
       gatheredContext: state.exploreOutput ? JSON.stringify(state.exploreOutput) : "",
+      previousDecisions: state.decisionHistory,
       previousQA: state.qaHistory,
+      // Legacy support
       onComplete: `npx spets orchestrate clarify-done ${state.taskId}`
     };
   }
@@ -1529,7 +1525,7 @@ ${issues}`;
     };
   }
   /**
-   * Checkpoint: Questions need answers
+   * Checkpoint: Decisions need user input
    */
   responseCheckpointClarify(state) {
     return {
@@ -1537,7 +1533,9 @@ ${issues}`;
       checkpoint: "clarify",
       taskId: state.taskId,
       step: state.currentStep,
+      decisions: state.decisions || [],
       questions: state.questions || [],
+      // Legacy support
       onComplete: `npx spets orchestrate clarified ${state.taskId} '<answers_json>'`
     };
   }
@@ -1633,23 +1631,23 @@ ${issues}`;
     return this.responsePhaseClarify(state);
   }
   /**
-   * Phase 2 complete: Questions generated (or none)
-   * If questions exist → checkpoint
-   * If no questions → move to execute phase with accumulated answers
+   * Phase 2 complete: Decisions identified (or ready to proceed)
+   * If decisions exist → checkpoint for user input
+   * If ready → move to execute phase
    */
-  cmdClarifyDone(taskId, questions) {
+  cmdClarifyDone(taskId, clarifyOutput) {
     const state = this.loadState(taskId);
     if (!state) {
       return this.responseError(`No workflow found: ${taskId}`, taskId);
     }
-    if (questions.length > 0) {
-      state.questions = questions;
+    if (!clarifyOutput.ready && clarifyOutput.decisions.length > 0) {
+      state.decisions = clarifyOutput.decisions;
       state.status = "clarify_pending";
       state.phase = "clarify";
       this.saveState(state);
       return this.responseCheckpointClarify(state);
     }
-    state.answers = state.qaHistory?.map((entry) => entry.answer);
+    state.answers = state.decisionHistory?.map((entry) => entry.answer);
     state.status = "phase_execute";
     state.phase = "execute";
     state.verifyAttempts = 0;
@@ -1657,54 +1655,45 @@ ${issues}`;
     return this.responsePhaseExecute(state);
   }
   /**
-   * Check if an answer indicates user confusion
+   * Legacy support: Questions-based clarify done
+   * @deprecated Use decision-based cmdClarifyDone instead
    */
-  isConfusedAnswer(answer) {
-    const confusionPatterns = [
-      /don'?t understand/i,
-      /not sure/i,
-      /unclear/i,
-      /what do you mean/i,
-      /i'?m confused/i,
-      /can you explain/i,
-      /뭔 말/i,
-      /이해가 안/i,
-      /모르겠/i,
-      /무슨 말/i,
-      /잘 모르/i
-    ];
-    return confusionPatterns.some((p) => p.test(answer));
+  cmdClarifyDoneLegacy(taskId, questions) {
+    const state = this.loadState(taskId);
+    if (!state) {
+      return this.responseError(`No workflow found: ${taskId}`, taskId);
+    }
+    if (questions.length > 0) {
+      state.questions = questions;
+      state.status = "clarify_pending";
+      state.phase = "clarify";
+      this.saveState(state);
+      return this.responseCheckpointClarify(state);
+    }
+    state.answers = state.qaHistory?.map((entry) => entry.answer);
+    state.status = "phase_execute";
+    state.phase = "execute";
+    state.verifyAttempts = 0;
+    this.saveState(state);
+    return this.responsePhaseExecute(state);
   }
   /**
-   * Human answered questions
-   * - Mark questions as resolved if answer is clear
-   * - Keep questions unresolved if user indicates confusion
-   * - Re-ask unresolved questions until all are resolved
+   * Human made decisions
+   * - Store decisions in history
+   * - Loop back to clarify phase to check for remaining decisions
    */
   cmdClarified(taskId, answers) {
     const state = this.loadState(taskId);
     if (!state) {
       return this.responseError(`No workflow found: ${taskId}`, taskId);
     }
-    const questions = state.questions || [];
-    for (const answer of answers) {
-      const question = questions.find((q) => q.id === answer.questionId);
-      if (question) {
-        question.resolved = !this.isConfusedAnswer(answer.answer);
-      }
-    }
-    const newEntries = questions.map((q, i) => ({
-      question: q,
-      answer: answers[i] || { questionId: q.id, answer: "" }
+    const decisions = state.decisions || [];
+    const newEntries = decisions.map((d, i) => ({
+      decision: d,
+      answer: answers[i] || { decisionId: d.id, selectedOptionId: "ai" }
     }));
-    state.qaHistory = [...state.qaHistory || [], ...newEntries];
-    const unresolvedQuestions = questions.filter((q) => !q.resolved);
-    if (unresolvedQuestions.length > 0) {
-      state.questions = unresolvedQuestions;
-      this.saveState(state);
-      return this.responseCheckpointClarify(state);
-    }
-    state.questions = void 0;
+    state.decisionHistory = [...state.decisionHistory || [], ...newEntries];
+    state.decisions = void 0;
     state.answers = void 0;
     state.status = "phase_clarify";
     state.phase = "clarify";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "spets",
-  "version": "0.1.66",
+  "version": "0.1.68",
   "description": "Spec Driven Development Execution Framework",
   "type": "module",
   "main": "dist/index.js",