@gitkraken/core-gitlens 0.3.0 → 0.4.0

package/dist/git/models/repository.js.map

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

package/dist/git/models/statusFile.d.ts

@@ -19,6 +19,15 @@ export declare class GitStatusFile implements GitFile {
         readonly previousOid?: string;
     } | undefined);
     get conflicted(): boolean;
+    /**
+     * True when the file has both staged (index) and unstaged (working-tree) changes and is not
+     * conflicted. Used by the host-side discard flows to apply partial-discard semantics — drop the
+     * working-tree delta while preserving the staged portion. Centralized here so those host paths
+     * agree on what "mixed" means. (The webview button predicate can't consume this getter — it
+     * runs against the wire `GitFileChangeShape` and infers the same state from the duplicate
+     * staged/unstaged rows the WIP feed emits per mixed path.)
+     */
+    get mixed(): boolean;
     get staged(): boolean;
     get status(): GitFileStatus;
     get uri(): Uri;

package/dist/git/models/statusFile.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"statusFile.d.ts","sourceRoot":"","sources":["../../src/models/statusFile.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,uBAAuB,CAAC;AACjD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACzC,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AACrD,OAAO,EAAE,qBAAqB,EAAE,kBAAkB,EAAE,wBAAwB,EAAE,MAAM,iBAAiB,CAAC;AAEtG,qBACa,aAAc,YAAW,OAAO;aAO3B,QAAQ,EAAE,MAAM;aAGhB,IAAI,EAAE,MAAM;aAEZ,YAAY,CAAC,EAAE,MAAM;aACrB,SAAS,CAAC,EAAE;QAAE,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,WAAW,CAAC,EAAE,MAAM,CAAA;KAAE,GAAG,SAAS;IAZhG,SAAgB,cAAc,EAAE,qBAAqB,GAAG,SAAS,CAAC;IAClE,SAAgB,WAAW,EAAE,kBAAkB,GAAG,SAAS,CAAC;IAC5D,SAAgB,iBAAiB,EAAE,wBAAwB,GAAG,SAAS,CAAC;IACxE,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAM;gBAGV,QAAQ,EAAE,MAAM,EAChC,CAAC,EAAE,MAAM,GAAG,SAAS,EACrB,CAAC,EAAE,MAAM,GAAG,SAAS,EACL,IAAI,EAAE,MAAM,EAC5B,GAAG,EAAE,GAAG,EACQ,YAAY,CAAC,EAAE,MAAM,YAAA,EACrB,SAAS,CAAC,EAAE;QAAE,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,WAAW,CAAC,EAAE,MAAM,CAAA;KAAE,GAAG,SAAS;IAwEhG,IAAI,UAAU,IAAI,OAAO,CAExB;IAED,IAAI,MAAM,IAAI,OAAO,CAEpB;IAED,IAAI,MAAM,IAAI,aAAa,CAE1B;IAED,IAAI,GAAG,IAAI,GAAG,CAEb;IAED,IAAI,GAAG,IAAI,OAAO,CAEjB;IAED,MAAM,CAAC,EAAE,CAAC,IAAI,EAAE,OAAO,GAAG,IAAI,IAAI,aAAa;CAG/C"}
+{"version":3,"file":"statusFile.d.ts","sourceRoot":"","sources":["../../src/models/statusFile.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,uBAAuB,CAAC;AACjD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACzC,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AACrD,OAAO,EAAE,qBAAqB,EAAE,kBAAkB,EAAE,wBAAwB,EAAE,MAAM,iBAAiB,CAAC;AAEtG,qBACa,aAAc,YAAW,OAAO;aAO3B,QAAQ,EAAE,MAAM;aAGhB,IAAI,EAAE,MAAM;aAEZ,YAAY,CAAC,EAAE,MAAM;aACrB,SAAS,CAAC,EAAE;QAAE,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,WAAW,CAAC,EAAE,MAAM,CAAA;KAAE,GAAG,SAAS;IAZhG,SAAgB,cAAc,EAAE,qBAAqB,GAAG,SAAS,CAAC;IAClE,SAAgB,WAAW,EAAE,kBAAkB,GAAG,SAAS,CAAC;IAC5D,SAAgB,iBAAiB,EAAE,wBAAwB,GAAG,SAAS,CAAC;IACxE,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAM;gBAGV,QAAQ,EAAE,MAAM,EAChC,CAAC,EAAE,MAAM,GAAG,SAAS,EACrB,CAAC,EAAE,MAAM,GAAG,SAAS,EACL,IAAI,EAAE,MAAM,EAC5B,GAAG,EAAE,GAAG,EACQ,YAAY,CAAC,EAAE,MAAM,YAAA,EACrB,SAAS,CAAC,EAAE;QAAE,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,WAAW,CAAC,EAAE,MAAM,CAAA;KAAE,GAAG,SAAS;IAwEhG,IAAI,UAAU,IAAI,OAAO,CAExB;IAED;;;;;;;OAOG;IACH,IAAI,KAAK,IAAI,OAAO,CAEnB;IAED,IAAI,MAAM,IAAI,OAAO,CAEpB;IAED,IAAI,MAAM,IAAI,aAAa,CAE1B;IAED,IAAI,GAAG,IAAI,GAAG,CAEb;IAED,IAAI,GAAG,IAAI,OAAO,CAEjB;IAED,MAAM,CAAC,EAAE,CAAC,IAAI,EAAE,OAAO,GAAG,IAAI,IAAI,aAAa;CAG/C"}

package/dist/git/models/statusFile.js

@@ -91,6 +91,17 @@ let GitStatusFile = GitStatusFile_1 = class GitStatusFile {
     get conflicted() {
         return this.conflictStatus != null;
     }
+    /**
+     * True when the file has both staged (index) and unstaged (working-tree) changes and is not
+     * conflicted. Used by the host-side discard flows to apply partial-discard semantics — drop the
+     * working-tree delta while preserving the staged portion. Centralized here so those host paths
+     * agree on what "mixed" means. (The webview button predicate can't consume this getter — it
+     * runs against the wire `GitFileChangeShape` and infers the same state from the duplicate
+     * staged/unstaged rows the WIP feed emits per mixed path.)
+     */
+    get mixed() {
+        return this.indexStatus != null && this.workingTreeStatus != null && this.conflictStatus == null;
+    }
     get staged() {
         return this.indexStatus != null;
     }

package/dist/git/models/statusFile.js.map

@@ -1 +1 @@
-{"version":3,"file":"statusFile.js","sourceRoot":"","sources":["../../src/models/statusFile.ts"],"names":[],"mappings":";;;;;;;AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,kCAAkC,CAAC;AAI5D,OAAO,EAAE,qBAAqB,EAAE,kBAAkB,EAAE,wBAAwB,EAAE,MAAM,iBAAiB,CAAC;AAG/F,IAAM,aAAa,qBAAnB,MAAM,aAAa;IAOR;IAGA;IAEA;IACA;IAZD,cAAc,CAAoC;IAClD,WAAW,CAAiC;IAC5C,iBAAiB,CAAuC;IACvD,IAAI,CAAM;IAE3B,YACiB,QAAgB,EAChC,CAAqB,EACrB,CAAqB,EACL,IAAY,EAC5B,GAAQ,EACQ,YAAqB,EACrB,SAA+E;QAN/E,aAAQ,GAAR,QAAQ,CAAQ;QAGhB,SAAI,GAAJ,IAAI,CAAQ;QAEZ,iBAAY,GAAZ,YAAY,CAAS;QACrB,cAAS,GAAT,SAAS,CAAsE;QAE/F,IAAI,CAAC,IAAI,GAAG,GAAG,CAAC;QAChB,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,IAAI,IAAI,EAAE,CAAC;YAC5B,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;gBACf,KAAK,IAAI;oBACR,IAAI,CAAC,iBAAiB,GAAG,wBAAwB,CAAC,SAAS,CAAC;oBAC5D,MAAM;gBACP,KAAK,IAAI;oBACR,IAAI,CAAC,iBAAiB,GAAG,wBAAwB,CAAC,OAAO,CAAC;oBAC1D,MAAM;gBACP,KAAK,IAAI;oBACR,IAAI,CAAC,cAAc,GAAG,qBAAqB,CAAC,WAAW,CAAC;oBACxD,MAAM;gBACP,KAAK,IAAI;oBACR,IAAI,CAAC,cAAc,GAAG,qBAAqB,CAAC,SAAS,CAAC;oBACtD,MAAM;gBACP,KAAK,IAAI;oBACR,IAAI,CAAC,cAAc,GAAG,qBAAqB,CAAC,WAAW,CAAC;oBACxD,MAAM;gBACP,KAAK,IAAI;oBACR,IAAI,CAAC,cAAc,GAAG,qBAAqB,CAAC,aAAa,CAAC;oBAC1D,MAAM;gBACP,KAAK,IAAI;oBACR,IAAI,CAAC,cAAc,GAAG,qBAAqB,CAAC,WAAW,CAAC;oBACxD,MAAM;gBACP,KAAK,IAAI;oBACR,IAAI,CAAC,cAAc,GAAG,qBAAqB,CAAC,aAAa,CAAC;oBAC1D,MAAM;gBACP,KAAK,IAAI;oBACR,IAAI,CAAC,cAAc,GAAG,qBAAqB,CAAC,cAAc,CAAC;oBAC3D,MAAM;YACR,CAAC;QACF,CAAC;QAED,IAAI,IAAI,CAAC,cAAc,IAAI,IAAI,EAAE,CAAC;YACjC,QAAQ,CAAC,EAAE,CAAC;gBACX,KAAK,GAAG;oBACP,IAAI,CAAC,WAAW,GAAG,kBAAkB,CAAC,KAAK,CAAC;oBAC5C,MAAM;gBACP,KAAK,GAAG;oBACP,IAAI,CAAC,WAAW,GAAG,kBAAkB,CAAC,OAAO,CAAC;oBAC9C,MAAM;gBACP,KAAK,GAAG;oBACP,IAAI,CAAC,WAAW,GAAG,kBAAkB,CAAC,QAAQ,CAAC;oBAC/C,MAAM;gBACP,KAAK,GAAG;oBACP,IAAI,CAAC,WAAW,GAAG,kBAAkB,CAAC,WAAW,CAAC;oBAClD,MAAM;gBACP,KAAK,GAAG;oBACP,IAAI,CAAC,WAAW,GAAG,kBAAkB,CAAC,OAAO,CAAC;oBAC9C,MAAM;gBACP,KAAK,GAAG;oBACP,IAAI,CAAC,WAAW,GAAG,kBAAkB,CAAC,MAAM,CAAC;oBAC7C,MAAM;YACR,CAAC;YAED,QAAQ,CAAC,EAAE,CAAC;gBACX,KAAK,GAAG;oBACP,YAAY;oBACZ,IAAI,CAAC,iBAAiB,GAAG,wBAAwB,CAAC,KAAK,CAAC;oBACxD,MAAM;gBACP,KAAK,GAAG;oBACP,IAAI,CAAC,iBAAiB,GAAG,wBAAwB,CAAC,OAAO,CAAC;oBAC1D,MAAM;gBACP,KAAK,GAAG;oBACP,IAAI,CAAC,iBAAiB,GAAG,wBAAwB,CAAC,QAAQ,CAAC;oBAC3D,MAAM;YACR,CAAC;QACF,CAAC;IACF,CAAC;IAED,IAAI,UAAU;QACb,OAAO,IAAI,CAAC,cAAc,IAAI,IAAI,CAAC;IACpC,CAAC;IAED,IAAI,MAAM;QACT,OAAO,IAAI,CAAC,WAAW,IAAI,IAAI,CAAC;IACjC,CAAC;IAED,IAAI,MAAM;QACT,OAAO,CAAC,IAAI,CAAC,cAAc,IAAI,IAAI,CAAC,WAAW,IAAI,IAAI,CAAC,iBAAiB,CAAE,CAAC;IAC7E,CAAC;IAED,IAAI,GAAG;QACN,OAAO,IAAI,CAAC,IAAI,CAAC;IAClB,CAAC;IAED,IAAI,GAAG;QACN,OAAO,IAAI,CAAC,iBAAiB,IAAI,IAAI,CAAC;IACvC,CAAC;IAED,MAAM,CAAC,EAAE,CAAC,IAAa;QACtB,OAAO,IAAI,YAAY,eAAa,CAAC;IACtC,CAAC;CACD,CAAA;AA5GY,aAAa;IADzB,QAAQ,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;GACT,aAAa,CA4GzB"}
+{"version":3,"file":"statusFile.js","sourceRoot":"","sources":["../../src/models/statusFile.ts"],"names":[],"mappings":"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"}

package/dist/git/providers/commits.d.ts

@@ -77,6 +77,10 @@ export interface GitCommitReachability {
 export interface GitCommitsSubProvider {
     getCommit(repoPath: string, rev: string, cancellation?: AbortSignal): Promise<GitCommit | undefined>;
     getCommitCount(repoPath: string, rev: string, cancellation?: AbortSignal): Promise<number | undefined>;
+    /** Whether `rev` has any commits not reachable from any remote-tracking ref (i.e. unpushed/unpublished).
+     *  Cheap early-exit probe (`rev-list --not --remotes <rev> -n 1`) — it does NOT count them. Returns
+     *  `undefined` when it can't be determined. */
+    hasUnpublishedCommits?(repoPath: string, rev: string, cancellation?: AbortSignal): Promise<boolean | undefined>;
     /** Cheap author/committer date lookup for a single revision. Skips the full commit parse (no files, parents, or message) — use when only the dates are needed. Pass a full SHA so caching stays correct (commits are immutable; refs are not). */
     getCommitDates?(repoPath: string, rev: string, cancellation?: AbortSignal): Promise<{
         authorDate: Date;

package/dist/git/providers/commits.d.ts.map

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

package/dist/git/providers/config.d.ts

@@ -52,9 +52,7 @@ export interface GitConfigSubProvider {
         commonGitDir: string | undefined;
         superprojectPath: string | undefined;
     } | [safe: true, repoPath: string] | [safe: false] | []>;
-    getGkConfig?(repoPath: string, key: GkConfigKeys | DeprecatedGkConfigKeys, options?: {
-        type?: GitConfigType;
-    }): Promise<string | undefined>;
+    getGkConfig?(repoPath: string, key: GkConfigKeys | DeprecatedGkConfigKeys): Promise<string | undefined>;
     getGkConfigRegex?(repoPath: string, pattern: string): Promise<Map<string, string>>;
     setGkConfig?(repoPath: string, key: GkConfigKeys | DeprecatedGkConfigKeys, value: string | undefined, options?: {
         skipInvalidation?: readonly GkConfigInvalidationTarget[];

package/dist/git/providers/config.d.ts.map

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

package/dist/git/providers/operations.d.ts

@@ -18,22 +18,14 @@ export interface GitOperationResult {
  */
 export type GitOperationRunOptions = Pick<GitRunOptions, 'env' | 'cancellation' | 'timeout'>;
 export interface GitOperationsSubProvider {
+    /**
+     * Switches the repository to a branch or ref. Pure branch/ref switching — does not accept
+     * a path. For path-level operations use {@link restore}.
+     */
     checkout(repoPath: string, ref: string, options?: {
         createBranch?: string | undefined;
-    } | {
-        path?: string | undefined;
+        noTracking?: boolean;
     }, runOptions?: GitOperationRunOptions): Promise<void>;
-    /**
-     * Checks out one side of a conflicted path during a paused merge/rebase/cherry-pick.
-     * Executes `git checkout --ours|--theirs -- <path>`, leaving the file unstaged.
-     */
-    checkoutConflictedPath(repoPath: string, path: string, side: 'ours' | 'theirs', runOptions?: GitOperationRunOptions): Promise<void>;
-    /**
-     * Checks out one side for multiple conflicted paths during a paused merge/rebase/cherry-pick.
-     * Batches paths into `git checkout --ours|--theirs -- <paths...>`, chunked to stay under the
-     * CLI length limit. Leaves files unstaged.
-     */
-    checkoutConflictedPaths(repoPath: string, paths: string[], side: 'ours' | 'theirs', runOptions?: GitOperationRunOptions): Promise<void>;
     cherryPick(repoPath: string, revs: string[], options?: {
         edit?: boolean;
         noCommit?: boolean;
@@ -77,8 +69,24 @@ export interface GitOperationsSubProvider {
     rebase(repoPath: string, upstream: string, options?: {
         autoStash?: boolean;
         branch?: string;
+        /** Command set as `sequence.editor` — edits the interactive rebase todo list. */
         editor?: string;
         interactive?: boolean;
+        /**
+         * Set when the `editor` is a script that rewrites the todo by command word + SHA (e.g. the
+         * Commit Graph's headless squash/drop/reword) rather than a human. Forces git to emit a plain,
+         * natural-order todo by disabling `rebase.autosquash` (which would reorder commits and rewrite
+         * `pick`→`fixup` for `fixup!`/`squash!` commits) and `rebase.abbreviateCommands` (which would
+         * emit `p` instead of `pick`). Both honor the user's git config otherwise.
+         */
+        programmaticEditor?: boolean;
+        /**
+         * Command git uses to edit per-commit messages (the combined message a `squash` produces, or a
+         * `reword`). Applied as `GIT_EDITOR` — which git's interactive-rebase `reword`/`squash` step honors,
+         * unlike `core.editor` — with `core.editor` also set as a fallback. When omitted, git falls back to
+         * the user's configured editor.
+         */
+        messageEditor?: string;
         onto?: string;
         updateRefs?: boolean;
         source?: unknown;
@@ -86,6 +94,25 @@ export interface GitOperationsSubProvider {
     reset(repoPath: string, rev: string, options?: {
         mode?: 'hard' | 'keep' | 'merge' | 'mixed' | 'soft';
     }, runOptions?: GitOperationRunOptions): Promise<void>;
+    /**
+     * Restores the working-tree copy of one or more paths. Single path or array; arrays are
+     * chunked under the CLI length limit and dispatched as one git invocation per chunk
+     * (typically one for normal-sized batches).
+     *
+     * Source selection — `options` is mutually exclusive (`side` wins if both are supplied):
+     *
+     * - **No options** (`git checkout -- <paths>`): copies the index to the working tree, leaving
+     *   the index untouched. Use to drop unstaged changes (mixed-file partial discard preserves
+     *   the staged portion this way).
+     * - **`{ ref }`** (`git checkout <ref> -- <paths>`): resets BOTH the index and the working
+     *   tree of the path(s) to `<ref>`. Use to fully revert files to HEAD, a specific commit, etc.
+     * - **`{ side }`** (`git checkout --ours|--theirs -- <paths>`): conflict-resolution
+     *   shortcut, valid only during a paused merge/rebase/cherry-pick. Leaves files unstaged.
+     */
+    restore(repoPath: string, path: string | string[], options?: {
+        ref?: string;
+        side?: 'ours' | 'theirs';
+    }, runOptions?: GitOperationRunOptions): Promise<void>;
     revert(repoPath: string, refs: string[], options?: {
         editMessage?: boolean;
         source?: unknown;

package/dist/git/providers/operations.d.ts.map

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

package/dist/git/providers/worktrees.d.ts

@@ -6,12 +6,14 @@ export interface GitWorktreesSubProvider {
         createBranch?: string;
         detach?: boolean;
         force?: boolean;
+        noTracking?: boolean;
     }): Promise<void>;
     createWorktreeWithResult(repoPath: string, path: string, options?: {
         commitish?: string;
         createBranch?: string;
         detach?: boolean;
         force?: boolean;
+        noTracking?: boolean;
     }): Promise<GitWorktree | undefined>;
     getWorktree(repoPath: string, predicate: (w: GitWorktree) => boolean, cancellation?: AbortSignal): Promise<GitWorktree | undefined>;
     getWorktrees(repoPath: string, cancellation?: AbortSignal): Promise<GitWorktree[]>;

package/dist/git/providers/worktrees.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"worktrees.d.ts","sourceRoot":"","sources":["../../src/providers/worktrees.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,uBAAuB,CAAC;AACjD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAEzD,MAAM,WAAW,uBAAuB;IACvC,cAAc,CACb,QAAQ,EAAE,MAAM,EAChB,IAAI,EAAE,MAAM,EACZ,OAAO,CAAC,EAAE;QAAE,SAAS,CAAC,EAAE,MAAM,CAAC;QAAC,YAAY,CAAC,EAAE,MAAM,CAAC;QAAC,MAAM,CAAC,EAAE,OAAO,CAAC;QAAC,KAAK,CAAC,EAAE,OAAO,CAAA;KAAE,GACxF,OAAO,CAAC,IAAI,CAAC,CAAC;IACjB,wBAAwB,CACvB,QAAQ,EAAE,MAAM,EAChB,IAAI,EAAE,MAAM,EACZ,OAAO,CAAC,EAAE;QAAE,SAAS,CAAC,EAAE,MAAM,CAAC;QAAC,YAAY,CAAC,EAAE,MAAM,CAAC;QAAC,MAAM,CAAC,EAAE,OAAO,CAAC;QAAC,KAAK,CAAC,EAAE,OAAO,CAAA;KAAE,GACxF,OAAO,CAAC,WAAW,GAAG,SAAS,CAAC,CAAC;IACpC,WAAW,CACV,QAAQ,EAAE,MAAM,EAChB,SAAS,EAAE,CAAC,CAAC,EAAE,WAAW,KAAK,OAAO,EACtC,YAAY,CAAC,EAAE,WAAW,GACxB,OAAO,CAAC,WAAW,GAAG,SAAS,CAAC,CAAC;IACpC,YAAY,CAAC,QAAQ,EAAE,MAAM,EAAE,YAAY,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,WAAW,EAAE,CAAC,CAAC;IACnF,sBAAsB,CAAC,QAAQ,EAAE,MAAM,GAAG,GAAG,GAAG,SAAS,CAAC;IAC1D,cAAc,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,GAAG,EAAE,OAAO,CAAC,EAAE;QAAE,KAAK,CAAC,EAAE,OAAO,CAAA;KAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CACnG"}
+{"version":3,"file":"worktrees.d.ts","sourceRoot":"","sources":["../../src/providers/worktrees.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,uBAAuB,CAAC;AACjD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAEzD,MAAM,WAAW,uBAAuB;IACvC,cAAc,CACb,QAAQ,EAAE,MAAM,EAChB,IAAI,EAAE,MAAM,EACZ,OAAO,CAAC,EAAE;QACT,SAAS,CAAC,EAAE,MAAM,CAAC;QACnB,YAAY,CAAC,EAAE,MAAM,CAAC;QACtB,MAAM,CAAC,EAAE,OAAO,CAAC;QACjB,KAAK,CAAC,EAAE,OAAO,CAAC;QAChB,UAAU,CAAC,EAAE,OAAO,CAAC;KACrB,GACC,OAAO,CAAC,IAAI,CAAC,CAAC;IACjB,wBAAwB,CACvB,QAAQ,EAAE,MAAM,EAChB,IAAI,EAAE,MAAM,EACZ,OAAO,CAAC,EAAE;QACT,SAAS,CAAC,EAAE,MAAM,CAAC;QACnB,YAAY,CAAC,EAAE,MAAM,CAAC;QACtB,MAAM,CAAC,EAAE,OAAO,CAAC;QACjB,KAAK,CAAC,EAAE,OAAO,CAAC;QAChB,UAAU,CAAC,EAAE,OAAO,CAAC;KACrB,GACC,OAAO,CAAC,WAAW,GAAG,SAAS,CAAC,CAAC;IACpC,WAAW,CACV,QAAQ,EAAE,MAAM,EAChB,SAAS,EAAE,CAAC,CAAC,EAAE,WAAW,KAAK,OAAO,EACtC,YAAY,CAAC,EAAE,WAAW,GACxB,OAAO,CAAC,WAAW,GAAG,SAAS,CAAC,CAAC;IACpC,YAAY,CAAC,QAAQ,EAAE,MAAM,EAAE,YAAY,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,WAAW,EAAE,CAAC,CAAC;IACnF,sBAAsB,CAAC,QAAQ,EAAE,MAAM,GAAG,GAAG,GAAG,SAAS,CAAC;IAC1D,cAAc,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,GAAG,EAAE,OAAO,CAAC,EAAE;QAAE,KAAK,CAAC,EAAE,OAAO,CAAA;KAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CACnG"}

package/dist/git/remotes/custom.d.ts

@@ -13,6 +13,8 @@ export declare class CustomRemoteProvider extends RemoteProvider {
     get name(): string;
     protected get issueLinkPattern(): string;
     get autolinks(): (AutolinkReference | DynamicAutolinkReference)[];
+    get avatarUrlTemplate(): string | undefined;
+    getUrlForAvatar(email: string, size: number): string | undefined;
     protected getUrlForRepository(): string;
     protected getUrlForBranches(): string;
     protected getUrlForBranch(branch: string): string;

package/dist/git/remotes/custom.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"custom.d.ts","sourceRoot":"","sources":["../../src/remotes/custom.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,iBAAiB,EAAE,wBAAwB,EAAE,MAAM,uBAAuB,CAAC;AACzF,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AACxD,OAAO,KAAK,EAAE,gBAAgB,EAAE,iBAAiB,EAAE,MAAM,6BAA6B,CAAC;AACvF,OAAO,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAC7D,OAAO,KAAK,EAAE,+BAA+B,EAAE,MAAM,6BAA6B,CAAC;AACnF,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,mCAAmC,CAAC;AACtE,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,uBAAuB,CAAC;AAEtE,qBAAa,oBAAqB,SAAQ,cAAc;IACvD,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAoB;gBAE7B,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,iBAAiB,EAAE,QAAQ,CAAC,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM;IAKnG,IAAI,EAAE,IAAI,gBAAgB,CAEzB;IAED,IAAI,YAAY,IAAI,YAAY,GAAG,SAAS,CAE3C;IAED,IAAI,IAAI,IAAI,MAAM,CAEjB;IAED,cAAuB,gBAAgB,IAAI,MAAM,CAEhD;IAED,IAAa,SAAS,IAAI,CAAC,iBAAiB,GAAG,wBAAwB,CAAC,EAAE,CAEzE;cAEkB,mBAAmB,IAAI,MAAM;IAIhD,SAAS,CAAC,iBAAiB,IAAI,MAAM;IAIrC,SAAS,CAAC,eAAe,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM;IAIjD,SAAS,CAAC,eAAe,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM;cAI3B,mBAAmB,CACrC,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,EACZ,QAAQ,EAAE,wBAAwB,GAChC,MAAM,GAAG,SAAS;cAMF,0BAA0B,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,EAAE,+BAA+B,GAAG,MAAM,GAAG,SAAS;IASlH,SAAS,CAAC,aAAa,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,SAAS,GAAG,MAAM;IA6CnG,OAAO,CAAC,MAAM;IAMd,OAAO,CAAC,UAAU;CAelB"}
+{"version":3,"file":"custom.d.ts","sourceRoot":"","sources":["../../src/remotes/custom.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,iBAAiB,EAAE,wBAAwB,EAAE,MAAM,uBAAuB,CAAC;AACzF,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AACxD,OAAO,KAAK,EAAE,gBAAgB,EAAE,iBAAiB,EAAE,MAAM,6BAA6B,CAAC;AACvF,OAAO,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAC7D,OAAO,KAAK,EAAE,+BAA+B,EAAE,MAAM,6BAA6B,CAAC;AACnF,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,mCAAmC,CAAC;AACtE,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,uBAAuB,CAAC;AAEtE,qBAAa,oBAAqB,SAAQ,cAAc;IACvD,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAoB;gBAE7B,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,iBAAiB,EAAE,QAAQ,CAAC,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM;IAKnG,IAAI,EAAE,IAAI,gBAAgB,CAEzB;IAED,IAAI,YAAY,IAAI,YAAY,GAAG,SAAS,CAE3C;IAED,IAAI,IAAI,IAAI,MAAM,CAEjB;IAED,cAAuB,gBAAgB,IAAI,MAAM,CAEhD;IAED,IAAa,SAAS,IAAI,CAAC,iBAAiB,GAAG,wBAAwB,CAAC,EAAE,CAEzE;IAED,IAAI,iBAAiB,IAAI,MAAM,GAAG,SAAS,CAE1C;IAED,eAAe,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS;cAmB7C,mBAAmB,IAAI,MAAM;IAIhD,SAAS,CAAC,iBAAiB,IAAI,MAAM;IAIrC,SAAS,CAAC,eAAe,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM;IAIjD,SAAS,CAAC,eAAe,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM;cAI3B,mBAAmB,CACrC,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,EACZ,QAAQ,EAAE,wBAAwB,GAChC,MAAM,GAAG,SAAS;cAMF,0BAA0B,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,EAAE,+BAA+B,GAAG,MAAM,GAAG,SAAS;IASlH,SAAS,CAAC,aAAa,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,SAAS,GAAG,MAAM;IA6CnG,OAAO,CAAC,MAAM;IAMd,OAAO,CAAC,UAAU;CAelB"}

package/dist/git/remotes/custom.js

@@ -21,6 +21,26 @@ export class CustomRemoteProvider extends RemoteProvider {
     get autolinks() {
         return [];
     }
+    get avatarUrlTemplate() {
+        return this.urls.avatar;
+    }
+    getUrlForAvatar(email, size) {
+        if (this.urls.avatar == null)
+            return undefined;
+        // Split on the last `@` so local-parts that contain `@` are preserved (per RFC 5322)
+        const at = email.lastIndexOf('@');
+        const emailName = at === -1 ? email : email.slice(0, at);
+        const domain = at === -1 ? '' : email.slice(at + 1);
+        // Component-encode identity values — commit emails are attacker-controllable and
+        // must never be able to inject URL-structural characters (`/`, `?`, `#`, ...) into the
+        // resulting URL
+        return interpolate(this.urls.avatar, {
+            email: encodeURIComponent(email),
+            emailName: encodeURIComponent(emailName),
+            domain: encodeURIComponent(domain),
+            size: String(size),
+        });
+    }
     getUrlForRepository() {
         return this.getUrl(this.urls.repository, this.getContext());
     }

package/dist/git/remotes/custom.js.map

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

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

@@ -1,6 +1,38 @@
 import type { GitFileConflictStatus } from '../models/fileStatus.js';
 export type ConflictResolutionAction = 'take-ours' | 'take-theirs' | 'delete' | 'unsupported';
+/**
+ * A richer description of a conflict than the raw XY status code — used to label conflicts the
+ * AI text resolver can't parse (binary, symlink, submodule, mode-only, add/add) and to surface
+ * rename conflicts. Derived by {@link classifyConflictKind} from the XY status plus, when
+ * available, the per-stage file modes/oids and rename/binary hints the caller computes.
+ */
+export type ConflictKind = 'text' | 'binary' | 'symlink' | 'submodule' | 'mode-only' | 'add-add' | 'delete-modify' | 'both-deleted' | 'rename-rename' | 'rename-delete' | 'rename-modify' | 'unknown';
+export type ConflictRenameKind = 'rename-rename' | 'rename-delete' | 'rename-modify';
+/**
+ * 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 declare function classifyConflictKind(status: GitFileConflictStatus, modes?: {
+    base?: string;
+    current?: string;
+    incoming?: string;
+}, oids?: {
+    base?: string;
+    current?: string;
+    incoming?: string;
+}, hints?: {
+    binary?: boolean;
+    rename?: ConflictRenameKind;
+}): ConflictKind;
 export declare function classifyConflictAction(status: GitFileConflictStatus, resolution: 'current' | 'incoming'): ConflictResolutionAction;
 export declare function canStageCurrent(status: GitFileConflictStatus): boolean;
 export declare function canStageIncoming(status: GitFileConflictStatus): boolean;
+/** 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 declare function getConflictKindLabel(kind: ConflictKind, renameOf?: string): {
+    label: string;
+    description: string;
+};
 //# sourceMappingURL=conflictResolution.utils.d.ts.map

package/dist/git/utils/conflictResolution.utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"conflictResolution.utils.d.ts","sourceRoot":"","sources":["../../src/utils/conflictResolution.utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,yBAAyB,CAAC;AAErE,MAAM,MAAM,wBAAwB,GAAG,WAAW,GAAG,aAAa,GAAG,QAAQ,GAAG,aAAa,CAAC;AAE9F,wBAAgB,sBAAsB,CACrC,MAAM,EAAE,qBAAqB,EAC7B,UAAU,EAAE,SAAS,GAAG,UAAU,GAChC,wBAAwB,CAa1B;AAGD,wBAAgB,eAAe,CAAC,MAAM,EAAE,qBAAqB,GAAG,OAAO,CAEtE;AAGD,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,qBAAqB,GAAG,OAAO,CAEvE"}
+{"version":3,"file":"conflictResolution.utils.d.ts","sourceRoot":"","sources":["../../src/utils/conflictResolution.utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,yBAAyB,CAAC;AAErE,MAAM,MAAM,wBAAwB,GAAG,WAAW,GAAG,aAAa,GAAG,QAAQ,GAAG,aAAa,CAAC;AAE9F;;;;;GAKG;AACH,MAAM,MAAM,YAAY,GACrB,MAAM,GACN,QAAQ,GACR,SAAS,GACT,WAAW,GACX,WAAW,GACX,SAAS,GACT,eAAe,GACf,cAAc,GACd,eAAe,GACf,eAAe,GACf,eAAe,GACf,SAAS,CAAC;AAEb,MAAM,MAAM,kBAAkB,GAAG,eAAe,GAAG,eAAe,GAAG,eAAe,CAAC;AAKrF;;;;;GAKG;AACH,wBAAgB,oBAAoB,CACnC,MAAM,EAAE,qBAAqB,EAC7B,KAAK,CAAC,EAAE;IAAE,IAAI,CAAC,EAAE,MAAM,CAAC;IAAC,OAAO,CAAC,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,EAAE,MAAM,CAAA;CAAE,EAC9D,IAAI,CAAC,EAAE;IAAE,IAAI,CAAC,EAAE,MAAM,CAAC;IAAC,OAAO,CAAC,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,EAAE,MAAM,CAAA;CAAE,EAC7D,KAAK,CAAC,EAAE;IAAE,MAAM,CAAC,EAAE,OAAO,CAAC;IAAC,MAAM,CAAC,EAAE,kBAAkB,CAAA;CAAE,GACvD,YAAY,CA2Bd;AAED,wBAAgB,sBAAsB,CACrC,MAAM,EAAE,qBAAqB,EAC7B,UAAU,EAAE,SAAS,GAAG,UAAU,GAChC,wBAAwB,CAa1B;AAGD,wBAAgB,eAAe,CAAC,MAAM,EAAE,qBAAqB,GAAG,OAAO,CAEtE;AAGD,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,qBAAqB,GAAG,OAAO,CAEvE;AAED;kFACkF;AAClF,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,YAAY,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,WAAW,EAAE,MAAM,CAAA;CAAE,CAyDlH"}

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

@@ -1,3 +1,38 @@
+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';
+}
 export function classifyConflictAction(status, resolution) {
     const takeCurrent = resolution === 'current';
     if (status === 'DD')
@@ -22,4 +57,64 @@ export function canStageCurrent(status) {
 export 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' };
+    }
+}
 //# sourceMappingURL=conflictResolution.utils.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"conflictResolution.utils.js","sourceRoot":"","sources":["../../src/utils/conflictResolution.utils.ts"],"names":[],"mappings":"AAIA,MAAM,UAAU,sBAAsB,CACrC,MAA6B,EAC7B,UAAkC;IAElC,MAAM,WAAW,GAAG,UAAU,KAAK,SAAS,CAAC;IAE7C,IAAI,MAAM,KAAK,IAAI;QAAE,OAAO,QAAQ,CAAC;IACrC,IAAI,MAAM,KAAK,IAAI,IAAI,CAAC,WAAW;QAAE,OAAO,QAAQ,CAAC;IACrD,IAAI,MAAM,KAAK,IAAI,IAAI,WAAW;QAAE,OAAO,QAAQ,CAAC;IAEpD,2EAA2E;IAC3E,4EAA4E;IAC5E,IAAI,MAAM,KAAK,IAAI,IAAI,WAAW;QAAE,OAAO,aAAa,CAAC;IACzD,IAAI,MAAM,KAAK,IAAI,IAAI,CAAC,WAAW;QAAE,OAAO,aAAa,CAAC;IAE1D,OAAO,WAAW,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,aAAa,CAAC;AAClD,CAAC;AAED,sHAAsH;AACtH,MAAM,UAAU,eAAe,CAAC,MAA6B;IAC5D,OAAO,MAAM,KAAK,IAAI,IAAI,MAAM,KAAK,IAAI,CAAC;AAC3C,CAAC;AAED,sHAAsH;AACtH,MAAM,UAAU,gBAAgB,CAAC,MAA6B;IAC7D,OAAO,MAAM,KAAK,IAAI,IAAI,MAAM,KAAK,IAAI,CAAC;AAC3C,CAAC"}
+{"version":3,"file":"conflictResolution.utils.js","sourceRoot":"","sources":["../../src/utils/conflictResolution.utils.ts"],"names":[],"mappings":"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"}

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

@@ -12,4 +12,7 @@ export declare const defaultContributorScoreOptions: ContributorScoreOptions;
 export declare function calculateContributionScore(stats: GitCommitStats | undefined, timestamp: number, options?: ContributorScoreOptions): number;
 export declare function calculateDistribution<T extends string>(stats: GitContributorsStats | undefined, prefix: T): Record<`${typeof prefix}${GitContributionTiers}`, number>;
 export declare function matchContributor(c: GitContributor, user: GitUser): boolean;
+/** 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;
 //# sourceMappingURL=contributor.utils.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"contributor.utils.d.ts","sourceRoot":"","sources":["../../src/utils/contributor.utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAC1D,OAAO,KAAK,EAAE,oBAAoB,EAAE,cAAc,EAAE,oBAAoB,EAAE,MAAM,0BAA0B,CAAC;AAC3G,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAEjD,MAAM,WAAW,uBAAuB;IAEvC,qBAAqB,EAAE,MAAM,CAAC;IAC9B,qBAAqB,EAAE,MAAM,CAAC;IAG9B,YAAY,EAAE,MAAM,CAAC;IAGrB,eAAe,EAAE,MAAM,CAAC;IACxB,eAAe,EAAE,MAAM,CAAC;CACxB;AAED,eAAO,MAAM,8BAA8B,EAAE,uBAM5C,CAAC;AAEF,wBAAgB,0BAA0B,CACzC,KAAK,EAAE,cAAc,GAAG,SAAS,EACjC,SAAS,EAAE,MAAM,EACjB,OAAO,GAAE,uBAAwD,GAC/D,MAAM,CAaR;AAED,wBAAgB,qBAAqB,CAAC,CAAC,SAAS,MAAM,EACrD,KAAK,EAAE,oBAAoB,GAAG,SAAS,EACvC,MAAM,EAAE,CAAC,GACP,MAAM,CAAC,GAAG,OAAO,MAAM,GAAG,oBAAoB,EAAE,EAAE,MAAM,CAAC,CA6B3D;AAED,wBAAgB,gBAAgB,CAAC,CAAC,EAAE,cAAc,EAAE,IAAI,EAAE,OAAO,GAAG,OAAO,CAE1E"}
+{"version":3,"file":"contributor.utils.d.ts","sourceRoot":"","sources":["../../src/utils/contributor.utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAC1D,OAAO,KAAK,EAAE,oBAAoB,EAAE,cAAc,EAAE,oBAAoB,EAAE,MAAM,0BAA0B,CAAC;AAC3G,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAEjD,MAAM,WAAW,uBAAuB;IAEvC,qBAAqB,EAAE,MAAM,CAAC;IAC9B,qBAAqB,EAAE,MAAM,CAAC;IAG9B,YAAY,EAAE,MAAM,CAAC;IAGrB,eAAe,EAAE,MAAM,CAAC;IACxB,eAAe,EAAE,MAAM,CAAC;CACxB;AAED,eAAO,MAAM,8BAA8B,EAAE,uBAM5C,CAAC;AAEF,wBAAgB,0BAA0B,CACzC,KAAK,EAAE,cAAc,GAAG,SAAS,EACjC,SAAS,EAAE,MAAM,EACjB,OAAO,GAAE,uBAAwD,GAC/D,MAAM,CAaR;AAED,wBAAgB,qBAAqB,CAAC,CAAC,SAAS,MAAM,EACrD,KAAK,EAAE,oBAAoB,GAAG,SAAS,EACvC,MAAM,EAAE,CAAC,GACP,MAAM,CAAC,GAAG,OAAO,MAAM,GAAG,oBAAoB,EAAE,EAAE,MAAM,CAAC,CA6B3D;AAED,wBAAgB,gBAAgB,CAAC,CAAC,EAAE,cAAc,EAAE,IAAI,EAAE,OAAO,GAAG,OAAO,CAE1E;AAED;sGACsG;AACtG,wBAAgB,wBAAwB,CAAC,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,QAAQ,CAAC,MAAM,CAAC,GAAG,MAAM,CAoB7F"}

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

@@ -52,4 +52,26 @@ export function calculateDistribution(stats, prefix) {
 export 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;
+}
 //# sourceMappingURL=contributor.utils.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"contributor.utils.js","sourceRoot":"","sources":["../../src/utils/contributor.utils.ts"],"names":[],"mappings":"AAiBA,MAAM,CAAC,MAAM,8BAA8B,GAA4B;IACtE,qBAAqB,EAAE,EAAE;IACzB,YAAY,EAAE,GAAG;IACjB,eAAe,EAAE,GAAG;IACpB,eAAe,EAAE,GAAG;IACpB,qBAAqB,EAAE,IAAI;CAC3B,CAAC;AAEF,MAAM,UAAU,0BAA0B,CACzC,KAAiC,EACjC,SAAiB,EACjB,UAAmC,8BAA8B;IAEjE,IAAI,KAAK,IAAI,IAAI;QAAE,OAAO,CAAC,CAAC;IAE5B,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;IACvB,MAAM,SAAS,GAAG,CAAC,GAAG,GAAG,SAAS,CAAC,GAAG,CAAC,EAAE,GAAG,IAAI,GAAG,IAAI,CAAC,CAAC;IAEzD,wCAAwC;IACxC,MAAM,YAAY,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,SAAS,GAAG,OAAO,CAAC,qBAAqB,CAAC,CAAC;IAE1E,wCAAwC;IACxC,MAAM,WAAW,GAAG,KAAK,CAAC,SAAS,GAAG,OAAO,CAAC,eAAe,GAAG,KAAK,CAAC,SAAS,GAAG,OAAO,CAAC,eAAe,CAAC;IAE1G,OAAO,IAAI,CAAC,GAAG,CAAC,WAAW,GAAG,CAAC,CAAC,GAAG,YAAY,GAAG,OAAO,CAAC,YAAY,CAAC,EAAE,OAAO,CAAC,qBAAqB,CAAC,CAAC;AACzG,CAAC;AAED,MAAM,UAAU,qBAAqB,CACpC,KAAuC,EACvC,MAAS;IAET,IAAI,KAAK,IAAI,IAAI;QAAE,OAAO,EAA0E,CAAC;IAErG,MAAM,YAAY,GAAuD;QACxE,CAAC,GAAG,MAAM,KAAK,CAAC,EAAE,CAAC;QACnB,CAAC,GAAG,MAAM,OAAO,CAAC,EAAE,CAAC;QACrB,CAAC,GAAG,MAAM,QAAQ,CAAC,EAAE,CAAC;QACtB,CAAC,GAAG,MAAM,SAAS,CAAC,EAAE,CAAC;QACvB,CAAC,GAAG,MAAM,UAAU,CAAC,EAAE,CAAC;QACxB,CAAC,GAAG,MAAM,QAAQ,CAAC,EAAE,CAAC;KACtB,CAAC;IAEF,KAAK,MAAM,CAAC,IAAI,KAAK,CAAC,aAAa,EAAE,CAAC;QACrC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC;YACb,YAAY,CAAC,GAAG,MAAM,KAAK,CAAC,EAAE,CAAC;QAChC,CAAC;aAAM,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;YACnB,YAAY,CAAC,GAAG,MAAM,OAAO,CAAC,EAAE,CAAC;QAClC,CAAC;aAAM,IAAI,CAAC,IAAI,EAAE,EAAE,CAAC;YACpB,YAAY,CAAC,GAAG,MAAM,QAAQ,CAAC,EAAE,CAAC;QACnC,CAAC;aAAM,IAAI,CAAC,IAAI,EAAE,EAAE,CAAC;YACpB,YAAY,CAAC,GAAG,MAAM,SAAS,CAAC,EAAE,CAAC;QACpC,CAAC;aAAM,IAAI,CAAC,IAAI,GAAG,EAAE,CAAC;YACrB,YAAY,CAAC,GAAG,MAAM,UAAU,CAAC,EAAE,CAAC;QACrC,CAAC;aAAM,CAAC;YACP,YAAY,CAAC,GAAG,MAAM,QAAQ,CAAC,EAAE,CAAC;QACnC,CAAC;IACF,CAAC;IAED,OAAO,YAAY,CAAC;AACrB,CAAC;AAED,MAAM,UAAU,gBAAgB,CAAC,CAAiB,EAAE,IAAa;IAChE,OAAO,CAAC,CAAC,IAAI,KAAK,IAAI,CAAC,IAAI,IAAI,CAAC,CAAC,KAAK,KAAK,IAAI,CAAC,KAAK,IAAI,CAAC,CAAC,QAAQ,KAAK,IAAI,CAAC,QAAQ,CAAC;AACvF,CAAC"}
+{"version":3,"file":"contributor.utils.js","sourceRoot":"","sources":["../../src/utils/contributor.utils.ts"],"names":[],"mappings":"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"}