git-it-done 1.0.3 → 1.1.1

package/dist/utils/fileStaging.js

@@ -9,17 +9,25 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 import { select, multiselect, spinner, cancel, isCancel } from '@clack/prompts';
 import chalk from 'chalk';
-import { gitCommand } from './gitCommand.js';
+import { gitCommand, gitErrorText } from './gitCommand.js';
 import { getChanges } from './getFileChanges.js';
+import { getRepoRoot } from './repoRoot.js';
 import { formatFileStatus } from './formatFileStatus.js';
 export function handleFileStaging(changes) {
     return __awaiter(this, void 0, void 0, function* () {
-        let filesToCommit = changes.staged;
-        // If files are already staged, return them
-        if (changes.staged.length > 0) {
-            return filesToCommit;
+        let current = changes;
+        // Never silently adopt a pre-existing index — show it and ask.
+        if (current.staged.length > 0) {
+            const decision = yield confirmExistingIndex(current.staged);
+            if (decision === 'keep') {
+                return current.staged;
+            }
+            resetIndex();
+            current = getChanges();
+            if (current.unstaged.length === 0 && current.untracked.length === 0) {
+                return [];
+            }
         }
-        // Handle unstaged files
         const stageOption = yield select({
             message: 'No files are staged. What would you like to do?',
             options: [
@@ -33,21 +41,59 @@ export function handleFileStaging(changes) {
             process.exit(0);
         }
         if (stageOption === 'all') {
-            filesToCommit = yield stageAllFiles();
+            return yield stageAllFiles();
         }
-        else if (stageOption === 'select') {
-            filesToCommit = yield stageSelectedFiles(changes);
+        if (stageOption === 'select') {
+            return yield stageSelectedFiles(current);
+        }
+        return current.staged;
+    });
+}
+function confirmExistingIndex(staged) {
+    return __awaiter(this, void 0, void 0, function* () {
+        console.log(chalk.bold('\n📦 Already staged (from a previous session or manual `git add`):'));
+        staged.forEach(({ status, file, from }) => console.log(`  ${formatFileStatus(status)} ${from ? `${from} → ${file}` : file}`));
+        const decision = yield select({
+            message: `${staged.length} file(s) are already staged. What would you like to do?`,
+            options: [
+                { value: 'keep', label: 'Commit these staged files' },
+                { value: 'reset', label: 'Unstage everything and choose again' },
+                { value: 'cancel', label: 'Cancel' }
+            ]
+        });
+        if (isCancel(decision) || decision === 'cancel') {
+            cancel('Operation cancelled');
+            process.exit(0);
         }
-        return filesToCommit;
+        return decision;
     });
 }
+function resetIndex() {
+    const s = spinner();
+    s.start('Unstaging files...');
+    let result = gitCommand(['reset', '--quiet', '--', ':/']);
+    // An unborn branch has no HEAD to reset against; drop the paths from the index.
+    if (!result.ok) {
+        result = gitCommand(['rm', '--cached', '-r', '-f', '--quiet', '--', ':/']);
+    }
+    if (!result.ok) {
+        s.stop('❌ Failed to unstage files');
+        console.log(chalk.red(gitErrorText(result)));
+        cancel('Failed to unstage files');
+        process.exit(1);
+    }
+    s.stop('Index cleared');
+}
 function stageAllFiles() {
     return __awaiter(this, void 0, void 0, function* () {
         const s = spinner();
         s.start('Staging all files...');
-        const result = gitCommand('add .');
-        if (result === null) {
+        // `:/` makes this repo-root-relative, so the staged set matches the status
+        // display even when the tool is run from a subdirectory.
+        const result = gitCommand(['add', '-A', '--', ':/']);
+        if (!result.ok) {
             s.stop('❌ Failed to stage files');
+            console.log(chalk.red(gitErrorText(result)));
             cancel('Failed to stage files');
             process.exit(1);
         }
@@ -60,9 +106,9 @@ function stageSelectedFiles(changes) {
         const unstaged = [...changes.unstaged, ...changes.untracked];
         const selectedFiles = yield multiselect({
             message: 'Select files to stage:',
-            options: unstaged.map(({ status, file }) => ({
+            options: unstaged.map(({ status, file, from }) => ({
                 value: file,
-                label: `${formatFileStatus(status)} ${file}`
+                label: `${formatFileStatus(status)} ${from ? `${from} → ${file}` : file}`
             })),
             required: true
         });
@@ -70,18 +116,18 @@ function stageSelectedFiles(changes) {
             cancel('Operation cancelled');
             process.exit(0);
         }
+        const files = selectedFiles;
         const s = spinner();
         s.start('Staging selected files...');
-        let stagingFailed = false;
-        selectedFiles.forEach(file => {
-            const result = gitCommand(`add "${file}"`);
-            if (result === null) {
-                stagingFailed = true;
-            }
+        // Paths are repo-root-relative, so run from the repo root; `--literal-pathspecs`
+        // stops names containing `*`, `[` or a leading `:` being read as pathspec magic.
+        const repoRoot = getRepoRoot();
+        const result = gitCommand(['--literal-pathspecs', 'add', '--', ...files], {
+            cwd: repoRoot !== null && repoRoot !== void 0 ? repoRoot : undefined
         });
-        if (stagingFailed) {
+        if (!result.ok) {
             s.stop('❌ Some files failed to stage');
-            console.log(chalk.yellow('Some files may not have been staged properly.'));
+            console.log(chalk.red(gitErrorText(result)));
         }
         else {
             s.stop('Files staged');

package/dist/utils/fileStaging.js.map

@@ -1 +1 @@
-{"version":3,"file":"fileStaging.js","sourceRoot":"","sources":["../../src/utils/fileStaging.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"fileStaging.js","sourceRoot":"","sources":["../../src/utils/fileStaging.ts"],"names":[],"mappings":"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"}

package/dist/utils/formatFileStatus.js

@@ -9,6 +9,12 @@ export function formatFileStatus(status) {
             return chalk.red('- deleted');
         case 'R':
             return chalk.blue('→ renamed');
+        case 'C':
+            return chalk.blue('⧉ copied');
+        case 'T':
+            return chalk.magenta('± typechange');
+        case 'U':
+            return chalk.red('! unmerged');
         case '??':
             return chalk.cyan('? untracked');
         default:

package/dist/utils/formatFileStatus.js.map

@@ -1 +1 @@
-{"version":3,"file":"formatFileStatus.js","sourceRoot":"","sources":["../../src/utils/formatFileStatus.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,MAAM,UAAU,gBAAgB,CAAC,MAAc;IAC7C,QAAQ,MAAM,EAAE,CAAC;QACf,KAAK,GAAG;YACN,OAAO,KAAK,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;QAChC,KAAK,GAAG;YACN,OAAO,KAAK,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC;QACpC,KAAK,GAAG;YACN,OAAO,KAAK,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;QAChC,KAAK,GAAG;YACN,OAAO,KAAK,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;QACjC,KAAK,IAAI;YACP,OAAO,KAAK,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;QACnC;YACE,OAAO,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IAC9B,CAAC;AACH,CAAC"}
+{"version":3,"file":"formatFileStatus.js","sourceRoot":"","sources":["../../src/utils/formatFileStatus.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,MAAM,UAAU,gBAAgB,CAAC,MAAc;IAC7C,QAAQ,MAAM,EAAE,CAAC;QACf,KAAK,GAAG;YACN,OAAO,KAAK,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;QAChC,KAAK,GAAG;YACN,OAAO,KAAK,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC;QACpC,KAAK,GAAG;YACN,OAAO,KAAK,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;QAChC,KAAK,GAAG;YACN,OAAO,KAAK,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;QACjC,KAAK,GAAG;YACN,OAAO,KAAK,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QAChC,KAAK,GAAG;YACN,OAAO,KAAK,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC;QACvC,KAAK,GAAG;YACN,OAAO,KAAK,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;QACjC,KAAK,IAAI;YACP,OAAO,KAAK,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;QACnC;YACE,OAAO,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IAC9B,CAAC;AACH,CAAC"}

package/dist/utils/generateCommitMessage.d.ts

@@ -1,2 +1,14 @@
+import { DiffSignals } from './diffSignals.js';
 import { FileChange } from './types/types.js';
+export type FileCategory = 'deps' | 'test' | 'docs' | 'config' | 'style' | 'source';
+export declare function categorizeFile(file: string): FileCategory;
+/** The category the majority of the changed files belong to. */
+export declare function dominantCategory(files: FileChange[]): FileCategory;
+/**
+ * Most common directory across the changed files. `packages/x/...` and
+ * `apps/x/...` resolve to `x` so a monorepo commit is not scoped `packages`.
+ */
+export declare function deriveScope(files: FileChange[]): string;
+/** Pure, testable core: no git access, all inputs explicit. */
+export declare function buildCommitMessage(files: FileChange[], signals?: DiffSignals | null): string;
 export declare function generateCommitMessage(files: FileChange[]): string;

package/dist/utils/generateCommitMessage.js

@@ -1,105 +1,200 @@
 import path from 'path';
-import { gitCommand } from './gitCommand.js';
-// Generate commit message based on changes
-export function generateCommitMessage(files) {
-    var _a, _b, _c;
-    const fileTypes = new Map();
+import chalk from 'chalk';
+import { readStagedDiffSignals } from './diffSignals.js';
+/** Checked in this order, so the more specific category always wins a tie. */
+const CATEGORY_ORDER = ['deps', 'test', 'docs', 'config', 'style', 'source'];
+const DEPS_FILE = /^(package(-lock)?\.json|npm-shrinkwrap\.json|yarn\.lock|pnpm-lock\.yaml|bun\.lockb?|requirements(-[\w.]+)?\.txt|Pipfile(\.lock)?|poetry\.lock|Gemfile(\.lock)?|go\.(mod|sum)|Cargo\.(toml|lock)|composer\.(json|lock))$/i;
+const TEST_DIR = /(^|\/)(tests?|__tests__|__mocks__|spec|e2e|cypress)\//i;
+const TEST_FILE = /(\.(test|spec)\.[cm]?[jt]sx?|_test\.(go|py|rb)|^test_[^/]+\.py)$/i;
+const DOCS_DIR = /(^|\/)docs?\//i;
+const DOCS_FILE = /(\.(md|mdx|rst|adoc)|^(readme|changelog|contributing|authors|license)(\.[a-z]+)?)$/i;
+const STYLE_FILE = /\.(css|scss|sass|less|styl)$/i;
+/** Real configuration files — not "anything ending in .json". */
+const CONFIG_FILE = /^(tsconfig(\.[\w-]+)?\.json|jsconfig\.json|\.editorconfig|\.gitignore|\.gitattributes|\.npmrc|\.npmignore|\.nvmrc|\.node-version|\.eslintrc(\.[\w-]+)?|\.eslintignore|\.prettierrc(\.[\w-]+)?|\.prettierignore|\.babelrc(\.[\w-]+)?|\.dockerignore|\.env(\.[\w-]+)?|Dockerfile(\.[\w-]+)?|docker-compose(\.[\w-]+)?\.ya?ml|Makefile|renovate\.json|netlify\.toml|vercel\.json)$/i;
+const CONFIG_SUFFIX = /\.config\.([cm]?[jt]s|json|ya?ml|toml)$/i;
+const CONFIG_DIR = /^\.(github|circleci|vscode|husky|idea)\//i;
+/** Monorepo container directories whose child directory is the useful scope. */
+const CONTAINER_DIRS = new Set(['packages', 'apps', 'libs', 'services', 'crates', 'modules']);
+export function categorizeFile(file) {
+    var _a;
+    const base = (_a = file.split('/').pop()) !== null && _a !== void 0 ? _a : file;
+    if (DEPS_FILE.test(base))
+        return 'deps';
+    if (TEST_DIR.test(file) || TEST_FILE.test(base))
+        return 'test';
+    if (DOCS_DIR.test(file) || DOCS_FILE.test(base))
+        return 'docs';
+    if (CONFIG_FILE.test(base) || CONFIG_SUFFIX.test(base) || CONFIG_DIR.test(file))
+        return 'config';
+    if (STYLE_FILE.test(base))
+        return 'style';
+    return 'source';
+}
+/** The category the majority of the changed files belong to. */
+export function dominantCategory(files) {
+    var _a, _b;
+    const counts = new Map();
+    for (const { file } of files) {
+        const category = categorizeFile(file);
+        counts.set(category, ((_a = counts.get(category)) !== null && _a !== void 0 ? _a : 0) + 1);
+    }
+    let winner = 'source';
+    let best = 0;
+    for (const category of CATEGORY_ORDER) {
+        const count = (_b = counts.get(category)) !== null && _b !== void 0 ? _b : 0;
+        if (count > best) {
+            winner = category;
+            best = count;
+        }
+    }
+    return winner;
+}
+/**
+ * Most common directory across the changed files. `packages/x/...` and
+ * `apps/x/...` resolve to `x` so a monorepo commit is not scoped `packages`.
+ */
+export function deriveScope(files) {
+    var _a;
+    const counts = new Map();
+    for (const { file } of files) {
+        const segments = file.split('/').filter(Boolean);
+        if (segments.length < 2)
+            continue;
+        let scope = segments[0];
+        if (CONTAINER_DIRS.has(scope.toLowerCase()) && segments.length > 2) {
+            scope = segments[1];
+        }
+        scope = scope.replace(/[()\s]/g, '');
+        if (!scope)
+            continue;
+        counts.set(scope, ((_a = counts.get(scope)) !== null && _a !== void 0 ? _a : 0) + 1);
+    }
+    let winner = '';
+    let best = 0;
+    for (const [scope, count] of counts) {
+        if (count > best) {
+            winner = scope;
+            best = count;
+        }
+    }
+    return winner;
+}
+function countOperations(files) {
     const operations = { added: 0, modified: 0, deleted: 0, renamed: 0 };
-    let scope = '';
-    // Analyze files
-    for (const { status, file } of files) {
-        const ext = path.extname(file);
-        fileTypes.set(ext, (fileTypes.get(ext) || 0) + 1);
+    for (const { status } of files) {
         switch (status) {
             case 'A':
+            case '??':
                 operations.added++;
                 break;
             case 'M':
+            case 'T':
                 operations.modified++;
                 break;
             case 'D':
                 operations.deleted++;
                 break;
             case 'R':
+            case 'C':
                 operations.renamed++;
                 break;
         }
-        // Determine scope from top-level directory
-        if (!scope) {
-            const dir = file.split('/')[0];
-            if (dir && dir !== file) {
-                scope = dir;
-            }
-        }
     }
-    // Detect content types
-    const hasPattern = (regex) => files.some(f => regex.test(f.file));
-    const hasTests = hasPattern(/test|spec/i);
-    const hasDocs = hasPattern(/readme|doc|\.md$/i);
-    const hasConfig = hasPattern(/config|\.json$|\.ya?ml$|package\.json/i);
-    const hasStyles = hasPattern(/\.(css|scss|sass|less)$/i);
-    const hasDeps = hasPattern(/package(-lock)?\.json|yarn\.lock|requirements\.txt/i);
-    // Determine type and description
-    let type = 'chore';
-    let description = '';
-    if (hasDeps) {
-        type = 'deps';
-        description = 'update dependencies';
-    }
-    else if (hasTests) {
-        type = 'test';
-        description = 'update tests';
-    }
-    else if (hasDocs) {
-        type = 'docs';
-        description = 'update documentation';
-    }
-    else if (hasConfig) {
-        type = 'config';
-        description = 'update configuration';
-    }
-    else if (hasStyles) {
-        type = 'style';
-        description = 'update styles';
-    }
-    else if (operations.added > 0 && operations.modified === 0 && operations.deleted === 0) {
-        type = 'feat';
-        description = operations.added === 1
-            ? `add ${path.basename(((_a = files.find(f => f.status === 'A')) === null || _a === void 0 ? void 0 : _a.file) || '')}`
-            : 'add new files';
-    }
-    else if (operations.deleted > 0 && operations.added === 0 && operations.modified === 0) {
-        type = 'remove';
-        description = operations.deleted === 1
-            ? `remove ${path.basename(((_b = files.find(f => f.status === 'D')) === null || _b === void 0 ? void 0 : _b.file) || '')}`
-            : 'remove files';
-    }
-    else if (operations.modified > 0) {
-        type = 'fix';
-        description = operations.modified === 1 && operations.added === 0 && operations.deleted === 0
-            ? `update ${path.basename(((_c = files.find(f => f.status === 'M')) === null || _c === void 0 ? void 0 : _c.file) || '')}`
-            : 'update and improve code';
-    }
-    // Refine with diff content
-    try {
-        const diff = gitCommand('diff --cached') || '';
-        if (/bug|fix|error|issue/i.test(diff)) {
-            type = 'fix';
-            description = 'resolve issues and bugs';
-        }
-        else if (/refactor|restructure/i.test(diff)) {
-            type = 'refactor';
-            description = 'refactor code structure';
-        }
-        else if (/function|def|class|interface/i.test(diff) && type === 'fix') {
-            type = 'feat';
-            description = 'implement new functionality';
-        }
+    return operations;
+}
+function firstNameWithStatus(files, statuses) {
+    const match = files.find(file => statuses.includes(file.status));
+    return match ? path.basename(match.file) : '';
+}
+function classifySource(files, operations) {
+    const { added, modified, deleted, renamed } = operations;
+    if (added > 0 && modified === 0 && deleted === 0 && renamed === 0) {
+        return {
+            type: 'feat',
+            description: added === 1 ? `add ${firstNameWithStatus(files, ['A', '??'])}` : `add ${added} new files`
+        };
+    }
+    if (deleted > 0 && added === 0 && modified === 0 && renamed === 0) {
+        return {
+            type: 'refactor',
+            description: deleted === 1 ? `remove ${firstNameWithStatus(files, ['D'])}` : `remove ${deleted} files`
+        };
+    }
+    if (renamed > 0 && added === 0 && modified === 0 && deleted === 0) {
+        return {
+            type: 'refactor',
+            description: renamed === 1 ? `rename ${firstNameWithStatus(files, ['R', 'C'])}` : `rename ${renamed} files`
+        };
+    }
+    if (added > 0 && added >= modified + deleted + renamed) {
+        return { type: 'feat', description: 'add new functionality' };
+    }
+    if (modified === 1 && added === 0 && deleted === 0 && renamed === 0) {
+        return { type: 'chore', description: `update ${firstNameWithStatus(files, ['M', 'T'])}` };
+    }
+    return { type: 'chore', description: 'update and improve code' };
+}
+function classifyByCategory(category, files, operations) {
+    switch (category) {
+        case 'deps':
+            // `deps` is not a Conventional Commits type; dependency bumps are `build`.
+            return { type: 'build', description: 'update dependencies' };
+        case 'test':
+            return {
+                type: 'test',
+                description: operations.modified === 0 && operations.added > 0 ? 'add tests' : 'update tests'
+            };
+        case 'docs':
+            return { type: 'docs', description: 'update documentation' };
+        case 'config':
+            // `config` is not a Conventional Commits type either.
+            return { type: 'chore', description: 'update configuration' };
+        case 'style':
+            return { type: 'style', description: 'update styles' };
+        default:
+            return classifySource(files, operations);
+    }
+}
+/**
+ * Diff hints only ever break a tie: they refine the vague `chore: update ...`
+ * fallback and are never allowed to override a confident classification such as
+ * "40 files were added" or "this commit only touches docs".
+ */
+function refine(base, signals) {
+    if (!signals || signals.oversized || base.type !== 'chore') {
+        return base;
+    }
+    if (signals.fixIntent) {
+        return { type: 'fix', description: 'correct faulty behavior' };
+    }
+    if (signals.newApi) {
+        return { type: 'feat', description: 'implement new functionality' };
+    }
+    if (signals.refactorIntent) {
+        return { type: 'refactor', description: 'restructure code' };
     }
-    catch (_d) {
-        // Ignore diff errors
+    if (signals.conditionalChurn) {
+        return { type: 'fix', description: 'correct conditional handling' };
     }
+    return base;
+}
+/** Pure, testable core: no git access, all inputs explicit. */
+export function buildCommitMessage(files, signals = null) {
+    const operations = countOperations(files);
+    const category = dominantCategory(files);
+    const base = classifyByCategory(category, files, operations);
+    const { type, description } = category === 'source' ? refine(base, signals) : base;
+    // Renames-only commits used to produce an empty description ("chore(src): ").
+    const safeDescription = description.trim() || 'update files';
+    const scope = deriveScope(files);
     const scopeStr = scope ? `(${scope})` : '';
-    return `${type}${scopeStr}: ${description}`;
+    return `${type}${scopeStr}: ${safeDescription}`;
+}
+export function generateCommitMessage(files) {
+    const signals = readStagedDiffSignals();
+    if (signals === null || signals === void 0 ? void 0 : signals.oversized) {
+        console.log(chalk.yellow('⚠️  Staged diff is too large to analyse — the message is based on file names only.'));
+    }
+    return buildCommitMessage(files, signals);
 }
 //# sourceMappingURL=generateCommitMessage.js.map

package/dist/utils/generateCommitMessage.js.map

@@ -1 +1 @@
-{"version":3,"file":"generateCommitMessage.js","sourceRoot":"","sources":["../../src/utils/generateCommitMessage.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"generateCommitMessage.js","sourceRoot":"","sources":["../../src/utils/generateCommitMessage.ts"],"names":[],"mappings":"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"}

package/dist/utils/getFileChanges.d.ts

@@ -1,2 +1,16 @@
-import { GitChanges } from "./types/types.js";
+import { FileChange, GitChanges } from './types/types.js';
+/**
+ * Parse `git diff --name-status -z` output.
+ *
+ * With `-z` every field is its own NUL-terminated record:
+ *   `M\0path\0`                for ordinary changes
+ *   `R100\0oldPath\0newPath\0` for renames (and `C###` for copies)
+ *
+ * The similarity score is stripped from the status and the destination path is
+ * used for renames/copies, so downstream code never sees `R100` or a bogus
+ * `old\tnew` path.
+ */
+export declare function parseNameStatusZ(output: string): FileChange[];
+/** Parse a NUL-separated list of paths (e.g. `git ls-files -z`). */
+export declare function parseNulList(output: string, status: string): FileChange[];
 export declare function getChanges(): GitChanges;

package/dist/utils/getFileChanges.js

@@ -1,25 +1,66 @@
-import { gitCommand } from "./gitCommand.js";
-// Get file changes
-function parseGitStatus(output, defaultStatus = '') {
-    return output
-        .split('\n')
-        .filter(Boolean)
-        .map(line => {
-        if (defaultStatus) {
-            return { status: defaultStatus, file: line };
+import { gitCommand } from './gitCommand.js';
+/**
+ * Parse `git diff --name-status -z` output.
+ *
+ * With `-z` every field is its own NUL-terminated record:
+ *   `M\0path\0`                for ordinary changes
+ *   `R100\0oldPath\0newPath\0` for renames (and `C###` for copies)
+ *
+ * The similarity score is stripped from the status and the destination path is
+ * used for renames/copies, so downstream code never sees `R100` or a bogus
+ * `old\tnew` path.
+ */
+export function parseNameStatusZ(output) {
+    const tokens = output.split('\0').filter(token => token.length > 0);
+    const changes = [];
+    for (let i = 0; i < tokens.length;) {
+        const raw = tokens[i++];
+        const status = raw.charAt(0).toUpperCase();
+        if (status === 'R' || status === 'C') {
+            const from = tokens[i++];
+            const to = tokens[i++];
+            if (from === undefined || to === undefined)
+                break;
+            changes.push({ status, file: to, from });
+        }
+        else {
+            const file = tokens[i++];
+            if (file === undefined)
+                break;
+            changes.push({ status, file });
         }
-        const [status, ...fileParts] = line.split('\t');
-        return { status, file: fileParts.join('\t') };
-    });
+    }
+    return changes;
+}
+/** Parse a NUL-separated list of paths (e.g. `git ls-files -z`). */
+export function parseNulList(output, status) {
+    return output
+        .split('\0')
+        .filter(file => file.length > 0)
+        .map(file => ({ status, file }));
+}
+function nameStatus(args) {
+    const result = gitCommand(args);
+    return result.ok ? parseNameStatusZ(result.stdout) : [];
 }
 export function getChanges() {
-    const stagedOutput = gitCommand('diff --cached --name-status') || '';
-    const unstagedOutput = gitCommand('diff --name-status') || '';
-    const untrackedOutput = gitCommand('ls-files --others --exclude-standard') || '';
+    const staged = nameStatus(['diff', '--cached', '--name-status', '--find-renames', '-z']);
+    const unstaged = nameStatus(['diff', '--name-status', '--find-renames', '-z']);
+    // `--full-name` + `:/` keep untracked paths repo-root-relative like the diff
+    // output above, even when the tool is invoked from a subdirectory.
+    const untrackedResult = gitCommand([
+        'ls-files',
+        '--others',
+        '--exclude-standard',
+        '--full-name',
+        '-z',
+        '--',
+        ':/'
+    ]);
     return {
-        staged: parseGitStatus(stagedOutput),
-        unstaged: parseGitStatus(unstagedOutput),
-        untracked: parseGitStatus(untrackedOutput, '??')
+        staged,
+        unstaged,
+        untracked: untrackedResult.ok ? parseNulList(untrackedResult.stdout, '??') : []
     };
 }
 //# sourceMappingURL=getFileChanges.js.map