@gitkraken/core-gitlens 0.6.0 → 0.7.0

package/dist/git/utils/conflictResolution.utils.js

@@ -1,120 +1,123 @@
-const symlinkMode = '120000';
-const submoduleMode = '160000';
+import * as l10n from "@vscode/l10n";
+//#region ../git/src/utils/conflictResolution.utils.ts
+const symlinkMode = "120000";
+const submoduleMode = "160000";
 /**
- * Classifies a conflict into a {@link ConflictKind}. Pure — all detection that needs git/IO
- * (rename correlation, binary sniffing) is computed by the caller and passed via `hints`. When
- * `modes`/`oids` are omitted (e.g. a webview caller that only has the XY status), it still returns
- * a useful coarse kind; pass the per-stage data for the fine-grained symlink/submodule/mode-only split.
- */
-export function classifyConflictKind(status, modes, oids, hints) {
-    if (hints?.rename != null)
-        return hints.rename;
-    if (status === 'DD')
-        return 'both-deleted';
-    if (status === 'UD' || status === 'DU')
-        return 'delete-modify';
-    const presentModes = [modes?.current, modes?.incoming, modes?.base].filter((m) => m != null);
-    if (presentModes.includes(submoduleMode))
-        return 'submodule';
-    if (presentModes.includes(symlinkMode))
-        return 'symlink';
-    if (hints?.binary)
-        return 'binary';
-    // Both sides present with identical content (same oid) but different mode → only the file mode
-    // conflicts (e.g. one side flipped the executable bit).
-    if (modes?.current != null &&
-        modes?.incoming != null &&
-        modes.current !== modes.incoming &&
-        oids?.current != null &&
-        oids.current === oids?.incoming) {
-        return 'mode-only';
-    }
-    if (status === 'AA' || status === 'AU' || status === 'UA')
-        return 'add-add';
-    return 'text';
+* Classifies a conflict into a {@link ConflictKind}. Pure — all detection that needs git/IO
+* (rename correlation, binary sniffing) is computed by the caller and passed via `hints`. When
+* `modes`/`oids` are omitted (e.g. a webview caller that only has the XY status), it still returns
+* a useful coarse kind; pass the per-stage data for the fine-grained symlink/submodule/mode-only split.
+*/
+function classifyConflictKind(status, modes, oids, hints) {
+	if (hints?.rename != null) return hints.rename;
+	if (status === "DD") return "both-deleted";
+	if (status === "UD" || status === "DU") return "delete-modify";
+	const presentModes = [
+		modes?.current,
+		modes?.incoming,
+		modes?.base
+	].filter((m) => m != null);
+	if (presentModes.includes(submoduleMode)) return "submodule";
+	if (presentModes.includes(symlinkMode)) return "symlink";
+	if (hints?.binary) return "binary";
+	if (modes?.current != null && modes?.incoming != null && modes.current !== modes.incoming && oids?.current != null && oids.current === oids?.incoming) return "mode-only";
+	if (status === "AA" || status === "AU" || status === "UA") return "add-add";
+	return "text";
 }
-export function classifyConflictAction(status, resolution) {
-    const takeCurrent = resolution === 'current';
-    if (status === 'DD')
-        return 'delete';
-    if (status === 'UD' && !takeCurrent)
-        return 'delete';
-    if (status === 'DU' && takeCurrent)
-        return 'delete';
-    // `git checkout --{ours,theirs}` fails when the requested stage is absent.
-    // Single-file UI filters these out; bulk resolve surfaces them as failures.
-    if (status === 'UA' && takeCurrent)
-        return 'unsupported';
-    if (status === 'AU' && !takeCurrent)
-        return 'unsupported';
-    return takeCurrent ? 'take-ours' : 'take-theirs';
+function classifyConflictAction(status, resolution) {
+	const takeCurrent = resolution === "current";
+	if (status === "DD") return "delete";
+	if (status === "UD" && !takeCurrent) return "delete";
+	if (status === "DU" && takeCurrent) return "delete";
+	if (status === "UA" && takeCurrent) return "unsupported";
+	if (status === "AU" && !takeCurrent) return "unsupported";
+	return takeCurrent ? "take-ours" : "take-theirs";
 }
-// Stage Current is invalid when the current side has no content to take (added/deleted only by them, or both deleted)
-export function canStageCurrent(status) {
-    return status !== 'UA' && status !== 'DD';
+function canStageCurrent(status) {
+	return status !== "UA" && status !== "DD";
 }
-// Stage Incoming is invalid when the incoming side has no content to take (added/deleted only by us, or both deleted)
-export function canStageIncoming(status) {
-    return status !== 'AU' && status !== 'DD';
+function canStageIncoming(status) {
+	return status !== "AU" && status !== "DD";
 }
-/** A short label + one-line description for a {@link ConflictKind}, used to explain conflicts the AI
- *  resolver can't auto-merge (and rename conflicts) wherever they're surfaced. */
-export function getConflictKindLabel(kind, renameOf) {
-    const named = renameOf ? `"${renameOf}"` : 'The file';
-    switch (kind) {
-        case 'binary':
-            return {
-                label: 'Binary conflict',
-                description: 'Binary file changed on both sides — choose a side to keep',
-            };
-        case 'symlink':
-            return {
-                label: 'Symlink conflict',
-                description: 'Symbolic link changed on both sides — choose a side to keep',
-            };
-        case 'submodule':
-            return {
-                label: 'Submodule conflict',
-                description: 'Submodule reference changed on both sides — choose a side to keep',
-            };
-        case 'mode-only':
-            return {
-                label: 'File mode conflict',
-                description: 'Only the file mode differs (e.g. the executable bit) — choose a side to keep',
-            };
-        case 'add-add':
-            // Covers AA (added on both sides) as well as AU/UA (added on one side) — keep the wording
-            // accurate for all three rather than asserting "both sides".
-            return {
-                label: 'Add conflict',
-                description: 'Conflicting file additions — choose a side to keep',
-            };
-        case 'delete-modify':
-            return {
-                label: 'Modified and deleted',
-                description: 'Deleted on one side and modified on the other — keep the file or delete it',
-            };
-        case 'both-deleted':
-            return { label: 'Deleted on both sides', description: 'Deleted on both sides — confirm the deletion' };
-        case 'rename-rename':
-            return {
-                label: 'Renamed differently',
-                description: `${named} was renamed differently on each side — choose which name to keep`,
-            };
-        case 'rename-delete':
-            return {
-                label: 'Renamed and deleted',
-                description: `${named} was renamed on one side and deleted on the other — keep the file or delete it`,
-            };
-        case 'rename-modify':
-            return {
-                label: 'Renamed and modified',
-                description: `${named} was renamed on one side and modified on the other`,
-            };
-        case 'text':
-            return { label: 'Text conflict', description: 'Conflicting changes on both sides' };
-        default:
-            return { label: 'Conflict', description: 'Resolve this conflict manually' };
-    }
+/** A short label, complete description, and standalone reason for a {@link ConflictKind}, used to
+*  explain conflicts the AI resolver can't auto-merge (and rename conflicts) wherever they're surfaced. */
+function getConflictKindLabel(kind, renameOf) {
+	switch (kind) {
+		case "binary": return {
+			label: l10n.t("Binary conflict"),
+			description: l10n.t("Binary file changed on both sides — choose a side to keep"),
+			reason: l10n.t("Binary file changed on both sides")
+		};
+		case "symlink": return {
+			label: l10n.t("Symlink conflict"),
+			description: l10n.t("Symbolic link changed on both sides — choose a side to keep"),
+			reason: l10n.t("Symbolic link changed on both sides")
+		};
+		case "submodule": return {
+			label: l10n.t("Submodule conflict"),
+			description: l10n.t("Submodule reference changed on both sides — choose a side to keep"),
+			reason: l10n.t("Submodule reference changed on both sides")
+		};
+		case "mode-only": return {
+			label: l10n.t("File mode conflict"),
+			description: l10n.t("Only the file mode differs (e.g. the executable bit) — choose a side to keep"),
+			reason: l10n.t("Only the file mode differs (e.g. the executable bit)")
+		};
+		case "add-add": return {
+			label: l10n.t("Add conflict"),
+			description: l10n.t("Conflicting file additions — choose a side to keep"),
+			reason: l10n.t("Conflicting file additions")
+		};
+		case "delete-modify": return {
+			label: l10n.t("Modified and deleted"),
+			description: l10n.t("Deleted on one side and modified on the other — keep the file or delete it"),
+			reason: l10n.t("Deleted on one side and modified on the other")
+		};
+		case "both-deleted": return {
+			label: l10n.t("Deleted on both sides"),
+			description: l10n.t("Deleted on both sides — confirm the deletion"),
+			reason: l10n.t("Deleted on both sides")
+		};
+		case "rename-rename": return renameOf ? {
+			label: l10n.t("Renamed differently"),
+			description: l10n.t("\"{file}\" was renamed differently on each side — choose which name to keep.", { file: renameOf }),
+			reason: l10n.t("\"{file}\" was renamed differently on each side", { file: renameOf })
+		} : {
+			label: l10n.t("Renamed differently"),
+			description: l10n.t("The file was renamed differently on each side — choose which name to keep."),
+			reason: l10n.t("The file was renamed differently on each side")
+		};
+		case "rename-delete": return renameOf ? {
+			label: l10n.t("Renamed and deleted"),
+			description: l10n.t("\"{file}\" was renamed on one side and deleted on the other — keep the file or delete it.", { file: renameOf }),
+			reason: l10n.t("\"{file}\" was renamed on one side and deleted on the other", { file: renameOf })
+		} : {
+			label: l10n.t("Renamed and deleted"),
+			description: l10n.t("The file was renamed on one side and deleted on the other — keep the file or delete it."),
+			reason: l10n.t("The file was renamed on one side and deleted on the other")
+		};
+		case "rename-modify": return renameOf ? {
+			label: l10n.t("Renamed and modified"),
+			description: l10n.t("\"{file}\" was renamed on one side and modified on the other", { file: renameOf }),
+			reason: l10n.t("\"{file}\" was renamed on one side and modified on the other", { file: renameOf })
+		} : {
+			label: l10n.t("Renamed and modified"),
+			description: l10n.t("The file was renamed on one side and modified on the other"),
+			reason: l10n.t("The file was renamed on one side and modified on the other")
+		};
+		case "text": return {
+			label: l10n.t("Text conflict"),
+			description: l10n.t("Conflicting changes on both sides"),
+			reason: l10n.t("Conflicting changes on both sides")
+		};
+		default: return {
+			label: l10n.t("Conflict"),
+			description: l10n.t("Resolve this conflict manually"),
+			reason: l10n.t("Resolve this conflict manually")
+		};
+	}
 }
+//#endregion
+export { canStageCurrent, canStageIncoming, classifyConflictAction, classifyConflictKind, getConflictKindLabel };
+
 //# sourceMappingURL=conflictResolution.utils.js.map

package/dist/git/utils/conflictResolution.utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"conflictResolution.utils.js","sourceRoot":"","sources":["../../../src/git/utils/conflictResolution.utils.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"conflictResolution.utils.js","names":[],"sources":["../../../../git/src/utils/conflictResolution.utils.ts"],"sourcesContent":["import * as l10n from '@vscode/l10n';\nimport type { GitFileConflictStatus } from '../models/fileStatus.js';\n\nexport type ConflictResolutionAction = 'take-ours' | 'take-theirs' | 'delete' | 'unsupported';\n\n/**\n * A richer description of a conflict than the raw XY status code — used to label conflicts the\n * AI text resolver can't parse (binary, symlink, submodule, mode-only, add/add) and to surface\n * rename conflicts. Derived by {@link classifyConflictKind} from the XY status plus, when\n * available, the per-stage file modes/oids and rename/binary hints the caller computes.\n */\nexport type ConflictKind =\n\t| 'text'\n\t| 'binary'\n\t| 'symlink'\n\t| 'submodule'\n\t| 'mode-only'\n\t| 'add-add'\n\t| 'delete-modify'\n\t| 'both-deleted'\n\t| 'rename-rename'\n\t| 'rename-delete'\n\t| 'rename-modify'\n\t| 'unknown';\n\nexport type ConflictRenameKind = 'rename-rename' | 'rename-delete' | 'rename-modify';\n\nconst symlinkMode = '120000';\nconst submoduleMode = '160000';\n\n/**\n * Classifies a conflict into a {@link ConflictKind}. Pure — all detection that needs git/IO\n * (rename correlation, binary sniffing) is computed by the caller and passed via `hints`. When\n * `modes`/`oids` are omitted (e.g. a webview caller that only has the XY status), it still returns\n * a useful coarse kind; pass the per-stage data for the fine-grained symlink/submodule/mode-only split.\n */\nexport function classifyConflictKind(\n\tstatus: GitFileConflictStatus,\n\tmodes?: { base?: string; current?: string; incoming?: string },\n\toids?: { base?: string; current?: string; incoming?: string },\n\thints?: { binary?: boolean; rename?: ConflictRenameKind },\n): ConflictKind {\n\tif (hints?.rename != null) return hints.rename;\n\n\tif (status === 'DD') return 'both-deleted';\n\tif (status === 'UD' || status === 'DU') return 'delete-modify';\n\n\tconst presentModes = [modes?.current, modes?.incoming, modes?.base].filter((m): m is string => m != null);\n\tif (presentModes.includes(submoduleMode)) return 'submodule';\n\tif (presentModes.includes(symlinkMode)) return 'symlink';\n\n\tif (hints?.binary) return 'binary';\n\n\t// Both sides present with identical content (same oid) but different mode → only the file mode\n\t// conflicts (e.g. one side flipped the executable bit).\n\tif (\n\t\tmodes?.current != null &&\n\t\tmodes?.incoming != null &&\n\t\tmodes.current !== modes.incoming &&\n\t\toids?.current != null &&\n\t\toids.current === oids?.incoming\n\t) {\n\t\treturn 'mode-only';\n\t}\n\n\tif (status === 'AA' || status === 'AU' || status === 'UA') return 'add-add';\n\n\treturn 'text';\n}\n\nexport function classifyConflictAction(\n\tstatus: GitFileConflictStatus,\n\tresolution: 'current' | 'incoming',\n): ConflictResolutionAction {\n\tconst takeCurrent = resolution === 'current';\n\n\tif (status === 'DD') return 'delete';\n\tif (status === 'UD' && !takeCurrent) return 'delete';\n\tif (status === 'DU' && takeCurrent) return 'delete';\n\n\t// `git checkout --{ours,theirs}` fails when the requested stage is absent.\n\t// Single-file UI filters these out; bulk resolve surfaces them as failures.\n\tif (status === 'UA' && takeCurrent) return 'unsupported';\n\tif (status === 'AU' && !takeCurrent) return 'unsupported';\n\n\treturn takeCurrent ? 'take-ours' : 'take-theirs';\n}\n\n// Stage Current is invalid when the current side has no content to take (added/deleted only by them, or both deleted)\nexport function canStageCurrent(status: GitFileConflictStatus): boolean {\n\treturn status !== 'UA' && status !== 'DD';\n}\n\n// Stage Incoming is invalid when the incoming side has no content to take (added/deleted only by us, or both deleted)\nexport function canStageIncoming(status: GitFileConflictStatus): boolean {\n\treturn status !== 'AU' && status !== 'DD';\n}\n\n/** A short label, complete description, and standalone reason for a {@link ConflictKind}, used to\n *  explain conflicts the AI resolver can't auto-merge (and rename conflicts) wherever they're surfaced. */\nexport function getConflictKindLabel(\n\tkind: ConflictKind,\n\trenameOf?: string,\n): { label: string; description: string; reason: string } {\n\tswitch (kind) {\n\t\tcase 'binary':\n\t\t\treturn {\n\t\t\t\tlabel: l10n.t('Binary conflict'),\n\t\t\t\tdescription: l10n.t('Binary file changed on both sides — choose a side to keep'),\n\t\t\t\treason: l10n.t('Binary file changed on both sides'),\n\t\t\t};\n\t\tcase 'symlink':\n\t\t\treturn {\n\t\t\t\tlabel: l10n.t('Symlink conflict'),\n\t\t\t\tdescription: l10n.t('Symbolic link changed on both sides — choose a side to keep'),\n\t\t\t\treason: l10n.t('Symbolic link changed on both sides'),\n\t\t\t};\n\t\tcase 'submodule':\n\t\t\treturn {\n\t\t\t\tlabel: l10n.t('Submodule conflict'),\n\t\t\t\tdescription: l10n.t('Submodule reference changed on both sides — choose a side to keep'),\n\t\t\t\treason: l10n.t('Submodule reference changed on both sides'),\n\t\t\t};\n\t\tcase 'mode-only':\n\t\t\treturn {\n\t\t\t\tlabel: l10n.t('File mode conflict'),\n\t\t\t\tdescription: l10n.t('Only the file mode differs (e.g. the executable bit) — choose a side to keep'),\n\t\t\t\treason: l10n.t('Only the file mode differs (e.g. the executable bit)'),\n\t\t\t};\n\t\tcase 'add-add':\n\t\t\t// Covers AA (added on both sides) as well as AU/UA (added on one side) — keep the wording\n\t\t\t// accurate for all three rather than asserting \"both sides\".\n\t\t\treturn {\n\t\t\t\tlabel: l10n.t('Add conflict'),\n\t\t\t\tdescription: l10n.t('Conflicting file additions — choose a side to keep'),\n\t\t\t\treason: l10n.t('Conflicting file additions'),\n\t\t\t};\n\t\tcase 'delete-modify':\n\t\t\treturn {\n\t\t\t\tlabel: l10n.t('Modified and deleted'),\n\t\t\t\tdescription: l10n.t('Deleted on one side and modified on the other — keep the file or delete it'),\n\t\t\t\treason: l10n.t('Deleted on one side and modified on the other'),\n\t\t\t};\n\t\tcase 'both-deleted':\n\t\t\treturn {\n\t\t\t\tlabel: l10n.t('Deleted on both sides'),\n\t\t\t\tdescription: l10n.t('Deleted on both sides — confirm the deletion'),\n\t\t\t\treason: l10n.t('Deleted on both sides'),\n\t\t\t};\n\t\tcase 'rename-rename':\n\t\t\treturn renameOf\n\t\t\t\t? {\n\t\t\t\t\t\tlabel: l10n.t('Renamed differently'),\n\t\t\t\t\t\tdescription: l10n.t(\n\t\t\t\t\t\t\t'\"{file}\" was renamed differently on each side — choose which name to keep.',\n\t\t\t\t\t\t\t{ file: renameOf },\n\t\t\t\t\t\t),\n\t\t\t\t\t\treason: l10n.t('\"{file}\" was renamed differently on each side', { file: renameOf }),\n\t\t\t\t\t}\n\t\t\t\t: {\n\t\t\t\t\t\tlabel: l10n.t('Renamed differently'),\n\t\t\t\t\t\tdescription: l10n.t(\n\t\t\t\t\t\t\t'The file was renamed differently on each side — choose which name to keep.',\n\t\t\t\t\t\t),\n\t\t\t\t\t\treason: l10n.t('The file was renamed differently on each side'),\n\t\t\t\t\t};\n\t\tcase 'rename-delete':\n\t\t\treturn renameOf\n\t\t\t\t? {\n\t\t\t\t\t\tlabel: l10n.t('Renamed and deleted'),\n\t\t\t\t\t\tdescription: l10n.t(\n\t\t\t\t\t\t\t'\"{file}\" was renamed on one side and deleted on the other — keep the file or delete it.',\n\t\t\t\t\t\t\t{ file: renameOf },\n\t\t\t\t\t\t),\n\t\t\t\t\t\treason: l10n.t('\"{file}\" was renamed on one side and deleted on the other', {\n\t\t\t\t\t\t\tfile: renameOf,\n\t\t\t\t\t\t}),\n\t\t\t\t\t}\n\t\t\t\t: {\n\t\t\t\t\t\tlabel: l10n.t('Renamed and deleted'),\n\t\t\t\t\t\tdescription: l10n.t(\n\t\t\t\t\t\t\t'The file was renamed on one side and deleted on the other — keep the file or delete it.',\n\t\t\t\t\t\t),\n\t\t\t\t\t\treason: l10n.t('The file was renamed on one side and deleted on the other'),\n\t\t\t\t\t};\n\t\tcase 'rename-modify':\n\t\t\treturn renameOf\n\t\t\t\t? {\n\t\t\t\t\t\tlabel: l10n.t('Renamed and modified'),\n\t\t\t\t\t\tdescription: l10n.t('\"{file}\" was renamed on one side and modified on the other', {\n\t\t\t\t\t\t\tfile: renameOf,\n\t\t\t\t\t\t}),\n\t\t\t\t\t\treason: l10n.t('\"{file}\" was renamed on one side and modified on the other', {\n\t\t\t\t\t\t\tfile: renameOf,\n\t\t\t\t\t\t}),\n\t\t\t\t\t}\n\t\t\t\t: {\n\t\t\t\t\t\tlabel: l10n.t('Renamed and modified'),\n\t\t\t\t\t\tdescription: l10n.t('The file was renamed on one side and modified on the other'),\n\t\t\t\t\t\treason: l10n.t('The file was renamed on one side and modified on the other'),\n\t\t\t\t\t};\n\t\tcase 'text':\n\t\t\treturn {\n\t\t\t\tlabel: l10n.t('Text conflict'),\n\t\t\t\tdescription: l10n.t('Conflicting changes on both sides'),\n\t\t\t\treason: l10n.t('Conflicting changes on both sides'),\n\t\t\t};\n\t\tdefault:\n\t\t\treturn {\n\t\t\t\tlabel: l10n.t('Conflict'),\n\t\t\t\tdescription: l10n.t('Resolve this conflict manually'),\n\t\t\t\treason: l10n.t('Resolve this conflict manually'),\n\t\t\t};\n\t}\n}\n"],"mappings":"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"}

package/dist/git/utils/contributor.utils.d.ts

@@ -1,12 +1,13 @@
-import type { GitCommitStats } from '../models/commit.js';
-import type { GitContributionTiers, GitContributor, GitContributorsStats } from '../models/contributor.js';
-import type { GitUser } from '../models/user.js';
+import { GitCommitStats } from "../models/commit.js";
+import { GitContributionTiers, GitContributor, GitContributorsStats } from "../models/contributor.js";
+import { GitUser } from "../models/user.js";
+//#region ../git/src/utils/contributor.utils.d.ts
 export interface ContributorScoreOptions {
-    recentThresholdInDays: number;
-    maxScoreNormalization: number;
-    recentWeight: number;
-    additionsWeight: number;
-    deletionsWeight: number;
+  recentThresholdInDays: number;
+  maxScoreNormalization: number;
+  recentWeight: number;
+  additionsWeight: number;
+  deletionsWeight: number;
 }
 export declare const defaultContributorScoreOptions: ContributorScoreOptions;
 export declare function calculateContributionScore(stats: GitCommitStats | undefined, timestamp: number, options?: ContributorScoreOptions, now?: number): number;
@@ -15,4 +16,5 @@ export declare function matchContributor(c: GitContributor, user: GitUser): bool
 /** Appends `Co-authored-by:` trailers for the given coauthors to a commit message, replacing
  *  any existing trailer block. Each coauthor is the `Name <email>` form (GitContributor.coauthor). */
 export declare function appendCoauthorsToMessage(message: string, coauthors: Iterable<string>): string;
+//#endregion
 //# sourceMappingURL=contributor.utils.d.ts.map

package/dist/git/utils/contributor.utils.js

@@ -1,76 +1,54 @@
-export const defaultContributorScoreOptions = {
-    recentThresholdInDays: 30,
-    recentWeight: 1.5,
-    additionsWeight: 0.8,
-    deletionsWeight: 1.2,
-    maxScoreNormalization: 1000,
+//#region ../git/src/utils/contributor.utils.ts
+const defaultContributorScoreOptions = {
+	recentThresholdInDays: 30,
+	recentWeight: 1.5,
+	additionsWeight: .8,
+	deletionsWeight: 1.2,
+	maxScoreNormalization: 1e3
 };
-export function calculateContributionScore(stats, timestamp, options = defaultContributorScoreOptions, now = Date.now()) {
-    if (stats == null)
-        return 0;
-    const ageInDays = (now - timestamp) / (24 * 3600 * 1000);
-    // Time decay factor (exponential decay)
-    const recencyScore = Math.exp(-ageInDays / options.recentThresholdInDays);
-    // Impact score with weighted components
-    const impactScore = stats.additions * options.additionsWeight + stats.deletions * options.deletionsWeight;
-    return Math.min(impactScore * (1 + recencyScore * options.recentWeight), options.maxScoreNormalization);
+function calculateContributionScore(stats, timestamp, options = defaultContributorScoreOptions, now = Date.now()) {
+	if (stats == null) return 0;
+	const ageInDays = (now - timestamp) / 864e5;
+	const recencyScore = Math.exp(-ageInDays / options.recentThresholdInDays);
+	const impactScore = stats.additions * options.additionsWeight + stats.deletions * options.deletionsWeight;
+	return Math.min(impactScore * (1 + recencyScore * options.recentWeight), options.maxScoreNormalization);
 }
-export function calculateDistribution(stats, prefix) {
-    if (stats == null)
-        return {};
-    const distribution = {
-        [`${prefix}[1]`]: 0,
-        [`${prefix}[2-5]`]: 0,
-        [`${prefix}[6-10]`]: 0,
-        [`${prefix}[11-50]`]: 0,
-        [`${prefix}[51-100]`]: 0,
-        [`${prefix}[101+]`]: 0,
-    };
-    for (const c of stats.contributions) {
-        if (c === 1) {
-            distribution[`${prefix}[1]`]++;
-        }
-        else if (c <= 5) {
-            distribution[`${prefix}[2-5]`]++;
-        }
-        else if (c <= 10) {
-            distribution[`${prefix}[6-10]`]++;
-        }
-        else if (c <= 50) {
-            distribution[`${prefix}[11-50]`]++;
-        }
-        else if (c <= 100) {
-            distribution[`${prefix}[51-100]`]++;
-        }
-        else {
-            distribution[`${prefix}[101+]`]++;
-        }
-    }
-    return distribution;
+function calculateDistribution(stats, prefix) {
+	if (stats == null) return {};
+	const distribution = {
+		[`${prefix}[1]`]: 0,
+		[`${prefix}[2-5]`]: 0,
+		[`${prefix}[6-10]`]: 0,
+		[`${prefix}[11-50]`]: 0,
+		[`${prefix}[51-100]`]: 0,
+		[`${prefix}[101+]`]: 0
+	};
+	for (const c of stats.contributions) if (c === 1) distribution[`${prefix}[1]`]++;
+	else if (c <= 5) distribution[`${prefix}[2-5]`]++;
+	else if (c <= 10) distribution[`${prefix}[6-10]`]++;
+	else if (c <= 50) distribution[`${prefix}[11-50]`]++;
+	else if (c <= 100) distribution[`${prefix}[51-100]`]++;
+	else distribution[`${prefix}[101+]`]++;
+	return distribution;
 }
-export function matchContributor(c, user) {
-    return c.name === user.name && c.email === user.email && c.username === user.username;
+function matchContributor(c, user) {
+	return c.name === user.name && c.email === user.email && c.username === user.username;
 }
 /** Appends `Co-authored-by:` trailers for the given coauthors to a commit message, replacing
- *  any existing trailer block. Each coauthor is the `Name <email>` form (GitContributor.coauthor). */
-export function appendCoauthorsToMessage(message, coauthors) {
-    const index = message.indexOf('Co-authored-by: ');
-    if (index !== -1) {
-        message = message.substring(0, index - 1).trimEnd();
-    }
-    for (const coauthor of coauthors) {
-        let newlines;
-        if (message.includes('Co-authored-by: ')) {
-            newlines = '\n';
-        }
-        else if (message.length !== 0 && message.endsWith('\n')) {
-            newlines = '\n\n';
-        }
-        else {
-            newlines = '\n\n\n';
-        }
-        message += `${newlines}Co-authored-by: ${coauthor}`;
-    }
-    return message;
+*  any existing trailer block. Each coauthor is the `Name <email>` form (GitContributor.coauthor). */
+function appendCoauthorsToMessage(message, coauthors) {
+	const index = message.indexOf("Co-authored-by: ");
+	if (index !== -1) message = message.substring(0, index - 1).trimEnd();
+	for (const coauthor of coauthors) {
+		let newlines;
+		if (message.includes("Co-authored-by: ")) newlines = "\n";
+		else if (message.length !== 0 && message.endsWith("\n")) newlines = "\n\n";
+		else newlines = "\n\n\n";
+		message += `${newlines}Co-authored-by: ${coauthor}`;
+	}
+	return message;
 }
+//#endregion
+export { appendCoauthorsToMessage, calculateContributionScore, calculateDistribution, defaultContributorScoreOptions, matchContributor };
+
 //# sourceMappingURL=contributor.utils.js.map

package/dist/git/utils/contributor.utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"contributor.utils.js","sourceRoot":"","sources":["../../../src/git/utils/contributor.utils.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"contributor.utils.js","names":[],"sources":["../../../../git/src/utils/contributor.utils.ts"],"sourcesContent":["import type { GitCommitStats } from '../models/commit.js';\nimport type { GitContributionTiers, GitContributor, GitContributorsStats } from '../models/contributor.js';\nimport type { GitUser } from '../models/user.js';\n\nexport interface ContributorScoreOptions {\n\t// Thresholds\n\trecentThresholdInDays: number;\n\tmaxScoreNormalization: number;\n\n\t// Time-based weights\n\trecentWeight: number;\n\n\t// Impact weights\n\tadditionsWeight: number;\n\tdeletionsWeight: number;\n}\n\nexport const defaultContributorScoreOptions: ContributorScoreOptions = {\n\trecentThresholdInDays: 30,\n\trecentWeight: 1.5,\n\tadditionsWeight: 0.8,\n\tdeletionsWeight: 1.2,\n\tmaxScoreNormalization: 1000,\n};\n\nexport function calculateContributionScore(\n\tstats: GitCommitStats | undefined,\n\ttimestamp: number,\n\toptions: ContributorScoreOptions = defaultContributorScoreOptions,\n\tnow: number = Date.now(),\n): number {\n\tif (stats == null) return 0;\n\n\tconst ageInDays = (now - timestamp) / (24 * 3600 * 1000);\n\n\t// Time decay factor (exponential decay)\n\tconst recencyScore = Math.exp(-ageInDays / options.recentThresholdInDays);\n\n\t// Impact score with weighted components\n\tconst impactScore = stats.additions * options.additionsWeight + stats.deletions * options.deletionsWeight;\n\n\treturn Math.min(impactScore * (1 + recencyScore * options.recentWeight), options.maxScoreNormalization);\n}\n\nexport function calculateDistribution<T extends string>(\n\tstats: GitContributorsStats | undefined,\n\tprefix: T,\n): Record<`${typeof prefix}${GitContributionTiers}`, number> {\n\tif (stats == null) return {} as unknown as Record<`${typeof prefix}${GitContributionTiers}`, number>;\n\n\tconst distribution: Record<`${string}${GitContributionTiers}`, number> = {\n\t\t[`${prefix}[1]`]: 0,\n\t\t[`${prefix}[2-5]`]: 0,\n\t\t[`${prefix}[6-10]`]: 0,\n\t\t[`${prefix}[11-50]`]: 0,\n\t\t[`${prefix}[51-100]`]: 0,\n\t\t[`${prefix}[101+]`]: 0,\n\t};\n\n\tfor (const c of stats.contributions) {\n\t\tif (c === 1) {\n\t\t\tdistribution[`${prefix}[1]`]++;\n\t\t} else if (c <= 5) {\n\t\t\tdistribution[`${prefix}[2-5]`]++;\n\t\t} else if (c <= 10) {\n\t\t\tdistribution[`${prefix}[6-10]`]++;\n\t\t} else if (c <= 50) {\n\t\t\tdistribution[`${prefix}[11-50]`]++;\n\t\t} else if (c <= 100) {\n\t\t\tdistribution[`${prefix}[51-100]`]++;\n\t\t} else {\n\t\t\tdistribution[`${prefix}[101+]`]++;\n\t\t}\n\t}\n\n\treturn distribution;\n}\n\nexport function matchContributor(c: GitContributor, user: GitUser): boolean {\n\treturn c.name === user.name && c.email === user.email && c.username === user.username;\n}\n\n/** Appends `Co-authored-by:` trailers for the given coauthors to a commit message, replacing\n *  any existing trailer block. Each coauthor is the `Name <email>` form (GitContributor.coauthor). */\nexport function appendCoauthorsToMessage(message: string, coauthors: Iterable<string>): string {\n\tconst index = message.indexOf('Co-authored-by: ');\n\tif (index !== -1) {\n\t\tmessage = message.substring(0, index - 1).trimEnd();\n\t}\n\n\tfor (const coauthor of coauthors) {\n\t\tlet newlines;\n\t\tif (message.includes('Co-authored-by: ')) {\n\t\t\tnewlines = '\\n';\n\t\t} else if (message.length !== 0 && message.endsWith('\\n')) {\n\t\t\tnewlines = '\\n\\n';\n\t\t} else {\n\t\t\tnewlines = '\\n\\n\\n';\n\t\t}\n\n\t\tmessage += `${newlines}Co-authored-by: ${coauthor}`;\n\t}\n\n\treturn message;\n}\n"],"mappings":";AAiBA,MAAa,iCAA0D;CACtE,uBAAuB;CACvB,cAAc;CACd,iBAAiB;CACjB,iBAAiB;CACjB,uBAAuB;AACxB;AAEA,SAAgB,2BACf,OACA,WACA,UAAmC,gCACnC,MAAc,KAAK,IAAI,GACd;CACT,IAAI,SAAS,MAAM,OAAO;CAE1B,MAAM,aAAa,MAAM,aAAc;CAGvC,MAAM,eAAe,KAAK,IAAI,CAAC,YAAY,QAAQ,qBAAqB;CAGxE,MAAM,cAAc,MAAM,YAAY,QAAQ,kBAAkB,MAAM,YAAY,QAAQ;CAE1F,OAAO,KAAK,IAAI,eAAe,IAAI,eAAe,QAAQ,eAAe,QAAQ,qBAAqB;AACvG;AAEA,SAAgB,sBACf,OACA,QAC4D;CAC5D,IAAI,SAAS,MAAM,OAAO,CAAC;CAE3B,MAAM,eAAmE;GACvE,GAAG,OAAO,OAAO;GACjB,GAAG,OAAO,SAAS;GACnB,GAAG,OAAO,UAAU;GACpB,GAAG,OAAO,WAAW;GACrB,GAAG,OAAO,YAAY;GACtB,GAAG,OAAO,UAAU;CACtB;CAEA,KAAK,MAAM,KAAK,MAAM,eACrB,IAAI,MAAM,GACT,aAAa,GAAG,OAAO,KAAK;MACtB,IAAI,KAAK,GACf,aAAa,GAAG,OAAO,OAAO;MACxB,IAAI,KAAK,IACf,aAAa,GAAG,OAAO,QAAQ;MACzB,IAAI,KAAK,IACf,aAAa,GAAG,OAAO,SAAS;MAC1B,IAAI,KAAK,KACf,aAAa,GAAG,OAAO,UAAU;MAEjC,aAAa,GAAG,OAAO,QAAQ;CAIjC,OAAO;AACR;AAEA,SAAgB,iBAAiB,GAAmB,MAAwB;CAC3E,OAAO,EAAE,SAAS,KAAK,QAAQ,EAAE,UAAU,KAAK,SAAS,EAAE,aAAa,KAAK;AAC9E;;;AAIA,SAAgB,yBAAyB,SAAiB,WAAqC;CAC9F,MAAM,QAAQ,QAAQ,QAAQ,kBAAkB;CAChD,IAAI,UAAU,IACb,UAAU,QAAQ,UAAU,GAAG,QAAQ,CAAC,CAAC,CAAC,QAAQ;CAGnD,KAAK,MAAM,YAAY,WAAW;EACjC,IAAI;EACJ,IAAI,QAAQ,SAAS,kBAAkB,GACtC,WAAW;OACL,IAAI,QAAQ,WAAW,KAAK,QAAQ,SAAS,IAAI,GACvD,WAAW;OAEX,WAAW;EAGZ,WAAW,GAAG,SAAS,kBAAkB;CAC1C;CAEA,OAAO;AACR"}

package/dist/git/utils/fetch.utils.d.ts

@@ -1,3 +1,4 @@
+//#region ../git/src/utils/fetch.utils.d.ts
 export declare const millisecondsPerDay: number;
 /**
  * Calculates the update interval for fetch status based on how long ago the last fetch occurred.
@@ -17,4 +18,5 @@ export declare const millisecondsPerDay: number;
  * - ≥ 2 days ago: refresh every 1 day
  */
 export declare function getLastFetchedUpdateInterval(lastFetched: number): number;
+//#endregion
 //# sourceMappingURL=fetch.utils.d.ts.map

package/dist/git/utils/fetch.utils.js

@@ -1,47 +1,36 @@
-const millisecondsPerMinute = 60 * 1000;
-const millisecondsPerHour = 60 * 60 * 1000;
-export const millisecondsPerDay = 24 * 60 * 60 * 1000;
+//#region ../git/src/utils/fetch.utils.ts
+const millisecondsPerMinute = 6e4;
+const millisecondsPerHour = 36e5;
+const millisecondsPerDay = 864e5;
 /**
- * Calculates the update interval for fetch status based on how long ago the last fetch occurred.
- * Uses stepped intervals to prevent thrashing from frequent recalculations.
- *
- * @param lastFetched - Timestamp (in milliseconds) of the last fetch
- * @returns Update interval in milliseconds
- *
- * Interval schedule:
- * - < 15 minutes ago: refresh every 5 minutes
- * - < 30 minutes ago: refresh every 10 minutes
- * - < 1 hour ago: refresh every 20 minutes
- * - < 3 hours ago: refresh every 1 hour
- * - < 6 hours ago: refresh every 2 hours
- * - < 12 hours ago: refresh every 4 hours
- * - < 2 days ago: refresh every 8 hours
- * - ≥ 2 days ago: refresh every 1 day
- */
-export function getLastFetchedUpdateInterval(lastFetched) {
-    const timeDiff = Date.now() - lastFetched;
-    // Stepped intervals to prevent thrashing
-    if (timeDiff < 15 * millisecondsPerMinute) {
-        return 5 * millisecondsPerMinute;
-    }
-    if (timeDiff < 30 * millisecondsPerMinute) {
-        return 10 * millisecondsPerMinute;
-    }
-    if (timeDiff < millisecondsPerHour) {
-        return 20 * millisecondsPerMinute;
-    }
-    if (timeDiff < 3 * millisecondsPerHour) {
-        return millisecondsPerHour;
-    }
-    if (timeDiff < 6 * millisecondsPerHour) {
-        return 2 * millisecondsPerHour;
-    }
-    if (timeDiff < 12 * millisecondsPerHour) {
-        return 4 * millisecondsPerHour;
-    }
-    if (timeDiff < 2 * millisecondsPerDay) {
-        return 8 * millisecondsPerHour;
-    }
-    return millisecondsPerDay;
+* Calculates the update interval for fetch status based on how long ago the last fetch occurred.
+* Uses stepped intervals to prevent thrashing from frequent recalculations.
+*
+* @param lastFetched - Timestamp (in milliseconds) of the last fetch
+* @returns Update interval in milliseconds
+*
+* Interval schedule:
+* - < 15 minutes ago: refresh every 5 minutes
+* - < 30 minutes ago: refresh every 10 minutes
+* - < 1 hour ago: refresh every 20 minutes
+* - < 3 hours ago: refresh every 1 hour
+* - < 6 hours ago: refresh every 2 hours
+* - < 12 hours ago: refresh every 4 hours
+* - < 2 days ago: refresh every 8 hours
+* - ≥ 2 days ago: refresh every 1 day
+*/
+function getLastFetchedUpdateInterval(lastFetched) {
+	const timeDiff = Date.now() - lastFetched;
+	if (timeDiff < 15 * millisecondsPerMinute) return 5 * millisecondsPerMinute;
+	if (timeDiff < 30 * millisecondsPerMinute) return 10 * millisecondsPerMinute;
+	if (timeDiff < millisecondsPerHour) return 20 * millisecondsPerMinute;
+	if (timeDiff < 3 * millisecondsPerHour) return millisecondsPerHour;
+	if (timeDiff < 6 * millisecondsPerHour) return 2 * millisecondsPerHour;
+	if (timeDiff < 12 * millisecondsPerHour) return 4 * millisecondsPerHour;
+	if (timeDiff < 1728e5) return 8 * millisecondsPerHour;
+	return millisecondsPerDay;
 }
+//#endregion
+export { getLastFetchedUpdateInterval, millisecondsPerDay };
+
 //# sourceMappingURL=fetch.utils.js.map

package/dist/git/utils/fetch.utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"fetch.utils.js","sourceRoot":"","sources":["../../../src/git/utils/fetch.utils.ts"],"names":[],"mappings":"AAAA,MAAM,qBAAqB,GAAG,EAAE,GAAG,IAAI,CAAC;AACxC,MAAM,mBAAmB,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC;AAC3C,MAAM,CAAC,MAAM,kBAAkB,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC;AAEtD;;;;;;;;;;;;;;;;GAgBG;AACH,MAAM,UAAU,4BAA4B,CAAC,WAAmB;IAC/D,MAAM,QAAQ,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,WAAW,CAAC;IAE1C,yCAAyC;IACzC,IAAI,QAAQ,GAAG,EAAE,GAAG,qBAAqB,EAAE,CAAC;QAC3C,OAAO,CAAC,GAAG,qBAAqB,CAAC;IAClC,CAAC;IACD,IAAI,QAAQ,GAAG,EAAE,GAAG,qBAAqB,EAAE,CAAC;QAC3C,OAAO,EAAE,GAAG,qBAAqB,CAAC;IACnC,CAAC;IACD,IAAI,QAAQ,GAAG,mBAAmB,EAAE,CAAC;QACpC,OAAO,EAAE,GAAG,qBAAqB,CAAC;IACnC,CAAC;IACD,IAAI,QAAQ,GAAG,CAAC,GAAG,mBAAmB,EAAE,CAAC;QACxC,OAAO,mBAAmB,CAAC;IAC5B,CAAC;IACD,IAAI,QAAQ,GAAG,CAAC,GAAG,mBAAmB,EAAE,CAAC;QACxC,OAAO,CAAC,GAAG,mBAAmB,CAAC;IAChC,CAAC;IACD,IAAI,QAAQ,GAAG,EAAE,GAAG,mBAAmB,EAAE,CAAC;QACzC,OAAO,CAAC,GAAG,mBAAmB,CAAC;IAChC,CAAC;IACD,IAAI,QAAQ,GAAG,CAAC,GAAG,kBAAkB,EAAE,CAAC;QACvC,OAAO,CAAC,GAAG,mBAAmB,CAAC;IAChC,CAAC;IACD,OAAO,kBAAkB,CAAC;AAC3B,CAAC"}
+{"version":3,"file":"fetch.utils.js","names":[],"sources":["../../../../git/src/utils/fetch.utils.ts"],"sourcesContent":["const millisecondsPerMinute = 60 * 1000;\nconst millisecondsPerHour = 60 * 60 * 1000;\nexport const millisecondsPerDay = 24 * 60 * 60 * 1000;\n\n/**\n * Calculates the update interval for fetch status based on how long ago the last fetch occurred.\n * Uses stepped intervals to prevent thrashing from frequent recalculations.\n *\n * @param lastFetched - Timestamp (in milliseconds) of the last fetch\n * @returns Update interval in milliseconds\n *\n * Interval schedule:\n * - < 15 minutes ago: refresh every 5 minutes\n * - < 30 minutes ago: refresh every 10 minutes\n * - < 1 hour ago: refresh every 20 minutes\n * - < 3 hours ago: refresh every 1 hour\n * - < 6 hours ago: refresh every 2 hours\n * - < 12 hours ago: refresh every 4 hours\n * - < 2 days ago: refresh every 8 hours\n * - ≥ 2 days ago: refresh every 1 day\n */\nexport function getLastFetchedUpdateInterval(lastFetched: number): number {\n\tconst timeDiff = Date.now() - lastFetched;\n\n\t// Stepped intervals to prevent thrashing\n\tif (timeDiff < 15 * millisecondsPerMinute) {\n\t\treturn 5 * millisecondsPerMinute;\n\t}\n\tif (timeDiff < 30 * millisecondsPerMinute) {\n\t\treturn 10 * millisecondsPerMinute;\n\t}\n\tif (timeDiff < millisecondsPerHour) {\n\t\treturn 20 * millisecondsPerMinute;\n\t}\n\tif (timeDiff < 3 * millisecondsPerHour) {\n\t\treturn millisecondsPerHour;\n\t}\n\tif (timeDiff < 6 * millisecondsPerHour) {\n\t\treturn 2 * millisecondsPerHour;\n\t}\n\tif (timeDiff < 12 * millisecondsPerHour) {\n\t\treturn 4 * millisecondsPerHour;\n\t}\n\tif (timeDiff < 2 * millisecondsPerDay) {\n\t\treturn 8 * millisecondsPerHour;\n\t}\n\treturn millisecondsPerDay;\n}\n"],"mappings":";AAAA,MAAM,wBAAwB;AAC9B,MAAM,sBAAsB;AAC5B,MAAa,qBAAqB;;;;;;;;;;;;;;;;;;AAmBlC,SAAgB,6BAA6B,aAA6B;CACzE,MAAM,WAAW,KAAK,IAAI,IAAI;CAG9B,IAAI,WAAW,KAAK,uBACnB,OAAO,IAAI;CAEZ,IAAI,WAAW,KAAK,uBACnB,OAAO,KAAK;CAEb,IAAI,WAAW,qBACd,OAAO,KAAK;CAEb,IAAI,WAAW,IAAI,qBAClB,OAAO;CAER,IAAI,WAAW,IAAI,qBAClB,OAAO,IAAI;CAEZ,IAAI,WAAW,KAAK,qBACnB,OAAO,IAAI;CAEZ,IAAI,WAAW,QACd,OAAO,IAAI;CAEZ,OAAO;AACR"}