santree 0.0.14 → 0.0.16

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/create.js

@@ -3,10 +3,10 @@ import { useEffect, useState } from "react";
 import { Text, Box } from "ink";
 import Spinner from "ink-spinner";
 import { z } from "zod";
-import { spawn } from "child_process";
+import { execSync } from "child_process";
 import * as fs from "fs";
 import { createWorktree, findMainRepoRoot, getDefaultBranch, pullLatest, hasInitScript, getInitScriptPath, extractTicketId, } from "../lib/git.js";
-import { execSync } from "child_process";
+import { spawnAsync } from "../lib/exec.js";
 export const description = "Create a new worktree from a branch";
 export const options = z.object({
     base: z.string().optional().describe("Base branch to create from"),
@@ -136,27 +136,18 @@ export default function Create({ options, args }) {
                         finalize(result.path, branch);
                         return;
                     }
-                    const child = spawn(initScript, [], {
+                    const initResult = await spawnAsync(initScript, [], {
                         cwd: result.path,
-                        stdio: "pipe",
                         env: {
                             ...process.env,
                             SANTREE_WORKTREE_PATH: result.path,
                             SANTREE_REPO_ROOT: mainRepo,
                         },
                     });
-                    // Capture output but don't display (to avoid conflicting with Ink)
-                    child.stdout?.on("data", () => { });
-                    child.stderr?.on("data", () => { });
-                    child.on("error", (err) => {
-                        setMessage(`Warning: Init script failed: ${err.message}`);
-                    });
-                    child.on("close", (code) => {
-                        if (code !== 0) {
-                            setMessage(`Warning: Init script exited with code ${code}`);
-                        }
-                        finalize(result.path, branch);
-                    });
+                    if (initResult.code !== 0) {
+                        setMessage(`Warning: Init script exited with code ${initResult.code}`);
+                    }
+                    finalize(result.path, branch);
                 }
                 else {
                     finalize(result.path, branch);

package/dist/commands/doctor.js

@@ -2,10 +2,11 @@ import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { Box, Text } from "ink";
 import Spinner from "ink-spinner";
 import { useEffect, useState } from "react";
-import { exec } from "child_process";
+import { exec, execSync } from "child_process";
 import { promisify } from "util";
 import * as fs from "fs";
 import * as path from "path";
+import { findMainRepoRoot, getSantreeDir, getInitScriptPath, } from "../lib/git.js";
 const execAsync = promisify(exec);
 export const description = "Check system requirements and integrations";
 /**
@@ -138,7 +139,9 @@ async function checkLinearMcp() {
             configured: true,
             url: urlMatch?.[1],
             status,
-            hint: isConnected ? undefined : "Open Linear MCP URL in browser to authenticate",
+            hint: isConnected
+                ? undefined
+                : "Open Linear MCP URL in browser to authenticate",
         };
     }
     return {
@@ -177,7 +180,8 @@ async function checkStatusline() {
             if (settings.statusLine?.command) {
                 currentCommand = String(settings.statusLine.command);
                 // Check if it points to santree statusline
-                claudeSettingsConfigured = currentCommand.includes("santree statusline");
+                claudeSettingsConfigured =
+                    currentCommand.includes("santree statusline");
             }
         }
     }
@@ -186,7 +190,8 @@ async function checkStatusline() {
     }
     let hint;
     if (!claudeSettingsConfigured) {
-        hint = 'Add to ~/.claude/settings.json: "statusLine": { "type": "command", "command": "santree statusline" }';
+        hint =
+            'Add to ~/.claude/settings.json: "statusLine": { "type": "command", "command": "santree statusline" }';
     }
     return {
         claudeSettingsConfigured,
@@ -194,6 +199,78 @@ async function checkStatusline() {
         hint,
     };
 }
+/**
+ * Checks if a path is gitignored (via .gitignore or .git/info/exclude).
+ */
+function isGitIgnored(filePath, cwd) {
+    try {
+        execSync(`git check-ignore -q "${filePath}"`, { cwd, stdio: "ignore" });
+        return true; // exit 0 = ignored
+    }
+    catch {
+        return false; // exit 1 = not ignored
+    }
+}
+/**
+ * Checks if the current directory is a git repo and if .santree/init.sh exists and is executable.
+ */
+function checkSantreeSetup() {
+    const mainRepoRoot = findMainRepoRoot();
+    if (!mainRepoRoot) {
+        return {
+            isGitRepo: false,
+            santreeFolderExists: false,
+            initShExists: false,
+            initShExecutable: false,
+            worktreesIgnored: false,
+            metadataIgnored: false,
+            hints: ["Not in a git repository"],
+        };
+    }
+    const santreeDir = getSantreeDir(mainRepoRoot);
+    const initShPath = getInitScriptPath(mainRepoRoot);
+    const santreeFolderExists = fs.existsSync(santreeDir);
+    const initShExists = fs.existsSync(initShPath);
+    let initShExecutable = false;
+    if (initShExists) {
+        try {
+            fs.accessSync(initShPath, fs.constants.X_OK);
+            initShExecutable = true;
+        }
+        catch {
+            initShExecutable = false;
+        }
+    }
+    // Check gitignore status (use relative paths for git check-ignore)
+    const worktreesIgnored = isGitIgnored(".santree/worktrees", mainRepoRoot);
+    const metadataIgnored = isGitIgnored(".santree/metadata.json", mainRepoRoot);
+    const hints = [];
+    if (!santreeFolderExists) {
+        hints.push(`Create .santree folder: mkdir ${santreeDir}`);
+    }
+    else if (!initShExists) {
+        hints.push(`Create init.sh: touch ${initShPath} && chmod +x ${initShPath}`);
+    }
+    else if (!initShExecutable) {
+        hints.push(`Make init.sh executable: chmod +x ${initShPath}`);
+    }
+    if (!worktreesIgnored) {
+        hints.push("Add .santree/worktrees to .gitignore");
+    }
+    if (!metadataIgnored) {
+        hints.push("Add .santree/metadata.json to .gitignore");
+    }
+    return {
+        isGitRepo: true,
+        mainRepoRoot,
+        santreeFolderExists,
+        initShExists,
+        initShExecutable,
+        worktreesIgnored,
+        metadataIgnored,
+        hints,
+    };
+}
 function StatusIcon({ ok, required }) {
     if (ok) {
         return _jsx(Text, { color: "green", children: "\u2713" });
@@ -204,7 +281,8 @@ function ToolRow({ tool }) {
     return (_jsxs(Box, { flexDirection: "column", marginBottom: 1, children: [_jsxs(Box, { children: [_jsx(StatusIcon, { ok: tool.installed && !tool.hint, required: tool.required }), _jsx(Text, { children: " " }), _jsx(Text, { bold: true, children: tool.name }), _jsxs(Text, { dimColor: true, children: [" - ", tool.description] }), !tool.required && _jsx(Text, { dimColor: true, children: " (optional)" })] }), tool.installed ? (_jsxs(Box, { marginLeft: 2, flexDirection: "column", children: [_jsxs(Text, { dimColor: true, children: ["Version: ", tool.version] }), _jsxs(Text, { dimColor: true, children: ["Path: ", tool.path] }), tool.authStatus && _jsxs(Text, { dimColor: true, children: ["Auth: ", tool.authStatus] }), tool.hint && _jsxs(Text, { color: "yellow", children: ["\u21B3 ", tool.hint] })] })) : (_jsx(Box, { marginLeft: 2, children: _jsxs(Text, { color: "yellow", children: ["\u21B3 ", tool.hint] }) }))] }));
 }
 function McpRow({ mcp }) {
-    const isOk = mcp.configured && Boolean(mcp.status?.includes("✓") || mcp.status?.includes("Connected"));
+    const isOk = mcp.configured &&
+        Boolean(mcp.status?.includes("✓") || mcp.status?.includes("Connected"));
     return (_jsxs(Box, { flexDirection: "column", marginBottom: 1, children: [_jsxs(Box, { children: [_jsx(StatusIcon, { ok: isOk, required: true }), _jsx(Text, { children: " " }), _jsx(Text, { bold: true, children: mcp.name }), _jsx(Text, { dimColor: true, children: " - Linear ticket integration for Claude" })] }), mcp.configured ? (_jsxs(Box, { marginLeft: 2, flexDirection: "column", children: [mcp.url && _jsxs(Text, { dimColor: true, children: ["URL: ", mcp.url] }), mcp.status && _jsxs(Text, { dimColor: true, children: ["Status: ", mcp.status] }), mcp.hint && _jsxs(Text, { color: "yellow", children: ["\u21B3 ", mcp.hint] })] })) : (mcp.hint && (_jsx(Box, { marginLeft: 2, children: _jsxs(Text, { color: "yellow", children: ["\u21B3 ", mcp.hint] }) })))] }));
 }
 function ShellRow({ configured, shell, }) {
@@ -213,11 +291,27 @@ function ShellRow({ configured, shell, }) {
 function StatuslineRow({ status }) {
     return (_jsxs(Box, { flexDirection: "column", marginBottom: 1, children: [_jsxs(Box, { children: [_jsx(StatusIcon, { ok: status.claudeSettingsConfigured, required: false }), _jsx(Text, { children: " " }), _jsx(Text, { bold: true, children: "Claude Statusline" }), _jsx(Text, { dimColor: true, children: " - Custom statusline in Claude Code" }), _jsx(Text, { dimColor: true, children: " (optional)" })] }), _jsxs(Box, { marginLeft: 2, flexDirection: "column", children: [status.currentCommand ? (_jsxs(Text, { dimColor: true, children: ["Command: ", status.currentCommand] })) : (_jsx(Text, { dimColor: true, children: "Command: not configured" })), status.hint && _jsxs(Text, { color: "yellow", children: ["\u21B3 ", status.hint] })] })] }));
 }
+function SantreeSetupRow({ status }) {
+    const isOk = status.santreeFolderExists &&
+        status.initShExists &&
+        status.initShExecutable &&
+        status.worktreesIgnored &&
+        status.metadataIgnored;
+    if (!status.isGitRepo) {
+        return (_jsxs(Box, { flexDirection: "column", marginBottom: 1, children: [_jsxs(Box, { children: [_jsx(StatusIcon, { ok: false, required: false }), _jsx(Text, { children: " " }), _jsx(Text, { bold: true, children: "Repository Setup" }), _jsx(Text, { dimColor: true, children: " - .santree configuration" }), _jsx(Text, { dimColor: true, children: " (optional)" })] }), _jsx(Box, { marginLeft: 2, children: _jsx(Text, { dimColor: true, children: "Not in a git repository" }) })] }));
+    }
+    return (_jsxs(Box, { flexDirection: "column", marginBottom: 1, children: [_jsxs(Box, { children: [_jsx(StatusIcon, { ok: isOk, required: false }), _jsx(Text, { children: " " }), _jsx(Text, { bold: true, children: "Repository Setup" }), _jsx(Text, { dimColor: true, children: " - .santree configuration" }), _jsx(Text, { dimColor: true, children: " (optional)" })] }), _jsxs(Box, { marginLeft: 2, flexDirection: "column", children: [_jsxs(Text, { dimColor: true, children: ["Main repo: ", status.mainRepoRoot] }), _jsxs(Text, { dimColor: true, children: [".santree folder: ", status.santreeFolderExists ? "exists" : "missing"] }), status.santreeFolderExists && (_jsxs(Text, { dimColor: true, children: ["init.sh:", " ", status.initShExists
+                                ? status.initShExecutable
+                                    ? "executable"
+                                    : "not executable"
+                                : "missing"] })), _jsxs(Text, { dimColor: true, children: [".santree/worktrees ignored: ", status.worktreesIgnored ? "yes" : "no"] }), _jsxs(Text, { dimColor: true, children: [".santree/metadata.json ignored:", " ", status.metadataIgnored ? "yes" : "no"] }), status.hints.map((hint, i) => (_jsxs(Text, { color: "yellow", children: ["\u21B3 ", hint] }, i)))] })] }));
+}
 export default function Doctor() {
     const [tools, setTools] = useState([]);
     const [mcp, setMcp] = useState(null);
     const [shellStatus, setShellStatus] = useState(null);
     const [statusline, setStatusline] = useState(null);
+    const [santreeSetup, setSantreeSetup] = useState(null);
     const [loading, setLoading] = useState(true);
     useEffect(() => {
         async function runChecks() {
@@ -254,6 +348,7 @@ export default function Doctor() {
             setMcp(mcpResult);
             setShellStatus(checkShellIntegration());
             setStatusline(statuslineResult);
+            setSantreeSetup(checkSantreeSetup());
             setLoading(false);
         }
         runChecks();
@@ -263,9 +358,10 @@ export default function Doctor() {
     }
     const requiredMissing = tools.filter((t) => t.required && (!t.installed || t.hint));
     const optionalMissing = tools.filter((t) => !t.required && !t.installed);
-    const mcpOk = mcp?.configured && (mcp?.status?.includes("✓") || mcp?.status?.includes("Connected"));
+    const mcpOk = mcp?.configured &&
+        (mcp?.status?.includes("✓") || mcp?.status?.includes("Connected"));
     const allRequired = requiredMissing.length === 0 && mcpOk && shellStatus?.configured;
-    return (_jsxs(Box, { flexDirection: "column", padding: 1, children: [_jsx(Box, { marginBottom: 1, children: _jsx(Text, { bold: true, color: "cyan", children: "Santree Doctor" }) }), _jsx(Box, { marginBottom: 1, flexDirection: "column", children: _jsx(Text, { bold: true, underline: true, children: "CLI Tools" }) }), tools.map((tool) => (_jsx(ToolRow, { tool: tool }, tool.name))), _jsx(Box, { marginBottom: 1, marginTop: 1, flexDirection: "column", children: _jsx(Text, { bold: true, underline: true, children: "Integrations" }) }), mcp && _jsx(McpRow, { mcp: mcp }), shellStatus && (_jsx(ShellRow, { configured: shellStatus.configured, shell: shellStatus.shell })), _jsx(Box, { marginBottom: 1, marginTop: 1, flexDirection: "column", children: _jsx(Text, { bold: true, underline: true, children: "Aesthetics" }) }), statusline && _jsx(StatuslineRow, { status: statusline }), _jsx(Box, { marginTop: 1, borderStyle: "single", borderColor: allRequired ? "green" : "yellow", paddingX: 2, children: allRequired ? (_jsx(Text, { color: "green", children: "All requirements satisfied! Santree is ready to use." })) : (_jsxs(Box, { flexDirection: "column", children: [_jsxs(Text, { color: "yellow", children: [requiredMissing.length +
+    return (_jsxs(Box, { flexDirection: "column", padding: 1, children: [_jsx(Box, { marginBottom: 1, children: _jsx(Text, { bold: true, color: "cyan", children: "Santree Doctor" }) }), _jsx(Box, { marginBottom: 1, flexDirection: "column", children: _jsx(Text, { bold: true, underline: true, children: "CLI Tools" }) }), tools.map((tool) => (_jsx(ToolRow, { tool: tool }, tool.name))), _jsx(Box, { marginBottom: 1, marginTop: 1, flexDirection: "column", children: _jsx(Text, { bold: true, underline: true, children: "Integrations" }) }), mcp && _jsx(McpRow, { mcp: mcp }), shellStatus && (_jsx(ShellRow, { configured: shellStatus.configured, shell: shellStatus.shell })), santreeSetup && _jsx(SantreeSetupRow, { status: santreeSetup }), _jsx(Box, { marginBottom: 1, marginTop: 1, flexDirection: "column", children: _jsx(Text, { bold: true, underline: true, children: "Aesthetics" }) }), statusline && _jsx(StatuslineRow, { status: statusline }), _jsx(Box, { marginTop: 1, borderStyle: "single", borderColor: allRequired ? "green" : "yellow", paddingX: 2, children: allRequired ? (_jsx(Text, { color: "green", children: "All requirements satisfied! Santree is ready to use." })) : (_jsxs(Box, { flexDirection: "column", children: [_jsxs(Text, { color: "yellow", children: [requiredMissing.length +
                                     (mcpOk ? 0 : 1) +
                                     (shellStatus?.configured ? 0 : 1), " ", "required item(s) need attention"] }), optionalMissing.length > 0 && (_jsxs(Text, { dimColor: true, children: [optionalMissing.length, " optional item(s) not installed"] }))] })) })] }));
 }

package/dist/commands/list.js

@@ -4,7 +4,7 @@ import { Text, Box } from "ink";
 import Spinner from "ink-spinner";
 import { exec } from "child_process";
 import { promisify } from "util";
-import { listWorktrees, getWorktreeMetadata, isWorktreePath, } from "../lib/git.js";
+import { listWorktrees, getBaseBranch, isWorktreePath } from "../lib/git.js";
 import { getPRInfoAsync } from "../lib/github.js";
 export const description = "List all worktrees with status information";
 const execAsync = promisify(exec);
@@ -48,13 +48,10 @@ export default function List() {
                     let prState = "";
                     let status = "-";
                     if (!isMain) {
-                        const metadata = getWorktreeMetadata(wt.path);
-                        if (metadata?.base_branch) {
-                            base = metadata.base_branch;
-                        }
+                        base = wt.branch ? getBaseBranch(wt.branch) : base;
                         // Run async operations in parallel
                         const [aheadResult, dirtyResult, prInfo] = await Promise.all([
-                            base !== "-" ? getCommitsAhead(wt.path, base) : Promise.resolve(-1),
+                            getCommitsAhead(wt.path, base),
                             isDirty(wt.path),
                             wt.branch ? getPRInfoAsync(wt.branch) : Promise.resolve(null),
                         ]);

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, 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";
 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,20 +137,19 @@ 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
             await new Promise((r) => setTimeout(r, 10));
             // Get base branch from metadata
-            const metadata = getWorktreeMetadata(currentRepo);
-            const base = metadata?.base_branch ?? getDefaultBranch();
+            const base = getBaseBranch(branchName);
             setBaseBranch(base);
             // Check commits ahead
             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 +171,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 +190,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/setup.js

@@ -2,10 +2,10 @@ 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 { spawn } from "child_process";
 import * as path from "path";
 import * as fs from "fs";
 import { findMainRepoRoot, getSantreeDir, isInWorktree } from "../lib/git.js";
+import { spawnAsync } from "../lib/exec.js";
 export const description = "Run init script in current worktree";
 export default function Setup() {
     const [status, setStatus] = useState("checking");
@@ -48,40 +48,23 @@ export default function Setup() {
             setWorktreePath(cwd);
             setStatus("running");
             // Run script and capture output
-            const exitCode = await new Promise((resolve) => {
-                const child = spawn(initScript, [], {
-                    cwd,
-                    stdio: "pipe",
-                    env: {
-                        ...process.env,
-                        SANTREE_WORKTREE_PATH: cwd,
-                        SANTREE_REPO_ROOT: mainRepo,
-                    },
-                });
-                let scriptOutput = "";
-                child.stdout?.on("data", (data) => {
-                    scriptOutput += data.toString();
-                    setOutput(scriptOutput);
-                });
-                child.stderr?.on("data", (data) => {
-                    scriptOutput += data.toString();
-                    setOutput(scriptOutput);
-                });
-                child.on("close", (code) => {
-                    resolve(code ?? 1);
-                });
-                child.on("error", (err) => {
-                    setOutput(err.message);
-                    resolve(1);
-                });
+            const result = await spawnAsync(initScript, [], {
+                cwd,
+                env: {
+                    ...process.env,
+                    SANTREE_WORKTREE_PATH: cwd,
+                    SANTREE_REPO_ROOT: mainRepo,
+                },
+                onOutput: setOutput,
             });
-            if (exitCode === 0) {
+            setOutput(result.output);
+            if (result.code === 0) {
                 setStatus("done");
                 setMessage("Init script completed successfully");
             }
             else {
                 setStatus("error");
-                setMessage(`Init script failed (exit code ${exitCode})`);
+                setMessage(`Init script failed (exit code ${result.code})`);
             }
         }
         run();

package/dist/commands/statusline.js

@@ -79,17 +79,9 @@ function isWorktree(cwd) {
         return false;
     }
 }
-// Get santree metadata if exists
-function getSantreeMetadata(cwd) {
-    const metadataPath = path.join(cwd, ".santree_metadata.json");
-    if (!fs.existsSync(metadataPath))
-        return null;
-    try {
-        return JSON.parse(fs.readFileSync(metadataPath, "utf-8"));
-    }
-    catch {
-        return null;
-    }
+// Check if directory is a santree-managed worktree
+function isSantreeWorktree(cwd) {
+    return cwd.includes("/.santree/worktrees/");
 }
 // Extract ticket ID from branch name (e.g., feature/TEAM-123-desc -> TEAM-123)
 function extractTicketId(branch) {
@@ -130,7 +122,7 @@ function formatChanges(changes) {
     return parts.length > 0 ? parts.join(" ") : `${c.dim}clean${c.reset}`;
 }
 // Build statusline for santree worktree
-function buildSantreeStatusline(cwd, metadata, model, usedPercentage) {
+function buildSantreeStatusline(cwd, model, usedPercentage) {
     const parts = [];
     const branch = git(cwd, "rev-parse --abbrev-ref HEAD") || "unknown";
     // Ticket ID (prominent)
@@ -217,15 +209,8 @@ export default function Statusline() {
             // Not a git repo
             output = buildPlainStatusline(cwd, model, usedPercentage);
         }
-        else if (isWorktree(cwd)) {
-            // Check for santree metadata
-            const metadata = getSantreeMetadata(cwd);
-            if (metadata) {
-                output = buildSantreeStatusline(cwd, metadata, model, usedPercentage);
-            }
-            else {
-                output = buildGitStatusline(cwd, model, usedPercentage);
-            }
+        else if (isWorktree(cwd) && isSantreeWorktree(cwd)) {
+            output = buildSantreeStatusline(cwd, model, usedPercentage);
         }
         else {
             // Regular git repo