@benzotti/jedi 0.1.27 → 0.1.29

package/action/workflow-template.yml

@@ -30,6 +30,8 @@ on:
     types: [created]
   pull_request_review_comment:
     types: [created]
+  pull_request_review:
+    types: [submitted]
   push:
     branches: [main, master]
 
@@ -40,23 +42,30 @@ permissions:
   id-token: write
 
 jobs:
-  # ── Triggered by "Hey Jedi" comments on issues/PRs ──
+  # ── Triggered by "Hey Jedi" comments on issues/PRs or PR reviews ──
   jedi:
     if: >-
-      (github.event_name == 'issue_comment' || github.event_name == 'pull_request_review_comment')
-      && contains(github.event.comment.body, 'Hey Jedi')
+      (github.event_name == 'issue_comment' && contains(github.event.comment.body, 'Hey Jedi'))
+      || (github.event_name == 'pull_request_review_comment' && contains(github.event.comment.body, 'Hey Jedi'))
+      || (github.event_name == 'pull_request_review' && contains(github.event.review.body, 'Hey Jedi'))
     runs-on: ubuntu-latest
     steps:
-      # Resolve the PR head branch for issue_comment events
-      # (github.head_ref is only set on pull_request events, not issue_comment)
+      # Resolve the PR head branch
+      # - issue_comment: github.head_ref is empty, resolve via API
+      # - pull_request_review / pull_request_review_comment: github.event.pull_request.head.ref is available
       - name: Resolve PR branch
         id: pr
-        if: github.event.issue.pull_request
         run: |
-          PR_DATA=$(gh api repos/${{ github.repository }}/pulls/${{ github.event.issue.number }} --jq '{head_ref: .head.ref, head_sha: .head.sha}')
-          echo "branch=$(echo "$PR_DATA" | jq -r .head_ref)" >> "$GITHUB_OUTPUT"
+          if [ -n "$PR_HEAD_REF" ]; then
+            echo "branch=$PR_HEAD_REF" >> "$GITHUB_OUTPUT"
+          elif [ -n "$PR_NUMBER" ]; then
+            BRANCH=$(gh api repos/${{ github.repository }}/pulls/$PR_NUMBER --jq '.head.ref')
+            echo "branch=$BRANCH" >> "$GITHUB_OUTPUT"
+          fi
         env:
           GH_TOKEN: ${{ github.token }}
+          PR_HEAD_REF: ${{ github.event.pull_request.head.ref || '' }}
+          PR_NUMBER: ${{ github.event.issue.number || github.event.pull_request.number || '' }}
 
       - uses: actions/checkout@v4
         with:
@@ -118,20 +127,22 @@ jobs:
         run: bun install -g @anthropic-ai/claude-code
 
       # Run Jedi CLI directly — full pipeline with routing, agents, and comment posting
+      # IMPORTANT: All user input is passed via env vars to avoid shell injection
       - name: Run Jedi
         run: |
-          COMMENT_BODY="${{ github.event.comment.body }}"
-          COMMENT_ID="${{ github.event.comment.id }}"
-          PR_NUMBER="${{ github.event.issue.pull_request && github.event.issue.number || '' }}"
-          ISSUE_NUMBER="${{ github.event.issue.number }}"
-
-          ARGS="--repo ${{ github.repository }}"
+          ARGS="--repo $REPO"
           [ -n "$COMMENT_ID" ] && ARGS="$ARGS --comment-id $COMMENT_ID"
           [ -n "$PR_NUMBER" ] && ARGS="$ARGS --pr-number $PR_NUMBER"
           [ -n "$ISSUE_NUMBER" ] && ARGS="$ARGS --issue-number $ISSUE_NUMBER"
 
           bunx @benzotti/jedi@latest action "$COMMENT_BODY" $ARGS
         env:
+          # Resolve comment body from whichever event type triggered this
+          COMMENT_BODY: ${{ github.event.comment.body || github.event.review.body || '' }}
+          COMMENT_ID: ${{ github.event.comment.id || github.event.review.id || '' }}
+          PR_NUMBER: ${{ github.event.issue.number || github.event.pull_request.number || '' }}
+          ISSUE_NUMBER: ${{ github.event.issue.number || github.event.pull_request.number || '' }}
+          REPO: ${{ github.repository }}
           ANTHROPIC_API_KEY: ${{ secrets.ANTHROPIC_API_KEY }}
           CLICKUP_API_TOKEN: ${{ secrets.CLICKUP_API_TOKEN }}
           GH_TOKEN: ${{ github.token }}

package/dist/index.js

@@ -11169,8 +11169,9 @@ function buildConversationContext(thread, currentCommentId) {
   }
   const previousJediRuns = jediSegments.filter((c3) => c3.isJedi).length;
   const isFollowUp = previousJediRuns > 0;
+  const isPostImplementation = jediSegments.some((c3) => c3.isJedi && c3.body.includes("<sup>implement</sup>"));
   if (jediSegments.length === 0) {
-    return { history: "", previousJediRuns: 0, isFollowUp: false };
+    return { history: "", previousJediRuns: 0, isFollowUp: false, isPostImplementation: false };
   }
   const lines = ["## Previous Conversation", ""];
   for (const comment of jediSegments) {
@@ -11186,7 +11187,7 @@ function buildConversationContext(thread, currentCommentId) {
     lines.push("");
   }
   return { history: lines.join(`
-`), previousJediRuns, isFollowUp };
+`), previousJediRuns, isFollowUp, isPostImplementation };
 }
 var COMMAND_EMOJI = {
   plan: "\uD83D\uDD2E",
@@ -11321,13 +11322,15 @@ var actionCommand = defineCommand({
     const issueNumber = Number(args["pr-number"] ?? args["issue-number"] ?? 0);
     let conversationHistory = "";
     let isFollowUp = false;
+    let isPostImplementation = false;
     if (repo && issueNumber) {
       const thread = await fetchCommentThread(repo, issueNumber);
       const context = buildConversationContext(thread, commentId ?? 0);
       conversationHistory = context.history;
       isFollowUp = context.isFollowUp;
+      isPostImplementation = context.isPostImplementation;
       if (isFollowUp) {
-        consola.info(`Continuing conversation (${context.previousJediRuns} previous Jedi run(s))`);
+        consola.info(`Continuing conversation (${context.previousJediRuns} previous Jedi run(s))${isPostImplementation ? " [post-implementation]" : ""}`);
       }
     }
     const intent = parseComment(args.comment, isFollowUp);
@@ -11339,7 +11342,7 @@ var actionCommand = defineCommand({
     if (repo && commentId) {
       await reactToComment(repo, commentId, "eyes").catch(() => {});
     }
-    const commandLabel = intent.isApproval ? "plan" : intent.isFeedback ? "feedback" : intent.command;
+    const commandLabel = intent.isApproval ? "plan" : intent.isFeedback && isPostImplementation ? "implement" : intent.isFeedback ? "feedback" : intent.command;
     let placeholderCommentId = null;
     if (repo && issueNumber) {
       const thinkingBody = `<h3>\uD83E\uDDE0 Jedi <sup>thinking</sup></h3>
@@ -11349,6 +11352,49 @@ var actionCommand = defineCommand({
 _Working on it..._`;
       placeholderCommentId = await postGitHubComment(repo, issueNumber, thinkingBody).catch(() => null);
     }
+    if (intent.isFeedback && intent.isApproval) {
+      const { existsSync: existsSync13 } = await import("fs");
+      const { join: join12 } = await import("path");
+      const statePath = join12(cwd, ".jdi/config/state.yaml");
+      if (existsSync13(statePath)) {
+        const stateContent = await Bun.file(statePath).text();
+        const now = new Date().toISOString();
+        let updated = stateContent;
+        if (/review\.status:/.test(updated)) {
+          updated = updated.replace(/review\.status:\s*.+/, `review.status: approved`);
+        } else {
+          updated += `
+review.status: approved
+`;
+        }
+        if (/review\.approved_at:/.test(updated)) {
+          updated = updated.replace(/review\.approved_at:\s*.+/, `review.approved_at: ${now}`);
+        } else {
+          updated += `review.approved_at: ${now}
+`;
+        }
+        await Bun.write(statePath, updated);
+      }
+      const approvalBody = `Plan approved and locked in.
+
+Say **\`Hey Jedi implement\`** when you're ready to go.`;
+      const finalBody = formatJediComment("plan", approvalBody);
+      if (repo && placeholderCommentId) {
+        await updateGitHubComment(repo, placeholderCommentId, finalBody).catch((err) => {
+          consola.error("Failed to update approval comment:", err);
+        });
+      } else if (repo && issueNumber) {
+        await postGitHubComment(repo, issueNumber, finalBody).catch((err) => {
+          consola.error("Failed to post approval comment:", err);
+        });
+      } else {
+        console.log(finalBody);
+      }
+      if (repo && commentId) {
+        await reactToComment(repo, commentId, "+1").catch(() => {});
+      }
+      return;
+    }
     if (intent.command === "ping") {
       const { existsSync: existsSync13 } = await import("fs");
       const { join: join12 } = await import("path");
@@ -11427,7 +11473,7 @@ _Working on it..._`;
     }
     const baseProtocol = resolve9(cwd, ".jdi/framework/components/meta/AgentBase.md");
     let prompt2;
-    if (intent.isFeedback && intent.isApproval) {
+    if (intent.isFeedback && isPostImplementation) {
       prompt2 = [
         `Read ${baseProtocol} for the base agent protocol.`,
         ``,
@@ -11435,15 +11481,21 @@ _Working on it..._`;
         ``,
         conversationHistory,
         ``,
-        `## Plan Approved`,
+        `## Feedback on Implementation`,
         `> ${intent.description}`,
         ``,
-        `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`,
+        `## Instructions`,
+        `The user is iterating on code that Jedi already implemented. Review the conversation above to understand what was built.`,
+        `Be conversational \u2014 if the user asks a question, answer it first. Then make changes if needed.`,
+        `Apply changes incrementally to the existing code \u2014 do not rewrite from scratch.`,
         ``,
-        `Respond with a short confirmation that the plan is approved and ready, then ask:`,
-        `"Say **implement** when you're ready to go."`
+        `## Auto-Commit`,
+        `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 "fix: ..."\` or \`git commit -m "refactor: ..."\` with a conventional commit message`,
+        `3. \`git push\` (no -u, no origin, no branch name \u2014 just \`git push\`)`,
+        `Present a summary of what you changed.`
       ].join(`
 `);
     } else if (intent.isFeedback) {
@@ -11681,7 +11733,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.isApproval ? "implement" : intent.isFeedback ? "feedback" : intent.command;
+      const actionLabel = intent.isFeedback ? "feedback" : intent.command;
       let commentBody;
       if (success && fullResponse) {
         commentBody = formatJediComment(actionLabel, fullResponse);
@@ -11770,7 +11822,7 @@ var setupActionCommand = defineCommand({
 // package.json
 var package_default = {
   name: "@benzotti/jedi",
-  version: "0.1.27",
+  version: "0.1.29",
   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.27",
+  "version": "0.1.29",
   "description": "JDI - Context-efficient AI development framework for Claude Code",
   "type": "module",
   "bin": {