santree 0.0.13 → 0.0.15

package/README.md

@@ -81,6 +81,7 @@ santree clean
 | `santree sync` | Sync current worktree with base branch |
 | `santree setup` | Run the init script (`.santree/init.sh`) |
 | `santree work` | Launch Claude AI to work on the current ticket |
+| `santree pr` | Create a GitHub pull request (opens in browser) |
 | `santree clean` | Remove worktrees with merged/closed PRs |
 | `santree doctor` | Check system requirements and integrations |
 | `santree editor` | Open workspace file in VSCode or Cursor |
@@ -179,6 +180,13 @@ Shows worktrees with merged/closed PRs and prompts for confirmation before remov
 |--------|-------------|
 | `--editor <cmd>` | Editor command to use (default: `code`). Also configurable via `SANTREE_EDITOR` env var |
 
+### pr
+| Option | Description |
+|--------|-------------|
+| `--fill` | Use AI to fill the PR template before opening |
+
+Automatically pushes, detects existing PRs, and uses the first commit message as the title. If a closed PR exists for the branch, prompts before creating a new one.
+
 ### work
 | Option | Description |
 |--------|-------------|

package/dist/commands/pr.d.ts

@@ -1,7 +1,7 @@
 import { z } from "zod";
 export declare const description = "Create a GitHub pull request";
 export declare const options: z.ZodObject<{
-    draft: z.ZodOptional<z.ZodBoolean>;
+    fill: z.ZodOptional<z.ZodBoolean>;
 }, z.core.$strip>;
 type Props = {
     options: z.infer<typeof options>;

package/dist/commands/pr.js

@@ -1,17 +1,20 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { useEffect, useState } from "react";
-import { Text, Box, useApp } from "ink";
-import TextInput from "ink-text-input";
+import { Text, Box, useInput, useApp } from "ink";
 import Spinner from "ink-spinner";
 import { z } from "zod";
-import { exec } from "child_process";
+import { exec, spawnSync } from "child_process";
 import { promisify } from "util";
-import { findMainRepoRoot, findRepoRoot, getCurrentBranch, getDefaultBranch, getWorktreeMetadata, hasUncommittedChanges, getCommitsAhead, remoteBranchExists, getUnpushedCommits, extractTicketId, isInWorktree, getLatestCommitMessage, } from "../lib/git.js";
-import { ghCliAvailable, getPRInfoAsync, pushBranch, createPR, } from "../lib/github.js";
+import { join } from "path";
+import { writeFileSync } from "fs";
+import { tmpdir } from "os";
+import { findMainRepoRoot, findRepoRoot, getCurrentBranch, getDefaultBranch, getWorktreeMetadata, hasUncommittedChanges, getCommitsAhead, remoteBranchExists, getUnpushedCommits, extractTicketId, isInWorktree, getFirstCommitMessage, getCommitLog, getDiffStat, getDiffContent, } from "../lib/git.js";
+import { ghCliAvailable, getPRInfoAsync, pushBranch, createPR, getPRTemplate, } from "../lib/github.js";
+import { renderPrompt } from "../lib/prompts.js";
 const execAsync = promisify(exec);
 export const description = "Create a GitHub pull request";
 export const options = z.object({
-    draft: z.boolean().optional().describe("Create as draft PR"),
+    fill: z.boolean().optional().describe("Use AI to fill the PR template"),
 });
 export default function PR({ options }) {
     const { exit } = useApp();
@@ -20,27 +23,78 @@ export default function PR({ options }) {
     const [branch, setBranch] = useState(null);
     const [baseBranch, setBaseBranch] = useState(null);
     const [issueId, setIssueId] = useState(null);
-    const [titleInput, setTitleInput] = useState("");
-    async function handleTitleSubmit(value) {
-        const finalTitle = value.trim();
-        if (!finalTitle) {
+    const [closedPrInfo, setClosedPrInfo] = useState(null);
+    const [pendingCreate, setPendingCreate] = useState(false);
+    useInput((input, key) => {
+        if (status !== "confirm-reopen")
+            return;
+        if (input === "y" || input === "Y") {
+            setClosedPrInfo(null);
+            setPendingCreate(true);
+        }
+        else if (input === "n" || input === "N" || key.escape) {
             setStatus("error");
-            setMessage("PR title is required");
+            setMessage("Cancelled");
             setTimeout(() => exit(), 100);
-            return;
         }
+    });
+    useEffect(() => {
+        if (!pendingCreate || !branch || !baseBranch)
+            return;
+        setPendingCreate(false);
+        openPR();
+    }, [pendingCreate]);
+    function openPR() {
         if (!branch || !baseBranch)
             return;
+        const title = getFirstCommitMessage(baseBranch) ?? branch;
+        let bodyFile;
+        if (options.fill) {
+            setStatus("filling");
+            setMessage("Filling PR template with AI...");
+            const prTemplate = getPRTemplate();
+            if (!prTemplate) {
+                setStatus("error");
+                setMessage("No PR template found at .github/pull_request_template.md");
+                setTimeout(() => exit(), 100);
+                return;
+            }
+            const commitLog = getCommitLog(baseBranch) ?? "";
+            const diffStat = getDiffStat(baseBranch) ?? "";
+            const diff = getDiffContent(baseBranch) ?? "";
+            const ticketId = extractTicketId(branch);
+            const prompt = renderPrompt("fill-pr", {
+                pr_template: prTemplate,
+                commit_log: commitLog,
+                diff_stat: diffStat,
+                diff,
+                ticket_id: ticketId ?? "",
+                branch_name: branch,
+            });
+            const result = spawnSync("happy", ["-p", prompt, "--output-format", "text"], {
+                encoding: "utf-8",
+                maxBuffer: 10 * 1024 * 1024,
+            });
+            if (result.status !== 0) {
+                setStatus("error");
+                setMessage("Failed to generate PR body with Claude");
+                setTimeout(() => exit(), 100);
+                return;
+            }
+            const body = result.stdout.trim();
+            bodyFile = join(tmpdir(), `santree-pr-${Date.now()}.md`);
+            writeFileSync(bodyFile, body);
+        }
         setStatus("creating");
-        setMessage("Creating PR...");
-        const result = createPR(finalTitle, baseBranch, branch, options.draft ?? false);
+        setMessage("Opening PR in browser...");
+        const result = createPR(title, baseBranch, branch, bodyFile);
         if (result === 0) {
             setStatus("done");
             setMessage("Opened PR creation page in browser");
         }
         else {
             setStatus("error");
-            setMessage("Failed to create PR");
+            setMessage("Failed to open PR page");
         }
         setTimeout(() => exit(), 100);
     }
@@ -83,7 +137,7 @@ export default function PR({ options }) {
             // Check for uncommitted changes
             if (hasUncommittedChanges()) {
                 setStatus("error");
-                setMessage("You have uncommitted changes. Please commit your changes before creating a PR.");
+                setMessage("You have uncommitted changes. Please commit before creating a PR.");
                 return;
             }
             // Yield to let spinner animate
@@ -96,7 +150,7 @@ export default function PR({ options }) {
             const commitsAhead = getCommitsAhead(base);
             if (commitsAhead === 0) {
                 setStatus("error");
-                setMessage(`No commits ahead of ${base}. You need to make commits before creating a PR.`);
+                setMessage(`No commits ahead of ${base}. Make commits before creating a PR.`);
                 return;
             }
             // Yield to let spinner animate
@@ -118,6 +172,12 @@ export default function PR({ options }) {
             // Check if PR already exists
             const existingPr = await getPRInfoAsync(branchName);
             if (existingPr) {
+                if (existingPr.state === "CLOSED") {
+                    // Closed PR — let user decide to create a new one
+                    setClosedPrInfo(existingPr);
+                    setStatus("confirm-reopen");
+                    return;
+                }
                 setStatus("existing");
                 setMessage(`PR already exists (#${existingPr.number}) - ${existingPr.state}`);
                 if (existingPr.url) {
@@ -131,25 +191,26 @@ export default function PR({ options }) {
                 setTimeout(() => exit(), 100);
                 return;
             }
-            // Get the latest commit message for the PR title
-            const latestCommit = getLatestCommitMessage();
-            let suggestedTitle = latestCommit ?? "";
             // Extract ticket ID from branch name to display in UI
             const ticket = extractTicketId(branchName);
             if (ticket) {
                 setIssueId(ticket);
             }
-            setTitleInput(suggestedTitle);
-            setStatus("awaiting-title");
         }
         run();
-    }, [options.draft]);
-    const isLoading = status === "checking" || status === "pushing" || status === "creating";
+    }, [options.fill]);
+    // Once branch and baseBranch are set and we're still checking, go straight to PR
+    useEffect(() => {
+        if (status === "checking" && branch && baseBranch && !closedPrInfo) {
+            openPR();
+        }
+    }, [status, branch, baseBranch]);
+    const isLoading = status === "checking" || status === "pushing" || status === "filling" || status === "creating";
     return (_jsxs(Box, { flexDirection: "column", padding: 1, width: "100%", children: [_jsx(Box, { marginBottom: 1, children: _jsx(Text, { bold: true, color: "cyan", children: "\uD83D\uDD17 Pull Request" }) }), _jsxs(Box, { flexDirection: "column", borderStyle: "round", borderColor: status === "error"
                     ? "red"
                     : status === "done"
                         ? "green"
                         : status === "existing"
                             ? "yellow"
-                            : "blue", paddingX: 1, width: "100%", children: [branch && (_jsxs(Box, { gap: 1, children: [_jsx(Text, { dimColor: true, children: "branch:" }), _jsx(Text, { color: "cyan", bold: true, children: branch })] })), baseBranch && (_jsxs(Box, { gap: 1, children: [_jsx(Text, { dimColor: true, children: "base:" }), _jsx(Text, { color: "blue", children: baseBranch })] })), issueId && (_jsxs(Box, { gap: 1, children: [_jsx(Text, { dimColor: true, children: "issue:" }), _jsx(Text, { color: "blue", bold: true, children: issueId })] })), _jsxs(Box, { gap: 1, children: [_jsx(Text, { dimColor: true, children: "type:" }), _jsx(Text, { backgroundColor: options.draft ? "yellow" : "green", color: "black", children: options.draft ? " draft " : " ready " })] })] }), _jsxs(Box, { marginTop: 1, children: [isLoading && (_jsxs(Box, { children: [_jsx(Text, { color: "cyan", children: _jsx(Spinner, { type: "dots" }) }), _jsxs(Text, { children: [" ", message || "Checking..."] })] })), status === "awaiting-title" && (_jsxs(Box, { children: [_jsx(Text, { color: "cyan", bold: true, children: "PR Title: " }), _jsx(TextInput, { value: titleInput, onChange: setTitleInput, onSubmit: handleTitleSubmit })] })), status === "done" && (_jsxs(Text, { color: "green", bold: true, children: ["\u2713 ", message] })), status === "existing" && (_jsxs(Text, { color: "yellow", bold: true, children: ["\u26A0 ", message] })), status === "error" && (_jsxs(Text, { color: "red", bold: true, children: ["\u2717 ", message] }))] })] }));
+                            : "blue", paddingX: 1, width: "100%", children: [branch && (_jsxs(Box, { gap: 1, children: [_jsx(Text, { dimColor: true, children: "branch:" }), _jsx(Text, { color: "cyan", bold: true, children: branch })] })), baseBranch && (_jsxs(Box, { gap: 1, children: [_jsx(Text, { dimColor: true, children: "base:" }), _jsx(Text, { color: "blue", children: baseBranch })] })), issueId && (_jsxs(Box, { gap: 1, children: [_jsx(Text, { dimColor: true, children: "issue:" }), _jsx(Text, { color: "blue", bold: true, children: issueId })] }))] }), _jsxs(Box, { marginTop: 1, flexDirection: "column", children: [isLoading && (_jsxs(Box, { children: [_jsx(Text, { color: "cyan", children: _jsx(Spinner, { type: "dots" }) }), _jsxs(Text, { children: [" ", message || "Checking..."] })] })), status === "confirm-reopen" && closedPrInfo && (_jsxs(Box, { children: [_jsxs(Text, { color: "yellow", children: ["PR #", closedPrInfo.number, " was closed. Create a new one? "] }), _jsx(Text, { color: "green", bold: true, children: "[y]" }), _jsx(Text, { children: " / " }), _jsx(Text, { color: "red", bold: true, children: "[n]" })] })), status === "done" && (_jsxs(Text, { color: "green", bold: true, children: ["\u2713 ", message] })), status === "existing" && (_jsxs(Text, { color: "yellow", bold: true, children: ["\u26A0 ", message] })), status === "error" && (_jsxs(Text, { color: "red", bold: true, children: ["\u2717 ", message] }))] })] }));
 }

package/dist/commands/statusline.js

@@ -132,7 +132,7 @@ function formatChanges(changes) {
 // Build statusline for santree worktree
 function buildSantreeStatusline(cwd, metadata, model, usedPercentage) {
     const parts = [];
-    const branch = metadata.branch_name || git(cwd, "rev-parse --abbrev-ref HEAD") || "unknown";
+    const branch = git(cwd, "rev-parse --abbrev-ref HEAD") || "unknown";
     // Ticket ID (prominent)
     const ticketId = extractTicketId(branch);
     if (ticketId) {

package/dist/commands/work.js

@@ -4,23 +4,14 @@ import { Text, Box } from "ink";
 import Spinner from "ink-spinner";
 import { z } from "zod";
 import { spawn } from "child_process";
-import { fileURLToPath } from "url";
-import { dirname, join } from "path";
-import nunjucks from "nunjucks";
 import { getCurrentBranch, extractTicketId, findRepoRoot } from "../lib/git.js";
-const __filename = fileURLToPath(import.meta.url);
-const __dirname = dirname(__filename);
-const promptsDir = join(__dirname, "..", "..", "prompts");
-const promptsEnv = new nunjucks.Environment(new nunjucks.FileSystemLoader(promptsDir), { autoescape: false });
+import { renderPrompt } from "../lib/prompts.js";
 export const description = "Launch Claude to work on current ticket";
 export const options = z.object({
     plan: z.boolean().optional().describe("Only create implementation plan"),
     review: z.boolean().optional().describe("Review changes against ticket"),
     "fix-pr": z.boolean().optional().describe("Fetch PR comments and fix them"),
 });
-function renderPrompt(mode, context) {
-    return promptsEnv.render(`${mode}.njk`, context);
-}
 function getMode(opts) {
     if (opts["fix-pr"])
         return "fix-pr";

package/dist/lib/exec.d.ts

@@ -0,0 +1,7 @@
+/**
+ * Run a shell command and return trimmed stdout, or null on failure.
+ */
+export declare function run(command: string, options?: {
+    cwd?: string;
+    maxBuffer?: number;
+}): string | null;

package/dist/lib/exec.js

@@ -0,0 +1,12 @@
+import { execSync } from "child_process";
+/**
+ * Run a shell command and return trimmed stdout, or null on failure.
+ */
+export function run(command, options) {
+    try {
+        return execSync(command, { encoding: "utf-8", ...options }).trim();
+    }
+    catch {
+        return null;
+    }
+}

package/dist/lib/git.d.ts

@@ -4,44 +4,196 @@ export interface Worktree {
     commit: string;
     isBare: boolean;
 }
+/**
+ * Find the toplevel directory of the current git repository.
+ * Runs: `git rev-parse --show-toplevel`
+ * Returns null if not inside a git repo.
+ */
 export declare function findRepoRoot(): string | null;
+/**
+ * Find the root of the main (non-worktree) repository by resolving --git-common-dir.
+ * Runs: `git rev-parse --git-common-dir`
+ * Returns null if not inside a git repo.
+ */
 export declare function findMainRepoRoot(): string | null;
+/**
+ * Check whether the current working directory is inside a git worktree (not the main repo).
+ * Compares `git rev-parse --git-dir` vs `--git-common-dir` — they differ inside a worktree.
+ * Returns false if not in a git repo or if in the main repo.
+ */
 export declare function isInWorktree(): boolean;
+/**
+ * Check whether a given path is a git worktree (not a main repo checkout).
+ * Runs: `git rev-parse --git-dir` and `--git-common-dir` with cwd set to wtPath.
+ * Returns false if the path is not a git repo or is the main repo.
+ */
 export declare function isWorktreePath(wtPath: string): boolean;
+/**
+ * Get the name of the currently checked-out branch.
+ * Runs: `git rev-parse --abbrev-ref HEAD`
+ * Returns null if in detached HEAD state or not in a git repo.
+ */
 export declare function getCurrentBranch(): string | null;
+/**
+ * Determine the default branch (e.g. main or master) for the origin remote.
+ * Runs: `git symbolic-ref refs/remotes/origin/HEAD`
+ * Falls back to checking if "main" or "master" branches exist locally.
+ * Returns "main" as a last resort.
+ */
 export declare function getDefaultBranch(): string;
+/**
+ * List all git worktrees in the current repository.
+ * Runs: `git worktree list --porcelain`
+ * Returns an empty array on failure.
+ */
 export declare function listWorktrees(): Worktree[];
+/**
+ * Get the path to the .santree directory inside a repo root.
+ */
 export declare function getSantreeDir(repoRoot: string): string;
+/**
+ * Get the path to the .santree/worktrees directory inside a repo root.
+ */
 export declare function getWorktreesDir(repoRoot: string): string;
+/**
+ * Create a new git worktree for a branch, optionally creating the branch from a base.
+ * The worktree directory is named after the ticket ID extracted from the branch name.
+ * Runs: `git worktree add [-b branchName] <path> <branch|baseBranch>`
+ * Returns { success: false, error } if no ticket ID found, path already exists, or git fails.
+ */
 export declare function createWorktree(branchName: string, baseBranch: string, repoRoot: string): Promise<{
     success: boolean;
     path?: string;
     error?: string;
 }>;
+/**
+ * Remove a git worktree by branch name, cleaning up the directory and optionally deleting the branch.
+ * Runs: `git worktree remove [--force] <path>` then `git branch -d|-D <branchName>`
+ * Returns { success: false, error } if worktree not found or git fails.
+ */
 export declare function removeWorktree(branchName: string, repoRoot: string, force?: boolean): Promise<{
     success: boolean;
     error?: string;
 }>;
+/**
+ * Extract a ticket ID (e.g. "TEAM-123") from a branch name.
+ * Matches the first occurrence of LETTERS-DIGITS in the string.
+ * Returns null if no ticket ID pattern is found.
+ */
 export declare function extractTicketId(branch: string): string | null;
+/**
+ * Get the filesystem path for a worktree by its branch name.
+ * Uses `git worktree list --porcelain` under the hood.
+ * Returns null if no worktree is checked out on that branch.
+ */
 export declare function getWorktreePath(branchName: string): string | null;
+/**
+ * Read the .santree_metadata.json file from a worktree directory.
+ * Returns null if the file doesn't exist or can't be parsed.
+ */
 export declare function getWorktreeMetadata(worktreePath: string): {
-    branch_name?: string;
     base_branch?: string;
-    created_at?: string;
 } | null;
+/**
+ * Check if there are any uncommitted changes (staged or unstaged).
+ * Runs: `git status --porcelain`
+ * Returns false if not in a git repo.
+ */
 export declare function hasUncommittedChanges(): boolean;
+/**
+ * Check if there are staged changes ready to commit.
+ * Runs: `git diff --cached --quiet` (exits non-zero if there are staged changes).
+ * Returns false if not in a git repo.
+ */
 export declare function hasStagedChanges(): boolean;
+/**
+ * Check if there are unstaged modifications or untracked files.
+ * Runs: `git diff --quiet` and `git ls-files --others --exclude-standard`
+ * Returns false if not in a git repo.
+ */
 export declare function hasUnstagedChanges(): boolean;
+/**
+ * Get a short summary of the working tree status.
+ * Runs: `git status --short`
+ * Returns empty string on failure.
+ */
 export declare function getGitStatus(): string;
+/**
+ * Get a diffstat of staged changes.
+ * Runs: `git diff --cached --stat`
+ * Returns empty string on failure.
+ */
 export declare function getStagedDiffStat(): string;
+/**
+ * Count how many commits the current branch is behind origin/baseBranch.
+ * Runs: `git rev-list --count HEAD..origin/<baseBranch>`
+ * Returns 0 on failure.
+ */
 export declare function getCommitsBehind(baseBranch: string): number;
+/**
+ * Count how many commits the current branch is ahead of baseBranch.
+ * Runs: `git rev-list --count <baseBranch>..HEAD`
+ * Returns 0 on failure.
+ */
 export declare function getCommitsAhead(baseBranch: string): number;
+/**
+ * Check if a branch exists on the remote (origin).
+ * Runs: `git ls-remote --heads origin <branchName>`
+ * Returns false on failure.
+ */
 export declare function remoteBranchExists(branchName: string): boolean;
+/**
+ * Count how many local commits haven't been pushed to origin.
+ * Runs: `git rev-list --count origin/<branchName>..HEAD`
+ * If no remote tracking branch exists, counts all commits on HEAD.
+ * Returns 0 on failure.
+ */
 export declare function getUnpushedCommits(branchName: string): number;
+/**
+ * Fetch from origin and pull the latest changes on a base branch.
+ * Runs: `git fetch origin`, `git checkout <baseBranch>`, `git pull origin <baseBranch>`
+ * Returns { success: false, message } if any step fails.
+ */
 export declare function pullLatest(baseBranch: string, repoRoot: string): {
     success: boolean;
     message: string;
 };
+/**
+ * Check if a .santree/init.sh script exists in the repo.
+ */
 export declare function hasInitScript(repoRoot: string): boolean;
+/**
+ * Get the path to the .santree/init.sh script.
+ */
 export declare function getInitScriptPath(repoRoot: string): string;
+/**
+ * Get the subject line of the latest commit.
+ * Runs: `git log -1 --format=%s`
+ * Returns null if not in a git repo or no commits.
+ */
 export declare function getLatestCommitMessage(): string | null;
+/**
+ * Get the subject line of the first commit on the current branch since baseBranch.
+ * Runs: `git log <baseBranch>..HEAD --reverse --format=%s`
+ * Returns null if there are no commits ahead of baseBranch.
+ */
+export declare function getFirstCommitMessage(baseBranch: string): string | null;
+/**
+ * Get a formatted commit log of all commits since baseBranch.
+ * Runs: `git log <baseBranch>..HEAD --format="- %s"`
+ * Returns null if there are no commits or on failure.
+ */
+export declare function getCommitLog(baseBranch: string): string | null;
+/**
+ * Get a diffstat summary of all changes since baseBranch.
+ * Runs: `git diff <baseBranch>..HEAD --stat`
+ * Returns null if there are no changes or on failure.
+ */
+export declare function getDiffStat(baseBranch: string): string | null;
+/**
+ * Get the full diff of all changes since baseBranch.
+ * Runs: `git diff <baseBranch>..HEAD`
+ * Uses a 10MB max buffer for large diffs.
+ * Returns null if there are no changes or on failure.
+ */
+export declare function getDiffContent(baseBranch: string): string | null;

package/dist/lib/git.js

@@ -2,135 +2,141 @@ import { execSync, exec } from "child_process";
 import { promisify } from "util";
 import * as path from "path";
 import * as fs from "fs";
+import { run } from "./exec.js";
 const execAsync = promisify(exec);
+/**
+ * Find the toplevel directory of the current git repository.
+ * Runs: `git rev-parse --show-toplevel`
+ * Returns null if not inside a git repo.
+ */
 export function findRepoRoot() {
-    try {
-        return execSync("git rev-parse --show-toplevel", {
-            encoding: "utf-8",
-        }).trim();
-    }
-    catch {
-        return null;
-    }
+    return run("git rev-parse --show-toplevel");
 }
+/**
+ * Find the root of the main (non-worktree) repository by resolving --git-common-dir.
+ * Runs: `git rev-parse --git-common-dir`
+ * Returns null if not inside a git repo.
+ */
 export function findMainRepoRoot() {
-    try {
-        const gitCommonDir = execSync("git rev-parse --git-common-dir", {
-            encoding: "utf-8",
-        }).trim();
-        return path.dirname(path.resolve(gitCommonDir));
-    }
-    catch {
+    const gitCommonDir = run("git rev-parse --git-common-dir");
+    if (!gitCommonDir)
         return null;
-    }
+    return path.dirname(path.resolve(gitCommonDir));
 }
+/**
+ * Check whether the current working directory is inside a git worktree (not the main repo).
+ * Compares `git rev-parse --git-dir` vs `--git-common-dir` — they differ inside a worktree.
+ * Returns false if not in a git repo or if in the main repo.
+ */
 export function isInWorktree() {
-    try {
-        const gitDir = execSync("git rev-parse --git-dir", {
-            encoding: "utf-8",
-        }).trim();
-        const gitCommonDir = execSync("git rev-parse --git-common-dir", {
-            encoding: "utf-8",
-        }).trim();
-        // If they differ, we're in a worktree
-        return path.resolve(gitDir) !== path.resolve(gitCommonDir);
-    }
-    catch {
+    const gitDir = run("git rev-parse --git-dir");
+    const gitCommonDir = run("git rev-parse --git-common-dir");
+    if (!gitDir || !gitCommonDir)
         return false;
-    }
+    return path.resolve(gitDir) !== path.resolve(gitCommonDir);
 }
+/**
+ * Check whether a given path is a git worktree (not a main repo checkout).
+ * Runs: `git rev-parse --git-dir` and `--git-common-dir` with cwd set to wtPath.
+ * Returns false if the path is not a git repo or is the main repo.
+ */
 export function isWorktreePath(wtPath) {
-    try {
-        const gitDir = execSync("git rev-parse --git-dir", {
-            encoding: "utf-8",
-            cwd: wtPath,
-        }).trim();
-        const gitCommonDir = execSync("git rev-parse --git-common-dir", {
-            encoding: "utf-8",
-            cwd: wtPath,
-        }).trim();
-        // If they differ, it's a worktree (not the main repo)
-        return path.resolve(wtPath, gitDir) !== path.resolve(wtPath, gitCommonDir);
-    }
-    catch {
+    const gitDir = run("git rev-parse --git-dir", { cwd: wtPath });
+    const gitCommonDir = run("git rev-parse --git-common-dir", { cwd: wtPath });
+    if (!gitDir || !gitCommonDir)
         return false;
-    }
+    return path.resolve(wtPath, gitDir) !== path.resolve(wtPath, gitCommonDir);
 }
+/**
+ * Get the name of the currently checked-out branch.
+ * Runs: `git rev-parse --abbrev-ref HEAD`
+ * Returns null if in detached HEAD state or not in a git repo.
+ */
 export function getCurrentBranch() {
-    try {
-        return execSync("git rev-parse --abbrev-ref HEAD", {
-            encoding: "utf-8",
-        }).trim();
-    }
-    catch {
-        return null;
-    }
+    return run("git rev-parse --abbrev-ref HEAD");
 }
+/**
+ * Determine the default branch (e.g. main or master) for the origin remote.
+ * Runs: `git symbolic-ref refs/remotes/origin/HEAD`
+ * Falls back to checking if "main" or "master" branches exist locally.
+ * Returns "main" as a last resort.
+ */
 export function getDefaultBranch() {
-    try {
-        const ref = execSync("git symbolic-ref refs/remotes/origin/HEAD", {
-            encoding: "utf-8",
-        }).trim();
+    const ref = run("git symbolic-ref refs/remotes/origin/HEAD");
+    if (ref)
         return ref.replace("refs/remotes/origin/", "");
-    }
-    catch {
-        // Fall back to checking if main/master exists
-        for (const branch of ["main", "master"]) {
-            try {
-                execSync(`git rev-parse --verify refs/heads/${branch}`, {
-                    stdio: "ignore",
-                });
-                return branch;
-            }
-            catch {
-                continue;
-            }
+    // Fall back to checking if main/master exists
+    for (const branch of ["main", "master"]) {
+        try {
+            execSync(`git rev-parse --verify refs/heads/${branch}`, {
+                stdio: "ignore",
+            });
+            return branch;
+        }
+        catch {
+            continue;
         }
-        return "main";
     }
+    return "main";
 }
+/**
+ * List all git worktrees in the current repository.
+ * Runs: `git worktree list --porcelain`
+ * Returns an empty array on failure.
+ */
 export function listWorktrees() {
-    try {
-        const output = execSync("git worktree list --porcelain", {
-            encoding: "utf-8",
-        });
-        const worktrees = [];
-        let current = {};
-        for (const line of output.split("\n")) {
-            if (line.startsWith("worktree ")) {
-                current.path = line.replace("worktree ", "");
-            }
-            else if (line.startsWith("HEAD ")) {
-                current.commit = line.replace("HEAD ", "").slice(0, 8);
-            }
-            else if (line.startsWith("branch ")) {
-                current.branch = line.replace("branch refs/heads/", "");
-            }
-            else if (line === "bare") {
-                current.isBare = true;
-            }
-            else if (line === "" && current.path) {
-                worktrees.push(current);
-                current = {};
-            }
+    const output = run("git worktree list --porcelain");
+    if (!output)
+        return [];
+    const worktrees = [];
+    let current = {};
+    for (const line of output.split("\n")) {
+        if (line.startsWith("worktree ")) {
+            current.path = line.replace("worktree ", "");
+        }
+        else if (line.startsWith("HEAD ")) {
+            current.commit = line.replace("HEAD ", "").slice(0, 8);
+        }
+        else if (line.startsWith("branch ")) {
+            current.branch = line.replace("branch refs/heads/", "");
+        }
+        else if (line === "bare") {
+            current.isBare = true;
         }
-        if (current.path) {
+        else if (line === "" && current.path) {
             worktrees.push(current);
+            current = {};
         }
-        return worktrees;
     }
-    catch {
-        return [];
+    if (current.path) {
+        worktrees.push(current);
     }
+    return worktrees;
 }
+/**
+ * Get the path to the .santree directory inside a repo root.
+ */
 export function getSantreeDir(repoRoot) {
     return path.join(repoRoot, ".santree");
 }
+/**
+ * Get the path to the .santree/worktrees directory inside a repo root.
+ */
 export function getWorktreesDir(repoRoot) {
     return path.join(getSantreeDir(repoRoot), "worktrees");
 }
+/**
+ * Create a new git worktree for a branch, optionally creating the branch from a base.
+ * The worktree directory is named after the ticket ID extracted from the branch name.
+ * Runs: `git worktree add [-b branchName] <path> <branch|baseBranch>`
+ * Returns { success: false, error } if no ticket ID found, path already exists, or git fails.
+ */
 export async function createWorktree(branchName, baseBranch, repoRoot) {
-    const dirName = branchName.replace(/\//g, "__");
+    const ticketId = extractTicketId(branchName);
+    if (!ticketId) {
+        return { success: false, error: "No ticket ID found in branch name (expected pattern like TEAM-123)" };
+    }
+    const dirName = ticketId;
     const worktreesDir = getWorktreesDir(repoRoot);
     const worktreePath = path.join(worktreesDir, dirName);
     if (fs.existsSync(worktreePath)) {
@@ -164,9 +170,7 @@ export async function createWorktree(branchName, baseBranch, repoRoot) {
         }
         // Save metadata
         const metadata = {
-            branch_name: branchName,
             base_branch: baseBranch,
-            created_at: new Date().toISOString(),
         };
         fs.writeFileSync(path.join(worktreePath, ".santree_metadata.json"), JSON.stringify(metadata, null, 2));
         return { success: true, path: worktreePath };
@@ -178,6 +182,11 @@ export async function createWorktree(branchName, baseBranch, repoRoot) {
         };
     }
 }
+/**
+ * Remove a git worktree by branch name, cleaning up the directory and optionally deleting the branch.
+ * Runs: `git worktree remove [--force] <path>` then `git branch -d|-D <branchName>`
+ * Returns { success: false, error } if worktree not found or git fails.
+ */
 export async function removeWorktree(branchName, repoRoot, force = false) {
     // Find the worktree by branch name using git's worktree tracking
     const worktreePath = getWorktreePath(branchName);
@@ -220,6 +229,11 @@ export async function removeWorktree(branchName, repoRoot, force = false) {
         };
     }
 }
+/**
+ * Extract a ticket ID (e.g. "TEAM-123") from a branch name.
+ * Matches the first occurrence of LETTERS-DIGITS in the string.
+ * Returns null if no ticket ID pattern is found.
+ */
 export function extractTicketId(branch) {
     const match = branch.match(/([a-zA-Z]+)-(\d+)/);
     if (match) {
@@ -227,11 +241,20 @@ export function extractTicketId(branch) {
     }
     return null;
 }
+/**
+ * Get the filesystem path for a worktree by its branch name.
+ * Uses `git worktree list --porcelain` under the hood.
+ * Returns null if no worktree is checked out on that branch.
+ */
 export function getWorktreePath(branchName) {
     const worktrees = listWorktrees();
     const wt = worktrees.find((w) => w.branch === branchName);
     return wt?.path ?? null;
 }
+/**
+ * Read the .santree_metadata.json file from a worktree directory.
+ * Returns null if the file doesn't exist or can't be parsed.
+ */
 export function getWorktreeMetadata(worktreePath) {
     const metadataPath = path.join(worktreePath, ".santree_metadata.json");
     if (!fs.existsSync(metadataPath)) {
@@ -244,15 +267,20 @@ export function getWorktreeMetadata(worktreePath) {
         return null;
     }
 }
+/**
+ * Check if there are any uncommitted changes (staged or unstaged).
+ * Runs: `git status --porcelain`
+ * Returns false if not in a git repo.
+ */
 export function hasUncommittedChanges() {
-    try {
-        const output = execSync("git status --porcelain", { encoding: "utf-8" });
-        return Boolean(output.trim());
-    }
-    catch {
-        return false;
-    }
+    const output = run("git status --porcelain");
+    return output !== null && output !== "";
 }
+/**
+ * Check if there are staged changes ready to commit.
+ * Runs: `git diff --cached --quiet` (exits non-zero if there are staged changes).
+ * Returns false if not in a git repo.
+ */
 export function hasStagedChanges() {
     try {
         execSync("git diff --cached --quiet", { stdio: "ignore" });
@@ -262,6 +290,11 @@ export function hasStagedChanges() {
         return true;
     }
 }
+/**
+ * Check if there are unstaged modifications or untracked files.
+ * Runs: `git diff --quiet` and `git ls-files --others --exclude-standard`
+ * Returns false if not in a git repo.
+ */
 export function hasUnstagedChanges() {
     try {
         // Check for modified files
@@ -272,64 +305,62 @@ export function hasUnstagedChanges() {
             return true;
         }
         // Check for untracked files
-        const output = execSync("git ls-files --others --exclude-standard", {
-            encoding: "utf-8",
-        });
-        return Boolean(output.trim());
+        const output = run("git ls-files --others --exclude-standard");
+        return output !== null && output !== "";
     }
     catch {
         return false;
     }
 }
+/**
+ * Get a short summary of the working tree status.
+ * Runs: `git status --short`
+ * Returns empty string on failure.
+ */
 export function getGitStatus() {
-    try {
-        return execSync("git status --short", { encoding: "utf-8" }).trim();
-    }
-    catch {
-        return "";
-    }
+    return run("git status --short") ?? "";
 }
+/**
+ * Get a diffstat of staged changes.
+ * Runs: `git diff --cached --stat`
+ * Returns empty string on failure.
+ */
 export function getStagedDiffStat() {
-    try {
-        return execSync("git diff --cached --stat", { encoding: "utf-8" }).trim();
-    }
-    catch {
-        return "";
-    }
+    return run("git diff --cached --stat") ?? "";
 }
+/**
+ * Count how many commits the current branch is behind origin/baseBranch.
+ * Runs: `git rev-list --count HEAD..origin/<baseBranch>`
+ * Returns 0 on failure.
+ */
 export function getCommitsBehind(baseBranch) {
-    try {
-        const output = execSync(`git rev-list --count HEAD..origin/${baseBranch}`, {
-            encoding: "utf-8",
-        });
-        return parseInt(output.trim(), 10) || 0;
-    }
-    catch {
-        return 0;
-    }
+    const output = run(`git rev-list --count HEAD..origin/${baseBranch}`);
+    return output ? parseInt(output, 10) || 0 : 0;
 }
+/**
+ * Count how many commits the current branch is ahead of baseBranch.
+ * Runs: `git rev-list --count <baseBranch>..HEAD`
+ * Returns 0 on failure.
+ */
 export function getCommitsAhead(baseBranch) {
-    try {
-        const output = execSync(`git rev-list --count ${baseBranch}..HEAD`, {
-            encoding: "utf-8",
-        });
-        return parseInt(output.trim(), 10) || 0;
-    }
-    catch {
-        return 0;
-    }
+    const output = run(`git rev-list --count ${baseBranch}..HEAD`);
+    return output ? parseInt(output, 10) || 0 : 0;
 }
+/**
+ * Check if a branch exists on the remote (origin).
+ * Runs: `git ls-remote --heads origin <branchName>`
+ * Returns false on failure.
+ */
 export function remoteBranchExists(branchName) {
-    try {
-        const output = execSync(`git ls-remote --heads origin ${branchName}`, {
-            encoding: "utf-8",
-        });
-        return output.includes(branchName);
-    }
-    catch {
-        return false;
-    }
+    const output = run(`git ls-remote --heads origin ${branchName}`);
+    return output !== null && output.includes(branchName);
 }
+/**
+ * Count how many local commits haven't been pushed to origin.
+ * Runs: `git rev-list --count origin/<branchName>..HEAD`
+ * If no remote tracking branch exists, counts all commits on HEAD.
+ * Returns 0 on failure.
+ */
 export function getUnpushedCommits(branchName) {
     try {
         // Check if remote tracking branch exists
@@ -340,21 +371,22 @@ export function getUnpushedCommits(branchName) {
         }
         catch {
             // No remote branch, count all local commits
-            const output = execSync("git rev-list --count HEAD", {
-                encoding: "utf-8",
-            });
-            return parseInt(output.trim(), 10) || 0;
+            const output = run("git rev-list --count HEAD");
+            return output ? parseInt(output, 10) || 0 : 0;
         }
         // Count commits ahead of remote
-        const output = execSync(`git rev-list --count origin/${branchName}..HEAD`, {
-            encoding: "utf-8",
-        });
-        return parseInt(output.trim(), 10) || 0;
+        const output = run(`git rev-list --count origin/${branchName}..HEAD`);
+        return output ? parseInt(output, 10) || 0 : 0;
     }
     catch {
         return 0;
     }
 }
+/**
+ * Fetch from origin and pull the latest changes on a base branch.
+ * Runs: `git fetch origin`, `git checkout <baseBranch>`, `git pull origin <baseBranch>`
+ * Returns { success: false, message } if any step fails.
+ */
 export function pullLatest(baseBranch, repoRoot) {
     try {
         // Fetch from origin
@@ -374,20 +406,61 @@ export function pullLatest(baseBranch, repoRoot) {
         };
     }
 }
+/**
+ * Check if a .santree/init.sh script exists in the repo.
+ */
 export function hasInitScript(repoRoot) {
     const initScript = path.join(getSantreeDir(repoRoot), "init.sh");
     return fs.existsSync(initScript);
 }
+/**
+ * Get the path to the .santree/init.sh script.
+ */
 export function getInitScriptPath(repoRoot) {
     return path.join(getSantreeDir(repoRoot), "init.sh");
 }
+/**
+ * Get the subject line of the latest commit.
+ * Runs: `git log -1 --format=%s`
+ * Returns null if not in a git repo or no commits.
+ */
 export function getLatestCommitMessage() {
-    try {
-        return execSync("git log -1 --format=%s", {
-            encoding: "utf-8",
-        }).trim();
-    }
-    catch {
+    return run("git log -1 --format=%s");
+}
+/**
+ * Get the subject line of the first commit on the current branch since baseBranch.
+ * Runs: `git log <baseBranch>..HEAD --reverse --format=%s`
+ * Returns null if there are no commits ahead of baseBranch.
+ */
+export function getFirstCommitMessage(baseBranch) {
+    const output = run(`git log ${baseBranch}..HEAD --reverse --format=%s`);
+    if (!output)
         return null;
-    }
+    const firstLine = output.split("\n")[0];
+    return firstLine || null;
+}
+/**
+ * Get a formatted commit log of all commits since baseBranch.
+ * Runs: `git log <baseBranch>..HEAD --format="- %s"`
+ * Returns null if there are no commits or on failure.
+ */
+export function getCommitLog(baseBranch) {
+    return run(`git log ${baseBranch}..HEAD --format="- %s"`) || null;
+}
+/**
+ * Get a diffstat summary of all changes since baseBranch.
+ * Runs: `git diff <baseBranch>..HEAD --stat`
+ * Returns null if there are no changes or on failure.
+ */
+export function getDiffStat(baseBranch) {
+    return run(`git diff ${baseBranch}..HEAD --stat`) || null;
+}
+/**
+ * Get the full diff of all changes since baseBranch.
+ * Runs: `git diff <baseBranch>..HEAD`
+ * Uses a 10MB max buffer for large diffs.
+ * Returns null if there are no changes or on failure.
+ */
+export function getDiffContent(baseBranch) {
+    return run(`git diff ${baseBranch}..HEAD`, { maxBuffer: 10 * 1024 * 1024 }) || null;
 }

package/dist/lib/github.d.ts

@@ -3,9 +3,47 @@ export interface PRInfo {
     state: "OPEN" | "MERGED" | "CLOSED";
     url?: string;
 }
+/**
+ * Get PR info (number, state, url) for a branch using the GitHub CLI.
+ * Runs: `gh pr view "<branchName>" --json number,state,url`
+ * Returns null if no PR exists for the branch or gh CLI fails.
+ */
 export declare function getPRInfo(branchName: string): PRInfo | null;
+/**
+ * Async version of getPRInfo. Get PR info for a branch using the GitHub CLI.
+ * Runs: `gh pr view "<branchName>" --json number,state,url`
+ * Returns null if no PR exists for the branch or gh CLI fails.
+ */
 export declare function getPRInfoAsync(branchName: string): Promise<PRInfo | null>;
+/**
+ * Check if the GitHub CLI (gh) is available on PATH.
+ * Runs: `which gh`
+ * Returns false if gh is not installed.
+ */
 export declare function ghCliAvailable(): boolean;
+/**
+ * Push a branch to origin, optionally with --force-with-lease.
+ * Runs: `git push -u origin "<branchName>" [--force-with-lease]`
+ * Uses stdio: "inherit" so push progress is shown to the user.
+ * Returns false if the push fails.
+ */
 export declare function pushBranch(branchName: string, force?: boolean): boolean;
-export declare function createPR(title: string, baseBranch: string, headBranch: string, draft: boolean): number;
+/**
+ * Create a GitHub pull request and open it in the browser.
+ * Runs: `gh pr create --title "<title>" --base "<baseBranch>" --head "<headBranch>" --web [--body-file "<bodyFile>"]`
+ * Uses stdio: "inherit" so the browser open is handled by gh.
+ * Returns 0 on success, 1 on failure.
+ */
+export declare function createPR(title: string, baseBranch: string, headBranch: string, bodyFile?: string): number;
+/**
+ * Fetch the pull request template from the repo's .github/pull_request_template.md.
+ * Runs: `gh api repos/{owner}/{repo}/contents/.github/pull_request_template.md --jq .content`
+ * Returns the decoded template content, or null if none exists.
+ */
+export declare function getPRTemplate(): string | null;
+/**
+ * Fetch all comments on a pull request.
+ * Runs: `gh pr view <prNumber> --json comments --jq '.comments[] | "- \(.author.login): \(.body)"'`
+ * Returns empty string if the PR has no comments or on failure.
+ */
 export declare function getPRComments(prNumber: string): string;

package/dist/lib/github.js

@@ -1,9 +1,17 @@
 import { execSync, exec } from "child_process";
 import { promisify } from "util";
+import { run } from "./exec.js";
 const execAsync = promisify(exec);
+/**
+ * Get PR info (number, state, url) for a branch using the GitHub CLI.
+ * Runs: `gh pr view "<branchName>" --json number,state,url`
+ * Returns null if no PR exists for the branch or gh CLI fails.
+ */
 export function getPRInfo(branchName) {
+    const output = run(`gh pr view "${branchName}" --json number,state,url`);
+    if (!output)
+        return null;
     try {
-        const output = execSync(`gh pr view "${branchName}" --json number,state,url`, { encoding: "utf-8" });
         const data = JSON.parse(output);
         return {
             number: String(data.number ?? ""),
@@ -15,6 +23,11 @@ export function getPRInfo(branchName) {
         return null;
     }
 }
+/**
+ * Async version of getPRInfo. Get PR info for a branch using the GitHub CLI.
+ * Runs: `gh pr view "<branchName>" --json number,state,url`
+ * Returns null if no PR exists for the branch or gh CLI fails.
+ */
 export async function getPRInfoAsync(branchName) {
     try {
         const { stdout } = await execAsync(`gh pr view "${branchName}" --json number,state,url`);
@@ -29,6 +42,11 @@ export async function getPRInfoAsync(branchName) {
         return null;
     }
 }
+/**
+ * Check if the GitHub CLI (gh) is available on PATH.
+ * Runs: `which gh`
+ * Returns false if gh is not installed.
+ */
 export function ghCliAvailable() {
     try {
         execSync("which gh", { stdio: "ignore" });
@@ -38,6 +56,12 @@ export function ghCliAvailable() {
         return false;
     }
 }
+/**
+ * Push a branch to origin, optionally with --force-with-lease.
+ * Runs: `git push -u origin "<branchName>" [--force-with-lease]`
+ * Uses stdio: "inherit" so push progress is shown to the user.
+ * Returns false if the push fails.
+ */
 export function pushBranch(branchName, force = false) {
     try {
         const forceFlag = force ? "--force-with-lease" : "";
@@ -50,22 +74,38 @@ export function pushBranch(branchName, force = false) {
         return false;
     }
 }
-export function createPR(title, baseBranch, headBranch, draft) {
+/**
+ * Create a GitHub pull request and open it in the browser.
+ * Runs: `gh pr create --title "<title>" --base "<baseBranch>" --head "<headBranch>" --web [--body-file "<bodyFile>"]`
+ * Uses stdio: "inherit" so the browser open is handled by gh.
+ * Returns 0 on success, 1 on failure.
+ */
+export function createPR(title, baseBranch, headBranch, bodyFile) {
     try {
-        const draftFlag = draft ? "--draft" : "";
-        execSync(`gh pr create --title "${title}" --base "${baseBranch}" --head "${headBranch}" --web ${draftFlag}`.trim(), { stdio: "inherit" });
+        const bodyFlag = bodyFile ? `--body-file "${bodyFile}"` : "";
+        execSync(`gh pr create --title "${title}" --base "${baseBranch}" --head "${headBranch}" --web ${bodyFlag}`.trim(), { stdio: "inherit" });
         return 0;
     }
     catch {
         return 1;
     }
 }
+/**
+ * Fetch the pull request template from the repo's .github/pull_request_template.md.
+ * Runs: `gh api repos/{owner}/{repo}/contents/.github/pull_request_template.md --jq .content`
+ * Returns the decoded template content, or null if none exists.
+ */
+export function getPRTemplate() {
+    const output = run(`gh api repos/{owner}/{repo}/contents/.github/pull_request_template.md --jq .content`);
+    if (!output)
+        return null;
+    return Buffer.from(output, "base64").toString("utf-8");
+}
+/**
+ * Fetch all comments on a pull request.
+ * Runs: `gh pr view <prNumber> --json comments --jq '.comments[] | "- \(.author.login): \(.body)"'`
+ * Returns empty string if the PR has no comments or on failure.
+ */
 export function getPRComments(prNumber) {
-    try {
-        const output = execSync(`gh pr view ${prNumber} --json comments --jq '.comments[] | "- \\(.author.login): \\(.body)"'`, { encoding: "utf-8" });
-        return output.trim();
-    }
-    catch {
-        return "";
-    }
+    return run(`gh pr view ${prNumber} --json comments --jq '.comments[] | "- \\(.author.login): \\(.body)"'`) ?? "";
 }

package/dist/lib/prompts.d.ts

@@ -0,0 +1,6 @@
+/**
+ * Render a nunjucks template from the prompts/ directory.
+ * @param template - Template name without extension (e.g. "fill-pr")
+ * @param context  - Variables to inject into the template
+ */
+export declare function renderPrompt(template: string, context: Record<string, string>): string;

package/dist/lib/prompts.js

@@ -0,0 +1,15 @@
+import { fileURLToPath } from "url";
+import { dirname, join } from "path";
+import nunjucks from "nunjucks";
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = dirname(__filename);
+const promptsDir = join(__dirname, "..", "..", "prompts");
+const promptsEnv = new nunjucks.Environment(new nunjucks.FileSystemLoader(promptsDir), { autoescape: false });
+/**
+ * Render a nunjucks template from the prompts/ directory.
+ * @param template - Template name without extension (e.g. "fill-pr")
+ * @param context  - Variables to inject into the template
+ */
+export function renderPrompt(template, context) {
+    return promptsEnv.render(`${template}.njk`, context);
+}

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "santree",
-	"version": "0.0.13",
+	"version": "0.0.15",
 	"description": "Git worktree manager with Linear integration",
 	"license": "MIT",
 	"author": "Santiago Toscanini",

package/prompts/fill-pr.njk

@@ -0,0 +1,29 @@
+You are filling out a pull request template. Output ONLY the filled template markdown, nothing else.
+
+## PR Template
+
+{{ pr_template }}
+
+## Context
+
+Branch: {{ branch_name }}
+{% if ticket_id %}Ticket: {{ ticket_id }}{% endif %}
+
+### Commits
+{{ commit_log }}
+
+### Files Changed
+{{ diff_stat }}
+
+### Diff
+```
+{{ diff }}
+```
+
+## Instructions
+
+- Fill the template sections using the commits and diff above
+- Be concise and factual
+- For any screenshot sections, leave a comment: `<!-- Screenshot: describe what to show -->`
+- Do NOT wrap the output in a code block
+- Output ONLY the filled template