@benzotti/jedi 0.1.24 → 0.1.26

package/dist/index.js

@@ -9343,19 +9343,27 @@ Based on the user's request, follow the appropriate workflow:
 - **PR feedback** ("feedback"): Address review comments using \`.jdi/framework/agents/jdi-pr-feedback.md\`. Extract learnings from reviewer preferences.
 - **"do" + ClickUp URL**: Full flow \u2014 plan from ticket, then implement.
 
+## Approval Gate
+
+Planning and implementation are separate gates \u2014 NEVER auto-proceed to implementation after planning or plan refinement.
+When the user provides refinement feedback on a plan, ONLY update the plan files in \`.jdi/plans/\`. Do NOT implement code.
+Implementation only happens when the user explicitly approves ("approved", "lgtm", "looks good", "ship it") or explicitly requests implementation ("implement", "build", "execute").
+
 ## Auto-Commit (CI Mode)
 
-You are running inside a GitHub Action on a PR branch. After implementing or making changes:
-1. Stage all changed files with \`git add\` (only files you changed \u2014 NOT .jdi/ or .claude/)
-2. Commit with a conventional commit message (e.g. "feat: implement X")
-3. Push to the current branch with \`git push\`
-Do NOT ask the user whether to commit \u2014 just do it. The user will review the PR diff directly.
+You are already on the correct PR branch. Do NOT create new branches or switch branches.
+After **implementing** changes (NOT after planning or plan refinement):
+1. \`git add\` only source files you changed (NOT .jdi/ or .claude/)
+2. \`git commit -m "feat: ..."\` with a conventional commit message
+3. \`git push\` (no -u, no origin, no branch name \u2014 just \`git push\`)
+Plan files (\`.jdi/plans/\`) are cached separately and should NOT be committed.
 
 ## Iterative Refinement
 
 After completing any workflow, present a summary and ask for feedback.
-When the user provides feedback, apply changes incrementally \u2014 do not restart from scratch.
-When the user approves ("approved", "lgtm", "looks good"), finalise the work \u2014 commit and push all outstanding changes.
+- **Plan refinement feedback** (e.g. "add error handling", "change task 2", "use a different approach"): Update ONLY the plan files in \`.jdi/plans/\`. Present the updated plan. Ask "Any changes before implementation?" Do NOT implement code.
+- **Approval** ("approved", "lgtm", "looks good", "ship it"): Mark the plan as approved. Do NOT implement \u2014 wait for an explicit "implement" command.
+- **Questions** ("why did you...", "what about..."): Answer conversationally first, then take action if needed.
 
 ## ClickUp Integration
 
@@ -11221,7 +11229,8 @@ function parseComment(comment, isFollowUp) {
         description: comment.trim(),
         clickUpUrl: null,
         fullFlow: false,
-        isFeedback: true
+        isFeedback: true,
+        isApproval: false
       };
     }
     return null;
@@ -11232,28 +11241,28 @@ function parseComment(comment, isFollowUp) {
   const description = body.replace(/(https?:\/\/[^\s]*clickup\.com\/t\/[a-z0-9]+)/i, "").replace(/\s+/g, " ").trim();
   const lower = body.toLowerCase();
   if (lower.startsWith("ping") || lower.startsWith("status")) {
-    return { command: "ping", description: "", clickUpUrl: null, fullFlow: false, isFeedback: false };
+    return { command: "ping", description: "", clickUpUrl: null, fullFlow: false, isFeedback: false, isApproval: false };
   }
   if (lower.startsWith("plan ")) {
-    return { command: "plan", description, clickUpUrl, fullFlow: false, isFeedback: false };
+    return { command: "plan", description, clickUpUrl, fullFlow: false, isFeedback: false, isApproval: false };
   }
   if (lower.startsWith("implement")) {
-    return { command: "implement", description, clickUpUrl, fullFlow: false, isFeedback: false };
+    return { command: "implement", description, clickUpUrl, fullFlow: false, isFeedback: false, isApproval: false };
   }
   if (lower.startsWith("quick ")) {
-    return { command: "quick", description, clickUpUrl, fullFlow: false, isFeedback: false };
+    return { command: "quick", description, clickUpUrl, fullFlow: false, isFeedback: false, isApproval: false };
   }
   if (lower.startsWith("review")) {
-    return { command: "review", description, clickUpUrl, fullFlow: false, isFeedback: false };
+    return { command: "review", description, clickUpUrl, fullFlow: false, isFeedback: false, isApproval: false };
   }
   if (lower.startsWith("feedback")) {
-    return { command: "feedback", description, clickUpUrl, fullFlow: false, isFeedback: false };
+    return { command: "feedback", description, clickUpUrl, fullFlow: false, isFeedback: false, isApproval: false };
   }
   if (lower.startsWith("do ")) {
     if (clickUpUrl) {
-      return { command: "plan", description, clickUpUrl, fullFlow: true, isFeedback: false };
+      return { command: "plan", description, clickUpUrl, fullFlow: true, isFeedback: false, isApproval: false };
     }
-    return { command: "quick", description, clickUpUrl, fullFlow: false, isFeedback: false };
+    return { command: "quick", description, clickUpUrl, fullFlow: false, isFeedback: false, isApproval: false };
   }
   if (/^(approved?|lgtm|looks?\s*good|ship\s*it)/i.test(lower)) {
     return {
@@ -11261,7 +11270,8 @@ function parseComment(comment, isFollowUp) {
       description: body,
       clickUpUrl: null,
       fullFlow: false,
-      isFeedback: true
+      isFeedback: true,
+      isApproval: true
     };
   }
   if (isFollowUp) {
@@ -11270,10 +11280,11 @@ function parseComment(comment, isFollowUp) {
       description: body,
       clickUpUrl: null,
       fullFlow: false,
-      isFeedback: true
+      isFeedback: true,
+      isApproval: false
     };
   }
-  return { command: "plan", description, clickUpUrl, fullFlow: false, isFeedback: false };
+  return { command: "plan", description, clickUpUrl, fullFlow: false, isFeedback: false, isApproval: false };
 }
 var actionCommand = defineCommand({
   meta: {
@@ -11324,11 +11335,11 @@ var actionCommand = defineCommand({
       consola.error("Could not parse 'Hey Jedi' intent from comment");
       process.exit(1);
     }
-    consola.info(`Parsed intent: ${intent.isFeedback ? "feedback on previous" : intent.command}${intent.fullFlow ? " (full flow)" : ""}`);
+    consola.info(`Parsed intent: ${intent.isApproval ? "approval (finalise plan)" : intent.isFeedback ? "refinement feedback" : intent.command}${intent.fullFlow ? " (full flow)" : ""}`);
     if (repo && commentId) {
       await reactToComment(repo, commentId, "eyes").catch(() => {});
     }
-    const commandLabel = intent.isFeedback ? "feedback" : intent.command;
+    const commandLabel = intent.isApproval ? "plan" : intent.isFeedback ? "feedback" : intent.command;
     let placeholderCommentId = null;
     if (repo && issueNumber) {
       const thinkingBody = `<h3>\uD83E\uDDE0 Jedi <sup>thinking</sup></h3>
@@ -11416,7 +11427,7 @@ _Working on it..._`;
     }
     const baseProtocol = resolve9(cwd, ".jdi/framework/components/meta/AgentBase.md");
     let prompt2;
-    if (intent.isFeedback) {
+    if (intent.isFeedback && intent.isApproval) {
       prompt2 = [
         `Read ${baseProtocol} for the base agent protocol.`,
         ``,
@@ -11424,29 +11435,44 @@ _Working on it..._`;
         ``,
         conversationHistory,
         ``,
-        `## Current Feedback`,
-        `The user has provided feedback on previous Jedi work:`,
-        ``,
+        `## Plan Approved`,
         `> ${intent.description}`,
         ``,
-        `## Instructions`,
-        `Review the previous conversation above. The user is iterating on work Jedi already started.`,
+        `The user has approved the plan. Finalise it:`,
+        `1. Read \`.jdi/config/state.yaml\` and update \`review.status\` to "approved" and \`review.approved_at\` to now`,
+        `2. Do NOT implement any code \u2014 approval and implementation are separate gates`,
         ``,
-        `IMPORTANT: Always be conversational. If the user asks a question, ANSWER IT FIRST before taking any action.`,
-        `Explain your reasoning, then describe what you'll do (if anything), then do it.`,
-        `Never silently make changes without explaining why.`,
+        `Respond with a short confirmation that the plan is approved and ready, then ask:`,
+        `"Say **implement** when you're ready to go."`
+      ].join(`
+`);
+    } else if (intent.isFeedback) {
+      const agentSpec = resolve9(cwd, `.jdi/framework/agents/jdi-planner.md`);
+      prompt2 = [
+        `Read ${baseProtocol} for the base agent protocol.`,
+        `You are jdi-planner. Read ${agentSpec} for your full specification.`,
         ``,
-        `- If the feedback is a **question** ("why did you...", "what about...", "can you explain..."), answer it conversationally first. If the answer implies a change is needed, explain that and then apply it.`,
-        `- If the feedback is an **approval** ("approved", "lgtm", "looks good", "ship it"), finalise the current work \u2014 commit all outstanding changes and push to the current branch. Do NOT ask \u2014 just do it.`,
-        `- If the feedback is a **refinement** ("change task 2", "use a different approach", "add error handling"), explain what you're changing and why, then apply the changes. Present an updated summary with the full updated plan in a collapsible block:`,
-        `   <details>`,
-        `   <summary>View full plan</summary>`,
-        `   `,
-        `   [full updated plan content here as markdown]`,
-        `   `,
-        `   </details>`,
+        ...contextLines,
+        ``,
+        conversationHistory,
+        ``,
+        `## Refinement Feedback`,
+        `> ${intent.description}`,
+        ``,
+        `## HARD CONSTRAINTS \u2014 PLAN REFINEMENT MODE`,
+        `- ONLY modify files under \`.jdi/plans/\` and \`.jdi/config/\` \u2014 NEVER create, edit, or delete source code files`,
+        `- NEVER run \`git commit\`, \`git push\`, or any git write operations`,
+        `- Planning and implementation are SEPARATE gates \u2014 user must explicitly approve before implementation`,
+        ``,
+        `## Instructions`,
+        `Read state.yaml and existing plan files. Apply feedback incrementally \u2014 do not restart from scratch.`,
+        `If the feedback is a question, answer it conversationally. If it implies a plan change, update the plan.`,
         ``,
-        `Read state.yaml and any existing plan files to understand what was previously done. Apply changes incrementally \u2014 do not restart from scratch.`
+        `## Response Format (MANDATORY)`,
+        `1-2 sentence summary of what changed. Then the full updated plan in a collapsible block:`,
+        `\`<details><summary>View full plan</summary> ... </details>\``,
+        `Use the same plan structure as the initial plan (tasks table, per-task details, verification).`,
+        `End with: "Any changes before implementation?"`
       ].join(`
 `);
     } else {
@@ -11533,11 +11559,11 @@ Use the ClickUp ticket above as the primary requirements source.` : ``,
             `Follow the implement-plan orchestration.`,
             ``,
             `## Auto-Commit`,
-            `You are running inside a GitHub Action on a PR branch. After implementing all changes:`,
-            `1. Stage all changed files with \`git add\` (only files you changed \u2014 NOT .jdi/ or .claude/)`,
-            `2. Commit with a conventional commit message (e.g. "feat: implement X")`,
-            `3. Push to the current branch with \`git push\``,
-            `Do NOT ask the user \u2014 just commit and push. The user will review the PR diff directly.`,
+            `You are already on the correct PR branch. Do NOT create new branches or switch branches.`,
+            `After implementing all changes:`,
+            `1. \`git add\` only source files you changed (NOT .jdi/ or .claude/)`,
+            `2. \`git commit -m "feat: ..."\` with a conventional commit message`,
+            `3. \`git push\` (no -u, no origin, no branch name \u2014 just \`git push\`)`,
             `Present a summary of what was implemented and committed.`
           ].join(`
 `);
@@ -11553,11 +11579,12 @@ Use the ClickUp ticket above as the primary requirements source.` : ``,
             `Keep changes minimal and focused.`,
             ``,
             `## Auto-Commit`,
-            `You are running inside a GitHub Action on a PR branch. After making changes:`,
-            `1. Stage all changed files with \`git add\` (only files you changed \u2014 NOT .jdi/ or .claude/)`,
-            `2. Commit with a conventional commit message`,
-            `3. Push to the current branch with \`git push\``,
-            `Do NOT ask the user \u2014 just commit and push. Present what you changed.`
+            `You are already on the correct PR branch. Do NOT create new branches or switch branches.`,
+            `After making changes:`,
+            `1. \`git add\` only source files you changed (NOT .jdi/ or .claude/)`,
+            `2. \`git commit -m "..."\` with a conventional commit message`,
+            `3. \`git push\` (no -u, no origin, no branch name \u2014 just \`git push\`)`,
+            `Present what you changed.`
           ].join(`
 `);
           break;
@@ -11621,11 +11648,12 @@ Use the ClickUp ticket above as the primary requirements source.` : ``,
           `Follow the implement-plan orchestration.`,
           ``,
           `## Auto-Commit`,
-          `You are running inside a GitHub Action on a PR branch. After implementing all changes:`,
-          `1. Stage all changed files with \`git add\` (only files you changed \u2014 NOT .jdi/ or .claude/)`,
-          `2. Commit with a conventional commit message (e.g. "feat: implement X")`,
-          `3. Push to the current branch with \`git push\``,
-          `Do NOT ask the user \u2014 just commit and push. Present a summary of what was implemented and committed.`
+          `You are already on the correct PR branch. Do NOT create new branches or switch branches.`,
+          `After implementing all changes:`,
+          `1. \`git add\` only source files you changed (NOT .jdi/ or .claude/)`,
+          `2. \`git commit -m "feat: ..."\` with a conventional commit message`,
+          `3. \`git push\` (no -u, no origin, no branch name \u2014 just \`git push\`)`,
+          `Present a summary of what was implemented and committed.`
         ].join(`
 `);
         const implResult = await spawnClaude(implementPrompt, {
@@ -11653,7 +11681,7 @@ Use the ClickUp ticket above as the primary requirements source.` : ``,
     if (saved.codebaseIndexSaved)
       consola.info("Codebase index persisted to storage");
     if (repo && issueNumber) {
-      const actionLabel = intent.isFeedback ? "feedback" : intent.command;
+      const actionLabel = intent.isApproval ? "implement" : intent.isFeedback ? "feedback" : intent.command;
       let commentBody;
       if (success && fullResponse) {
         commentBody = formatJediComment(actionLabel, fullResponse);
@@ -11742,7 +11770,7 @@ var setupActionCommand = defineCommand({
 // package.json
 var package_default = {
   name: "@benzotti/jedi",
-  version: "0.1.24",
+  version: "0.1.26",
   description: "JDI - Context-efficient AI development framework for Claude Code",
   type: "module",
   bin: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@benzotti/jedi",
-  "version": "0.1.24",
+  "version": "0.1.26",
   "description": "JDI - Context-efficient AI development framework for Claude Code",
   "type": "module",
   "bin": {
@@ -33,7 +33,7 @@
     "type": "git",
     "url": "https://github.com/zottiben/jedi.git"
   },
-"license": "MIT",
+  "license": "MIT",
   "engines": {
     "node": ">=18"
   }