git-coco 0.12.0 → 0.13.0

package/dist/index.d.ts

@@ -4,8 +4,8 @@ import { OllamaInput } from '@langchain/community/llms/ollama';
 import { BaseLLMParams } from '@langchain/core/language_models/llms';
 import * as _langchain_openai from '@langchain/openai';
 import { TiktokenModel, OpenAIInput, ChatOpenAI } from '@langchain/openai';
-import { ChatOllama } from '@langchain/ollama';
 import { SimpleGit } from 'simple-git';
+import { ChatOllama } from '@langchain/ollama';
 import { Color } from 'chalk';
 import { TiktokenModel as TiktokenModel$1 } from 'tiktoken';
 
@@ -285,7 +285,7 @@ interface BaseParserInput {
 }
 interface FileChangeParserInput extends BaseParserInput {
     changes: FileChange[];
-    commit: '--staged' | string;
+    commit: '--staged' | '--unstaged' | '--untracked' | string;
 }
 interface CommitLogParserInput extends BaseParserInput {
     range: {

package/dist/index.esm.mjs

@@ -2608,100 +2608,6 @@ async function summarizeDiffs(rootDiffNode, { tokenizer, logger, maxTokens = 204
     return directoryDiffs.map(handleOutput).join('');
 }
 
-class DiffTreeNode {
-    constructor(path) {
-        this.path = [];
-        this.files = [];
-        this.children = new Map();
-        if (path)
-            this.path = path;
-    }
-    addFile(file) {
-        this.files.push(file);
-    }
-    addChild(part, node) {
-        this.children.set(part, node);
-    }
-    getChild(part) {
-        return this.children.get(part);
-    }
-    getPath() {
-        return this.path.join('/');
-    }
-    print(indentation = 0) {
-        const indent = ' '.repeat(indentation);
-        let output = `${indent}- Path: ${this.getPath()}\n`;
-        if (this.files.length > 0) {
-            output += `${indent}  Files:\n`;
-            for (const file of this.files) {
-                output += `${indent}    - ${file.summary}\n`;
-            }
-        }
-        if (this.children.size > 0) {
-            output += `${indent}  Children:\n`;
-            for (const [, child] of this.children) {
-                output += child.print(indentation + 4);
-            }
-        }
-        return output;
-    }
-}
-const createDiffTree = (changes) => {
-    const root = new DiffTreeNode();
-    for (const change of changes) {
-        let currentParent = root;
-        const parts = change.filePath.split('/');
-        parts.pop();
-        for (const part of parts) {
-            let childNode = currentParent.getChild(part);
-            if (!childNode) {
-                childNode = new DiffTreeNode([...currentParent.path, part]);
-                currentParent.addChild(part, childNode);
-            }
-            currentParent = childNode;
-        }
-        // Create a NodeFile object and add it to the parent
-        currentParent.addFile({
-            filePath: change.filePath,
-            oldFilePath: change.oldFilePath,
-            summary: change.summary,
-            status: change.status,
-        });
-    }
-    return root;
-};
-
-/**
- * Asynchronously collect diffs for a given node and its children.
- */
-async function collectDiffs(node, getFileDiff, tokenizer, logger) {
-    // Collect diffs for the files of the current node
-    const diffPromises = node.files.map(async (nodeFile) => {
-        const diff = await getFileDiff(nodeFile);
-        const tokenCount = tokenizer(diff);
-        logger.verbose(`Collected diff for ${nodeFile.filePath} (${tokenCount} tokens)`, {
-            color: 'magenta',
-        });
-        return {
-            file: nodeFile.filePath,
-            summary: nodeFile.summary,
-            diff,
-            tokenCount,
-        };
-    });
-    // Collect diffs for the children of the current node
-    const childrenPromises = Array.from(node.children.values()).map(async (child) => collectDiffs(child, getFileDiff, tokenizer, logger));
-    const [diffs, children] = await Promise.all([
-        Promise.all(diffPromises),
-        Promise.all(childrenPromises),
-    ]);
-    return {
-        path: node.getPath(),
-        diffs,
-        children,
-    };
-}
-
 /**
  * Base interface that all chains must implement.
  */
@@ -5950,6 +5856,100 @@ function getTextSplitter(options = {}) {
     return new RecursiveCharacterTextSplitter(options);
 }
 
+/**
+ * Asynchronously collect diffs for a given node and its children.
+ */
+async function collectDiffs(node, getFileDiff, tokenizer, logger) {
+    // Collect diffs for the files of the current node
+    const diffPromises = node.files.map(async (nodeFile) => {
+        const diff = await getFileDiff(nodeFile);
+        const tokenCount = tokenizer(diff);
+        logger.verbose(`Collected diff for ${nodeFile.filePath} (${tokenCount} tokens)`, {
+            color: 'magenta',
+        });
+        return {
+            file: nodeFile.filePath,
+            summary: nodeFile.summary,
+            diff,
+            tokenCount,
+        };
+    });
+    // Collect diffs for the children of the current node
+    const childrenPromises = Array.from(node.children.values()).map(async (child) => collectDiffs(child, getFileDiff, tokenizer, logger));
+    const [diffs, children] = await Promise.all([
+        Promise.all(diffPromises),
+        Promise.all(childrenPromises),
+    ]);
+    return {
+        path: node.getPath(),
+        diffs,
+        children,
+    };
+}
+
+class DiffTreeNode {
+    constructor(path) {
+        this.path = [];
+        this.files = [];
+        this.children = new Map();
+        if (path)
+            this.path = path;
+    }
+    addFile(file) {
+        this.files.push(file);
+    }
+    addChild(part, node) {
+        this.children.set(part, node);
+    }
+    getChild(part) {
+        return this.children.get(part);
+    }
+    getPath() {
+        return this.path.join('/');
+    }
+    print(indentation = 0) {
+        const indent = ' '.repeat(indentation);
+        let output = `${indent}- Path: ${this.getPath()}\n`;
+        if (this.files.length > 0) {
+            output += `${indent}  Files:\n`;
+            for (const file of this.files) {
+                output += `${indent}    - ${file.summary}\n`;
+            }
+        }
+        if (this.children.size > 0) {
+            output += `${indent}  Children:\n`;
+            for (const [, child] of this.children) {
+                output += child.print(indentation + 4);
+            }
+        }
+        return output;
+    }
+}
+const createDiffTree = (changes) => {
+    const root = new DiffTreeNode();
+    for (const change of changes) {
+        let currentParent = root;
+        const parts = change.filePath.split('/');
+        parts.pop();
+        for (const part of parts) {
+            let childNode = currentParent.getChild(part);
+            if (!childNode) {
+                childNode = new DiffTreeNode([...currentParent.path, part]);
+                currentParent.addChild(part, childNode);
+            }
+            currentParent = childNode;
+        }
+        // Create a NodeFile object and add it to the parent
+        currentParent.addFile({
+            filePath: change.filePath,
+            oldFilePath: change.oldFilePath,
+            summary: change.summary,
+            status: change.status,
+        });
+    }
+    return root;
+};
+
 /**
  * Parses the default file diff for a given nodeFile.
  *
@@ -5959,8 +5959,15 @@ function getTextSplitter(options = {}) {
  * @returns A Promise that resolves to the file diff as a string.
  */
 async function parseDefaultFileDiff(nodeFile, commit = '--staged', git) {
-    if (commit !== '--staged') {
-        return await git.diff([`${commit}~1..${commit}`, '--', nodeFile.filePath]);
+    if (commit === '--staged') {
+        return await git.diff(['--staged', nodeFile.filePath]);
+    }
+    else if (commit === '--unstaged') {
+        return await git.diff([nodeFile.filePath]);
+    }
+    else if (commit === '--untracked') {
+        // For untracked files, return the entire file content
+        return await git.show([`:${nodeFile.filePath}`]);
     }
     return await git.diff([commit, nodeFile.filePath]);
 }
@@ -6041,10 +6048,6 @@ async function getDiff(nodeFile, commit, { git, logger, }) {
 const MAX_TOKENS_PER_SUMMARY = 12288;
 async function fileChangeParser({ changes, commit, options: { tokenizer, git, llm: model, logger }, }) {
     const textSplitter = getTextSplitter({ chunkSize: 10000, chunkOverlap: 250 });
-    // const textSplitter = new TokenTextSplitter({
-    //   chunkSize: 10000,
-    //   chunkOverlap: 250,
-    // });
     const summarizationChain = getSummarizationChain(model, {
         type: 'map_reduce',
         combineMapPrompt: SUMMARIZE_PROMPT,
@@ -6326,7 +6329,10 @@ const handler$2 = async (argv, logger) => {
                 parser,
             });
             const appendedText = argv.append ? `\n\n${argv.append}` : '';
-            return `${commitMsg.title}\n\n${commitMsg.body}${appendedText}`;
+            const branchName = await getCurrentBranchName({ git });
+            const ticketId = extractTicketIdFromBranchName(branchName);
+            const ticketFooter = argv.appendTicket && ticketId ? `\n\nPart of **${ticketId}**` : '';
+            return `${commitMsg.title}\n\n${commitMsg.body}${appendedText}${ticketFooter}`;
         },
         noResult: async () => {
             await noResult$1({ git, logger });
@@ -6365,6 +6371,10 @@ const options$2 = {
         description: 'Add content to the end of the generated commit message',
         type: 'string',
     },
+    appendTicket: {
+        description: 'Append ticket ID from branch name to the commit message',
+        type: 'boolean',
+    },
     additional: {
         description: 'Add extra contextual information to the prompt',
         type: 'string',
@@ -6887,13 +6897,25 @@ const handler = async (argv, logger) => {
             case 'current':
                 const { staged, unstaged, untracked } = await getChanges({ git });
                 logger.log(`Staged: ${staged.length}, Unstaged: ${unstaged?.length || 0}, Untracked: ${untracked?.length || 0}`);
-                const result = await fileChangeParser({
-                    changes: [...staged, ...(unstaged ? unstaged : []), ...(untracked ? untracked : [])],
-                    commit: 'HEAD',
+                const unstagedChanges = await fileChangeParser({
+                    changes: unstaged || [],
+                    commit: '--unstaged',
+                    options: { tokenizer, git, llm, logger },
+                });
+                const unstagedResponse = `Unstaged changes:\n${unstagedChanges}`;
+                const untrackedChanges = await fileChangeParser({
+                    changes: untracked || [],
+                    commit: '--untracked',
+                    options: { tokenizer, git, llm, logger },
+                });
+                const untrackedResponse = `Untracked changes:\n${untrackedChanges}`;
+                const stagedChanges = await fileChangeParser({
+                    changes: staged,
+                    commit: '--staged',
                     options: { tokenizer, git, llm, logger },
                 });
-                logger.log(`Parsed Result: ${result}`);
-                return [result];
+                const stagedResponse = `Staged changes:\n${stagedChanges}`;
+                return [unstagedResponse, untrackedResponse, stagedResponse];
             case 'yesterday':
                 const yesterday = new Date();
                 yesterday.setDate(yesterday.getDate() - 1);
@@ -6915,7 +6937,6 @@ const handler = async (argv, logger) => {
         }
     }
     async function parser(changes) {
-        console.log({ changes });
         return changes.join('\n');
     }
     const recap = await generateAndReviewLoop({

package/dist/index.js

@@ -2629,100 +2629,6 @@ async function summarizeDiffs(rootDiffNode, { tokenizer, logger, maxTokens = 204
     return directoryDiffs.map(handleOutput).join('');
 }
 
-class DiffTreeNode {
-    constructor(path) {
-        this.path = [];
-        this.files = [];
-        this.children = new Map();
-        if (path)
-            this.path = path;
-    }
-    addFile(file) {
-        this.files.push(file);
-    }
-    addChild(part, node) {
-        this.children.set(part, node);
-    }
-    getChild(part) {
-        return this.children.get(part);
-    }
-    getPath() {
-        return this.path.join('/');
-    }
-    print(indentation = 0) {
-        const indent = ' '.repeat(indentation);
-        let output = `${indent}- Path: ${this.getPath()}\n`;
-        if (this.files.length > 0) {
-            output += `${indent}  Files:\n`;
-            for (const file of this.files) {
-                output += `${indent}    - ${file.summary}\n`;
-            }
-        }
-        if (this.children.size > 0) {
-            output += `${indent}  Children:\n`;
-            for (const [, child] of this.children) {
-                output += child.print(indentation + 4);
-            }
-        }
-        return output;
-    }
-}
-const createDiffTree = (changes) => {
-    const root = new DiffTreeNode();
-    for (const change of changes) {
-        let currentParent = root;
-        const parts = change.filePath.split('/');
-        parts.pop();
-        for (const part of parts) {
-            let childNode = currentParent.getChild(part);
-            if (!childNode) {
-                childNode = new DiffTreeNode([...currentParent.path, part]);
-                currentParent.addChild(part, childNode);
-            }
-            currentParent = childNode;
-        }
-        // Create a NodeFile object and add it to the parent
-        currentParent.addFile({
-            filePath: change.filePath,
-            oldFilePath: change.oldFilePath,
-            summary: change.summary,
-            status: change.status,
-        });
-    }
-    return root;
-};
-
-/**
- * Asynchronously collect diffs for a given node and its children.
- */
-async function collectDiffs(node, getFileDiff, tokenizer, logger) {
-    // Collect diffs for the files of the current node
-    const diffPromises = node.files.map(async (nodeFile) => {
-        const diff = await getFileDiff(nodeFile);
-        const tokenCount = tokenizer(diff);
-        logger.verbose(`Collected diff for ${nodeFile.filePath} (${tokenCount} tokens)`, {
-            color: 'magenta',
-        });
-        return {
-            file: nodeFile.filePath,
-            summary: nodeFile.summary,
-            diff,
-            tokenCount,
-        };
-    });
-    // Collect diffs for the children of the current node
-    const childrenPromises = Array.from(node.children.values()).map(async (child) => collectDiffs(child, getFileDiff, tokenizer, logger));
-    const [diffs, children] = await Promise.all([
-        Promise.all(diffPromises),
-        Promise.all(childrenPromises),
-    ]);
-    return {
-        path: node.getPath(),
-        diffs,
-        children,
-    };
-}
-
 /**
  * Base interface that all chains must implement.
  */
@@ -5971,6 +5877,100 @@ function getTextSplitter(options = {}) {
     return new RecursiveCharacterTextSplitter(options);
 }
 
+/**
+ * Asynchronously collect diffs for a given node and its children.
+ */
+async function collectDiffs(node, getFileDiff, tokenizer, logger) {
+    // Collect diffs for the files of the current node
+    const diffPromises = node.files.map(async (nodeFile) => {
+        const diff = await getFileDiff(nodeFile);
+        const tokenCount = tokenizer(diff);
+        logger.verbose(`Collected diff for ${nodeFile.filePath} (${tokenCount} tokens)`, {
+            color: 'magenta',
+        });
+        return {
+            file: nodeFile.filePath,
+            summary: nodeFile.summary,
+            diff,
+            tokenCount,
+        };
+    });
+    // Collect diffs for the children of the current node
+    const childrenPromises = Array.from(node.children.values()).map(async (child) => collectDiffs(child, getFileDiff, tokenizer, logger));
+    const [diffs, children] = await Promise.all([
+        Promise.all(diffPromises),
+        Promise.all(childrenPromises),
+    ]);
+    return {
+        path: node.getPath(),
+        diffs,
+        children,
+    };
+}
+
+class DiffTreeNode {
+    constructor(path) {
+        this.path = [];
+        this.files = [];
+        this.children = new Map();
+        if (path)
+            this.path = path;
+    }
+    addFile(file) {
+        this.files.push(file);
+    }
+    addChild(part, node) {
+        this.children.set(part, node);
+    }
+    getChild(part) {
+        return this.children.get(part);
+    }
+    getPath() {
+        return this.path.join('/');
+    }
+    print(indentation = 0) {
+        const indent = ' '.repeat(indentation);
+        let output = `${indent}- Path: ${this.getPath()}\n`;
+        if (this.files.length > 0) {
+            output += `${indent}  Files:\n`;
+            for (const file of this.files) {
+                output += `${indent}    - ${file.summary}\n`;
+            }
+        }
+        if (this.children.size > 0) {
+            output += `${indent}  Children:\n`;
+            for (const [, child] of this.children) {
+                output += child.print(indentation + 4);
+            }
+        }
+        return output;
+    }
+}
+const createDiffTree = (changes) => {
+    const root = new DiffTreeNode();
+    for (const change of changes) {
+        let currentParent = root;
+        const parts = change.filePath.split('/');
+        parts.pop();
+        for (const part of parts) {
+            let childNode = currentParent.getChild(part);
+            if (!childNode) {
+                childNode = new DiffTreeNode([...currentParent.path, part]);
+                currentParent.addChild(part, childNode);
+            }
+            currentParent = childNode;
+        }
+        // Create a NodeFile object and add it to the parent
+        currentParent.addFile({
+            filePath: change.filePath,
+            oldFilePath: change.oldFilePath,
+            summary: change.summary,
+            status: change.status,
+        });
+    }
+    return root;
+};
+
 /**
  * Parses the default file diff for a given nodeFile.
  *
@@ -5980,8 +5980,15 @@ function getTextSplitter(options = {}) {
  * @returns A Promise that resolves to the file diff as a string.
  */
 async function parseDefaultFileDiff(nodeFile, commit = '--staged', git) {
-    if (commit !== '--staged') {
-        return await git.diff([`${commit}~1..${commit}`, '--', nodeFile.filePath]);
+    if (commit === '--staged') {
+        return await git.diff(['--staged', nodeFile.filePath]);
+    }
+    else if (commit === '--unstaged') {
+        return await git.diff([nodeFile.filePath]);
+    }
+    else if (commit === '--untracked') {
+        // For untracked files, return the entire file content
+        return await git.show([`:${nodeFile.filePath}`]);
     }
     return await git.diff([commit, nodeFile.filePath]);
 }
@@ -6062,10 +6069,6 @@ async function getDiff(nodeFile, commit, { git, logger, }) {
 const MAX_TOKENS_PER_SUMMARY = 12288;
 async function fileChangeParser({ changes, commit, options: { tokenizer, git, llm: model, logger }, }) {
     const textSplitter = getTextSplitter({ chunkSize: 10000, chunkOverlap: 250 });
-    // const textSplitter = new TokenTextSplitter({
-    //   chunkSize: 10000,
-    //   chunkOverlap: 250,
-    // });
     const summarizationChain = getSummarizationChain(model, {
         type: 'map_reduce',
         combineMapPrompt: SUMMARIZE_PROMPT,
@@ -6347,7 +6350,10 @@ const handler$2 = async (argv, logger) => {
                 parser,
             });
             const appendedText = argv.append ? `\n\n${argv.append}` : '';
-            return `${commitMsg.title}\n\n${commitMsg.body}${appendedText}`;
+            const branchName = await getCurrentBranchName({ git });
+            const ticketId = extractTicketIdFromBranchName(branchName);
+            const ticketFooter = argv.appendTicket && ticketId ? `\n\nPart of **${ticketId}**` : '';
+            return `${commitMsg.title}\n\n${commitMsg.body}${appendedText}${ticketFooter}`;
         },
         noResult: async () => {
             await noResult$1({ git, logger });
@@ -6386,6 +6392,10 @@ const options$2 = {
         description: 'Add content to the end of the generated commit message',
         type: 'string',
     },
+    appendTicket: {
+        description: 'Append ticket ID from branch name to the commit message',
+        type: 'boolean',
+    },
     additional: {
         description: 'Add extra contextual information to the prompt',
         type: 'string',
@@ -6908,13 +6918,25 @@ const handler = async (argv, logger) => {
             case 'current':
                 const { staged, unstaged, untracked } = await getChanges({ git });
                 logger.log(`Staged: ${staged.length}, Unstaged: ${unstaged?.length || 0}, Untracked: ${untracked?.length || 0}`);
-                const result = await fileChangeParser({
-                    changes: [...staged, ...(unstaged ? unstaged : []), ...(untracked ? untracked : [])],
-                    commit: 'HEAD',
+                const unstagedChanges = await fileChangeParser({
+                    changes: unstaged || [],
+                    commit: '--unstaged',
+                    options: { tokenizer, git, llm, logger },
+                });
+                const unstagedResponse = `Unstaged changes:\n${unstagedChanges}`;
+                const untrackedChanges = await fileChangeParser({
+                    changes: untracked || [],
+                    commit: '--untracked',
+                    options: { tokenizer, git, llm, logger },
+                });
+                const untrackedResponse = `Untracked changes:\n${untrackedChanges}`;
+                const stagedChanges = await fileChangeParser({
+                    changes: staged,
+                    commit: '--staged',
                     options: { tokenizer, git, llm, logger },
                 });
-                logger.log(`Parsed Result: ${result}`);
-                return [result];
+                const stagedResponse = `Staged changes:\n${stagedChanges}`;
+                return [unstagedResponse, untrackedResponse, stagedResponse];
             case 'yesterday':
                 const yesterday = new Date();
                 yesterday.setDate(yesterday.getDate() - 1);
@@ -6936,7 +6958,6 @@ const handler = async (argv, logger) => {
         }
     }
     async function parser(changes) {
-        console.log({ changes });
         return changes.join('\n');
     }
     const recap = await generateAndReviewLoop({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "git-coco",
-  "version": "0.12.0",
+  "version": "0.13.0",
   "description": "zero-effort git commits with coco.",
   "author": "gfargo <ghfargo@gmail.com>",
   "license": "MIT",