supipowers 0.2.7 → 0.4.0

package/src/fix-pr/scripts/diff-comments.sh

@@ -0,0 +1,33 @@
+#!/bin/bash
+# Compares two JSONL comment snapshots, outputs only new/changed comments
+# Usage: diff-comments.sh <prev_snapshot> <new_snapshot>
+# Exit 0 if new comments found, exit 1 if identical
+set -euo pipefail
+
+PREV="$1"
+NEW="$2"
+
+# If no previous snapshot, all comments are new
+if [[ ! -f "$PREV" ]]; then
+  cat "$NEW"
+  exit 0
+fi
+
+# Build fingerprint: id + updatedAt for each comment
+prev_fingerprints=$(jq -r '[.id, .updatedAt] | @tsv' "$PREV" 2>/dev/null | sort)
+new_fingerprints=$(jq -r '[.id, .updatedAt] | @tsv' "$NEW" 2>/dev/null | sort)
+
+# Find IDs that are new or changed
+new_ids=$(comm -13 <(echo "$prev_fingerprints") <(echo "$new_fingerprints") | cut -f1)
+
+if [[ -z "$new_ids" ]]; then
+  exit 1
+fi
+
+# Output the full comment objects for new/changed IDs
+while IFS= read -r id; do
+  [[ -z "$id" ]] && continue
+  jq -c "select(.id == $id)" "$NEW"
+done <<< "$new_ids"
+
+exit 0

package/src/fix-pr/scripts/fetch-pr-comments.sh

@@ -0,0 +1,25 @@
+#!/bin/bash
+# Fetches all review comments for a PR, outputs JSONL
+# Usage: fetch-pr-comments.sh <owner/repo> <pr_number> <output_file>
+set -euo pipefail
+
+REPO="$1"
+PR="$2"
+OUTPUT="$3"
+
+# Ensure output directory exists
+mkdir -p "$(dirname "$OUTPUT")"
+
+# Fetch inline review comments (code-level)
+gh api --paginate "repos/${REPO}/pulls/${PR}/comments" \
+  --jq '.[] | {id, path, line: .line, body, user: .user.login, createdAt: .created_at, updatedAt: .updated_at, inReplyToId: .in_reply_to_id, diffHunk: .diff_hunk, state: "COMMENTED"}' \
+  > "$OUTPUT" 2>/dev/null || true
+
+# Fetch review-level comments (top-level reviews with body text)
+gh api --paginate "repos/${REPO}/pulls/${PR}/reviews" \
+  --jq '.[] | select(.body != null and .body != "") | {id, path: null, line: null, body, user: .user.login, createdAt: .submitted_at, updatedAt: .submitted_at, inReplyToId: null, diffHunk: null, state}' \
+  >> "$OUTPUT" 2>/dev/null || true
+
+# Output summary to stderr for caller
+TOTAL=$(wc -l < "$OUTPUT" | tr -d ' ')
+echo "{\"total\": ${TOTAL}}" >&2

package/src/fix-pr/scripts/trigger-review.sh

@@ -0,0 +1,36 @@
+#!/bin/bash
+# Triggers automated reviewer to re-review a PR
+# Usage: trigger-review.sh <owner/repo> <pr_number> <reviewer_type> <trigger_method>
+set -euo pipefail
+
+REPO="$1"
+PR="$2"
+REVIEWER="$3"
+METHOD="${4:-}"
+
+case "$REVIEWER" in
+  coderabbit)
+    gh api "repos/${REPO}/issues/${PR}/comments" -f body="$METHOD" >/dev/null 2>&1
+    echo '{"triggered": true, "reviewer": "coderabbit"}'
+    ;;
+  copilot)
+    if [[ -n "$METHOD" ]]; then
+      gh api "repos/${REPO}/issues/${PR}/comments" -f body="$METHOD" >/dev/null 2>&1
+    else
+      gh api "repos/${REPO}/pulls/${PR}/requested_reviewers" \
+        --method POST -f "reviewers[]=copilot" >/dev/null 2>&1 || true
+    fi
+    echo '{"triggered": true, "reviewer": "copilot"}'
+    ;;
+  gemini)
+    gh api "repos/${REPO}/issues/${PR}/comments" -f body="$METHOD" >/dev/null 2>&1
+    echo '{"triggered": true, "reviewer": "gemini"}'
+    ;;
+  none)
+    echo '{"triggered": false, "reviewer": "none"}'
+    ;;
+  *)
+    echo '{"triggered": false, "error": "unknown reviewer type: '"$REVIEWER"'"}'
+    exit 1
+    ;;
+esac

package/src/fix-pr/scripts/wait-and-check.sh

@@ -0,0 +1,37 @@
+#!/bin/bash
+# Waits for delay, fetches new PR comments, diffs against previous snapshot
+# Usage: wait-and-check.sh <session_dir> <delay_seconds> <iteration> <owner/repo> <pr_number>
+# Output: new comment lines + JSON summary on last line
+set -euo pipefail
+
+SESSION_DIR="$1"
+DELAY="$2"
+ITERATION="$3"
+REPO="$4"
+PR="$5"
+
+SNAPSHOTS_DIR="${SESSION_DIR}/snapshots"
+PREV_ITERATION=$((ITERATION - 1))
+PREV_SNAPSHOT="${SNAPSHOTS_DIR}/comments-${PREV_ITERATION}.jsonl"
+NEW_SNAPSHOT="${SNAPSHOTS_DIR}/comments-${ITERATION}.jsonl"
+
+SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
+
+# Wait for reviewer to process
+echo "Waiting ${DELAY}s for reviewer to process changes..." >&2
+sleep "$DELAY"
+
+# Fetch new comments
+echo "Fetching PR comments (iteration ${ITERATION})..." >&2
+bash "${SCRIPT_DIR}/fetch-pr-comments.sh" "$REPO" "$PR" "$NEW_SNAPSHOT"
+
+# Diff against previous
+DIFF_OUTPUT=$(bash "${SCRIPT_DIR}/diff-comments.sh" "$PREV_SNAPSHOT" "$NEW_SNAPSHOT" 2>/dev/null) || true
+
+if [[ -n "$DIFF_OUTPUT" ]]; then
+  DIFF_COUNT=$(echo "$DIFF_OUTPUT" | wc -l | tr -d ' ')
+  echo "$DIFF_OUTPUT"
+  echo "{\"hasNewComments\": true, \"count\": ${DIFF_COUNT}, \"iteration\": ${ITERATION}}"
+else
+  echo "{\"hasNewComments\": false, \"count\": 0, \"iteration\": ${ITERATION}}"
+fi

package/src/fix-pr/types.ts

@@ -0,0 +1,71 @@
+/** Supported automated PR reviewers */
+export type ReviewerType = "coderabbit" | "copilot" | "gemini" | "none";
+
+/** How to handle comment replies */
+export type CommentReplyPolicy = "answer-all" | "answer-selective" | "no-answer";
+
+/** Model preference for a specific role */
+export interface ModelPref {
+  provider: string;
+  model: string;
+  tier: "low" | "high";
+}
+
+/** Per-repo fix-pr configuration */
+export interface FixPrConfig {
+  reviewer: {
+    type: ReviewerType;
+    triggerMethod: string | null;
+  };
+  commentPolicy: CommentReplyPolicy;
+  loop: {
+    delaySeconds: number;
+    maxIterations: number;
+  };
+  models: {
+    orchestrator: ModelPref;
+    planner: ModelPref;
+    fixer: ModelPref;
+  };
+}
+
+/** A PR review comment from GitHub API */
+export interface PrComment {
+  id: number;
+  path: string | null;
+  line: number | null;
+  body: string;
+  user: string;
+  createdAt: string;
+  updatedAt: string;
+  inReplyToId: number | null;
+  diffHunk: string | null;
+  state: string;
+}
+
+/** Assessment verdict for a single comment */
+export type CommentVerdict = "accept" | "reject" | "investigate";
+
+/** A group of related comments to fix together */
+export interface FixGroup {
+  id: string;
+  commentIds: number[];
+  files: string[];
+  description: string;
+}
+
+/** Session status */
+export type FixPrSessionStatus = "running" | "completed" | "failed";
+
+/** Session ledger for a fix-pr run */
+export interface FixPrSessionLedger {
+  id: string;
+  createdAt: string;
+  updatedAt: string;
+  prNumber: number;
+  repo: string;
+  status: FixPrSessionStatus;
+  iteration: number;
+  config: FixPrConfig;
+  commentsProcessed: number[];
+}

package/src/git/branch-finish.ts

@@ -0,0 +1,101 @@
+export interface FinishOption {
+  id: "merge" | "pr" | "keep" | "discard";
+  label: string;
+}
+
+/** The 4 structured options for finishing a branch */
+export const FINISH_OPTIONS: FinishOption[] = [
+  { id: "merge", label: "Merge back to base branch locally" },
+  { id: "pr", label: "Push and create a Pull Request" },
+  { id: "keep", label: "Keep the branch as-is (handle later)" },
+  { id: "discard", label: "Discard this work" },
+];
+
+export interface BranchFinishPromptOptions {
+  branchName: string;
+  baseBranch: string;
+  worktreePath?: string;
+}
+
+/**
+ * Build the prompt that guides the agent through finishing a development branch.
+ * Follows superpowers' finishing-a-development-branch skill:
+ * - Verify tests pass first
+ * - Present exactly 4 options
+ * - Execute chosen option
+ * - Clean up worktree (conditional)
+ */
+export function buildBranchFinishPrompt(options: BranchFinishPromptOptions): string {
+  const { branchName, baseBranch, worktreePath } = options;
+
+  const sections: string[] = [
+    "## Finish Development Branch",
+    "",
+    `Branch: \`${branchName}\` (base: \`${baseBranch}\`)`,
+    "",
+    "### Step 1: Verify tests pass",
+    "",
+    "Run the full test suite. All tests must pass before proceeding.",
+    "If tests fail, fix them first — do not offer options until green.",
+    "",
+    "### Step 2: Present options",
+    "",
+    "Ask the user:",
+    "",
+    "> Implementation complete. What would you like to do?",
+    ">",
+    `> 1. Merge back to \`${baseBranch}\` locally`,
+    "> 2. Push and create a Pull Request",
+    "> 3. Keep the branch as-is (handle later)",
+    "> 4. Discard this work",
+    "",
+    "### Option 1: Merge locally",
+    "",
+    "```bash",
+    `git checkout ${baseBranch}`,
+    "git pull",
+    `git merge ${branchName}`,
+    "# Verify tests pass on merged result",
+    `git branch -d ${branchName}`,
+    "```",
+    "",
+    "### Option 2: Push and create Pull Request",
+    "",
+    "```bash",
+    `git push -u origin ${branchName}`,
+    `gh pr create --title "<title>" --body "<summary>"`,
+    "```",
+    "",
+    "### Option 3: Keep as-is",
+    "",
+    `Report: "Keeping branch ${branchName}."`,
+    "Do NOT clean up worktree.",
+    "",
+    "### Option 4: Discard",
+    "",
+    "**Require explicit confirm before deleting.** Show what will be lost:",
+    "",
+    "```bash",
+    `git checkout ${baseBranch}`,
+    `git branch -D ${branchName}`,
+    "```",
+  ];
+
+  if (worktreePath) {
+    sections.push(
+      "",
+      "### Worktree cleanup",
+      "",
+      `Worktree at: \`${worktreePath}\``,
+      "",
+      "- **Options 1 and 4:** Clean up the worktree:",
+      "  ```bash",
+      `  git worktree remove ${worktreePath}`,
+      "  ```",
+      "- **Option 2:** Keep worktree (PR may need updates)",
+      "- **Option 3:** Keep worktree",
+    );
+  }
+
+  return sections.join("\n");
+}

package/src/git/worktree.ts

@@ -0,0 +1,119 @@
+import * as fs from "node:fs";
+import * as path from "node:path";
+
+export interface ProjectSetup {
+  type: "node" | "rust" | "python" | "go" | "unknown";
+  installCommand: string | null;
+  testCommand: string | null;
+}
+
+/**
+ * Detect existing worktree directory following priority:
+ * .worktrees > worktrees > null
+ */
+export function detectWorktreeDir(cwd: string): string | null {
+  const dotWorktrees = path.join(cwd, ".worktrees");
+  if (fs.existsSync(dotWorktrees)) return dotWorktrees;
+
+  const worktrees = path.join(cwd, "worktrees");
+  if (fs.existsSync(worktrees)) return worktrees;
+
+  return null;
+}
+
+/**
+ * Auto-detect project type and setup commands from project files.
+ */
+export function detectProjectSetup(cwd: string): ProjectSetup {
+  if (fs.existsSync(path.join(cwd, "package.json"))) {
+    return { type: "node", installCommand: "npm install", testCommand: "npm test" };
+  }
+  if (fs.existsSync(path.join(cwd, "Cargo.toml"))) {
+    return { type: "rust", installCommand: "cargo build", testCommand: "cargo test" };
+  }
+  if (fs.existsSync(path.join(cwd, "requirements.txt"))) {
+    return { type: "python", installCommand: "pip install -r requirements.txt", testCommand: "pytest" };
+  }
+  if (fs.existsSync(path.join(cwd, "pyproject.toml"))) {
+    return { type: "python", installCommand: "poetry install", testCommand: "pytest" };
+  }
+  if (fs.existsSync(path.join(cwd, "go.mod"))) {
+    return { type: "go", installCommand: "go mod download", testCommand: "go test ./..." };
+  }
+  return { type: "unknown", installCommand: null, testCommand: null };
+}
+
+export interface WorktreePromptOptions {
+  branchName: string;
+  cwd: string;
+}
+
+/**
+ * Build the prompt that guides the agent through creating an isolated git worktree.
+ * Follows superpowers' using-git-worktrees skill:
+ * - Smart directory selection (.worktrees > worktrees > ask)
+ * - .gitignore verification
+ * - Project setup detection
+ * - Baseline test verification
+ */
+export function buildWorktreePrompt(options: WorktreePromptOptions): string {
+  const { branchName, cwd } = options;
+
+  return [
+    "## Set Up Isolated Worktree",
+    "",
+    `Create an isolated workspace for branch \`${branchName}\`.`,
+    "",
+    "### Step 1: Select directory",
+    "",
+    "Check in priority order:",
+    `1. \`${cwd}/.worktrees/\` — if it exists, use it`,
+    `2. \`${cwd}/worktrees/\` — if it exists, use it`,
+    "3. Check CLAUDE.md for worktree directory preference",
+    "4. If none found, ask the user:",
+    '   - `.worktrees/` (project-local, hidden)',
+    '   - `~/.config/supipowers/worktrees/<project>/` (global location)',
+    "",
+    "### Step 2: Verify gitignore",
+    "",
+    "For project-local directories, verify the directory is ignored:",
+    "",
+    "```bash",
+    "git check-ignore -q .worktrees 2>/dev/null || git check-ignore -q worktrees 2>/dev/null",
+    "```",
+    "",
+    "If NOT ignored, add it to .gitignore and commit before proceeding.",
+    "",
+    "### Step 3: Create worktree",
+    "",
+    "```bash",
+    `git worktree add <dir>/${branchName} -b ${branchName}`,
+    `cd <dir>/${branchName}`,
+    "```",
+    "",
+    "### Step 4: Project setup",
+    "",
+    "Auto-detect and run appropriate setup:",
+    "",
+    "| File | Command |",
+    "|------|---------|",
+    "| `package.json` | `npm install` |",
+    "| `Cargo.toml` | `cargo build` |",
+    "| `requirements.txt` | `pip install -r requirements.txt` |",
+    "| `pyproject.toml` | `poetry install` |",
+    "| `go.mod` | `go mod download` |",
+    "",
+    "### Step 5: Verify baseline",
+    "",
+    "Run the test suite to verify a clean baseline before starting work.",
+    "If tests fail, report failures and ask whether to proceed or investigate.",
+    "",
+    "### Step 6: Report",
+    "",
+    "```",
+    "Worktree ready at <full-path>",
+    "Tests passing (<N> tests, 0 failures)",
+    `Ready to implement ${branchName}`,
+    "```",
+  ].join("\n");
+}

package/src/index.ts

@@ -5,12 +5,14 @@ import { homedir, tmpdir } from "node:os";
 import { registerSupiCommand, handleSupi } from "./commands/supi.js";
 import { registerConfigCommand, handleConfig } from "./commands/config.js";
 import { registerStatusCommand, handleStatus } from "./commands/status.js";
-import { registerPlanCommand } from "./commands/plan.js";
+import { registerPlanCommand, getActiveVisualSessionDir, setActiveVisualSessionDir } from "./commands/plan.js";
+import { getScriptsDir } from "./visual/companion.js";
 import { registerRunCommand } from "./commands/run.js";
 import { registerReviewCommand } from "./commands/review.js";
 import { registerQaCommand } from "./commands/qa.js";
 import { registerReleaseCommand } from "./commands/release.js";
 import { registerUpdateCommand, handleUpdate } from "./commands/update.js";
+import { registerFixPrCommand } from "./commands/fix-pr.js";
 
 // TUI-only commands — intercepted at the input level to prevent
 // message submission and "Working..." indicator
@@ -42,6 +44,7 @@ export default function supipowers(pi: ExtensionAPI): void {
   registerQaCommand(pi);
   registerReleaseCommand(pi);
   registerUpdateCommand(pi);
+  registerFixPrCommand(pi);
 
   // Intercept TUI-only commands at the input level — this runs BEFORE
   // message submission, so no chat message appears and no "Working..." indicator
@@ -61,13 +64,21 @@ export default function supipowers(pi: ExtensionAPI): void {
 
   // Session start
   pi.on("session_start", async (_event, ctx) => {
+    // Clean up any leftover visual companion from a previous session
+    const previousVisualDir = getActiveVisualSessionDir();
+    if (previousVisualDir) {
+      const stopScript = join(getScriptsDir(), "stop-server.sh");
+      pi.exec("bash", [stopScript, previousVisualDir], { cwd: getScriptsDir() }).catch(() => {});
+      setActiveVisualSessionDir(null);
+    }
+
     // Check for updates in the background
     const currentVersion = getInstalledVersion();
     if (!currentVersion) return;
 
     pi.exec("npm", ["view", "supipowers", "version"], { cwd: tmpdir() })
       .then((result) => {
-        if (result.exitCode !== 0) return;
+        if (result.code !== 0) return;
         const latest = result.stdout.trim();
         if (latest && latest !== currentVersion) {
           ctx.ui.notify(

package/src/lsp/detector.ts

@@ -10,13 +10,13 @@ export interface LspServerStatus {
  * Check which LSP servers are installed by looking for their binaries.
  */
 export async function checkInstalledServers(
-  exec: (cmd: string, args: string[]) => Promise<{ stdout: string; exitCode: number }>
+  exec: (cmd: string, args: string[]) => Promise<{ stdout: string; code: number }>
 ): Promise<LspServerStatus[]> {
   const results: LspServerStatus[] = [];
   for (const server of LSP_SERVERS) {
     try {
       const result = await exec("which", [server.server]);
-      results.push({ server, installed: result.exitCode === 0 });
+      results.push({ server, installed: result.code === 0 });
     } catch {
       results.push({ server, installed: false });
     }