sync-worktrees 1.7.4 → 1.8.0

package/README.md

@@ -252,7 +252,12 @@ sync-worktrees intelligently handles branches that have been rebased or force-pu
    - Automatically resets the worktree to match the upstream
    - No data loss since the content is the same
 
-2. **Diverged branches** - When a branch has different content after rebase/force-push:
+2. **Diverged branches with NO local changes** - When someone force-pushes but you haven't made local commits:
+   - Automatically resets to the new upstream state
+   - No move to `.diverged` since you have no work to preserve
+   - Keeps `.diverged` clean by only preserving actual user work
+
+3. **Diverged branches WITH local changes** - When a branch has different content AND you've made local commits:
    - Moves the worktree to `.diverged` directory within your worktrees folder
    - Preserves all your local changes and commits
    - Creates a fresh worktree from the upstream branch

package/dist/constants.d.ts

@@ -0,0 +1,54 @@
+export declare const GIT_CONSTANTS: {
+    readonly REMOTE_PREFIX: "origin/";
+    readonly REMOTE_NAME: "origin";
+    readonly HEAD_REF: "/HEAD";
+    readonly DEFAULT_BRANCH: "main";
+    readonly BARE_DIR_NAME: ".bare";
+    readonly DIVERGED_DIR_NAME: ".diverged";
+    readonly REFS: {
+        readonly HEADS: "refs/heads/";
+        readonly REMOTES: "refs/remotes/origin";
+        readonly REMOTES_ORIGIN: "refs/remotes/origin/*";
+    };
+    readonly FETCH_CONFIG: "+refs/heads/*:refs/remotes/origin/*";
+};
+export declare const GIT_OPERATIONS: {
+    readonly MERGE_HEAD: "MERGE_HEAD";
+    readonly CHERRY_PICK_HEAD: "CHERRY_PICK_HEAD";
+    readonly REVERT_HEAD: "REVERT_HEAD";
+    readonly BISECT_LOG: "BISECT_LOG";
+    readonly REBASE_MERGE: "rebase-merge";
+    readonly REBASE_APPLY: "rebase-apply";
+};
+export declare const DEFAULT_CONFIG: {
+    readonly CRON_SCHEDULE: "0 * * * *";
+    readonly RETRY: {
+        readonly MAX_ATTEMPTS: 3;
+        readonly MAX_LFS_RETRIES: 2;
+        readonly INITIAL_DELAY_MS: 1000;
+        readonly MAX_DELAY_MS: 30000;
+        readonly BACKOFF_MULTIPLIER: 2;
+    };
+    readonly UPDATE_EXISTING_WORKTREES: true;
+};
+export declare const ERROR_MESSAGES: {
+    readonly GIT_NOT_INITIALIZED: "Git service not initialized. Call initialize() first.";
+    readonly ALREADY_EXISTS: "already exists";
+    readonly ALREADY_REGISTERED: "already registered worktree";
+    readonly FAST_FORWARD_FAILED: readonly ["Not possible to fast-forward", "fatal: Not possible to fast-forward, aborting", "cannot fast-forward"];
+    readonly NO_UPSTREAM: readonly ["fatal: no upstream configured", "no upstream configured for branch", "fatal: ambiguous argument", "unknown revision or path"];
+    readonly LFS_ERROR: readonly ["smudge filter lfs failed", "git-lfs", "LFS"];
+    readonly EXDEV: "EXDEV";
+};
+export declare const TEST_TIMEOUT: {
+    readonly DEFAULT: 10000;
+    readonly E2E: 60000;
+};
+export declare const PATH_CONSTANTS: {
+    readonly GIT_DIR: ".git";
+    readonly README: "README";
+};
+export declare const METADATA_CONSTANTS: {
+    readonly MAX_HISTORY_ENTRIES: 10;
+};
+//# sourceMappingURL=constants.d.ts.map

package/dist/constants.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../src/constants.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,aAAa;;;;;;;;;;;;;CAahB,CAAC;AAEX,eAAO,MAAM,cAAc;;;;;;;CAOjB,CAAC;AAEX,eAAO,MAAM,cAAc;;;;;;;;;;CAUjB,CAAC;AAEX,eAAO,MAAM,cAAc;;;;;;;;CAiBjB,CAAC;AAEX,eAAO,MAAM,YAAY;;;CAGf,CAAC;AAEX,eAAO,MAAM,cAAc;;;CAGjB,CAAC;AAEX,eAAO,MAAM,kBAAkB;;CAErB,CAAC"}

package/dist/constants.js

@@ -0,0 +1,66 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.METADATA_CONSTANTS = exports.PATH_CONSTANTS = exports.TEST_TIMEOUT = exports.ERROR_MESSAGES = exports.DEFAULT_CONFIG = exports.GIT_OPERATIONS = exports.GIT_CONSTANTS = void 0;
+exports.GIT_CONSTANTS = {
+    REMOTE_PREFIX: "origin/",
+    REMOTE_NAME: "origin",
+    HEAD_REF: "/HEAD",
+    DEFAULT_BRANCH: "main",
+    BARE_DIR_NAME: ".bare",
+    DIVERGED_DIR_NAME: ".diverged",
+    REFS: {
+        HEADS: "refs/heads/",
+        REMOTES: "refs/remotes/origin",
+        REMOTES_ORIGIN: "refs/remotes/origin/*",
+    },
+    FETCH_CONFIG: "+refs/heads/*:refs/remotes/origin/*",
+};
+exports.GIT_OPERATIONS = {
+    MERGE_HEAD: "MERGE_HEAD",
+    CHERRY_PICK_HEAD: "CHERRY_PICK_HEAD",
+    REVERT_HEAD: "REVERT_HEAD",
+    BISECT_LOG: "BISECT_LOG",
+    REBASE_MERGE: "rebase-merge",
+    REBASE_APPLY: "rebase-apply",
+};
+exports.DEFAULT_CONFIG = {
+    CRON_SCHEDULE: "0 * * * *",
+    RETRY: {
+        MAX_ATTEMPTS: 3,
+        MAX_LFS_RETRIES: 2,
+        INITIAL_DELAY_MS: 1000,
+        MAX_DELAY_MS: 30000,
+        BACKOFF_MULTIPLIER: 2,
+    },
+    UPDATE_EXISTING_WORKTREES: true,
+};
+exports.ERROR_MESSAGES = {
+    GIT_NOT_INITIALIZED: "Git service not initialized. Call initialize() first.",
+    ALREADY_EXISTS: "already exists",
+    ALREADY_REGISTERED: "already registered worktree",
+    FAST_FORWARD_FAILED: [
+        "Not possible to fast-forward",
+        "fatal: Not possible to fast-forward, aborting",
+        "cannot fast-forward",
+    ],
+    NO_UPSTREAM: [
+        "fatal: no upstream configured",
+        "no upstream configured for branch",
+        "fatal: ambiguous argument",
+        "unknown revision or path",
+    ],
+    LFS_ERROR: ["smudge filter lfs failed", "git-lfs", "LFS"],
+    EXDEV: "EXDEV",
+};
+exports.TEST_TIMEOUT = {
+    DEFAULT: 10000,
+    E2E: 60000,
+};
+exports.PATH_CONSTANTS = {
+    GIT_DIR: ".git",
+    README: "README",
+};
+exports.METADATA_CONSTANTS = {
+    MAX_HISTORY_ENTRIES: 10,
+};
+//# sourceMappingURL=constants.js.map

package/dist/constants.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"constants.js","sourceRoot":"","sources":["../src/constants.ts"],"names":[],"mappings":";;;AAAa,QAAA,aAAa,GAAG;IAC3B,aAAa,EAAE,SAAS;IACxB,WAAW,EAAE,QAAQ;IACrB,QAAQ,EAAE,OAAO;IACjB,cAAc,EAAE,MAAM;IACtB,aAAa,EAAE,OAAO;IACtB,iBAAiB,EAAE,WAAW;IAC9B,IAAI,EAAE;QACJ,KAAK,EAAE,aAAa;QACpB,OAAO,EAAE,qBAAqB;QAC9B,cAAc,EAAE,uBAAuB;KACxC;IACD,YAAY,EAAE,qCAAqC;CAC3C,CAAC;AAEE,QAAA,cAAc,GAAG;IAC5B,UAAU,EAAE,YAAY;IACxB,gBAAgB,EAAE,kBAAkB;IACpC,WAAW,EAAE,aAAa;IAC1B,UAAU,EAAE,YAAY;IACxB,YAAY,EAAE,cAAc;IAC5B,YAAY,EAAE,cAAc;CACpB,CAAC;AAEE,QAAA,cAAc,GAAG;IAC5B,aAAa,EAAE,WAAW;IAC1B,KAAK,EAAE;QACL,YAAY,EAAE,CAAC;QACf,eAAe,EAAE,CAAC;QAClB,gBAAgB,EAAE,IAAI;QACtB,YAAY,EAAE,KAAK;QACnB,kBAAkB,EAAE,CAAC;KACtB;IACD,yBAAyB,EAAE,IAAI;CACvB,CAAC;AAEE,QAAA,cAAc,GAAG;IAC5B,mBAAmB,EAAE,uDAAuD;IAC5E,cAAc,EAAE,gBAAgB;IAChC,kBAAkB,EAAE,6BAA6B;IACjD,mBAAmB,EAAE;QACnB,8BAA8B;QAC9B,+CAA+C;QAC/C,qBAAqB;KACtB;IACD,WAAW,EAAE;QACX,+BAA+B;QAC/B,mCAAmC;QACnC,2BAA2B;QAC3B,0BAA0B;KAC3B;IACD,SAAS,EAAE,CAAC,0BAA0B,EAAE,SAAS,EAAE,KAAK,CAAC;IACzD,KAAK,EAAE,OAAO;CACN,CAAC;AAEE,QAAA,YAAY,GAAG;IAC1B,OAAO,EAAE,KAAK;IACd,GAAG,EAAE,KAAK;CACF,CAAC;AAEE,QAAA,cAAc,GAAG;IAC5B,OAAO,EAAE,MAAM;IACf,MAAM,EAAE,QAAQ;CACR,CAAC;AAEE,QAAA,kBAAkB,GAAG;IAChC,mBAAmB,EAAE,EAAE;CACf,CAAC"}

package/dist/errors/index.d.ts

@@ -0,0 +1,51 @@
+export declare class SyncWorktreesError extends Error {
+    readonly code: string;
+    readonly cause?: Error | undefined;
+    constructor(message: string, code: string, cause?: Error | undefined);
+}
+export declare class GitError extends SyncWorktreesError {
+    constructor(message: string, code: string, cause?: Error);
+}
+export declare class GitNotInitializedError extends GitError {
+    constructor();
+}
+export declare class GitOperationError extends GitError {
+    constructor(operation: string, details: string, cause?: Error);
+}
+export declare class FastForwardError extends GitError {
+    readonly branchName: string;
+    constructor(branchName: string, cause?: Error);
+}
+export declare class WorktreeError extends SyncWorktreesError {
+    constructor(message: string, code: string, cause?: Error);
+}
+export declare class WorktreeAlreadyExistsError extends WorktreeError {
+    readonly path: string;
+    readonly branchName: string;
+    constructor(path: string, branchName: string);
+}
+export declare class WorktreeNotCleanError extends WorktreeError {
+    readonly path: string;
+    readonly reasons: string[];
+    constructor(path: string, reasons: string[]);
+}
+export declare class ConfigError extends SyncWorktreesError {
+    constructor(message: string, code: string, cause?: Error);
+}
+export declare class ConfigValidationError extends ConfigError {
+    readonly field: string;
+    readonly reason: string;
+    constructor(field: string, reason: string);
+}
+export declare class PathResolutionError extends SyncWorktreesError {
+    readonly path: string;
+    readonly reason: string;
+    constructor(path: string, reason: string);
+}
+export declare class LfsError extends GitError {
+    constructor(message: string, cause?: Error);
+}
+export declare function isLfsError(error: Error | string): boolean;
+export declare function isFastForwardError(error: Error | string): boolean;
+export declare function isNoUpstreamError(error: Error | string): boolean;
+//# sourceMappingURL=index.d.ts.map

package/dist/errors/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/errors/index.ts"],"names":[],"mappings":"AAEA,qBAAa,kBAAmB,SAAQ,KAAK;aAGzB,IAAI,EAAE,MAAM;aACZ,KAAK,CAAC,EAAE,KAAK;gBAF7B,OAAO,EAAE,MAAM,EACC,IAAI,EAAE,MAAM,EACZ,KAAK,CAAC,EAAE,KAAK,YAAA;CAShC;AAED,qBAAa,QAAS,SAAQ,kBAAkB;gBAClC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,KAAK;CAGzD;AAED,qBAAa,sBAAuB,SAAQ,QAAQ;;CAInD;AAED,qBAAa,iBAAkB,SAAQ,QAAQ;gBACjC,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,KAAK;CAG9D;AAED,qBAAa,gBAAiB,SAAQ,QAAQ;aAE1B,UAAU,EAAE,MAAM;gBAAlB,UAAU,EAAE,MAAM,EAClC,KAAK,CAAC,EAAE,KAAK;CAIhB;AAED,qBAAa,aAAc,SAAQ,kBAAkB;gBACvC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,KAAK;CAGzD;AAED,qBAAa,0BAA2B,SAAQ,aAAa;aAEzC,IAAI,EAAE,MAAM;aACZ,UAAU,EAAE,MAAM;gBADlB,IAAI,EAAE,MAAM,EACZ,UAAU,EAAE,MAAM;CAIrC;AAED,qBAAa,qBAAsB,SAAQ,aAAa;aAEpC,IAAI,EAAE,MAAM;aACZ,OAAO,EAAE,MAAM,EAAE;gBADjB,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,MAAM,EAAE;CAIpC;AAED,qBAAa,WAAY,SAAQ,kBAAkB;gBACrC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,KAAK;CAGzD;AAED,qBAAa,qBAAsB,SAAQ,WAAW;aAElC,KAAK,EAAE,MAAM;aACb,MAAM,EAAE,MAAM;gBADd,KAAK,EAAE,MAAM,EACb,MAAM,EAAE,MAAM;CAIjC;AAED,qBAAa,mBAAoB,SAAQ,kBAAkB;aAEvC,IAAI,EAAE,MAAM;aACZ,MAAM,EAAE,MAAM;gBADd,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE,MAAM;CAIjC;AAED,qBAAa,QAAS,SAAQ,QAAQ;gBACxB,OAAO,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,KAAK;CAG3C;AAED,wBAAgB,UAAU,CAAC,KAAK,EAAE,KAAK,GAAG,MAAM,GAAG,OAAO,CAGzD;AAED,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,KAAK,GAAG,MAAM,GAAG,OAAO,CAGjE;AAED,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,KAAK,GAAG,MAAM,GAAG,OAAO,CAGhE"}

package/dist/errors/index.js

@@ -0,0 +1,119 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.LfsError = exports.PathResolutionError = exports.ConfigValidationError = exports.ConfigError = exports.WorktreeNotCleanError = exports.WorktreeAlreadyExistsError = exports.WorktreeError = exports.FastForwardError = exports.GitOperationError = exports.GitNotInitializedError = exports.GitError = exports.SyncWorktreesError = void 0;
+exports.isLfsError = isLfsError;
+exports.isFastForwardError = isFastForwardError;
+exports.isNoUpstreamError = isNoUpstreamError;
+const constants_1 = require("../constants");
+class SyncWorktreesError extends Error {
+    code;
+    cause;
+    constructor(message, code, cause) {
+        super(message);
+        this.code = code;
+        this.cause = cause;
+        this.name = this.constructor.name;
+        Object.setPrototypeOf(this, new.target.prototype);
+        if (cause && cause.stack) {
+            this.stack = `${this.stack}\nCaused by: ${cause.stack}`;
+        }
+    }
+}
+exports.SyncWorktreesError = SyncWorktreesError;
+class GitError extends SyncWorktreesError {
+    constructor(message, code, cause) {
+        super(message, `GIT_${code}`, cause);
+    }
+}
+exports.GitError = GitError;
+class GitNotInitializedError extends GitError {
+    constructor() {
+        super(constants_1.ERROR_MESSAGES.GIT_NOT_INITIALIZED, "NOT_INITIALIZED");
+    }
+}
+exports.GitNotInitializedError = GitNotInitializedError;
+class GitOperationError extends GitError {
+    constructor(operation, details, cause) {
+        super(`Git operation '${operation}' failed: ${details}`, "OPERATION_FAILED", cause);
+    }
+}
+exports.GitOperationError = GitOperationError;
+class FastForwardError extends GitError {
+    branchName;
+    constructor(branchName, cause) {
+        super(`Cannot fast-forward branch '${branchName}'`, "FAST_FORWARD_FAILED", cause);
+        this.branchName = branchName;
+    }
+}
+exports.FastForwardError = FastForwardError;
+class WorktreeError extends SyncWorktreesError {
+    constructor(message, code, cause) {
+        super(message, `WORKTREE_${code}`, cause);
+    }
+}
+exports.WorktreeError = WorktreeError;
+class WorktreeAlreadyExistsError extends WorktreeError {
+    path;
+    branchName;
+    constructor(path, branchName) {
+        super(`Worktree already exists at '${path}' for branch '${branchName}'`, "ALREADY_EXISTS");
+        this.path = path;
+        this.branchName = branchName;
+    }
+}
+exports.WorktreeAlreadyExistsError = WorktreeAlreadyExistsError;
+class WorktreeNotCleanError extends WorktreeError {
+    path;
+    reasons;
+    constructor(path, reasons) {
+        super(`Worktree at '${path}' is not clean: ${reasons.join(", ")}`, "NOT_CLEAN");
+        this.path = path;
+        this.reasons = reasons;
+    }
+}
+exports.WorktreeNotCleanError = WorktreeNotCleanError;
+class ConfigError extends SyncWorktreesError {
+    constructor(message, code, cause) {
+        super(message, `CONFIG_${code}`, cause);
+    }
+}
+exports.ConfigError = ConfigError;
+class ConfigValidationError extends ConfigError {
+    field;
+    reason;
+    constructor(field, reason) {
+        super(`Invalid configuration for '${field}': ${reason}`, "VALIDATION_FAILED");
+        this.field = field;
+        this.reason = reason;
+    }
+}
+exports.ConfigValidationError = ConfigValidationError;
+class PathResolutionError extends SyncWorktreesError {
+    path;
+    reason;
+    constructor(path, reason) {
+        super(`Path resolution failed for '${path}': ${reason}`, "PATH_RESOLUTION_FAILED");
+        this.path = path;
+        this.reason = reason;
+    }
+}
+exports.PathResolutionError = PathResolutionError;
+class LfsError extends GitError {
+    constructor(message, cause) {
+        super(`LFS operation failed: ${message}`, "LFS_ERROR", cause);
+    }
+}
+exports.LfsError = LfsError;
+function isLfsError(error) {
+    const message = typeof error === "string" ? error : error.message;
+    return constants_1.ERROR_MESSAGES.LFS_ERROR.some((pattern) => message.includes(pattern));
+}
+function isFastForwardError(error) {
+    const message = typeof error === "string" ? error : error.message;
+    return constants_1.ERROR_MESSAGES.FAST_FORWARD_FAILED.some((pattern) => message.includes(pattern));
+}
+function isNoUpstreamError(error) {
+    const message = typeof error === "string" ? error : error.message;
+    return constants_1.ERROR_MESSAGES.NO_UPSTREAM.some((pattern) => message.includes(pattern));
+}
+//# sourceMappingURL=index.js.map

package/dist/errors/index.js.map

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

package/dist/services/git.service.d.ts

@@ -1,4 +1,5 @@
 import type { Config } from "../types";
+import type { SyncMetadata } from "../types/sync-metadata";
 import type { SimpleGit } from "simple-git";
 export declare class GitService {
     private config;
@@ -44,6 +45,7 @@ export declare class GitService {
     resetToUpstream(worktreePath: string, branch: string): Promise<void>;
     getCurrentCommit(worktreePath: string): Promise<string>;
     getRemoteCommit(ref: string): Promise<string>;
+    getWorktreeMetadata(worktreePath: string): Promise<SyncMetadata | null>;
     private getWorktreesFromBare;
 }
 //# sourceMappingURL=git.service.d.ts.map

package/dist/services/git.service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"git.service.d.ts","sourceRoot":"","sources":["../../src/services/git.service.ts"],"names":[],"mappings":"AASA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AACvC,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAE5C,qBAAa,UAAU;IAOT,OAAO,CAAC,MAAM;IAN1B,OAAO,CAAC,GAAG,CAA0B;IACrC,OAAO,CAAC,YAAY,CAAS;IAC7B,OAAO,CAAC,gBAAgB,CAAS;IACjC,OAAO,CAAC,aAAa,CAAkB;IACvC,OAAO,CAAC,eAAe,CAA0B;gBAE7B,MAAM,EAAE,MAAM;IAM5B,UAAU,IAAI,OAAO,CAAC,SAAS,CAAC;IA6HtC,MAAM,IAAI,SAAS;IAOnB,gBAAgB,IAAI,MAAM;IAIpB,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;IAWzB,WAAW,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAW9C,iBAAiB,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;IAStC,6BAA6B,IAAI,OAAO,CAAC;QAAE,MAAM,EAAE,MAAM,CAAC;QAAC,YAAY,EAAE,IAAI,CAAA;KAAE,EAAE,CAAC;YAkC1E,sBAAsB;IAqB9B,WAAW,CAAC,UAAU,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAyHpE,cAAc,CAAC,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IA2BnD,cAAc,IAAI,OAAO,CAAC,IAAI,CAAC;IAM/B,mBAAmB,CAAC,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;YAMnD,cAAc;IAStB,kBAAkB,CAAC,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAyC1D,eAAe,CAAC,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IA6CvD,iBAAiB,CAAC,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAYzD,qBAAqB,CAAC,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAW7D,sBAAsB,CAAC,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IA+B9D,gBAAgB,IAAI,OAAO,CAAC,MAAM,CAAC;YAM3B,mBAAmB;IAsCjC,OAAO,CAAC,gBAAgB;IAIlB,YAAY,IAAI,OAAO,CAAC;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE,EAAE,CAAC;IAK3D,gBAAgB,CAAC,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAsBxD,cAAc,CAAC,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IA0BnD,kBAAkB,CAAC,YAAY,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAmBlF,cAAc,CAAC,YAAY,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAmBtE,kBAAkB,CAAC,YAAY,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAe1E,eAAe,CAAC,YAAY,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAgBpE,gBAAgB,CAAC,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAMvD,eAAe,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;YAOrC,oBAAoB;CAiCnC"}
+{"version":3,"file":"git.service.d.ts","sourceRoot":"","sources":["../../src/services/git.service.ts"],"names":[],"mappings":"AAUA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AACvC,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAC3D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAE5C,qBAAa,UAAU;IAOT,OAAO,CAAC,MAAM;IAN1B,OAAO,CAAC,GAAG,CAA0B;IACrC,OAAO,CAAC,YAAY,CAAS;IAC7B,OAAO,CAAC,gBAAgB,CAAS;IACjC,OAAO,CAAC,aAAa,CAAkB;IACvC,OAAO,CAAC,eAAe,CAA0B;gBAE7B,MAAM,EAAE,MAAM;IAM5B,UAAU,IAAI,OAAO,CAAC,SAAS,CAAC;IA6HtC,MAAM,IAAI,SAAS;IAOnB,gBAAgB,IAAI,MAAM;IAIpB,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;IAWzB,WAAW,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAW9C,iBAAiB,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;IAStC,6BAA6B,IAAI,OAAO,CAAC;QAAE,MAAM,EAAE,MAAM,CAAC;QAAC,YAAY,EAAE,IAAI,CAAA;KAAE,EAAE,CAAC;YAkC1E,sBAAsB;IAsB9B,WAAW,CAAC,UAAU,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IA8HpE,cAAc,CAAC,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAcnD,cAAc,IAAI,OAAO,CAAC,IAAI,CAAC;IAM/B,mBAAmB,CAAC,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;YAMnD,cAAc;IAStB,kBAAkB,CAAC,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAyC1D,eAAe,CAAC,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAkEvD,iBAAiB,CAAC,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAYzD,qBAAqB,CAAC,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAW7D,sBAAsB,CAAC,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IA+B9D,gBAAgB,IAAI,OAAO,CAAC,MAAM,CAAC;YAM3B,mBAAmB;IAsCjC,OAAO,CAAC,gBAAgB;IAIlB,YAAY,IAAI,OAAO,CAAC;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE,EAAE,CAAC;IAK3D,gBAAgB,CAAC,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAsBxD,cAAc,CAAC,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAgCnD,kBAAkB,CAAC,YAAY,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAmBlF,cAAc,CAAC,YAAY,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAmBtE,kBAAkB,CAAC,YAAY,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAe1E,eAAe,CAAC,YAAY,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAsBpE,gBAAgB,CAAC,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAMvD,eAAe,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAO7C,mBAAmB,CAAC,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,YAAY,GAAG,IAAI,CAAC;YAI/D,oBAAoB;CAiCnC"}

package/dist/services/git.service.js

@@ -41,6 +41,7 @@ const fs = __importStar(require("fs/promises"));
 const path = __importStar(require("path"));
 const simple_git_1 = __importDefault(require("simple-git"));
 const git_url_1 = require("../utils/git-url");
+const lfs_error_1 = require("../utils/lfs-error");
 const worktree_metadata_service_1 = require("./worktree-metadata.service");
 class GitService {
     config;
@@ -132,7 +133,7 @@ class GitService {
                 }
             }
             catch (error) {
-                const errorMessage = error instanceof Error ? error.message : String(error);
+                const errorMessage = (0, lfs_error_1.getErrorMessage)(error);
                 // Check if error is because directory already exists
                 if (errorMessage.includes("already exists")) {
                     console.log(`${this.defaultBranch} worktree directory already exists at '${absoluteWorktreePath}', skipping creation.`);
@@ -144,7 +145,7 @@ class GitService {
                         await bareGit.raw(["worktree", "add", absoluteWorktreePath, this.defaultBranch]);
                     }
                     catch (fallbackError) {
-                        const fallbackErrorMessage = fallbackError instanceof Error ? fallbackError.message : String(fallbackError);
+                        const fallbackErrorMessage = (0, lfs_error_1.getErrorMessage)(fallbackError);
                         if (fallbackErrorMessage.includes("already exists")) {
                             console.log(`${this.defaultBranch} worktree directory already exists at '${absoluteWorktreePath}', skipping creation.`);
                         }
@@ -242,10 +243,11 @@ class GitService {
                 : (0, simple_git_1.default)(worktreePath);
             const currentCommit = await worktreeGit.revparse(["HEAD"]);
             const parentCommit = await bareGit.revparse([this.defaultBranch]);
-            await this.metadataService.createInitialMetadata(this.bareRepoPath, branchName, currentCommit.trim(), `origin/${branchName}`, this.defaultBranch, parentCommit.trim());
+            await this.metadataService.createInitialMetadataFromPath(this.bareRepoPath, worktreePath, currentCommit.trim(), `origin/${branchName}`, this.defaultBranch, parentCommit.trim());
         }
         catch (metadataError) {
-            console.warn(`  - Failed to create metadata for worktree: ${metadataError}`);
+            console.error(`  - ❌ Failed to create metadata for '${branchName}': ${metadataError}`);
+            throw new Error(`Metadata creation failed for ${branchName}. This worktree cannot be auto-managed.`);
         }
     }
     async addWorktree(branchName, worktreePath) {
@@ -303,7 +305,11 @@ class GitService {
             await this.createWorktreeMetadata(bareGit, absoluteWorktreePath, branchName);
         }
         catch (error) {
-            const errorMessage = error instanceof Error ? error.message : String(error);
+            const errorMessage = (0, lfs_error_1.getErrorMessage)(error);
+            // Re-throw metadata creation errors - these are fatal and should not fall back
+            if (errorMessage.includes("Metadata creation failed")) {
+                throw error;
+            }
             // Check if this is an "already registered" error
             if (errorMessage.includes("already registered worktree")) {
                 console.warn(`  - Worktree already registered but missing. Pruning and retrying...`);
@@ -365,27 +371,14 @@ class GitService {
     }
     async removeWorktree(worktreePath) {
         const bareGit = (0, simple_git_1.default)(this.bareRepoPath);
-        // Try to get branch name before removing worktree
-        let branchName = null;
-        try {
-            const worktrees = await this.getWorktreesFromBare(bareGit);
-            const worktree = worktrees.find((w) => path.resolve(w.path) === path.resolve(worktreePath));
-            branchName = worktree?.branch || null;
-        }
-        catch {
-            // If we can't get the branch name, extract from path as fallback
-            branchName = path.basename(worktreePath);
-        }
         await bareGit.raw(["worktree", "remove", worktreePath, "--force"]);
         console.log(`  - ✅ Safely removed stale worktree at '${worktreePath}'.`);
-        // Clean up metadata
-        if (branchName) {
-            try {
-                await this.metadataService.deleteMetadata(this.bareRepoPath, branchName);
-            }
-            catch (metadataError) {
-                console.warn(`Failed to delete metadata for worktree: ${metadataError}`);
-            }
+        // Clean up metadata using the worktree path
+        try {
+            await this.metadataService.deleteMetadataFromPath(this.bareRepoPath, worktreePath);
+        }
+        catch (metadataError) {
+            console.warn(`Failed to delete metadata for worktree: ${metadataError}`);
         }
     }
     async pruneWorktrees() {
@@ -420,8 +413,8 @@ class GitService {
             // Check if upstream is gone
             const upstreamGone = await this.hasUpstreamGone(worktreePath);
             if (upstreamGone) {
-                // Load metadata to check for commits after last sync
-                const metadata = await this.metadataService.loadMetadata(this.bareRepoPath, currentBranch);
+                // Load metadata to check for commits after last sync (use path-based method)
+                const metadata = await this.metadataService.loadMetadataFromPath(this.bareRepoPath, worktreePath);
                 if (metadata?.lastSyncCommit) {
                     try {
                         // Check for commits after last sync
@@ -461,22 +454,38 @@ class GitService {
             return !remoteBranches.all.includes(upstream.trim());
         }
         catch (error) {
-            // Check if the error is because of no upstream configured
-            const errorMessage = error instanceof Error ? error.message : String(error);
-            // Match specific Git error messages for missing upstream
+            const errorMessage = (0, lfs_error_1.getErrorMessage)(error);
             if (errorMessage.includes("fatal: no upstream configured") ||
-                errorMessage.includes("no upstream configured for branch") ||
-                errorMessage.includes("fatal: ambiguous argument") ||
-                errorMessage.includes("unknown revision or path")) {
-                // This is expected when there's no upstream - not an error condition
+                errorMessage.includes("no upstream configured for branch")) {
+                return false;
+            }
+            if (errorMessage.includes("fatal: ambiguous argument") || errorMessage.includes("unknown revision or path")) {
+                try {
+                    const branchSummary = await worktreeGit.branch();
+                    const currentBranch = branchSummary.current;
+                    const remoteResult = await worktreeGit
+                        .raw(["config", "--get", `branch.${currentBranch}.remote`])
+                        .catch(() => "");
+                    const mergeResult = await worktreeGit
+                        .raw(["config", "--get", `branch.${currentBranch}.merge`])
+                        .catch(() => "");
+                    const remote = remoteResult.trim();
+                    const merge = mergeResult.trim();
+                    if (remote && merge) {
+                        const remoteBranchName = merge.replace("refs/heads/", "");
+                        const expectedUpstream = `${remote}/${remoteBranchName}`;
+                        const remoteBranches = await worktreeGit.branch(["-r"]);
+                        return !remoteBranches.all.includes(expectedUpstream);
+                    }
+                }
+                catch {
+                    // Can't determine config, be conservative
+                }
                 return false;
             }
-            // Log unexpected errors that don't match known patterns
             console.error(`Unexpected error checking upstream status for ${worktreePath}. ` +
                 `This might indicate a real issue rather than a missing upstream. ` +
                 `Error: ${errorMessage}`);
-            // Return false to be safe - we don't want to accidentally delete worktrees
-            // due to transient errors
             return false;
         }
     }
@@ -619,10 +628,10 @@ class GitService {
         if (isMainWorktree) {
             return;
         }
-        // Update metadata after successful update
+        // Update metadata after successful update (use path-based method)
         try {
             const currentCommit = await worktreeGit.revparse(["HEAD"]);
-            await this.metadataService.updateLastSync(this.bareRepoPath, currentBranch, currentCommit.trim(), "updated");
+            await this.metadataService.updateLastSyncFromPath(this.bareRepoPath, worktreePath, currentCommit.trim(), "updated", this.defaultBranch);
         }
         catch (metadataError) {
             console.warn(`Failed to update metadata for worktree: ${metadataError}`);
@@ -681,10 +690,10 @@ class GitService {
             ? (0, simple_git_1.default)(worktreePath).env({ GIT_LFS_SKIP_SMUDGE: "1" })
             : (0, simple_git_1.default)(worktreePath);
         await worktreeGit.reset(["--hard", `origin/${branch}`]);
-        // Update metadata after reset
+        // Update metadata after reset (use path-based method)
         try {
             const currentCommit = await worktreeGit.revparse(["HEAD"]);
-            await this.metadataService.updateLastSync(this.bareRepoPath, branch, currentCommit.trim(), "updated");
+            await this.metadataService.updateLastSyncFromPath(this.bareRepoPath, worktreePath, currentCommit.trim(), "updated", this.defaultBranch);
         }
         catch (metadataError) {
             console.warn(`Failed to update metadata after reset: ${metadataError}`);
@@ -701,6 +710,9 @@ class GitService {
         const commit = await git.revparse([ref]);
         return commit.trim();
     }
+    async getWorktreeMetadata(worktreePath) {
+        return this.metadataService.loadMetadataFromPath(this.bareRepoPath, worktreePath);
+    }
     async getWorktreesFromBare(bareGit) {
         const result = await bareGit.raw(["worktree", "list", "--porcelain"]);
         const worktrees = [];