santree 0.1.0 → 0.1.2

package/dist/commands/helpers/template.d.ts

@@ -0,0 +1,12 @@
+import { z } from "zod/v4";
+export declare const description = "Render a template to stdout";
+export declare const args: z.ZodTuple<[z.ZodEnum<{
+    linear: "linear";
+    "git-changes": "git-changes";
+    pr: "pr";
+}>], null>;
+type Props = {
+    args: z.infer<typeof args>;
+};
+export default function Template({ args }: Props): import("react/jsx-runtime").JSX.Element | null;
+export {};

package/dist/commands/helpers/template.js

@@ -0,0 +1,92 @@
+import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
+import { useEffect, useState, useRef } from "react";
+import { Text, Box, useApp } from "ink";
+import Spinner from "ink-spinner";
+import { argument } from "pastel";
+import { z } from "zod/v4";
+import { findRepoRoot, findMainRepoRoot, getCurrentBranch, extractTicketId, } from "../../lib/git.js";
+import { renderTicket } from "../../lib/prompts.js";
+import { getTicketContent } from "../../lib/linear.js";
+import { fetchAndRenderPR, fetchAndRenderDiff } from "../../lib/ai.js";
+export const description = "Render a template to stdout";
+export const args = z.tuple([
+    z
+        .enum(["linear", "git-changes", "pr"])
+        .describe(argument({ name: "type", description: "Template type (linear, git-changes, or pr)" })),
+]);
+export default function Template({ args }) {
+    const [type] = args;
+    const { exit } = useApp();
+    const [status, setStatus] = useState("loading");
+    const [message, setMessage] = useState("");
+    const hasRun = useRef(false);
+    useEffect(() => {
+        if (hasRun.current)
+            return;
+        hasRun.current = true;
+        async function run() {
+            await new Promise((r) => setTimeout(r, 50));
+            const repoRoot = findRepoRoot();
+            if (!repoRoot) {
+                setStatus("error");
+                setMessage("Not inside a git repository");
+                setTimeout(() => exit(), 100);
+                return;
+            }
+            const branch = getCurrentBranch();
+            if (!branch) {
+                setStatus("error");
+                setMessage("Could not determine current branch");
+                setTimeout(() => exit(), 100);
+                return;
+            }
+            if (type === "git-changes") {
+                const output = fetchAndRenderDiff(branch);
+                process.stdout.write(output);
+                setStatus("done");
+                setTimeout(() => exit(), 100);
+            }
+            else if (type === "pr") {
+                const output = fetchAndRenderPR(branch);
+                if (!output) {
+                    setStatus("error");
+                    setMessage(`No pull request found for branch '${branch}'`);
+                    setTimeout(() => exit(), 100);
+                    return;
+                }
+                process.stdout.write(output);
+                setStatus("done");
+                setTimeout(() => exit(), 100);
+            }
+            else {
+                const ticketId = extractTicketId(branch);
+                if (!ticketId) {
+                    setStatus("error");
+                    setMessage("Could not extract ticket ID from branch name. Expected format: user/TEAM-123-description");
+                    setTimeout(() => exit(), 100);
+                    return;
+                }
+                const mainRoot = findMainRepoRoot() ?? repoRoot;
+                const ticket = await getTicketContent(ticketId, mainRoot);
+                if (!ticket) {
+                    setStatus("error");
+                    setMessage(`Could not fetch Linear ticket ${ticketId}. Run 'santree linear auth' to authenticate.`);
+                    setTimeout(() => exit(), 100);
+                    return;
+                }
+                process.stdout.write(renderTicket(ticket));
+                setStatus("done");
+                setTimeout(() => exit(), 100);
+            }
+        }
+        run();
+    }, [type]);
+    if (status === "done")
+        return null;
+    const spinnerText = type === "linear"
+        ? "Fetching Linear ticket..."
+        : type === "pr"
+            ? "Fetching PR feedback..."
+            : "Gathering changes...";
+    return (_jsxs(Box, { children: [status === "loading" && (_jsxs(_Fragment, { children: [_jsx(Text, { color: "cyan", children: _jsx(Spinner, { type: "dots" }) }), _jsxs(Text, { children: [" ", spinnerText] })] })), status === "error" && (_jsx(Text, { color: "red", bold: true, children: message }))] }));
+}

package/dist/commands/linear/auth.js

@@ -3,12 +3,12 @@ import { useEffect, useState } from "react";
 import { Text, Box, useInput } from "ink";
 import Spinner from "ink-spinner";
 import { z } from "zod";
-import { findMainRepoRoot, setRepoLinearOrg, getRepoLinearOrg } from "../../lib/git.js";
-import { startOAuthFlow, revokeTokens, getAuthStatus, getValidTokens, getTicketContent, readAuthStore, } from "../../lib/linear.js";
+import { findMainRepoRoot, setRepoLinearOrg, getRepoLinearOrg, removeRepoLinearOrg, } from "../../lib/git.js";
+import { startOAuthFlow, getAuthStatus, getValidTokens, getTicketContent, readAuthStore, } from "../../lib/linear.js";
 import { renderTicket } from "../../lib/prompts.js";
 export const description = "Authenticate with Linear";
 export const options = z.object({
-    logout: z.boolean().optional().describe("Revoke tokens and log out"),
+    logout: z.boolean().optional().describe("Unlink Linear workspace from this repo"),
     status: z.boolean().optional().describe("Show current auth status"),
     test: z
         .string()
@@ -101,14 +101,19 @@ export default function LinearAuth({ options }) {
             }
             if (options.logout) {
                 const repoRoot = findMainRepoRoot();
-                const authStatus = getAuthStatus(repoRoot);
-                if (!authStatus.authenticated || !authStatus.orgSlug) {
-                    setMessage("Not authenticated with Linear");
+                if (!repoRoot) {
+                    setError("Not inside a git repository");
+                    setStatus("error");
+                    return;
+                }
+                const orgSlug = getRepoLinearOrg(repoRoot);
+                if (!orgSlug) {
+                    setMessage("No Linear workspace linked to this repo");
                     setStatus("done");
                     return;
                 }
-                await revokeTokens(authStatus.orgSlug);
-                setMessage(`Logged out from ${authStatus.orgName} (${authStatus.orgSlug})`);
+                removeRepoLinearOrg(repoRoot);
+                setMessage(`Unlinked Linear workspace (${orgSlug}) from this repo`);
                 setStatus("done");
                 return;
             }
@@ -149,15 +154,7 @@ export default function LinearAuth({ options }) {
                 setStatus("done");
                 return;
             }
-            if (orgs.length === 1) {
-                // Only one org, link it directly
-                const org = orgs[0];
-                setRepoLinearOrg(repoRoot, org.slug);
-                setMessage(`Linked repo to ${org.name} (${org.slug})`);
-                setStatus("done");
-                return;
-            }
-            // Multiple orgs — let user choose
+            // Let user choose from existing orgs or authenticate a new one
             setChoices(orgs);
             setStatus("choosing");
         }

package/dist/commands/pr/create.js

@@ -10,7 +10,7 @@ import { writeFileSync } from "fs";
 import { tmpdir } from "os";
 import { findMainRepoRoot, findRepoRoot, getCurrentBranch, getBaseBranch, 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";
+import { renderPrompt, renderDiff } from "../../lib/prompts.js";
 const execAsync = promisify(exec);
 export const description = "Create a GitHub pull request";
 export const options = z.object({
@@ -59,15 +59,16 @@ export default function PR({ options }) {
                 setTimeout(() => exit(), 100);
                 return;
             }
-            const commitLog = getCommitLog(baseBranch) ?? "";
-            const diffStat = getDiffStat(baseBranch) ?? "";
-            const diff = getDiffContent(baseBranch) ?? "";
             const ticketId = extractTicketId(branch);
+            const diffContent = renderDiff({
+                base_branch: baseBranch,
+                commit_log: getCommitLog(baseBranch),
+                diff_stat: getDiffStat(baseBranch),
+                diff: getDiffContent(baseBranch),
+            });
             const prompt = renderPrompt("fill-pr", {
                 pr_template: prTemplate,
-                commit_log: commitLog,
-                diff_stat: diffStat,
-                diff,
+                diff_content: diffContent,
                 ticket_id: ticketId ?? "",
                 branch_name: branch,
             });

package/dist/commands/pr/fix.js

@@ -2,8 +2,7 @@ import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { useEffect, useState } from "react";
 import { Text, Box } from "ink";
 import Spinner from "ink-spinner";
-import { resolveAIContext, renderAIPrompt, launchHappy, cleanupImages } from "../../lib/ai.js";
-import { getPRInfo, getPRComments } from "../../lib/github.js";
+import { resolveAIContext, renderAIPrompt, launchHappy, cleanupImages, fetchAndRenderPR, fetchAndRenderDiff, } from "../../lib/ai.js";
 export const description = "Fix PR review comments";
 export default function Fix() {
     const [status, setStatus] = useState("loading");
@@ -23,14 +22,18 @@ export default function Fix() {
             const ctx = result.context;
             setBranch(ctx.branch);
             setTicketId(ctx.ticketId);
-            // Fetch PR comments
-            const prInfo = getPRInfo(ctx.branch);
-            let prComments;
-            if (prInfo) {
-                prComments = getPRComments(prInfo.number) || undefined;
+            const prFeedback = fetchAndRenderPR(ctx.branch);
+            if (!prFeedback) {
+                setStatus("error");
+                setError(`No pull request found for branch '${ctx.branch}'`);
+                return;
             }
+            const diffContent = fetchAndRenderDiff(ctx.branch);
             setStatus("launching");
-            const prompt = renderAIPrompt("fix-pr", ctx, { pr_comments: prComments });
+            const prompt = renderAIPrompt("fix-pr", ctx, {
+                pr_feedback: prFeedback,
+                diff_content: diffContent,
+            });
             const child = launchHappy(prompt);
             child.on("error", (err) => {
                 setStatus("error");
@@ -44,5 +47,5 @@ export default function Fix() {
         }
         init();
     }, []);
-    return (_jsxs(Box, { flexDirection: "column", padding: 1, width: "100%", children: [_jsx(Box, { marginBottom: 1, children: _jsx(Text, { bold: true, color: "cyan", children: "Fix PR" }) }), _jsxs(Box, { flexDirection: "column", borderStyle: "round", borderColor: status === "error" ? "red" : "magenta", 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 })] })), ticketId && (_jsxs(Box, { gap: 1, children: [_jsx(Text, { dimColor: true, children: "ticket:" }), _jsx(Text, { color: "blue", bold: true, children: ticketId })] })), _jsxs(Box, { gap: 1, children: [_jsx(Text, { dimColor: true, children: "mode:" }), _jsx(Text, { backgroundColor: "magenta", color: "white", bold: true, children: " fix PR " })] })] }), _jsxs(Box, { marginTop: 1, children: [(status === "loading" || status === "fetching") && (_jsxs(Box, { children: [_jsx(Text, { color: "cyan", children: _jsx(Spinner, { type: "dots" }) }), _jsxs(Text, { children: [" ", status === "loading" ? "Loading..." : "Fetching ticket and PR comments..."] })] })), status === "launching" && (_jsxs(Box, { flexDirection: "column", children: [_jsx(Text, { color: "green", bold: true, children: "\u2713 Launching Claude (through Happy)..." }), _jsxs(Text, { dimColor: true, children: [" happy ", `"<fix-pr prompt for ${ticketId}>"`] })] })), status === "error" && (_jsxs(Text, { color: "red", bold: true, children: ["\u2717 ", error] }))] })] }));
+    return (_jsxs(Box, { flexDirection: "column", padding: 1, width: "100%", children: [_jsx(Box, { marginBottom: 1, children: _jsx(Text, { bold: true, color: "cyan", children: "Fix PR" }) }), _jsxs(Box, { flexDirection: "column", borderStyle: "round", borderColor: status === "error" ? "red" : "magenta", 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 })] })), ticketId && (_jsxs(Box, { gap: 1, children: [_jsx(Text, { dimColor: true, children: "ticket:" }), _jsx(Text, { color: "blue", bold: true, children: ticketId })] })), _jsxs(Box, { gap: 1, children: [_jsx(Text, { dimColor: true, children: "mode:" }), _jsx(Text, { backgroundColor: "magenta", color: "white", bold: true, children: " fix PR " })] })] }), _jsxs(Box, { marginTop: 1, children: [(status === "loading" || status === "fetching") && (_jsxs(Box, { children: [_jsx(Text, { color: "cyan", children: _jsx(Spinner, { type: "dots" }) }), _jsxs(Text, { children: [" ", status === "loading" ? "Loading..." : "Fetching ticket and PR feedback..."] })] })), status === "launching" && (_jsxs(Box, { flexDirection: "column", children: [_jsx(Text, { color: "green", bold: true, children: "\u2713 Launching Claude (through Happy)..." }), _jsxs(Text, { dimColor: true, children: [" happy ", `"<fix-pr prompt for ${ticketId}>"`] })] })), status === "error" && (_jsxs(Text, { color: "red", bold: true, children: ["\u2717 ", error] }))] })] }));
 }

package/dist/commands/pr/review.js

@@ -2,7 +2,7 @@ import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { useEffect, useState } from "react";
 import { Text, Box } from "ink";
 import Spinner from "ink-spinner";
-import { resolveAIContext, renderAIPrompt, launchHappy, cleanupImages } from "../../lib/ai.js";
+import { resolveAIContext, renderAIPrompt, launchHappy, cleanupImages, fetchAndRenderDiff, } from "../../lib/ai.js";
 export const description = "Review changes against ticket requirements";
 export default function Review() {
     const [status, setStatus] = useState("loading");
@@ -22,8 +22,11 @@ export default function Review() {
             const ctx = result.context;
             setBranch(ctx.branch);
             setTicketId(ctx.ticketId);
+            const diffContent = fetchAndRenderDiff(ctx.branch);
             setStatus("launching");
-            const prompt = renderAIPrompt("review", ctx);
+            const prompt = renderAIPrompt("review", ctx, {
+                diff_content: diffContent,
+            });
             const child = launchHappy(prompt);
             child.on("error", (err) => {
                 setStatus("error");
@@ -37,5 +40,5 @@ export default function Review() {
         }
         init();
     }, []);
-    return (_jsxs(Box, { flexDirection: "column", padding: 1, width: "100%", children: [_jsx(Box, { marginBottom: 1, children: _jsx(Text, { bold: true, color: "cyan", children: "Review" }) }), _jsxs(Box, { flexDirection: "column", borderStyle: "round", borderColor: status === "error" ? "red" : "yellow", 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 })] })), ticketId && (_jsxs(Box, { gap: 1, children: [_jsx(Text, { dimColor: true, children: "ticket:" }), _jsx(Text, { color: "blue", bold: true, children: ticketId })] })), _jsxs(Box, { gap: 1, children: [_jsx(Text, { dimColor: true, children: "mode:" }), _jsx(Text, { backgroundColor: "yellow", color: "white", bold: true, children: " review " })] })] }), _jsxs(Box, { marginTop: 1, children: [(status === "loading" || status === "fetching") && (_jsxs(Box, { children: [_jsx(Text, { color: "cyan", children: _jsx(Spinner, { type: "dots" }) }), _jsxs(Text, { children: [" ", status === "loading" ? "Loading..." : "Fetching ticket from Linear..."] })] })), status === "launching" && (_jsxs(Box, { flexDirection: "column", children: [_jsx(Text, { color: "green", bold: true, children: "\u2713 Launching Claude (through Happy)..." }), _jsxs(Text, { dimColor: true, children: [" happy ", `"<review prompt for ${ticketId}>"`] })] })), status === "error" && (_jsxs(Text, { color: "red", bold: true, children: ["\u2717 ", error] }))] })] }));
+    return (_jsxs(Box, { flexDirection: "column", padding: 1, width: "100%", children: [_jsx(Box, { marginBottom: 1, children: _jsx(Text, { bold: true, color: "cyan", children: "Review" }) }), _jsxs(Box, { flexDirection: "column", borderStyle: "round", borderColor: status === "error" ? "red" : "yellow", 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 })] })), ticketId && (_jsxs(Box, { gap: 1, children: [_jsx(Text, { dimColor: true, children: "ticket:" }), _jsx(Text, { color: "blue", bold: true, children: ticketId })] })), _jsxs(Box, { gap: 1, children: [_jsx(Text, { dimColor: true, children: "mode:" }), _jsx(Text, { backgroundColor: "yellow", color: "white", bold: true, children: " review " })] })] }), _jsxs(Box, { marginTop: 1, children: [(status === "loading" || status === "fetching") && (_jsxs(Box, { children: [_jsx(Text, { color: "cyan", children: _jsx(Spinner, { type: "dots" }) }), _jsxs(Text, { children: [" ", status === "loading" ? "Loading..." : "Fetching ticket, diff, and PR feedback..."] })] })), status === "launching" && (_jsxs(Box, { flexDirection: "column", children: [_jsx(Text, { color: "green", bold: true, children: "\u2713 Launching Claude (through Happy)..." }), _jsxs(Text, { dimColor: true, children: [" happy ", `"<review prompt for ${ticketId}>"`] })] })), status === "error" && (_jsxs(Text, { color: "red", bold: true, children: ["\u2717 ", error] }))] })] }));
 }

package/dist/commands/worktree/work.js

@@ -44,7 +44,7 @@ export default function Work({ options }) {
         if (status !== "ready" || !aiContext)
             return;
         setStatus("launching");
-        const prompt = renderAIPrompt(mode, aiContext);
+        const prompt = renderAIPrompt("work", aiContext, { mode });
         const child = launchHappy(prompt, { planMode: mode === "plan" });
         child.on("error", (err) => {
             setStatus("error");

package/dist/lib/ai.d.ts

@@ -26,6 +26,16 @@ export declare function buildPromptContext(ctx: AIContext, extra?: Record<string
  * Renders a named prompt template with the given context.
  */
 export declare function renderAIPrompt(template: string, ctx: AIContext, extra?: Record<string, string | undefined>): string;
+/**
+ * Fetch and render PR feedback for a branch.
+ * Returns rendered markdown or null if no PR exists.
+ */
+export declare function fetchAndRenderPR(branch: string): string | null;
+/**
+ * Fetch and render diff for a branch against its base branch.
+ * Returns rendered markdown.
+ */
+export declare function fetchAndRenderDiff(branch: string): string;
 /**
  * Spawns `happy` CLI with a rendered prompt.
  * Returns the child process so callers can listen for close/error.

package/dist/lib/ai.js

@@ -1,7 +1,8 @@
 import { spawn } from "child_process";
-import { getCurrentBranch, extractTicketId, findRepoRoot, findMainRepoRoot } from "./git.js";
-import { renderPrompt, renderTicket } from "./prompts.js";
+import { getCurrentBranch, extractTicketId, findRepoRoot, findMainRepoRoot, getBaseBranch, getCommitLog, getDiffStat, getDiffContent, } from "./git.js";
+import { renderPrompt, renderTicket, renderDiff, renderPR } from "./prompts.js";
 import { getTicketContent, cleanupImages } from "./linear.js";
+import { getPRInfo, getPRChecks, getPRReviews, getPRReviewComments, getPRConversationComments, getFailedCheckDetails, } from "./github.js";
 /**
  * Resolves repo, branch, ticket ID, and fetches the Linear ticket.
  * Returns an error string if any required context is missing.
@@ -45,6 +46,55 @@ export function buildPromptContext(ctx, extra) {
 export function renderAIPrompt(template, ctx, extra) {
     return renderPrompt(template, buildPromptContext(ctx, extra));
 }
+const BOT_AUTHORS = new Set([
+    "linear",
+    "github-actions",
+    "codecov",
+    "dependabot",
+    "renovate",
+    "netlify",
+    "vercel",
+]);
+/**
+ * Fetch and render PR feedback for a branch.
+ * Returns rendered markdown or null if no PR exists.
+ */
+export function fetchAndRenderPR(branch) {
+    const prInfo = getPRInfo(branch);
+    if (!prInfo)
+        return null;
+    const checks = getPRChecks(prInfo.number);
+    const failedChecks = (checks ?? [])
+        .filter((c) => c.bucket === "fail")
+        .map((c) => getFailedCheckDetails(c));
+    const reviews = getPRReviews(prInfo.number);
+    const reviewComments = getPRReviewComments(prInfo.number);
+    const allComments = getPRConversationComments(prInfo.number);
+    const conversationComments = (allComments ?? []).filter((c) => !BOT_AUTHORS.has(c.author) && !c.author.endsWith("[bot]"));
+    return renderPR({
+        pr_number: prInfo.number,
+        pr_url: prInfo.url ?? "",
+        branch,
+        checks,
+        failed_checks: failedChecks,
+        reviews,
+        review_comments: reviewComments,
+        conversation_comments: conversationComments,
+    });
+}
+/**
+ * Fetch and render diff for a branch against its base branch.
+ * Returns rendered markdown.
+ */
+export function fetchAndRenderDiff(branch) {
+    const baseBranch = getBaseBranch(branch);
+    return renderDiff({
+        base_branch: baseBranch,
+        commit_log: getCommitLog(baseBranch),
+        diff_stat: getDiffStat(baseBranch),
+        diff: getDiffContent(baseBranch),
+    });
+}
 /**
  * Spawns `happy` CLI with a rendered prompt.
  * Returns the child process so callers can listen for close/error.

package/dist/lib/git.d.ts

@@ -106,6 +106,11 @@ export declare function getRepoLinearOrg(repoRoot: string): string | null;
  * Stored as `_linear.org` in .santree/metadata.json.
  */
 export declare function setRepoLinearOrg(repoRoot: string, orgSlug: string): void;
+/**
+ * Remove the Linear org association from this repo.
+ * Deletes the `_linear` key from .santree/metadata.json.
+ */
+export declare function removeRepoLinearOrg(repoRoot: string): void;
 /**
  * Get the base branch for a given branch name.
  * Looks up metadata first, falls back to the default branch.

package/dist/lib/git.js

@@ -315,6 +315,15 @@ export function setRepoLinearOrg(repoRoot, orgSlug) {
     all._linear = { org: orgSlug };
     writeAllMetadata(repoRoot, all);
 }
+/**
+ * Remove the Linear org association from this repo.
+ * Deletes the `_linear` key from .santree/metadata.json.
+ */
+export function removeRepoLinearOrg(repoRoot) {
+    const all = readAllMetadata(repoRoot);
+    delete all._linear;
+    writeAllMetadata(repoRoot, all);
+}
 /**
  * Get the base branch for a given branch name.
  * Looks up metadata first, falls back to the default branch.

package/dist/lib/github.d.ts

@@ -47,3 +47,76 @@ export declare function getPRTemplate(): string | null;
  * Returns empty string if the PR has no comments or on failure.
  */
 export declare function getPRComments(prNumber: string): string;
+export interface PRConversationComment {
+    author: string;
+    body: string;
+    createdAt: string;
+}
+/**
+ * Fetch structured conversation comments on a pull request.
+ * Runs: `gh pr view <prNumber> --json comments`
+ * Returns null if gh CLI fails.
+ */
+export declare function getPRConversationComments(prNumber: string): PRConversationComment[] | null;
+export interface PRCheck {
+    name: string;
+    state: string;
+    bucket: string;
+    link: string;
+    description: string;
+    workflow: string;
+}
+export interface FailedCheckDetail {
+    name: string;
+    workflow: string;
+    description: string;
+    link: string;
+    failed_step: string | null;
+    log: string | null;
+}
+/**
+ * Fetch details for a failed CI check: which step failed and the failed step's log.
+ * Extracts job ID from the check link, fetches job details for the step name,
+ * then fetches the job log via the GitHub API and extracts the failed step's output.
+ * Returns enriched detail; gracefully degrades if API calls fail.
+ */
+export declare function getFailedCheckDetails(check: PRCheck): FailedCheckDetail;
+export interface PRReview {
+    author: {
+        login: string;
+    };
+    state: string;
+    body: string;
+    submittedAt: string;
+}
+export interface PRReviewComment {
+    user: {
+        login: string;
+    };
+    body: string;
+    path: string;
+    line: number | null;
+    original_line: number | null;
+    diff_hunk: string;
+    created_at: string;
+    in_reply_to_id?: number;
+    id: number;
+}
+/**
+ * Fetch CI check results for a pull request.
+ * Runs: `gh pr checks <prNumber> --json name,state,bucket,link,description,workflow`
+ * Returns null if gh CLI fails.
+ */
+export declare function getPRChecks(prNumber: string): PRCheck[] | null;
+/**
+ * Fetch reviews for a pull request.
+ * Runs: `gh pr view <prNumber> --json reviews`
+ * Returns null if gh CLI fails.
+ */
+export declare function getPRReviews(prNumber: string): PRReview[] | null;
+/**
+ * Fetch inline review comments for a pull request via the GitHub API.
+ * Runs: `gh api repos/{owner}/{repo}/pulls/<prNumber>/comments --paginate`
+ * Returns null if gh CLI fails.
+ */
+export declare function getPRReviewComments(prNumber: string): PRReviewComment[] | null;

package/dist/lib/github.js

@@ -109,3 +109,157 @@ export function getPRTemplate() {
 export function getPRComments(prNumber) {
     return (run(`gh pr view ${prNumber} --json comments --jq '.comments[] | "- \\(.author.login): \\(.body)"'`) ?? "");
 }
+/**
+ * Fetch structured conversation comments on a pull request.
+ * Runs: `gh pr view <prNumber> --json comments`
+ * Returns null if gh CLI fails.
+ */
+export function getPRConversationComments(prNumber) {
+    const output = run(`gh pr view ${prNumber} --json comments`);
+    if (!output)
+        return null;
+    try {
+        const data = JSON.parse(output);
+        return (data.comments ?? []).map((c) => ({
+            author: c.author?.login ?? "unknown",
+            body: c.body ?? "",
+            createdAt: c.createdAt ?? "",
+        }));
+    }
+    catch {
+        return null;
+    }
+}
+/**
+ * Fetch details for a failed CI check: which step failed and the failed step's log.
+ * Extracts job ID from the check link, fetches job details for the step name,
+ * then fetches the job log via the GitHub API and extracts the failed step's output.
+ * Returns enriched detail; gracefully degrades if API calls fail.
+ */
+export function getFailedCheckDetails(check) {
+    const detail = {
+        name: check.name,
+        workflow: check.workflow,
+        description: check.description,
+        link: check.link,
+        failed_step: null,
+        log: null,
+    };
+    const urlMatch = check.link?.match(/job\/(\d+)/);
+    if (!urlMatch)
+        return detail;
+    const jobId = urlMatch[1];
+    let stepStartMs = 0;
+    let stepEndMs = 0;
+    const jobOutput = run(`gh api repos/{owner}/{repo}/actions/jobs/${jobId}`);
+    if (jobOutput) {
+        try {
+            const job = JSON.parse(jobOutput);
+            const failedStep = job.steps?.find((s) => s.conclusion === "failure");
+            if (failedStep) {
+                detail.failed_step = failedStep.name;
+                stepStartMs = new Date(failedStep.started_at).getTime();
+                // Add 1s buffer — step API uses second precision but log has sub-second timestamps
+                stepEndMs = new Date(failedStep.completed_at).getTime() + 999;
+            }
+        }
+        catch { }
+    }
+    if (!stepStartMs)
+        return detail;
+    // Fetch job log via API (works even while run is still in progress)
+    const logOutput = run(`gh api repos/{owner}/{repo}/actions/jobs/${jobId}/logs 2>/dev/null`);
+    if (logOutput) {
+        const lines = logOutput.split("\n");
+        // Filter to lines within the failed step's time range
+        const stepLines = lines.filter((line) => {
+            const m = line.match(/^(\d{4}-\d{2}-\d{2}T[\d:.]+Z)/);
+            if (!m)
+                return false;
+            const ms = new Date(m[1]).getTime();
+            return ms >= stepStartMs && ms <= stepEndMs;
+        });
+        // Truncate at ##[error] — everything after is post-run cleanup noise
+        const errorIdx = stepLines.findIndex((l) => l.includes("##[error]"));
+        const bounded = errorIdx !== -1 ? stepLines.slice(0, errorIdx) : stepLines;
+        // Split non-group output into segments separated by ##[group]..##[endgroup] blocks.
+        // The last segment is the actual command output, earlier segments are
+        // setup noise (checkout, env vars, etc.).
+        const segments = [];
+        let current = [];
+        let inGroup = false;
+        for (const raw of bounded) {
+            const line = raw.replace(/^\d{4}-\d{2}-\d{2}T[\d:.]+Z\s*/, "");
+            if (line.startsWith("##[group]")) {
+                if (current.length) {
+                    segments.push(current);
+                    current = [];
+                }
+                inGroup = true;
+                continue;
+            }
+            if (line.startsWith("##[endgroup]")) {
+                inGroup = false;
+                continue;
+            }
+            if (line.startsWith("##["))
+                continue;
+            if (!inGroup)
+                current.push(line);
+        }
+        if (current.length)
+            segments.push(current);
+        if (segments.length)
+            detail.log = segments[segments.length - 1].join("\n");
+    }
+    return detail;
+}
+/**
+ * Fetch CI check results for a pull request.
+ * Runs: `gh pr checks <prNumber> --json name,state,bucket,link,description,workflow`
+ * Returns null if gh CLI fails.
+ */
+export function getPRChecks(prNumber) {
+    const output = run(`gh pr checks ${prNumber} --json name,state,bucket,link,description,workflow`);
+    if (!output)
+        return null;
+    try {
+        return JSON.parse(output);
+    }
+    catch {
+        return null;
+    }
+}
+/**
+ * Fetch reviews for a pull request.
+ * Runs: `gh pr view <prNumber> --json reviews`
+ * Returns null if gh CLI fails.
+ */
+export function getPRReviews(prNumber) {
+    const output = run(`gh pr view ${prNumber} --json reviews`);
+    if (!output)
+        return null;
+    try {
+        const data = JSON.parse(output);
+        return data.reviews ?? null;
+    }
+    catch {
+        return null;
+    }
+}
+/**
+ * Fetch inline review comments for a pull request via the GitHub API.
+ * Runs: `gh api repos/{owner}/{repo}/pulls/<prNumber>/comments --paginate`
+ * Returns null if gh CLI fails.
+ */
+export function getPRReviewComments(prNumber) {
+    const output = run(`gh api repos/{owner}/{repo}/pulls/${prNumber}/comments --paginate`);
+    if (!output)
+        return null;
+    try {
+        return JSON.parse(output);
+    }
+    catch {
+        return null;
+    }
+}

package/dist/lib/prompts.d.ts

@@ -1,4 +1,5 @@
 import type { LinearIssue } from "./linear.js";
+import type { PRCheck, PRReview, PRReviewComment, FailedCheckDetail, PRConversationComment } from "./github.js";
 /**
  * Render a nunjucks template from the prompts/ directory.
  * @param template - Template name without extension (e.g. "fill-pr")
@@ -9,3 +10,27 @@ export declare function renderPrompt(template: string, context: Record<string, s
  * Render a LinearIssue into formatted markdown using the ticket template.
  */
 export declare function renderTicket(issue: LinearIssue): string;
+export interface DiffData {
+    base_branch: string;
+    commit_log: string | null;
+    diff_stat: string | null;
+    diff: string | null;
+}
+/**
+ * Render diff data into formatted markdown using the diff template.
+ */
+export declare function renderDiff(data: DiffData): string;
+export interface PRData {
+    pr_number: string;
+    pr_url: string;
+    branch: string;
+    checks: PRCheck[] | null;
+    failed_checks: FailedCheckDetail[];
+    reviews: PRReview[] | null;
+    review_comments: PRReviewComment[] | null;
+    conversation_comments: PRConversationComment[];
+}
+/**
+ * Render PR feedback data into formatted markdown using the pr template.
+ */
+export declare function renderPR(data: PRData): string;

package/dist/lib/prompts.js

@@ -38,3 +38,15 @@ export function renderPrompt(template, context) {
 export function renderTicket(issue) {
     return promptsEnv.render("ticket.njk", issue);
 }
+/**
+ * Render diff data into formatted markdown using the diff template.
+ */
+export function renderDiff(data) {
+    return promptsEnv.render("diff.njk", data);
+}
+/**
+ * Render PR feedback data into formatted markdown using the pr template.
+ */
+export function renderPR(data) {
+    return promptsEnv.render("pr.njk", data);
+}

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "santree",
-	"version": "0.1.0",
+	"version": "0.1.2",
 	"description": "Git worktree manager",
 	"license": "MIT",
 	"author": "Santiago Toscanini",

package/prompts/diff.njk

@@ -0,0 +1,18 @@
+## Changes ({{ base_branch }}..HEAD)
+{%- if commit_log %}
+
+### Commits
+{{ commit_log }}
+{%- endif %}
+{%- if diff_stat %}
+
+### Files Changed
+{{ diff_stat }}
+{%- endif %}
+{%- if diff %}
+
+### Diff
+```
+{{ diff }}
+```
+{%- endif %}

package/prompts/fill-pr.njk

@@ -12,16 +12,7 @@ Branch: {{ branch_name }}
 {{ ticket_content }}
 {% endif %}
 
-### Commits
-{{ commit_log }}
-
-### Files Changed
-{{ diff_stat }}
-
-### Diff
-```
-{{ diff }}
-```
+{{ diff_content }}
 
 ## Instructions
 

package/prompts/fix-pr.njk

@@ -3,13 +3,13 @@
 {% else %}
 Note: Could not fetch Linear ticket {{ ticket_id }}. Proceed based on branch name context.
 {% endif %}
-
-Use `gh` CLI to fetch the latest PR comments and review feedback for the current branch.
-{% if pr_comments %}
-## PR Comments to Address
-
-{{ pr_comments }}
+{% if pr_feedback %}
+{{ pr_feedback }}
 {% endif %}
+{% if diff_content %}
+{{ diff_content }}
+{% endif %}
+
 ## Task
 
 1. Review each PR comment and understand what changes are requested

package/prompts/pr.njk

@@ -0,0 +1,68 @@
+## Pull Request #{{ pr_number }}
+**Branch:** {{ branch }}
+[View on GitHub]({{ pr_url }})
+
+{%- if checks %}
+
+### CI Checks
+{% for check in checks %}
+- {{ "PASS" if check.bucket == "pass" else ("FAIL" if check.bucket == "fail" else "PENDING") }} — {{ check.name }}{% if check.description %}: {{ check.description }}{% endif %}
+{%- endfor %}
+{%- endif %}
+{%- if failed_checks | length %}
+
+### Failed Checks
+{% for check in failed_checks %}
+**{{ check.name }}**{% if check.workflow %} ({{ check.workflow }}){% endif %}
+{% if check.failed_step %}- Failed step: `{{ check.failed_step }}`{% endif %}
+{% if check.link %}- [View logs]({{ check.link }}){% endif %}
+{% if check.log %}
+```
+{{ check.log }}
+```
+{% endif %}
+{% endfor %}
+{%- endif %}
+{%- if reviews | length %}
+
+### Reviews
+{% for review in reviews %}
+**{{ review.author.login }}** — {{ review.state }}{% if review.submittedAt %} — {{ review.submittedAt | date }}{% endif %}
+{% if review.body %}{{ review.body }}{% endif %}
+{% if not loop.last %}
+---
+{% endif %}
+{%- endfor %}
+{%- endif %}
+{%- if review_comments | length %}
+
+### Inline Review Comments
+{% for comment in review_comments %}
+{% if not comment.in_reply_to_id %}
+**{{ comment.user.login }}** on `{{ comment.path }}{% if comment.line %}:{{ comment.line }}{% endif %}` — {{ comment.created_at | date }}
+```
+{{ comment.diff_hunk }}
+```
+{{ comment.body }}
+{% for reply in review_comments %}
+{% if reply.in_reply_to_id == comment.id %}
+> **{{ reply.user.login }}** — {{ reply.created_at | date }}
+> {{ reply.body | indent(2) }}
+
+{% endif %}
+{%- endfor %}
+---
+{% endif %}
+{%- endfor %}
+{%- endif %}
+{%- if conversation_comments | length %}
+
+### Conversation Comments
+{% for comment in conversation_comments %}
+**{{ comment.author }}** — {{ comment.createdAt | date }}
+{{ comment.body }}
+{% if not loop.last %}
+---
+{% endif %}
+{%- endfor %}
+{%- endif %}

package/prompts/review.njk

@@ -3,10 +3,9 @@
 {% else %}
 Note: Could not fetch Linear ticket {{ ticket_id }}. Proceed based on branch name context.
 {% endif %}
-
-If a PR URL is linked in the ticket, use `gh` CLI to fetch PR details and any existing review comments.
-
-Review the current changes by running `git diff` against the base branch.
+{% if diff_content %}
+{{ diff_content }}
+{% endif %}
 
 Analyze:
 - Do the changes fully address the ticket requirements?

package/prompts/{implement.njk → work.njk}

@@ -4,12 +4,18 @@
 Note: Could not fetch Linear ticket {{ ticket_id }}. Proceed based on branch name context.
 {% endif %}
 
-If a PR URL is linked in the ticket, use `gh` CLI to fetch PR details, comments, and review feedback.
-
 Review the codebase to understand the relevant areas and existing patterns.
+{% if mode == "plan" %}
+Create a detailed implementation plan with:
+- Step-by-step approach
+- Files to modify
+- Potential risks or edge cases
 
+Do NOT implement yet - just plan. Wait for approval before making changes.
+{% else %}
 Create an implementation plan, then implement the changes.
 
 After implementation:
 - Run tests if applicable
 - Ensure code follows existing patterns
+{% endif %}

package/prompts/plan.njk

@@ -1,19 +0,0 @@
-{% if ticket_content %}
-{{ ticket_content }}
-{% else %}
-Note: Could not fetch Linear ticket {{ ticket_id }}. Proceed based on branch name context.
-{% endif %}
-
-If a PR URL is linked in the ticket, use `gh` CLI to fetch PR details, comments, and review feedback for additional context.
-
-Review the codebase to understand:
-- Relevant files and modules
-- Existing patterns and conventions
-- Dependencies and potential impact areas
-
-Create a detailed implementation plan with:
-- Step-by-step approach
-- Files to modify
-- Potential risks or edge cases
-
-Do NOT implement yet - just plan. Wait for approval before making changes.