santree 0.1.3 → 0.1.4

package/README.md

@@ -110,6 +110,7 @@ With the `stw` alias: `stw create`, `stw list`, `stw switch`, `stw work`, `stw c
 | Command | Description |
 |---------|-------------|
 | `santree linear auth` | Authenticate with Linear (OAuth) |
+| `santree linear switch` | Switch Linear workspace for this repo |
 | `santree linear open` | Open the current Linear ticket in the browser |
 
 ### Helpers (`santree helpers`)

package/dist/commands/linear/switch.d.ts

@@ -0,0 +1,2 @@
+export declare const description = "Switch Linear workspace for this repo";
+export default function LinearSwitch(): import("react/jsx-runtime").JSX.Element;

package/dist/commands/linear/switch.js

@@ -0,0 +1,71 @@
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+import { useEffect, useState } from "react";
+import { Text, Box, useInput } from "ink";
+import Spinner from "ink-spinner";
+import { findMainRepoRoot, setRepoLinearOrg, getRepoLinearOrg } from "../../lib/git.js";
+import { readAuthStore } from "../../lib/linear.js";
+export const description = "Switch Linear workspace for this repo";
+export default function LinearSwitch() {
+    const [status, setStatus] = useState("checking");
+    const [message, setMessage] = useState("");
+    const [error, setError] = useState(null);
+    const [choices, setChoices] = useState([]);
+    const [selected, setSelected] = useState(0);
+    const [currentOrg, setCurrentOrg] = useState(null);
+    useInput((input, key) => {
+        if (status !== "choosing")
+            return;
+        if (key.upArrow) {
+            setSelected((s) => Math.max(0, s - 1));
+        }
+        else if (key.downArrow) {
+            setSelected((s) => Math.min(choices.length - 1, s + 1));
+        }
+        else if (key.return) {
+            const choice = choices[selected];
+            const repoRoot = findMainRepoRoot();
+            setRepoLinearOrg(repoRoot, choice.slug);
+            setMessage(`Switched to ${choice.name} (${choice.slug})`);
+            setStatus("done");
+        }
+    });
+    useEffect(() => {
+        async function run() {
+            await new Promise((r) => setTimeout(r, 100));
+            const repoRoot = findMainRepoRoot();
+            if (!repoRoot) {
+                setError("Not inside a git repository");
+                setStatus("error");
+                return;
+            }
+            const store = readAuthStore();
+            const orgs = Object.entries(store).map(([slug, tokens]) => ({
+                slug,
+                name: tokens.org_name,
+            }));
+            if (orgs.length === 0) {
+                setError("No authenticated workspaces. Run: santree linear auth");
+                setStatus("error");
+                return;
+            }
+            if (orgs.length === 1) {
+                const org = orgs[0];
+                setRepoLinearOrg(repoRoot, org.slug);
+                setMessage(`Linked to ${org.name} (${org.slug})`);
+                setStatus("done");
+                return;
+            }
+            setCurrentOrg(getRepoLinearOrg(repoRoot));
+            setChoices(orgs);
+            setStatus("choosing");
+        }
+        run();
+    }, []);
+    useEffect(() => {
+        if (status === "done" || status === "error") {
+            const timer = setTimeout(() => process.exit(status === "error" ? 1 : 0), 100);
+            return () => clearTimeout(timer);
+        }
+    }, [status]);
+    return (_jsxs(Box, { flexDirection: "column", padding: 1, children: [_jsx(Box, { marginBottom: 1, children: _jsx(Text, { bold: true, color: "cyan", children: "Linear Switch" }) }), status === "checking" && (_jsxs(Box, { children: [_jsx(Text, { color: "cyan", children: _jsx(Spinner, { type: "dots" }) }), _jsx(Text, { children: " Checking..." })] })), status === "choosing" && (_jsxs(Box, { flexDirection: "column", children: [_jsx(Text, { children: "Select a workspace to link to this repo:" }), _jsx(Box, { flexDirection: "column", marginTop: 1, children: choices.map((org, i) => (_jsxs(Text, { children: [i === selected ? (_jsx(Text, { color: "cyan", bold: true, children: "> " })) : (_jsx(Text, { children: "  " })), org.name, " (", org.slug, ")", org.slug === currentOrg && _jsx(Text, { dimColor: true, children: " (current)" })] }, org.slug))) }), _jsx(Box, { marginTop: 1, children: _jsx(Text, { dimColor: true, children: "\u2191/\u2193 to select, Enter to confirm" }) })] })), status === "done" && _jsxs(Text, { color: "green", children: ["\u2713 ", message] }), status === "error" && (_jsxs(Text, { color: "red", bold: true, children: ["\u2717 ", error] }))] }));
+}

package/dist/commands/worktree/remove.d.ts

@@ -1,10 +1,12 @@
 import { z } from "zod";
 export declare const description = "Remove a worktree and its branch";
-export declare const options: z.ZodObject<{}, z.core.$strip>;
+export declare const options: z.ZodObject<{
+    force: z.ZodOptional<z.ZodBoolean>;
+}, z.core.$strip>;
 export declare const args: z.ZodTuple<[z.ZodString], null>;
 type Props = {
     options: z.infer<typeof options>;
     args: z.infer<typeof args>;
 };
-export default function Remove({ args }: Props): import("react/jsx-runtime").JSX.Element;
+export default function Remove({ args, options }: Props): import("react/jsx-runtime").JSX.Element;
 export {};

package/dist/commands/worktree/remove.js

@@ -1,40 +1,81 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { useEffect, useState } from "react";
-import { Text, Box } from "ink";
+import { Text, Box, useInput, useApp } from "ink";
 import Spinner from "ink-spinner";
 import { z } from "zod";
 import { removeWorktree, findMainRepoRoot } from "../../lib/git.js";
 export const description = "Remove a worktree and its branch";
-export const options = z.object({});
+export const options = z.object({
+    force: z.boolean().optional().describe("Skip confirmation prompt"),
+});
 export const args = z.tuple([z.string().describe("Branch name to remove")]);
-export default function Remove({ args }) {
+export default function Remove({ args, options }) {
     const [branchName] = args;
-    const [status, setStatus] = useState("idle");
+    const { exit } = useApp();
+    const [status, setStatus] = useState("checking");
     const [message, setMessage] = useState("");
+    const [repoRoot, setRepoRoot] = useState(null);
+    useInput((input) => {
+        if (status !== "confirming")
+            return;
+        if (input === "y" || input === "Y") {
+            doRemove();
+        }
+        else if (input === "n" || input === "N" || input === "\x03") {
+            setStatus("cancelled");
+            setMessage("Cancelled");
+            setTimeout(() => exit(), 100);
+        }
+    });
+    async function doRemove() {
+        if (!repoRoot)
+            return;
+        setStatus("removing");
+        setMessage(`Removing worktree ${branchName}...`);
+        const result = await removeWorktree(branchName, repoRoot, true);
+        if (result.success) {
+            setStatus("done");
+            setMessage(`Removed worktree and branch: ${branchName}`);
+        }
+        else {
+            setStatus("error");
+            setMessage(result.error ?? "Unknown error");
+        }
+    }
     useEffect(() => {
         async function run() {
-            // Small delay to allow spinner to render
             await new Promise((r) => setTimeout(r, 100));
-            const repoRoot = findMainRepoRoot();
-            if (!repoRoot) {
+            const root = findMainRepoRoot();
+            if (!root) {
                 setStatus("error");
                 setMessage("Not inside a git repository");
                 return;
             }
-            setStatus("removing");
-            setMessage(`Removing worktree ${branchName}...`);
-            const result = await removeWorktree(branchName, repoRoot, true);
-            if (result.success) {
-                setStatus("done");
-                setMessage(`Removed worktree and branch: ${branchName}`);
-            }
-            else {
-                setStatus("error");
-                setMessage(result.error ?? "Unknown error");
+            setRepoRoot(root);
+            if (options.force) {
+                setStatus("removing");
+                setMessage(`Removing worktree ${branchName}...`);
+                const result = await removeWorktree(branchName, root, true);
+                if (result.success) {
+                    setStatus("done");
+                    setMessage(`Removed worktree and branch: ${branchName}`);
+                }
+                else {
+                    setStatus("error");
+                    setMessage(result.error ?? "Unknown error");
+                }
+                return;
             }
+            setStatus("confirming");
         }
         run();
     }, [branchName]);
-    const isLoading = status === "idle" || status === "removing";
-    return (_jsxs(Box, { flexDirection: "column", padding: 1, width: "100%", children: [_jsx(Box, { marginBottom: 1, children: _jsx(Text, { bold: true, color: "cyan", children: "\uD83D\uDDD1\uFE0F Remove" }) }), _jsx(Box, { flexDirection: "column", borderStyle: "round", borderColor: status === "error" ? "red" : status === "done" ? "green" : "yellow", paddingX: 1, width: "100%", children: _jsxs(Box, { gap: 1, children: [_jsx(Text, { dimColor: true, children: "branch:" }), _jsx(Text, { color: "red", bold: true, children: branchName })] }) }), _jsxs(Box, { marginTop: 1, children: [isLoading && (_jsxs(Box, { children: [_jsx(Text, { color: "yellow", children: _jsx(Spinner, { type: "dots" }) }), _jsxs(Text, { children: [" ", message || "Removing..."] })] })), status === "done" && (_jsxs(Text, { color: "green", bold: true, children: ["\u2713 ", message] })), status === "error" && (_jsxs(Text, { color: "red", bold: true, children: ["\u2717 ", message] }))] })] }));
+    useEffect(() => {
+        if (status === "done" || status === "error") {
+            const timer = setTimeout(() => process.exit(status === "error" ? 1 : 0), 100);
+            return () => clearTimeout(timer);
+        }
+    }, [status]);
+    const isLoading = status === "checking" || status === "removing";
+    return (_jsxs(Box, { flexDirection: "column", padding: 1, width: "100%", children: [_jsx(Box, { marginBottom: 1, children: _jsx(Text, { bold: true, color: "cyan", children: "\uD83D\uDDD1\uFE0F Remove" }) }), _jsx(Box, { flexDirection: "column", borderStyle: "round", borderColor: status === "error" ? "red" : status === "done" ? "green" : "yellow", paddingX: 1, width: "100%", children: _jsxs(Box, { gap: 1, children: [_jsx(Text, { dimColor: true, children: "branch:" }), _jsx(Text, { color: "red", bold: true, children: branchName })] }) }), _jsxs(Box, { marginTop: 1, children: [isLoading && (_jsxs(Box, { children: [_jsx(Text, { color: "yellow", children: _jsx(Spinner, { type: "dots" }) }), _jsxs(Text, { children: [" ", message || "Removing..."] })] })), status === "confirming" && (_jsxs(Text, { bold: true, color: "yellow", children: ["Remove this worktree and delete the branch? [y/N]:", " "] })), status === "done" && (_jsxs(Text, { color: "green", bold: true, children: ["\u2713 ", message] })), status === "cancelled" && _jsxs(Text, { color: "yellow", children: ["\u2717 ", message] }), status === "error" && (_jsxs(Text, { color: "red", bold: true, children: ["\u2717 ", message] }))] })] }));
 }

package/dist/lib/github.d.ts

@@ -4,13 +4,7 @@ export interface PRInfo {
     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.
+ * Get PR info for a branch using the GitHub CLI (async).
  * Runs: `gh pr view "<branchName>" --json number,state,url`
  * Returns null if no PR exists for the branch or gh CLI fails.
  */
@@ -42,29 +36,23 @@ export declare function createPR(title: string, baseBranch: string, headBranch:
  */
 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;
-/**
- * Async version of getPRChecks.
+ * Fetch CI check results for a pull request (async).
  */
 export declare function getPRChecksAsync(prNumber: string): Promise<PRCheck[] | null>;
 /**
- * Async version of getPRReviews.
+ * Fetch reviews for a pull request (async).
  */
 export declare function getPRReviewsAsync(prNumber: string): Promise<PRReview[] | null>;
 /**
- * Async version of getPRReviewComments.
+ * Fetch inline review comments for a pull request via the GitHub API (async).
  */
 export declare function getPRReviewCommentsAsync(prNumber: string): Promise<PRReviewComment[] | null>;
 /**
- * Async version of getPRConversationComments.
+ * Fetch structured conversation comments on a pull request (async).
  */
 export declare function getPRConversationCommentsAsync(prNumber: string): Promise<PRConversationComment[] | null>;
 /**
- * Async version of getFailedCheckDetails.
+ * Fetch details for a failed CI check (async): which step failed and the failed step's log.
  */
 export declare function getFailedCheckDetailsAsync(check: PRCheck): Promise<FailedCheckDetail>;
 export interface PRConversationComment {
@@ -72,12 +60,6 @@ export interface PRConversationComment {
     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;
@@ -94,13 +76,6 @@ export interface FailedCheckDetail {
     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;
@@ -122,21 +97,3 @@ export interface PRReviewComment {
     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

@@ -3,28 +3,7 @@ import { promisify } from "util";
 import { run, runAsync } 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 data = JSON.parse(output);
-        return {
-            number: String(data.number ?? ""),
-            state: data.state ?? "OPEN",
-            url: data.url,
-        };
-    }
-    catch {
-        return null;
-    }
-}
-/**
- * Async version of getPRInfo. Get PR info for a branch using the GitHub CLI.
+ * Get PR info for a branch using the GitHub CLI (async).
  * Runs: `gh pr view "<branchName>" --json number,state,url`
  * Returns null if no PR exists for the branch or gh CLI fails.
  */
@@ -102,15 +81,7 @@ export function getPRTemplate() {
     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) {
-    return (run(`gh pr view ${prNumber} --json comments --jq '.comments[] | "- \\(.author.login): \\(.body)"'`) ?? "");
-}
-/**
- * Async version of getPRChecks.
+ * Fetch CI check results for a pull request (async).
  */
 export async function getPRChecksAsync(prNumber) {
     const output = await runAsync(`gh pr checks ${prNumber} --json name,state,bucket,link,description,workflow`);
@@ -124,7 +95,7 @@ export async function getPRChecksAsync(prNumber) {
     }
 }
 /**
- * Async version of getPRReviews.
+ * Fetch reviews for a pull request (async).
  */
 export async function getPRReviewsAsync(prNumber) {
     const output = await runAsync(`gh pr view ${prNumber} --json reviews`);
@@ -139,7 +110,7 @@ export async function getPRReviewsAsync(prNumber) {
     }
 }
 /**
- * Async version of getPRReviewComments.
+ * Fetch inline review comments for a pull request via the GitHub API (async).
  */
 export async function getPRReviewCommentsAsync(prNumber) {
     const output = await runAsync(`gh api repos/{owner}/{repo}/pulls/${prNumber}/comments --paginate`);
@@ -153,7 +124,7 @@ export async function getPRReviewCommentsAsync(prNumber) {
     }
 }
 /**
- * Async version of getPRConversationComments.
+ * Fetch structured conversation comments on a pull request (async).
  */
 export async function getPRConversationCommentsAsync(prNumber) {
     const output = await runAsync(`gh pr view ${prNumber} --json comments`);
@@ -172,7 +143,7 @@ export async function getPRConversationCommentsAsync(prNumber) {
     }
 }
 /**
- * Async version of getFailedCheckDetails.
+ * Fetch details for a failed CI check (async): which step failed and the failed step's log.
  */
 export async function getFailedCheckDetailsAsync(check) {
     const detail = {
@@ -245,157 +216,3 @@ export async function getFailedCheckDetailsAsync(check) {
     }
     return detail;
 }
-/**
- * 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/package.json

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

package/prompts/fix-pr.njk

@@ -1,7 +1,9 @@
 {% if ticket_content %}
 {{ ticket_content }}
 {% else %}
-Note: Could not fetch Linear ticket {{ ticket_id }}. Proceed based on branch name context.
+Note: Could not fetch Linear ticket {{ ticket_id }} directly.
+If a Linear MCP server is available, use it to fetch the ticket description, comments, and any relevant details for {{ ticket_id }}.
+Otherwise, proceed based on branch name context.
 {% endif %}
 {% if pr_feedback %}
 {{ pr_feedback }}

package/prompts/review.njk

@@ -1,7 +1,9 @@
 {% if ticket_content %}
 {{ ticket_content }}
 {% else %}
-Note: Could not fetch Linear ticket {{ ticket_id }}. Proceed based on branch name context.
+Note: Could not fetch Linear ticket {{ ticket_id }} directly.
+If a Linear MCP server is available, use it to fetch the ticket description, comments, and any relevant details for {{ ticket_id }}.
+Otherwise, proceed based on branch name context.
 {% endif %}
 {% if diff_content %}
 {{ diff_content }}

package/prompts/work.njk

@@ -1,7 +1,9 @@
 {% if ticket_content %}
 {{ ticket_content }}
 {% else %}
-Note: Could not fetch Linear ticket {{ ticket_id }}. Proceed based on branch name context.
+Note: Could not fetch Linear ticket {{ ticket_id }} directly.
+If a Linear MCP server is available, use it to fetch the ticket description, comments, and any relevant details for {{ ticket_id }}.
+Otherwise, proceed based on branch name context.
 {% endif %}
 
 Review the codebase to understand the relevant areas and existing patterns.