spets 0.1.5 → 0.1.7

package/dist/index.js

@@ -1069,6 +1069,7 @@ var GitHubPlatform = class extends BasePlatform {
   config;
   currentTaskId;
   currentOutputPath;
+  lastQuestions;
   constructor(config) {
     super();
     this.config = config;
@@ -1076,12 +1077,16 @@ var GitHubPlatform = class extends BasePlatform {
   setTaskId(taskId) {
     this.currentTaskId = taskId;
   }
+  setBranch(branch) {
+    this.config.branch = branch;
+  }
   async generateDocument(context) {
     this.currentTaskId = context.taskId;
     this.currentOutputPath = context.outputPath;
     const prompt = this.buildPrompt(context);
     const response = await this.callClaude(prompt);
     const { document, questions } = this.parseResponse(response);
+    this.lastQuestions = questions;
     return { document, questions };
   }
   async askUser(questions) {
@@ -1092,7 +1097,7 @@ var GitHubPlatform = class extends BasePlatform {
     throw new PauseForInputError("questions", questions);
   }
   async requestApproval(doc, stepName) {
-    const comment = this.formatApprovalComment(doc, stepName, this.currentTaskId, this.currentOutputPath);
+    const comment = this.formatApprovalComment(doc, stepName, this.currentTaskId, this.currentOutputPath, this.lastQuestions);
     await this.postComment(comment);
     console.log("\n\u23F8\uFE0F  Waiting for approval on GitHub...");
     console.log("   Comment /approve, /revise <feedback>, or /reject on the PR/Issue.");
@@ -1143,36 +1148,59 @@ var GitHubPlatform = class extends BasePlatform {
     lines.push("```");
     return lines.join("\n");
   }
-  formatApprovalComment(doc, stepName, taskId, outputPath) {
+  formatApprovalComment(doc, stepName, taskId, outputPath, openQuestions) {
     const relativePath = outputPath ? outputPath.replace(process.cwd() + "/", "") : `.spets/outputs/${taskId}/${stepName}.md`;
+    const { owner, repo, branch } = this.config;
+    const fileLink = branch ? `[\`${relativePath}\`](https://github.com/${owner}/${repo}/blob/${branch}/${relativePath})` : `\`${relativePath}\``;
+    const escapedDoc = doc.replace(/```/g, "\\`\\`\\`");
     const lines = [
       `## \u{1F4C4} Spets: ${stepName} - Review Required`,
       "",
       `> Task ID: \`${taskId}\``,
-      `> Output: \`${relativePath}\``,
+      `> Output: ${fileLink}`,
       "",
       "<details>",
       "<summary>\u{1F4DD} View Document</summary>",
       "",
-      "```markdown",
-      doc,
-      "```",
-      "",
-      "</details>",
-      "",
-      "---",
-      "",
-      "**Commands:**",
-      "| Command | Description |",
-      "|---------|-------------|",
-      "| `/approve` | Approve and continue to next step |",
-      "| `/approve --pr` | Approve and create a Pull Request |",
-      "| `/approve --issue` | Approve and create/update an Issue |",
-      "| `/revise <feedback>` | Request changes with feedback |",
-      "| `/reject` | Reject and stop workflow |",
+      escapedDoc,
       "",
-      "Example: `/revise Please add more details about error handling`"
+      "</details>"
     ];
+    if (openQuestions && openQuestions.length > 0) {
+      lines.push("");
+      lines.push("---");
+      lines.push("");
+      lines.push("### \u2753 Open Questions");
+      lines.push("");
+      for (let i = 0; i < openQuestions.length; i++) {
+        const q = openQuestions[i];
+        lines.push(`**Q${i + 1}:** ${q.question}`);
+        if (q.context) {
+          lines.push(`> ${q.context}`);
+        }
+        lines.push("");
+      }
+      lines.push("**To answer questions:**");
+      lines.push("```");
+      lines.push("/answer");
+      for (let i = 0; i < openQuestions.length; i++) {
+        lines.push(`Q${i + 1}: <your answer>`);
+      }
+      lines.push("```");
+    }
+    lines.push("");
+    lines.push("---");
+    lines.push("");
+    lines.push("**Commands:**");
+    lines.push("| Command | Description |");
+    lines.push("|---------|-------------|");
+    lines.push("| `/approve` | Approve and continue to next step |");
+    lines.push("| `/approve --pr` | Approve and create a Pull Request |");
+    lines.push("| `/approve --issue` | Approve and create/update an Issue |");
+    lines.push("| `/revise <feedback>` | Request changes with feedback |");
+    lines.push("| `/reject` | Reject and stop workflow |");
+    lines.push("");
+    lines.push("Example: `/revise Please add more details about error handling`");
     return lines.join("\n");
   }
   async postPRComment(body) {
@@ -1346,6 +1374,13 @@ _Managed by [Spets](https://github.com/eatnug/spets)_`;
   }
   return parseInt(match[1], 10);
 }
+function getCurrentBranch() {
+  try {
+    return execSync3("git branch --show-current", { encoding: "utf-8" }).trim() || void 0;
+  } catch {
+    return void 0;
+  }
+}
 function findLinkedIssueOrPR(info) {
   try {
     const result = execSync3(
@@ -1415,7 +1450,8 @@ async function startCommand(query, options) {
       owner: githubInfo.owner,
       repo: githubInfo.repo,
       prNumber,
-      issueNumber
+      issueNumber,
+      branch: getCurrentBranch()
     });
     console.log(`Starting workflow: ${taskId}`);
     console.log(`Query: ${query}`);
@@ -1807,6 +1843,13 @@ function getGitHubInfo2(cwd) {
   }
   return null;
 }
+function getCurrentBranch2(cwd) {
+  try {
+    return execSync4("git branch --show-current", { encoding: "utf-8", cwd }).trim();
+  } catch {
+    return void 0;
+  }
+}
 async function githubCommand(options) {
   const cwd = process.cwd();
   if (!spetsExists(cwd)) {
@@ -1832,9 +1875,20 @@ async function githubCommand(options) {
   console.log(`Received command: ${parsed.command}`);
   let taskId = task;
   if (!taskId) {
-    const taskMatch = comment.match(/Task ID: `([^`]+)`/);
-    if (taskMatch) {
-      taskId = taskMatch[1];
+    try {
+      const issueNum = issue || pr;
+      if (issueNum) {
+        const commentsJson = execSync4(
+          `gh api repos/${owner}/${repo}/issues/${issueNum}/comments --jq '.[].body'`,
+          { encoding: "utf-8" }
+        );
+        const taskMatch = commentsJson.match(/Task ID: `([^`]+)`/);
+        if (taskMatch) {
+          taskId = taskMatch[1];
+          console.log(`Found Task ID from Issue comments: ${taskId}`);
+        }
+      }
+    } catch {
     }
   }
   if (!taskId) {
@@ -1866,16 +1920,15 @@ async function githubCommand(options) {
     owner,
     repo,
     prNumber: pr ? parseInt(pr, 10) : void 0,
-    issueNumber: issue ? parseInt(issue, 10) : void 0
+    issueNumber: issue ? parseInt(issue, 10) : void 0,
+    branch: getCurrentBranch2(cwd)
   };
   switch (parsed.command) {
     case "approve": {
       console.log(`Approving step: ${state.currentStepName}`);
       updateDocumentStatus(outputPath, "approved");
       if (parsed.createPR) {
-        console.log("Creating Pull Request...");
-        const prNumber = await createPullRequest(githubConfig, taskId, userQuery, state.currentStepName);
-        console.log(`Created PR #${prNumber}`);
+        console.log("PR will be created after changes are committed.");
       }
       if (parsed.createIssue) {
         console.log("Creating/Updating Issue...");
@@ -1972,32 +2025,8 @@ async function postComment(config, body) {
     proc.on("error", reject);
   });
 }
-async function createPullRequest(config, taskId, userQuery, stepName) {
-  const { execSync: execSync5 } = await import("child_process");
-  const { owner, repo } = config;
-  const title = userQuery.slice(0, 50) + (userQuery.length > 50 ? "..." : "");
-  const body = `## Spets Workflow
-
-- Task ID: \`${taskId}\`
-- Current Step: **${stepName}**
-
-### Description
-${userQuery}
-
----
-_Created by [Spets](https://github.com/eatnug/spets)_`;
-  const result = execSync5(
-    `gh pr create --repo ${owner}/${repo} --title "${title.replace(/"/g, '\\"')}" --body "${body.replace(/"/g, '\\"')}"`,
-    { encoding: "utf-8" }
-  );
-  const match = result.match(/\/pull\/(\d+)/);
-  if (!match) {
-    throw new Error("Failed to parse PR number from gh output");
-  }
-  return parseInt(match[1], 10);
-}
 async function createOrUpdateIssue(config, taskId, userQuery, stepName) {
-  const { execSync: execSync5 } = await import("child_process");
+  const { spawnSync } = await import("child_process");
   const { owner, repo, issueNumber } = config;
   const body = `## Spets Workflow Update
 
@@ -2010,16 +2039,35 @@ ${userQuery}
 ---
 _Updated by [Spets](https://github.com/eatnug/spets)_`;
   if (issueNumber) {
-    execSync5(
-      `gh issue comment ${issueNumber} --repo ${owner}/${repo} --body "${body.replace(/"/g, '\\"')}"`,
-      { encoding: "utf-8" }
-    );
+    const result = spawnSync("gh", [
+      "issue",
+      "comment",
+      String(issueNumber),
+      "--repo",
+      `${owner}/${repo}`,
+      "--body",
+      body
+    ], { encoding: "utf-8" });
+    if (result.status !== 0) {
+      throw new Error(`Failed to comment on issue: ${result.stderr}`);
+    }
   } else {
     const title = userQuery.slice(0, 50) + (userQuery.length > 50 ? "..." : "");
-    execSync5(
-      `gh issue create --repo ${owner}/${repo} --title "${title.replace(/"/g, '\\"')}" --body "${body.replace(/"/g, '\\"')}" --label spets`,
-      { encoding: "utf-8" }
-    );
+    const result = spawnSync("gh", [
+      "issue",
+      "create",
+      "--repo",
+      `${owner}/${repo}`,
+      "--title",
+      title,
+      "--body",
+      body,
+      "--label",
+      "spets"
+    ], { encoding: "utf-8" });
+    if (result.status !== 0) {
+      throw new Error(`Failed to create issue: ${result.stderr}`);
+    }
   }
 }
 

package/package.json

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