@mcarvin/smart-diff 1.0.4 → 1.1.0

package/dist/index.umd.js

@@ -38,7 +38,7 @@
 
     function resolveLlmBaseUrl() {
         var _a, _b, _c;
-        return (_b = (_a = process.env.LLM_BASE_URL) === null || _a === void 0 ? void 0 : _a.trim()) !== null && _b !== void 0 ? _b : (_c = process.env.OPENAI_BASE_URL) === null || _c === void 0 ? void 0 : _c.trim();
+        return ((_b = (_a = process.env.LLM_BASE_URL) === null || _a === void 0 ? void 0 : _a.trim()) !== null && _b !== void 0 ? _b : (_c = process.env.OPENAI_BASE_URL) === null || _c === void 0 ? void 0 : _c.trim());
     }
     function parseHeaderJsonObject(raw) {
         const trimmed = raw === null || raw === void 0 ? void 0 : raw.trim();
@@ -46,12 +46,14 @@
             return {};
         try {
             const parsed = JSON.parse(trimmed);
-            if (typeof parsed !== 'object' || parsed === null || Array.isArray(parsed)) {
+            if (typeof parsed !== "object" ||
+                parsed === null ||
+                Array.isArray(parsed)) {
                 return {};
             }
             const out = {};
             for (const [key, value] of Object.entries(parsed)) {
-                if (typeof value === 'string' && value.length > 0) {
+                if (typeof value === "string" && value.length > 0) {
                     out[key] = value;
                 }
             }
@@ -68,7 +70,7 @@
         return Object.keys(merged).length > 0 ? merged : undefined;
     }
     function findAuthorizationHeaderName(headers) {
-        return Object.keys(headers).find((k) => k.toLowerCase() === 'authorization');
+        return Object.keys(headers).find((k) => k.toLowerCase() === "authorization");
     }
     function stripBearerPrefix(value) {
         var _a;
@@ -111,7 +113,7 @@
         var _a, _b, _c, _d, _e;
         const baseURL = resolveLlmBaseUrl();
         const mergedHeaders = (_a = parseLlmDefaultHeadersFromEnv()) !== null && _a !== void 0 ? _a : {};
-        const envApiKey = (_e = (_c = (_b = process.env.LLM_API_KEY) === null || _b === void 0 ? void 0 : _b.trim()) !== null && _c !== void 0 ? _c : (_d = process.env.OPENAI_API_KEY) === null || _d === void 0 ? void 0 : _d.trim()) !== null && _e !== void 0 ? _e : '';
+        const envApiKey = (_e = (_c = (_b = process.env.LLM_API_KEY) === null || _b === void 0 ? void 0 : _b.trim()) !== null && _c !== void 0 ? _c : (_d = process.env.OPENAI_API_KEY) === null || _d === void 0 ? void 0 : _d.trim()) !== null && _e !== void 0 ? _e : "";
         let defaultHeaders;
         let apiKey = envApiKey;
         if (apiKey.length === 0) {
@@ -119,12 +121,16 @@
             if (split.apiKeyFromAuthHeader) {
                 apiKey = split.apiKeyFromAuthHeader;
             }
-            defaultHeaders = Object.keys(split.defaultHeaders).length > 0 ? split.defaultHeaders : undefined;
+            defaultHeaders =
+                Object.keys(split.defaultHeaders).length > 0
+                    ? split.defaultHeaders
+                    : undefined;
         }
         else {
-            defaultHeaders = Object.keys(mergedHeaders).length > 0 ? mergedHeaders : undefined;
+            defaultHeaders =
+                Object.keys(mergedHeaders).length > 0 ? mergedHeaders : undefined;
         }
-        return Object.assign(Object.assign({ apiKey: apiKey.length > 0 ? apiKey : 'unused' }, (baseURL ? { baseURL } : {})), (defaultHeaders ? { defaultHeaders } : {}));
+        return Object.assign(Object.assign({ apiKey: apiKey.length > 0 ? apiKey : "unused" }, (baseURL ? { baseURL } : {})), (defaultHeaders ? { defaultHeaders } : {}));
     }
     function createOpenAiLikeClient() {
         return __awaiter(this, void 0, void 0, function* () {
@@ -134,9 +140,22 @@
     }
 
     const DEFAULT_LLM_MAX_DIFF_CHARS = 120000;
+    const DEFAULT_GIT_DIFF_SYSTEM_PROMPT = `You are a senior software engineer helping developers understand code and configuration changes from the git context they supplied.
+You receive: commit subject lines (when available), changed file paths, and unified git patch(es)—either one range diff or concatenated per-commit patches, depending on how the diff was produced. Patches may be truncated mid-section with an explicit marker—do not infer changes beyond visible lines.
+Explain what changed in terms of behavior, APIs, data, configuration, security, and operational risk. Tie claims to the patch when possible.
+Produce a concise, developer-focused summary in Markdown.
+Use sections that fit the change (for example: Highlights, Breaking or risky changes, API / contract changes, Data & schema, Configuration & infra, Security & auth, Tests & quality). Omit empty sections.
+Group related changes; do not list every individual file. When multiple commits appear in the context, briefly separate notable themes by commit when helpful.
+If the user message includes a Team line, use that exact team name in the summary title (for example: "## <Team> – Change summary" or similar).`;
+    const LLM_GATEWAY_REQUIRED_MESSAGE = "No LLM gateway configured. Set OPENAI_API_KEY or LLM_API_KEY, and/or LLM_BASE_URL or OPENAI_BASE_URL, " +
+        "and/or JSON in OPENAI_DEFAULT_HEADERS or LLM_DEFAULT_HEADERS. " +
+        "Alternatively pass openAiClientProvider to generateSummary or summarizeGitDiff.";
+
     function resolveLlmMaxDiffChars(cliOverride) {
         var _a;
-        if (cliOverride !== undefined && Number.isFinite(cliOverride) && cliOverride > 0) {
+        if (cliOverride !== undefined &&
+            Number.isFinite(cliOverride) &&
+            cliOverride > 0) {
             return Math.trunc(cliOverride);
         }
         const raw = (_a = process.env.LLM_MAX_DIFF_CHARS) === null || _a === void 0 ? void 0 : _a.trim();
@@ -155,70 +174,75 @@
         const marker = `\n\n--- TRUNCATED: unified diff was ${diffText.length} characters; only the first ${maxChars} were sent. Narrow the ref range, adjust commit/path filters, or raise maxDiffChars / LLM_MAX_DIFF_CHARS only if your model context allows. ---\n`;
         return diffText.slice(0, maxChars) + marker;
     }
-    const DEFAULT_GIT_DIFF_SYSTEM_PROMPT = `You are a senior software engineer helping developers understand code and configuration changes from the git context they supplied.
-You receive: commit subject lines (when available), changed file paths, and unified git patch(es)—either one range diff or concatenated per-commit patches, depending on how the diff was produced. Patches may be truncated mid-section with an explicit marker—do not infer changes beyond visible lines.
-Explain what changed in terms of behavior, APIs, data, configuration, security, and operational risk. Tie claims to the patch when possible.
-Produce a concise, developer-focused summary in Markdown.
-Use sections that fit the change (for example: Highlights, Breaking or risky changes, API / contract changes, Data & schema, Configuration & infra, Security & auth, Tests & quality). Omit empty sections.
-Group related changes; do not list every individual file. When multiple commits appear in the context, briefly separate notable themes by commit when helpful.
-If the user message includes a Team line, use that exact team name in the summary title (for example: "## <Team> – Change summary" or similar).`;
-    const LLM_GATEWAY_REQUIRED_MESSAGE = 'No LLM gateway configured. Set OPENAI_API_KEY or LLM_API_KEY, and/or LLM_BASE_URL or OPENAI_BASE_URL, ' +
-        'and/or JSON in OPENAI_DEFAULT_HEADERS or LLM_DEFAULT_HEADERS. ' +
-        'Alternatively pass openAiClientProvider to generateSummary or summarizeGitDiff.';
-    function generateSummary(diffText, fileNames, commits, flags, openAiClientProvider, diffSummary) {
+    function markdownDiffTruncationNotice(originalChars, maxChars) {
+        return `> **Truncated diff:** The unified diff was ${originalChars} characters; only the first ${maxChars} were sent to the model. The summary may not reflect the full change set. Narrow the ref range, adjust path filters, or raise \`maxDiffChars\` / \`LLM_MAX_DIFF_CHARS\`—often together with switching to a model whose context window can fit a larger prompt.\n\n`;
+    }
+    function generateSummary(input) {
         return __awaiter(this, void 0, void 0, function* () {
             var _a, _b;
+            const { diffText, fileNames, commits, flags, openAiClientProvider, diffSummary, } = input;
             if (!shouldUseLlmGateway() && openAiClientProvider === undefined) {
                 throw new Error(LLM_GATEWAY_REQUIRED_MESSAGE);
             }
             const maxDiffChars = resolveLlmMaxDiffChars(flags.maxDiffChars);
+            const diffTruncated = diffText.length > maxDiffChars;
             const diffForLlm = truncateUnifiedDiffForLlm(diffText, maxDiffChars);
             const userContent = buildOpenAiUserContent(flags, commits, fileNames, diffForLlm, diffSummary);
-            return callOpenAi(userContent, (_a = flags.model) !== null && _a !== void 0 ? _a : 'gpt-4o-mini', (_b = flags.systemPrompt) !== null && _b !== void 0 ? _b : DEFAULT_GIT_DIFF_SYSTEM_PROMPT, openAiClientProvider !== null && openAiClientProvider !== void 0 ? openAiClientProvider : (() => __awaiter(this, void 0, void 0, function* () { return createOpenAiLikeClient(); })));
+            const summary = yield callOpenAi(userContent, (_a = flags.model) !== null && _a !== void 0 ? _a : "gpt-4o-mini", (_b = flags.systemPrompt) !== null && _b !== void 0 ? _b : DEFAULT_GIT_DIFF_SYSTEM_PROMPT, openAiClientProvider !== null && openAiClientProvider !== void 0 ? openAiClientProvider : (() => __awaiter(this, void 0, void 0, function* () { return createOpenAiLikeClient(); })));
+            if (!diffTruncated) {
+                return summary;
+            }
+            return markdownDiffTruncationNotice(diffText.length, maxDiffChars) + summary;
         });
     }
     function formatRegexFilterLines(flags) {
         var _a, _b;
-        const includes = ((_a = flags.commitMessageIncludeRegexes) !== null && _a !== void 0 ? _a : []).map((s) => s.trim()).filter(Boolean);
-        const excludes = ((_b = flags.commitMessageExcludeRegexes) !== null && _b !== void 0 ? _b : []).map((s) => s.trim()).filter(Boolean);
+        const includes = ((_a = flags.commitMessageIncludeRegexes) !== null && _a !== void 0 ? _a : [])
+            .map((s) => s.trim())
+            .filter(Boolean);
+        const excludes = ((_b = flags.commitMessageExcludeRegexes) !== null && _b !== void 0 ? _b : [])
+            .map((s) => s.trim())
+            .filter(Boolean);
         const incLine = includes.length > 0
-            ? `Commit message include regexes (OR): ${includes.map((r) => JSON.stringify(r)).join(', ')}\n`
-            : '';
+            ? `Commit message include regexes (OR): ${includes.map((r) => JSON.stringify(r)).join(", ")}\n`
+            : "";
         const excLine = excludes.length > 0
-            ? `Commit message exclude regexes: ${excludes.map((r) => JSON.stringify(r)).join(', ')}\n`
-            : '';
+            ? `Commit message exclude regexes: ${excludes.map((r) => JSON.stringify(r)).join(", ")}\n`
+            : "";
         if (!incLine && !excLine) {
-            return 'Commit message filters: none.\nGit context shape: single unified diff for the full ref range.\n';
+            return "Commit message filters: none.\nGit context shape: single unified diff for the full ref range.\n";
         }
         return (`${incLine}${excLine}` +
-            'Git context shape: concatenated per-commit unified patches for commits that pass the message filters.\n');
+            "Git context shape: concatenated per-commit unified patches for commits that pass the message filters.\n");
     }
     function buildOpenAiUserContent(flags, commits, fileNames, diffText, diffSummary) {
         var _a, _b;
         const from = flags.from;
-        const to = (_a = flags.to) !== null && _a !== void 0 ? _a : 'HEAD';
+        const to = (_a = flags.to) !== null && _a !== void 0 ? _a : "HEAD";
         const team = (_b = flags.team) === null || _b === void 0 ? void 0 : _b.trim();
         const ts = new Date().toISOString();
-        const teamLine = team ? `Team: ${team}\n` : '';
+        const teamLine = team ? `Team: ${team}\n` : "";
         const filterBlock = formatRegexFilterLines(flags);
         const commitBlock = commits.length > 0
-            ? commits.map((c) => `- ${c.hash.slice(0, 7)} ${c.message.replace(/\r?\n/g, ' ')}`).join('\n')
-            : '- (no commits in range after filtering)';
-        const pathsBlock = fileNames.length > 0 ? fileNames.join('\n') : '(no paths in diff scope)';
+            ? commits
+                .map((c) => `- ${c.hash.slice(0, 7)} ${c.message.replace(/\r?\n/g, " ")}`)
+                .join("\n")
+            : "- (no commits in range after filtering)";
+        const pathsBlock = fileNames.length > 0 ? fileNames.join("\n") : "(no paths in diff scope)";
         const structuredDiffSection = diffSummary
             ? `=== Structured git context (JSON summary) ===\n${JSON.stringify(diffSummary, null, 2)}\n\n`
-            : '';
+            : "";
         return (`${teamLine}` +
             `Date: ${ts}\n\n` +
             `Git refs: ${from}..${to}\n` +
             filterBlock +
-            '\n' +
-            '=== Included commits (subject lines) ===\n' +
+            "\n" +
+            "=== Included commits (subject lines) ===\n" +
             `${commitBlock}\n\n` +
-            '=== Changed paths ===\n' +
+            "=== Changed paths ===\n" +
             `${pathsBlock}\n\n` +
             structuredDiffSection +
-            '=== Git context (unified diff(s); patches may be truncated with an explicit marker) ===\n' +
+            "=== Git context (unified diff(s); patches may be truncated with an explicit marker) ===\n" +
             diffText);
     }
     function callOpenAi(userContent, model, systemPrompt, openAiClientProvider) {
@@ -232,11 +256,11 @@ If the user message includes a Team line, use that exact team name in the summar
                 model,
                 messages: [
                     {
-                        role: 'system',
+                        role: "system",
                         content: systemPrompt,
                     },
                     {
-                        role: 'user',
+                        role: "user",
                         content: userContent,
                     },
                 ],
@@ -244,64 +268,25 @@ If the user message includes a Team line, use that exact team name in the summar
                 max_tokens: maxTokens,
             });
             const typedResponse = response;
-            const text = (_f = (_e = (_d = (_c = (_b = typedResponse.choices) === null || _b === void 0 ? void 0 : _b[0]) === null || _c === void 0 ? void 0 : _c.message) === null || _d === void 0 ? void 0 : _d.content) === null || _e === void 0 ? void 0 : _e.trim()) !== null && _f !== void 0 ? _f : '';
-            return text.length > 0 ? text : 'No summary generated by OpenAI.';
+            const text = (_f = (_e = (_d = (_c = (_b = typedResponse.choices) === null || _b === void 0 ? void 0 : _b[0]) === null || _c === void 0 ? void 0 : _c.message) === null || _d === void 0 ? void 0 : _d.content) === null || _e === void 0 ? void 0 : _e.trim()) !== null && _f !== void 0 ? _f : "";
+            return text.length > 0 ? text : "No summary generated by OpenAI.";
         });
     }
 
-    function createGitClient(cwd = process.cwd()) {
-        return simpleGit.simpleGit(cwd);
-    }
-    function getCommits(git, from, to) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const logResult = yield git.log({ from, to });
-            return logResult.all;
-        });
-    }
-    function compileRegex(pattern, label) {
-        try {
-            return new RegExp(pattern, 'i');
-        }
-        catch (_a) {
-            throw new Error(`Invalid ${label} regular expression: ${JSON.stringify(pattern)}`);
-        }
-    }
-    function commitMessagePassesFilters(message, includeRes, excludeRes) {
-        for (const ex of excludeRes) {
-            if (ex.test(message))
-                return false;
-        }
-        if (includeRes.length > 0 && !includeRes.some((r) => r.test(message)))
-            return false;
-        return true;
-    }
-    function filterCommitsByMessageRegexes(commits, includePatterns, excludePatterns) {
-        const includes = (includePatterns !== null && includePatterns !== void 0 ? includePatterns : []).map((p) => p.trim()).filter((p) => p.length > 0);
-        const excludes = (excludePatterns !== null && excludePatterns !== void 0 ? excludePatterns : []).map((p) => p.trim()).filter((p) => p.length > 0);
-        const includeRes = includes.map((p, i) => compileRegex(p, `commit message include pattern[${i}]`));
-        const excludeRes = excludes.map((p, i) => compileRegex(p, `commit message exclude pattern[${i}]`));
-        return commits.filter((c) => commitMessagePassesFilters(c.message, includeRes, excludeRes));
-    }
-    function getRepoRoot(git) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const root = yield git.revparse(['--show-toplevel']);
-            return root.trim();
-        });
-    }
     function normalizeRepoRelativePath(p) {
-        const trimmed = p.trim().replace(/\\/g, '/');
-        const noLeading = trimmed.replace(/^\/+/, '');
-        const noTrailingSlash = noLeading.replace(/\/+$/, '');
-        return noTrailingSlash.length > 0 ? noTrailingSlash : '.';
+        const trimmed = p.trim().replace(/\\/g, "/");
+        const noLeading = trimmed.replace(/^\/+/, "");
+        const noTrailingSlash = noLeading.replace(/\/+$/, "");
+        return noTrailingSlash.length > 0 ? noTrailingSlash : ".";
     }
     function assertPathUnderRepo(repoRoot, userPath) {
         const abs = node_path.resolve(repoRoot, userPath);
         const rel = node_path.relative(repoRoot, abs);
-        if (rel === '..') {
+        if (rel === "..") {
             throw new Error(`Path escapes repository root: ${JSON.stringify(userPath)}`);
         }
         const segments = rel.split(/[/\\]/);
-        if (segments.includes('..')) {
+        if (segments.includes("..")) {
             throw new Error(`Path escapes repository root: ${JSON.stringify(userPath)}`);
         }
     }
@@ -309,9 +294,13 @@ If the user message includes a Team line, use that exact team name in the summar
         var _a, _b, _c, _d;
         const includeRaw = (_b = (_a = pathFilter === null || pathFilter === void 0 ? void 0 : pathFilter.includeFolders) === null || _a === void 0 ? void 0 : _a.filter((p) => p.trim().length > 0)) !== null && _b !== void 0 ? _b : [];
         const excludeRaw = (_d = (_c = pathFilter === null || pathFilter === void 0 ? void 0 : pathFilter.excludeFolders) === null || _c === void 0 ? void 0 : _c.filter((p) => p.trim().length > 0)) !== null && _d !== void 0 ? _d : [];
-        const includes = includeRaw.map(normalizeRepoRelativePath).filter((p) => p !== '.' && p !== '');
-        const excludes = excludeRaw.map(normalizeRepoRelativePath).filter((p) => p !== '.' && p !== '');
-        const toValidate = includes.length > 0 ? includes : ['.'];
+        const includes = includeRaw
+            .map(normalizeRepoRelativePath)
+            .filter((p) => p !== "." && p !== "");
+        const excludes = excludeRaw
+            .map(normalizeRepoRelativePath)
+            .filter((p) => p !== "." && p !== "");
+        const toValidate = includes.length > 0 ? includes : ["."];
         for (const inc of toValidate) {
             assertPathUnderRepo(repoRoot, inc);
         }
@@ -320,7 +309,7 @@ If the user message includes a Team line, use that exact team name in the summar
         }
         const specs = [];
         if (includes.length === 0) {
-            specs.push('.');
+            specs.push(".");
         }
         else {
             for (const inc of includes) {
@@ -332,100 +321,73 @@ If the user message includes a Team line, use that exact team name in the summar
         }
         return specs;
     }
-    function getDiffPathContext(git, pathFilter, repoRootOverride) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const repoRoot = repoRootOverride !== null && repoRootOverride !== void 0 ? repoRootOverride : (yield getRepoRoot(git));
-            const specs = buildDiffPathspecs(repoRoot, pathFilter);
-            return { repoRoot, specs };
-        });
-    }
-    function getDiff(git, from, to, commits, filterByCommits, pathFilter, repoRootOverride) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const { specs } = yield getDiffPathContext(git, pathFilter, repoRootOverride);
-            if (!filterByCommits) {
-                return git.diff([`${from}..${to}`, '--', ...specs]);
-            }
-            const patches = yield Promise.all(commits.map((c) => git.diff([`${c.hash}^!`, '--', ...specs])));
-            return patches.filter(Boolean).join('\n');
-        });
+
+    function compileRegex(pattern, label) {
+        try {
+            return new RegExp(pattern, "i");
+        }
+        catch (_a) {
+            throw new Error(`Invalid ${label} regular expression: ${JSON.stringify(pattern)}`);
+        }
     }
-    function getDiffSummary(git, from, to, commits, filterByCommits, pathFilter, repoRootOverride) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const { specs } = yield getDiffPathContext(git, pathFilter, repoRootOverride);
-            if (!filterByCommits) {
-                const [numOutput, nameOutput] = yield Promise.all([
-                    git.diff(['--numstat', `${from}..${to}`, '--', ...specs]),
-                    git.diff(['--name-status', `${from}..${to}`, '--', ...specs]),
-                ]);
-                return buildDiffSummaryFromGitOutputs(nameOutput, numOutput);
-            }
-            const pairs = yield Promise.all(commits.map((c) => __awaiter(this, void 0, void 0, function* () {
-                const range = `${c.hash}^!`;
-                const [numOutput, nameOutput] = yield Promise.all([
-                    git.diff(['--numstat', range, '--', ...specs]),
-                    git.diff(['--name-status', range, '--', ...specs]),
-                ]);
-                return { numOutput, nameOutput };
-            })));
-            const nameJoined = pairs
-                .map((p) => p.nameOutput)
-                .filter(Boolean)
-                .join('\n');
-            const numJoined = pairs
-                .map((p) => p.numOutput)
-                .filter(Boolean)
-                .join('\n');
-            return buildDiffSummaryFromGitOutputs(nameJoined, numJoined);
-        });
+    function commitMessagePassesFilters(message, includeRes, excludeRes) {
+        for (const ex of excludeRes) {
+            if (ex.test(message))
+                return false;
+        }
+        if (includeRes.length > 0 && !includeRes.some((r) => r.test(message)))
+            return false;
+        return true;
     }
-    function getChangedFiles(git, from, to, commits, filterByCommits, pathFilter, repoRootOverride) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const { specs } = yield getDiffPathContext(git, pathFilter, repoRootOverride);
-            if (!filterByCommits) {
-                const output = yield git.diff(['--name-only', `${from}..${to}`, '--', ...specs]);
-                return output
-                    .split(/\r?\n/)
-                    .map((f) => f.trim())
-                    .filter(Boolean);
-            }
-            const fileSet = new Set();
-            yield Promise.all(commits.map((c) => __awaiter(this, void 0, void 0, function* () {
-                const output = yield git.show(['--name-only', '--pretty=format:', c.hash, '--', ...specs]);
-                output
-                    .split(/\r?\n/)
-                    .map((f) => f.trim())
-                    .filter(Boolean)
-                    .forEach((f) => fileSet.add(f));
-            })));
-            return Array.from(fileSet);
-        });
+    function filterCommitsByMessageRegexes(commits, includePatterns, excludePatterns) {
+        const includes = (includePatterns !== null && includePatterns !== void 0 ? includePatterns : [])
+            .map((p) => p.trim())
+            .filter((p) => p.length > 0);
+        const excludes = (excludePatterns !== null && excludePatterns !== void 0 ? excludePatterns : [])
+            .map((p) => p.trim())
+            .filter((p) => p.length > 0);
+        const includeRes = includes.map((p, i) => compileRegex(p, `commit message include pattern[${i}]`));
+        const excludeRes = excludes.map((p, i) => compileRegex(p, `commit message exclude pattern[${i}]`));
+        return commits.filter((c) => commitMessagePassesFilters(c.message, includeRes, excludeRes));
     }
+
     const GIT_STATUS_BY_FIRST_CHAR = {
-        A: 'added',
-        D: 'deleted',
-        R: 'renamed',
-        C: 'copied',
-        T: 'type-changed',
-        M: 'modified',
+        A: "added",
+        D: "deleted",
+        R: "renamed",
+        C: "copied",
+        T: "type-changed",
+        M: "modified",
     };
     function mapGitStatus(statusCode) {
         var _a;
-        return (_a = GIT_STATUS_BY_FIRST_CHAR[statusCode.charAt(0)]) !== null && _a !== void 0 ? _a : 'unknown';
+        return (_a = GIT_STATUS_BY_FIRST_CHAR[statusCode.charAt(0)]) !== null && _a !== void 0 ? _a : "unknown";
     }
     function mergeStatus(existing, next) {
         if (existing === next)
             return existing;
-        const precedence = ['deleted', 'added', 'renamed', 'copied', 'type-changed', 'modified', 'unknown'];
-        return precedence.indexOf(existing) <= precedence.indexOf(next) ? existing : next;
+        const precedence = [
+            "deleted",
+            "added",
+            "renamed",
+            "copied",
+            "type-changed",
+            "modified",
+            "unknown",
+        ];
+        return precedence.indexOf(existing) <= precedence.indexOf(next)
+            ? existing
+            : next;
     }
+
     function parseNameStatusLine(line) {
         var _a;
-        const parts = line.split('\t');
+        const parts = line.split("\t");
         let entry = null;
         if (parts.length >= 2) {
-            const statusToken = (_a = parts[0]) !== null && _a !== void 0 ? _a : '';
+            const statusToken = (_a = parts[0]) !== null && _a !== void 0 ? _a : "";
             const status = mapGitStatus(statusToken);
-            const isRenameOrCopy = statusToken.startsWith('R') || statusToken.startsWith('C');
+            const isRenameOrCopy = statusToken.startsWith("R") || statusToken.startsWith("C");
             if (isRenameOrCopy && parts.length >= 3) {
                 const oldPath = parts[1];
                 const newPath = parts[2];
@@ -471,6 +433,7 @@ If the user message includes a Team line, use that exact team name in the summar
         }
         return byPath;
     }
+
     function numStatPathToLookupKey(pathField) {
         const brace = /^(.*)\{(.+) => (.+)\}$/.exec(pathField);
         if (!brace) {
@@ -482,14 +445,14 @@ If the user message includes a Team line, use that exact team name in the summar
     }
     function parseNumStatLine(line) {
         var _a, _b;
-        const parts = line.split('\t');
+        const parts = line.split("\t");
         if (parts.length < 3)
             return null;
-        const addStr = (_a = parts[0]) !== null && _a !== void 0 ? _a : '';
-        const delStr = (_b = parts[1]) !== null && _b !== void 0 ? _b : '';
-        const pathField = parts.slice(2).join('\t');
-        const additions = addStr !== '-' ? Number.parseInt(addStr, 10) || 0 : 0;
-        const deletions = delStr !== '-' ? Number.parseInt(delStr, 10) || 0 : 0;
+        const addStr = (_a = parts[0]) !== null && _a !== void 0 ? _a : "";
+        const delStr = (_b = parts[1]) !== null && _b !== void 0 ? _b : "";
+        const pathField = parts.slice(2).join("\t");
+        const additions = addStr !== "-" ? Number.parseInt(addStr, 10) || 0 : 0;
+        const deletions = delStr !== "-" ? Number.parseInt(delStr, 10) || 0 : 0;
         const key = numStatPathToLookupKey(pathField);
         return { key, additions, deletions };
     }
@@ -503,56 +466,35 @@ If the user message includes a Team line, use that exact team name in the summar
             if (!parsed)
                 continue;
             const prev = (_a = into.get(parsed.key)) !== null && _a !== void 0 ? _a : { additions: 0, deletions: 0 };
-            into.set(parsed.key, { additions: prev.additions + parsed.additions, deletions: prev.deletions + parsed.deletions });
-        }
-    }
-    const STATUS_TO_SYNTHETIC_PREFIX = {
-        added: 'A',
-        deleted: 'D',
-        renamed: 'R100',
-        copied: 'C100',
-        'type-changed': 'T',
-        modified: 'M',
-        unknown: 'X',
-    };
-    function diffStatusToSyntheticPrefix(status) {
-        return STATUS_TO_SYNTHETIC_PREFIX[status];
-    }
-    function buildSyntheticDiffLine(meta, counts) {
-        const prefix = diffStatusToSyntheticPrefix(meta.status);
-        if (meta.oldPath) {
-            return `${prefix}\t${counts.additions}\t${counts.deletions}\t${meta.oldPath}\t${meta.path}`;
-        }
-        return `${prefix}\t${counts.additions}\t${counts.deletions}\t${meta.path}`;
-    }
-    function buildDiffSummaryFromGitOutputs(nameStatusOutput, numStatOutput) {
-        var _a;
-        const numMap = new Map();
-        accumulateNumStat(numStatOutput, numMap);
-        const mergedName = mergeNameEntriesByPath(parseNameStatusLines(nameStatusOutput));
-        const syntheticLines = [];
-        for (const [path, meta] of mergedName) {
-            const counts = (_a = numMap.get(path)) !== null && _a !== void 0 ? _a : { additions: 0, deletions: 0 };
-            syntheticLines.push(buildSyntheticDiffLine(meta, counts));
+            into.set(parsed.key, {
+                additions: prev.additions + parsed.additions,
+                deletions: prev.deletions + parsed.deletions,
+            });
         }
-        return parseDiffSummary(syntheticLines.join('\n'));
     }
+
     function parseTabDiffSummaryLine(line) {
         var _a;
-        const parts = line.split('\t');
+        const parts = line.split("\t");
         if (parts.length < 3)
             return null;
-        const statusToken = (_a = parts.shift()) !== null && _a !== void 0 ? _a : '';
+        const statusToken = (_a = parts.shift()) !== null && _a !== void 0 ? _a : "";
         const status = mapGitStatus(statusToken);
         const add0 = parts[0];
         const del0 = parts[1];
-        const additions = add0 && add0 !== '-' ? Number.parseInt(add0, 10) || 0 : 0;
-        const deletions = del0 && del0 !== '-' ? Number.parseInt(del0, 10) || 0 : 0;
+        const additions = add0 && add0 !== "-" ? Number.parseInt(add0, 10) || 0 : 0;
+        const deletions = del0 && del0 !== "-" ? Number.parseInt(del0, 10) || 0 : 0;
         if (parts.length === 3) {
             return { status, additions, deletions, newPath: parts[2] };
         }
         if (parts.length === 4) {
-            return { status, additions, deletions, oldPath: parts[2], newPath: parts[3] };
+            return {
+                status,
+                additions,
+                deletions,
+                oldPath: parts[2],
+                newPath: parts[3],
+            };
         }
         return null;
     }
@@ -598,11 +540,142 @@ If the user message includes a Team line, use that exact team name in the summar
         };
     }
 
+    const STATUS_TO_SYNTHETIC_PREFIX = {
+        added: "A",
+        deleted: "D",
+        renamed: "R100",
+        copied: "C100",
+        "type-changed": "T",
+        modified: "M",
+        unknown: "X",
+    };
+    function diffStatusToSyntheticPrefix(status) {
+        return STATUS_TO_SYNTHETIC_PREFIX[status];
+    }
+    function buildSyntheticDiffLine(meta, counts) {
+        const prefix = diffStatusToSyntheticPrefix(meta.status);
+        if (meta.oldPath) {
+            return `${prefix}\t${counts.additions}\t${counts.deletions}\t${meta.oldPath}\t${meta.path}`;
+        }
+        return `${prefix}\t${counts.additions}\t${counts.deletions}\t${meta.path}`;
+    }
+    function buildDiffSummaryFromGitOutputs(nameStatusOutput, numStatOutput) {
+        var _a;
+        const numMap = new Map();
+        accumulateNumStat(numStatOutput, numMap);
+        const mergedName = mergeNameEntriesByPath(parseNameStatusLines(nameStatusOutput));
+        const syntheticLines = [];
+        for (const [path, meta] of mergedName) {
+            const counts = (_a = numMap.get(path)) !== null && _a !== void 0 ? _a : { additions: 0, deletions: 0 };
+            syntheticLines.push(buildSyntheticDiffLine(meta, counts));
+        }
+        return parseDiffSummary(syntheticLines.join("\n"));
+    }
+
+    function createGitClient(cwd = process.cwd()) {
+        return simpleGit.simpleGit(cwd);
+    }
+    function getCommits(git, from, to) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const logResult = yield git.log({ from, to });
+            return logResult.all;
+        });
+    }
+    function getRepoRoot(git) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const root = yield git.revparse(["--show-toplevel"]);
+            return root.trim();
+        });
+    }
+    function getDiffPathContext(git, pathFilter, repoRootOverride) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const repoRoot = repoRootOverride !== null && repoRootOverride !== void 0 ? repoRootOverride : (yield getRepoRoot(git));
+            const specs = buildDiffPathspecs(repoRoot, pathFilter);
+            return { repoRoot, specs };
+        });
+    }
+    function getDiff(git, query) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const { from, to, commits, filterByCommits, pathFilter, repoRootOverride } = query;
+            const { specs } = yield getDiffPathContext(git, pathFilter, repoRootOverride);
+            if (!filterByCommits) {
+                return git.diff([`${from}..${to}`, "--", ...specs]);
+            }
+            const patches = yield Promise.all(commits.map((c) => git.diff([`${c.hash}^!`, "--", ...specs])));
+            return patches.filter(Boolean).join("\n");
+        });
+    }
+    function getDiffSummary(git, query) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const { from, to, commits, filterByCommits, pathFilter, repoRootOverride } = query;
+            const { specs } = yield getDiffPathContext(git, pathFilter, repoRootOverride);
+            if (!filterByCommits) {
+                const [numOutput, nameOutput] = yield Promise.all([
+                    git.diff(["--numstat", `${from}..${to}`, "--", ...specs]),
+                    git.diff(["--name-status", `${from}..${to}`, "--", ...specs]),
+                ]);
+                return buildDiffSummaryFromGitOutputs(nameOutput, numOutput);
+            }
+            const pairs = yield Promise.all(commits.map((c) => __awaiter(this, void 0, void 0, function* () {
+                const range = `${c.hash}^!`;
+                const [numOutput, nameOutput] = yield Promise.all([
+                    git.diff(["--numstat", range, "--", ...specs]),
+                    git.diff(["--name-status", range, "--", ...specs]),
+                ]);
+                return { numOutput, nameOutput };
+            })));
+            const nameJoined = pairs
+                .map((p) => p.nameOutput)
+                .filter(Boolean)
+                .join("\n");
+            const numJoined = pairs
+                .map((p) => p.numOutput)
+                .filter(Boolean)
+                .join("\n");
+            return buildDiffSummaryFromGitOutputs(nameJoined, numJoined);
+        });
+    }
+    function getChangedFiles(git, query) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const { from, to, commits, filterByCommits, pathFilter, repoRootOverride } = query;
+            const { specs } = yield getDiffPathContext(git, pathFilter, repoRootOverride);
+            if (!filterByCommits) {
+                const output = yield git.diff([
+                    "--name-only",
+                    `${from}..${to}`,
+                    "--",
+                    ...specs,
+                ]);
+                return output
+                    .split(/\r?\n/)
+                    .map((f) => f.trim())
+                    .filter(Boolean);
+            }
+            const fileSet = new Set();
+            yield Promise.all(commits.map((c) => __awaiter(this, void 0, void 0, function* () {
+                const output = yield git.show([
+                    "--name-only",
+                    "--pretty=format:",
+                    c.hash,
+                    "--",
+                    ...specs,
+                ]);
+                output
+                    .split(/\r?\n/)
+                    .map((f) => f.trim())
+                    .filter(Boolean)
+                    .forEach((f) => fileSet.add(f));
+            })));
+            return Array.from(fileSet);
+        });
+    }
+
     function hasNonEmptyTrimmed(arr) {
         return (arr !== null && arr !== void 0 ? arr : []).some((s) => s.trim().length > 0);
     }
     function shouldFilterByCommits(allCommits, filtered, opts) {
-        if (hasNonEmptyTrimmed(opts.commitMessageIncludeRegexes) || hasNonEmptyTrimmed(opts.commitMessageExcludeRegexes)) {
+        if (hasNonEmptyTrimmed(opts.commitMessageIncludeRegexes) ||
+            hasNonEmptyTrimmed(opts.commitMessageExcludeRegexes)) {
             return true;
         }
         return filtered.length !== allCommits.length;
@@ -612,8 +685,9 @@ If the user message includes a Team line, use that exact team name in the summar
             var _a, _b;
             const git = (_a = options.git) !== null && _a !== void 0 ? _a : createGitClient(options.cwd);
             const from = options.from;
-            const to = (_b = options.to) !== null && _b !== void 0 ? _b : 'HEAD';
-            const pathFilter = hasNonEmptyTrimmed(options.includeFolders) || hasNonEmptyTrimmed(options.excludeFolders)
+            const to = (_b = options.to) !== null && _b !== void 0 ? _b : "HEAD";
+            const pathFilter = hasNonEmptyTrimmed(options.includeFolders) ||
+                hasNonEmptyTrimmed(options.excludeFolders)
                 ? {
                     includeFolders: options.includeFolders,
                     excludeFolders: options.excludeFolders,
@@ -622,10 +696,17 @@ If the user message includes a Team line, use that exact team name in the summar
             const allCommits = yield getCommits(git, from, to);
             const filteredCommits = filterCommitsByMessageRegexes(allCommits, options.commitMessageIncludeRegexes, options.commitMessageExcludeRegexes);
             const filterByCommits = shouldFilterByCommits(allCommits, filteredCommits, options);
+            const rangeQuery = {
+                from,
+                to,
+                commits: filteredCommits,
+                filterByCommits,
+                pathFilter,
+            };
             const [diffText, fileNames, diffSummary] = yield Promise.all([
-                getDiff(git, from, to, filteredCommits, filterByCommits, pathFilter),
-                getChangedFiles(git, from, to, filteredCommits, filterByCommits, pathFilter),
-                getDiffSummary(git, from, to, filteredCommits, filterByCommits, pathFilter),
+                getDiff(git, rangeQuery),
+                getChangedFiles(git, rangeQuery),
+                getDiffSummary(git, rangeQuery),
             ]);
             const summarizeFlags = {
                 from,
@@ -637,7 +718,14 @@ If the user message includes a Team line, use that exact team name in the summar
                 commitMessageIncludeRegexes: options.commitMessageIncludeRegexes,
                 commitMessageExcludeRegexes: options.commitMessageExcludeRegexes,
             };
-            return generateSummary(diffText, fileNames, filteredCommits, summarizeFlags, options.openAiClientProvider, diffSummary);
+            return generateSummary({
+                diffText,
+                fileNames,
+                commits: filteredCommits,
+                flags: summarizeFlags,
+                openAiClientProvider: options.openAiClientProvider,
+                diffSummary,
+            });
         });
     }