@plannotator/pi-extension 0.16.7 → 0.17.0

package/generated/resolve-file.ts

@@ -79,6 +79,20 @@ function isSearchableMarkdownPath(input: string): boolean {
 	return MARKDOWN_PATH_REGEX.test(input.trim());
 }
 
+function stripWrappingQuotes(input: string): string {
+	if (input.length < 2) {
+		return input;
+	}
+
+	const first = input[0];
+	const last = input[input.length - 1];
+	if ((first === '"' && last === '"') || (first === "'" && last === "'")) {
+		return input.slice(1, -1);
+	}
+
+	return input;
+}
+
 /** Check if a path looks like a Windows absolute path (e.g. C:\ or C:/) */
 function hasWindowsDriveLetter(input: string): boolean {
 	return /^[a-zA-Z]:[/\\]/.test(input);
@@ -156,12 +170,10 @@ export function isAbsoluteMarkdownPath(
  * @param input - User-provided path (absolute, relative, or bare filename)
  * @param projectRoot - Project root directory to search within
  */
-export function resolveMarkdownFile(
+function resolveMarkdownFileCore(
 	input: string,
 	projectRoot: string,
 ): ResolveResult {
-	// Trim whitespace/CR that may leak from Windows shell pipelines
-	input = input.trim();
 	const normalizedInput = normalizeMarkdownPathInput(input);
 	const searchInput = normalizeSeparators(normalizedInput);
 	const isBareFilename = !searchInput.includes("/");
@@ -219,6 +231,47 @@ export function resolveMarkdownFile(
 	return { kind: "not_found", input };
 }
 
+/**
+ * Resolve a markdown file path within a project root.
+ *
+ * @param input - User-provided path (absolute, relative, or bare filename)
+ * @param projectRoot - Project root directory to search within
+ */
+export function resolveMarkdownFile(
+	input: string,
+	projectRoot: string,
+): ResolveResult {
+	const originalInput = input.trim();
+	const unquotedInput = stripWrappingQuotes(originalInput);
+
+	const primary = resolveMarkdownFileCore(unquotedInput, projectRoot);
+	if (primary.kind === "found") {
+		return primary;
+	}
+	if (primary.kind === "ambiguous") {
+		return { ...primary, input: originalInput };
+	}
+
+	if (!unquotedInput.startsWith("@")) {
+		return { kind: "not_found", input: originalInput };
+	}
+
+	const normalizedInput = unquotedInput.replace(/^@+/, "");
+	if (!normalizedInput) {
+		return { kind: "not_found", input: originalInput };
+	}
+
+	const fallback = resolveMarkdownFileCore(normalizedInput, projectRoot);
+	if (fallback.kind === "found") {
+		return fallback;
+	}
+	if (fallback.kind === "ambiguous") {
+		return { ...fallback, input: originalInput };
+	}
+
+	return { kind: "not_found", input: originalInput };
+}
+
 /**
  * Check if a directory contains at least one markdown file.
  * Used to validate folder annotation targets.

package/generated/review-core.ts

@@ -14,6 +14,7 @@ export type DiffType =
   | "unstaged"
   | "last-commit"
   | "branch"
+  | "merge-base"
   | `worktree:${string}`
   | "p4-default"
   | `p4-changelist:${string}`;
@@ -151,6 +152,7 @@ export async function getGitContext(
 
   if (currentBranch !== defaultBranch) {
     diffOptions.push({ id: "branch", label: `vs ${defaultBranch}` });
+    diffOptions.push({ id: "merge-base", label: `Current PR Diff` });
   }
 
   const [worktrees, currentTreePathResult] = await Promise.all([
@@ -386,6 +388,28 @@ export async function runGitDiff(
         break;
       }
 
+      case "merge-base": {
+        const mergeBaseResult = assertGitSuccess(
+          await runtime.runGit(["merge-base", defaultBranch, "HEAD"], { cwd }),
+          ["merge-base", defaultBranch, "HEAD"],
+        );
+        const mergeBase = mergeBaseResult.stdout.trim();
+        const mergeBaseDiffArgs = [
+          "diff",
+          "--no-ext-diff",
+          `${mergeBase}..HEAD`,
+          "--src-prefix=a/",
+          "--dst-prefix=b/",
+        ];
+        const mergeBaseDiff = assertGitSuccess(
+          await runtime.runGit(mergeBaseDiffArgs, { cwd }),
+          mergeBaseDiffArgs,
+        );
+        patch = mergeBaseDiff.stdout;
+        label = `PR diff vs ${defaultBranch}`;
+        break;
+      }
+
       default:
         return { patch: "", label: "Unknown diff type" };
     }
@@ -475,6 +499,14 @@ export async function getFileContentsForDiff(
         oldContent: await gitShow(defaultBranch, oldFilePath),
         newContent: await gitShow("HEAD", filePath),
       };
+    case "merge-base": {
+      const mbResult = await runtime.runGit(["merge-base", defaultBranch, "HEAD"], { cwd });
+      const mb = mbResult.exitCode === 0 ? mbResult.stdout.trim() : defaultBranch;
+      return {
+        oldContent: await gitShow(mb, oldFilePath),
+        newContent: await gitShow("HEAD", filePath),
+      };
+    }
     default:
       return { oldContent: null, newContent: null };
   }

package/generated/worktree.ts

@@ -0,0 +1,120 @@
+// @generated — DO NOT EDIT. Source: packages/shared/worktree.ts
+/**
+ * Worktree — runtime-agnostic git worktree primitives.
+ *
+ * Uses ReviewGitRuntime so both Bun and Node runtimes can use the same logic.
+ * Lives in packages/shared/ and gets vendored to Pi via vendor.sh.
+ *
+ * Designed as composable primitives, not tied to any specific use case.
+ * PR local checkout, agent sandboxes, parallel sessions — all compose from these.
+ */
+
+import type { ReviewGitRuntime } from "./review-core";
+
+// ---------------------------------------------------------------------------
+// Types
+// ---------------------------------------------------------------------------
+
+export interface CreateWorktreeOptions {
+  /** Git ref to check out (branch name, SHA, FETCH_HEAD, etc.) */
+  ref: string;
+  /** Absolute path where the worktree will be created. */
+  path: string;
+  /** Create in detached HEAD mode (no branch). Default: false. */
+  detach?: boolean;
+  /** CWD of the source repository. Defaults to process.cwd(). */
+  cwd?: string;
+}
+
+export interface RemoveWorktreeOptions {
+  /** Force removal even if the worktree has modifications. Default: false. */
+  force?: boolean;
+  /** CWD of the source repository. Required if the worktree was created from a different cwd. */
+  cwd?: string;
+}
+
+// ---------------------------------------------------------------------------
+// Primitives
+// ---------------------------------------------------------------------------
+
+/**
+ * Fetch a ref from origin.
+ * Runs: `git fetch origin <ref>`
+ * Throws on failure.
+ */
+export async function fetchRef(
+  runtime: ReviewGitRuntime,
+  ref: string,
+  options?: { cwd?: string },
+): Promise<void> {
+  const result = await runtime.runGit(["fetch", "origin", "--", ref], { cwd: options?.cwd });
+  if (result.exitCode !== 0) {
+    throw new Error(`git fetch origin ${ref} failed: ${result.stderr.trim() || `exit code ${result.exitCode}`}`);
+  }
+}
+
+/**
+ * Ensure a git object (commit SHA) is available locally.
+ * Checks with `git cat-file -t`, fetches from origin if missing.
+ * Returns true if the object is available after the attempt.
+ */
+export async function ensureObjectAvailable(
+  runtime: ReviewGitRuntime,
+  sha: string,
+  options?: { cwd?: string },
+): Promise<boolean> {
+  const check = await runtime.runGit(["cat-file", "-t", sha], { cwd: options?.cwd });
+  if (check.exitCode === 0) return true;
+
+  // Object missing locally — try fetching it
+  const fetch = await runtime.runGit(["fetch", "origin", "--", sha], { cwd: options?.cwd });
+  if (fetch.exitCode !== 0) return false;
+
+  // Verify it's now available
+  const recheck = await runtime.runGit(["cat-file", "-t", sha], { cwd: options?.cwd });
+  return recheck.exitCode === 0;
+}
+
+/**
+ * Create a git worktree.
+ * Runs: `git worktree add [--detach] <path> <ref>`
+ * Throws on failure with a descriptive error.
+ */
+export async function createWorktree(
+  runtime: ReviewGitRuntime,
+  options: CreateWorktreeOptions,
+): Promise<{ worktreePath: string }> {
+  const args = ["worktree", "add"];
+  if (options.detach) args.push("--detach");
+  args.push(options.path, options.ref);
+
+  const result = await runtime.runGit(args, { cwd: options.cwd });
+  if (result.exitCode !== 0) {
+    throw new Error(`git worktree add failed: ${result.stderr.trim() || `exit code ${result.exitCode}`}`);
+  }
+
+  return { worktreePath: options.path };
+}
+
+/**
+ * Remove a git worktree. Best-effort — logs errors but does not throw.
+ * Runs: `git worktree remove [--force] <path>`
+ */
+export async function removeWorktree(
+  runtime: ReviewGitRuntime,
+  worktreePath: string,
+  options?: RemoveWorktreeOptions,
+): Promise<void> {
+  const args = ["worktree", "remove"];
+  if (options?.force) args.push("--force");
+  args.push(worktreePath);
+
+  try {
+    const result = await runtime.runGit(args, { cwd: options?.cwd });
+    if (result.exitCode !== 0) {
+      console.error(`Warning: git worktree remove failed for ${worktreePath}: ${result.stderr.trim()}`);
+    }
+  } catch (err) {
+    console.error(`Warning: worktree cleanup error: ${err instanceof Error ? err.message : String(err)}`);
+  }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@plannotator/pi-extension",
-  "version": "0.16.7",
+  "version": "0.17.0",
   "type": "module",
   "description": "Plannotator extension for Pi coding agent - interactive plan review with visual annotation",
   "author": "backnotprop",