@superblocksteam/vite-plugin-file-sync 1.99.99-next.2 → 2.0.0-SNAPSHOT.2143e2e95d0107ab

package/dist/git-service/checkpoint-committer.js

@@ -0,0 +1,91 @@
+import { clearGitAuthFailed, markGitAuthFailed } from "../git-auth-state.js";
+import { getErrorMeta, getLogger } from "../util/logger.js";
+import { recordCheckpointCommit } from "./checkpoint-commit-metrics.js";
+import { commitAndPushLiveBranch } from "./commit-live-branch.js";
+const DEFAULT_COMMIT_MESSAGE = "Update application";
+/** Backs off 2s, 4s, 8s before giving the repository up as occupied. */
+const RETRY_BASE_DELAY_MS = 2_000;
+const MAX_RETRIES = 3;
+/**
+ * Mirrors every checkpoint onto the live branch as a real git commit.
+ *
+ * Failures are counted and reported to the editor, then swallowed: this runs
+ * off the back of autosave, which must keep working when the remote is
+ * unreachable. Whatever a run leaves behind goes out with the next checkpoint,
+ * which stages the whole working tree and pushes either way — except that the
+ * last edit of a session has no next checkpoint, so a run that never reached
+ * the repository is retried rather than dropped.
+ */
+export function createCheckpointGitCommitter({ getGitService, onGitStateChanged, superblocksBaseUrl, tryAcquireRepo, }) {
+    let queue = Promise.resolve();
+    let retryTimer;
+    const enqueue = (checkpoint, retry) => {
+        queue = queue.then(() => commit(checkpoint, retry));
+        return queue;
+    };
+    const scheduleRetry = (checkpoint, retry) => {
+        if (retry > MAX_RETRIES) {
+            getLogger().warn("[git] checkpoint dropped, repository stayed busy", {
+                gitCategory: "commit",
+                gitOperation: "commit-checkpoint",
+                gitOutcome: "failed",
+                commitId: checkpoint.commitId,
+            });
+            return;
+        }
+        // One retry stages the whole working tree, so it covers every checkpoint
+        // skipped while it was pending.
+        if (retryTimer) {
+            return;
+        }
+        retryTimer = setTimeout(() => {
+            retryTimer = undefined;
+            void enqueue(checkpoint, retry);
+        }, RETRY_BASE_DELAY_MS * 2 ** (retry - 1));
+        retryTimer.unref?.();
+    };
+    const commit = async (checkpoint, retry) => {
+        const release = tryAcquireRepo?.();
+        if (tryAcquireRepo && !release) {
+            getLogger().info("[git] checkpoint commit skipped, repository is busy", {
+                gitCategory: "commit",
+                gitOperation: "commit-checkpoint",
+                gitOutcome: "skipped",
+                commitId: checkpoint.commitId,
+                retry,
+            });
+            recordCheckpointCommit("busy");
+            scheduleRetry(checkpoint, retry + 1);
+            return;
+        }
+        try {
+            const gitService = await getGitService();
+            if (!gitService) {
+                return;
+            }
+            const { sha } = await commitAndPushLiveBranch({
+                gitService,
+                message: checkpoint.commitMessage ?? DEFAULT_COMMIT_MESSAGE,
+                superblocksBaseUrl,
+            });
+            clearGitAuthFailed();
+            recordCheckpointCommit(sha ? "succeeded" : "skipped");
+            // Even a run that wrote no commit of its own has pushed, and that push
+            // may be what finally carried out a commit an earlier one left behind.
+            onGitStateChanged();
+        }
+        catch (error) {
+            getLogger().error(`[git] checkpoint commit failed (commitId=${checkpoint.commitId})`, getErrorMeta(error));
+            markGitAuthFailed(error);
+            recordCheckpointCommit("failed");
+            // The editor's sync status is now wrong in a way the user can act on:
+            // behind the remote at best, pushing with a dead credential at worst.
+            onGitStateChanged();
+        }
+        finally {
+            release?.();
+        }
+    };
+    return (checkpoint) => enqueue(checkpoint, 0);
+}
+//# sourceMappingURL=checkpoint-committer.js.map

package/dist/git-service/checkpoint-committer.js.map

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

package/dist/git-service/commit-live-branch.d.ts

@@ -0,0 +1,17 @@
+import type { GitService } from "./index.js";
+/**
+ * Commits the whole working tree to the live branch and pushes it.
+ *
+ * A commit with nothing staged writes no tree, and simple-git reports an empty
+ * sha for it; that is not a failure, it just means everything the caller was
+ * committing is git-ignored. The push runs either way: a commit whose push
+ * failed earlier is otherwise stranded locally, and nothing else retries it.
+ */
+export declare function commitAndPushLiveBranch({ gitService, message, superblocksBaseUrl, }: {
+    gitService: GitService;
+    message: string;
+    superblocksBaseUrl?: string;
+}): Promise<{
+    sha: string | undefined;
+}>;
+//# sourceMappingURL=commit-live-branch.d.ts.map

package/dist/git-service/commit-live-branch.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"commit-live-branch.d.ts","sourceRoot":"","sources":["../../src/git-service/commit-live-branch.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AAI7C;;;;;;;GAOG;AACH,wBAAsB,uBAAuB,CAAC,EAC5C,UAAU,EACV,OAAO,EACP,kBAAkB,GACnB,EAAE;IACD,UAAU,EAAE,UAAU,CAAC;IACvB,OAAO,EAAE,MAAM,CAAC;IAChB,kBAAkB,CAAC,EAAE,MAAM,CAAC;CAC7B,GAAG,OAAO,CAAC;IAAE,GAAG,EAAE,MAAM,GAAG,SAAS,CAAA;CAAE,CAAC,CAgBvC"}

package/dist/git-service/commit-live-branch.js

@@ -0,0 +1,28 @@
+import { getLogger } from "../util/logger.js";
+import { pushLiveBranchWithAutoRecreate } from "./live-branch.js";
+import { ensureProviderWorkflowFiles } from "./provider-workflow-files.js";
+/**
+ * Commits the whole working tree to the live branch and pushes it.
+ *
+ * A commit with nothing staged writes no tree, and simple-git reports an empty
+ * sha for it; that is not a failure, it just means everything the caller was
+ * committing is git-ignored. The push runs either way: a commit whose push
+ * failed earlier is otherwise stranded locally, and nothing else retries it.
+ */
+export async function commitAndPushLiveBranch({ gitService, message, superblocksBaseUrl, }) {
+    // The manual commit this replaced seeded the repository's CI sync file on its
+    // way past, and nothing else writes one for a provider other than GitHub.
+    await ensureProviderWorkflowFiles(gitService, superblocksBaseUrl);
+    await gitService.add(".");
+    const { commit } = await gitService.commit(message);
+    if (!commit) {
+        getLogger().info("[git] checkpoint wrote no commit, pushing anyway", {
+            gitCategory: "commit",
+            gitOperation: "commit-checkpoint",
+            gitOutcome: "skipped",
+        });
+    }
+    await pushLiveBranchWithAutoRecreate(gitService);
+    return { sha: commit || undefined };
+}
+//# sourceMappingURL=commit-live-branch.js.map

package/dist/git-service/commit-live-branch.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"commit-live-branch.js","sourceRoot":"","sources":["../../src/git-service/commit-live-branch.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAE9C,OAAO,EAAE,8BAA8B,EAAE,MAAM,kBAAkB,CAAC;AAClE,OAAO,EAAE,2BAA2B,EAAE,MAAM,8BAA8B,CAAC;AAE3E;;;;;;;GAOG;AACH,MAAM,CAAC,KAAK,UAAU,uBAAuB,CAAC,EAC5C,UAAU,EACV,OAAO,EACP,kBAAkB,GAKnB;IACC,8EAA8E;IAC9E,0EAA0E;IAC1E,MAAM,2BAA2B,CAAC,UAAU,EAAE,kBAAkB,CAAC,CAAC;IAClE,MAAM,UAAU,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IAC1B,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,UAAU,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;IACpD,IAAI,CAAC,MAAM,EAAE,CAAC;QACZ,SAAS,EAAE,CAAC,IAAI,CAAC,kDAAkD,EAAE;YACnE,WAAW,EAAE,QAAQ;YACrB,YAAY,EAAE,mBAAmB;YACjC,UAAU,EAAE,SAAS;SACtB,CAAC,CAAC;IACL,CAAC;IAED,MAAM,8BAA8B,CAAC,UAAU,CAAC,CAAC;IACjD,OAAO,EAAE,GAAG,EAAE,MAAM,IAAI,SAAS,EAAE,CAAC;AACtC,CAAC"}

package/dist/git-service/ensure-workflow-file.d.ts

@@ -0,0 +1,20 @@
+import type { GitService } from "./index.js";
+interface WorkflowProviderConfig {
+    /** Human-readable provider name used in log messages, e.g. "github" or "gitlab". */
+    providerName: string;
+    /** Relative path for the workflow file, e.g. ".github/workflows/superblocks-sync.yml". */
+    workflowPath: string;
+    /** Returns true if the remote URL belongs to this provider. */
+    isProviderRemoteUrl: (remoteUrl: string) => boolean;
+    /** Builds the workflow file content from a Superblocks base URL. */
+    buildWorkflowFromBaseUrl: (superblocksBaseUrl: string) => string;
+}
+/**
+ * Generic helper that creates a CI workflow file for a given provider
+ * if the repo's remote matches and the file doesn't already exist.
+ */
+export declare function ensureWorkflowFile(gitService: GitService, config: WorkflowProviderConfig, superblocksBaseUrl?: string): Promise<{
+    created: boolean;
+}>;
+export {};
+//# sourceMappingURL=ensure-workflow-file.d.ts.map

package/dist/git-service/ensure-workflow-file.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"ensure-workflow-file.d.ts","sourceRoot":"","sources":["../../src/git-service/ensure-workflow-file.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AAE7C,UAAU,sBAAsB;IAC9B,oFAAoF;IACpF,YAAY,EAAE,MAAM,CAAC;IACrB,0FAA0F;IAC1F,YAAY,EAAE,MAAM,CAAC;IACrB,+DAA+D;IAC/D,mBAAmB,EAAE,CAAC,SAAS,EAAE,MAAM,KAAK,OAAO,CAAC;IACpD,oEAAoE;IACpE,wBAAwB,EAAE,CAAC,kBAAkB,EAAE,MAAM,KAAK,MAAM,CAAC;CAClE;AAED;;;GAGG;AACH,wBAAsB,kBAAkB,CACtC,UAAU,EAAE,UAAU,EACtB,MAAM,EAAE,sBAAsB,EAC9B,kBAAkB,CAAC,EAAE,MAAM,GAC1B,OAAO,CAAC;IAAE,OAAO,EAAE,OAAO,CAAA;CAAE,CAAC,CAuD/B"}

package/dist/git-service/ensure-workflow-file.js

@@ -0,0 +1,51 @@
+import { access, mkdir, writeFile } from "node:fs/promises";
+import { dirname, join } from "node:path";
+import { getLogger } from "../util/logger.js";
+/**
+ * Generic helper that creates a CI workflow file for a given provider
+ * if the repo's remote matches and the file doesn't already exist.
+ */
+export async function ensureWorkflowFile(gitService, config, superblocksBaseUrl) {
+    const operationName = `ensure-${config.providerName}-workflow-file`;
+    let remoteUrl;
+    try {
+        remoteUrl = (await gitService.raw(["remote", "get-url", "origin"])).trim();
+    }
+    catch (error) {
+        getLogger().warn(`[git] ${operationName} failed to read origin URL`, {
+            gitCategory: "setup",
+            gitOperation: operationName,
+            gitOutcome: "failed",
+            gitErrorKind: "read_origin_url_failed",
+            workDir: gitService.workDir,
+            message: error instanceof Error ? error.message : String(error),
+        });
+        return { created: false };
+    }
+    if (!config.isProviderRemoteUrl(remoteUrl)) {
+        return { created: false };
+    }
+    const workflowPath = join(gitService.workDir, config.workflowPath);
+    try {
+        await access(workflowPath);
+        return { created: false };
+    }
+    catch (error) {
+        if (error instanceof Error && "code" in error && error.code !== "ENOENT") {
+            throw error;
+        }
+    }
+    const resolvedUrl = superblocksBaseUrl || "";
+    if (!resolvedUrl) {
+        getLogger().warn(`[git] ${operationName}: no superblocksBaseUrl provided, workflow will use default prod domain`, {
+            gitCategory: "setup",
+            gitOperation: operationName,
+            gitOutcome: "degraded",
+        });
+    }
+    await mkdir(dirname(workflowPath), { recursive: true });
+    await writeFile(workflowPath, config.buildWorkflowFromBaseUrl(resolvedUrl), "utf-8");
+    getLogger().info(`[git] ${operationName}: created ${config.workflowPath}`);
+    return { created: true };
+}
+//# sourceMappingURL=ensure-workflow-file.js.map

package/dist/git-service/ensure-workflow-file.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"ensure-workflow-file.js","sourceRoot":"","sources":["../../src/git-service/ensure-workflow-file.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAC5D,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAE1C,OAAO,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAc9C;;;GAGG;AACH,MAAM,CAAC,KAAK,UAAU,kBAAkB,CACtC,UAAsB,EACtB,MAA8B,EAC9B,kBAA2B;IAE3B,MAAM,aAAa,GAAG,UAAU,MAAM,CAAC,YAAY,gBAAgB,CAAC;IACpE,IAAI,SAAiB,CAAC;IAEtB,IAAI,CAAC;QACH,SAAS,GAAG,CAAC,MAAM,UAAU,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,SAAS,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;IAC7E,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,SAAS,EAAE,CAAC,IAAI,CAAC,SAAS,aAAa,4BAA4B,EAAE;YACnE,WAAW,EAAE,OAAO;YACpB,YAAY,EAAE,aAAa;YAC3B,UAAU,EAAE,QAAQ;YACpB,YAAY,EAAE,wBAAwB;YACtC,OAAO,EAAE,UAAU,CAAC,OAAO;YAC3B,OAAO,EAAE,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC;SAChE,CAAC,CAAC;QACH,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC;IAC5B,CAAC;IAED,IAAI,CAAC,MAAM,CAAC,mBAAmB,CAAC,SAAS,CAAC,EAAE,CAAC;QAC3C,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC;IAC5B,CAAC;IAED,MAAM,YAAY,GAAG,IAAI,CAAC,UAAU,CAAC,OAAO,EAAE,MAAM,CAAC,YAAY,CAAC,CAAC;IAEnE,IAAI,CAAC;QACH,MAAM,MAAM,CAAC,YAAY,CAAC,CAAC;QAC3B,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC;IAC5B,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,IAAI,KAAK,YAAY,KAAK,IAAI,MAAM,IAAI,KAAK,IAAI,KAAK,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;YACzE,MAAM,KAAK,CAAC;QACd,CAAC;IACH,CAAC;IAED,MAAM,WAAW,GAAG,kBAAkB,IAAI,EAAE,CAAC;IAC7C,IAAI,CAAC,WAAW,EAAE,CAAC;QACjB,SAAS,EAAE,CAAC,IAAI,CACd,SAAS,aAAa,yEAAyE,EAC/F;YACE,WAAW,EAAE,OAAO;YACpB,YAAY,EAAE,aAAa;YAC3B,UAAU,EAAE,UAAU;SACvB,CACF,CAAC;IACJ,CAAC;IAED,MAAM,KAAK,CAAC,OAAO,CAAC,YAAY,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;IACxD,MAAM,SAAS,CACb,YAAY,EACZ,MAAM,CAAC,wBAAwB,CAAC,WAAW,CAAC,EAC5C,OAAO,CACR,CAAC;IAEF,SAAS,EAAE,CAAC,IAAI,CAAC,SAAS,aAAa,aAAa,MAAM,CAAC,YAAY,EAAE,CAAC,CAAC;IAE3E,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;AAC3B,CAAC"}

package/dist/git-service/errors.d.ts

@@ -0,0 +1,31 @@
+export declare class GitConflictError extends Error {
+    readonly files: string[];
+    readonly name = "GitConflictError";
+    constructor(files: string[], stderr: string);
+}
+export declare class GitAuthError extends Error {
+    readonly name = "GitAuthError";
+    constructor(stderr: string);
+}
+export declare class GitRemoteError extends Error {
+    readonly name = "GitRemoteError";
+    constructor(stderr: string);
+}
+export declare class GitMergeError extends Error {
+    readonly name = "GitMergeError";
+    constructor(stderr: string);
+}
+export declare class GitPermissionError extends Error {
+    readonly name = "GitPermissionError";
+    constructor(stderr: string);
+}
+export declare class GitNonFastForwardError extends Error {
+    readonly name = "GitNonFastForwardError";
+    constructor(stderr: string);
+}
+export declare class GitLayoutMismatchError extends Error {
+    readonly offendingPath: string;
+    readonly name = "GitLayoutMismatchError";
+    constructor(offendingPath: string);
+}
+//# sourceMappingURL=errors.d.ts.map

package/dist/git-service/errors.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"errors.d.ts","sourceRoot":"","sources":["../../src/git-service/errors.ts"],"names":[],"mappings":"AAAA,qBAAa,gBAAiB,SAAQ,KAAK;IAIvC,QAAQ,CAAC,KAAK,EAAE,MAAM,EAAE;IAH1B,SAAkB,IAAI,sBAAsB;gBAGjC,KAAK,EAAE,MAAM,EAAE,EACxB,MAAM,EAAE,MAAM;CAIjB;AAED,qBAAa,YAAa,SAAQ,KAAK;IACrC,SAAkB,IAAI,kBAAkB;gBAE5B,MAAM,EAAE,MAAM;CAG3B;AAED,qBAAa,cAAe,SAAQ,KAAK;IACvC,SAAkB,IAAI,oBAAoB;gBAE9B,MAAM,EAAE,MAAM;CAG3B;AAED,qBAAa,aAAc,SAAQ,KAAK;IACtC,SAAkB,IAAI,mBAAmB;gBAE7B,MAAM,EAAE,MAAM;CAG3B;AAED,qBAAa,kBAAmB,SAAQ,KAAK;IAC3C,SAAkB,IAAI,wBAAwB;gBAElC,MAAM,EAAE,MAAM;CAK3B;AAED,qBAAa,sBAAuB,SAAQ,KAAK;IAC/C,SAAkB,IAAI,4BAA4B;gBAEtC,MAAM,EAAE,MAAM;CAG3B;AAED,qBAAa,sBAAuB,SAAQ,KAAK;IAGnC,QAAQ,CAAC,aAAa,EAAE,MAAM;IAF1C,SAAkB,IAAI,4BAA4B;gBAE7B,aAAa,EAAE,MAAM;CAO3C"}

package/dist/git-service/errors.js

@@ -0,0 +1,49 @@
+export class GitConflictError extends Error {
+    files;
+    name = "GitConflictError";
+    constructor(files, stderr) {
+        super(`Merge conflict in ${files.length} file(s):\n${stderr}`);
+        this.files = files;
+    }
+}
+export class GitAuthError extends Error {
+    name = "GitAuthError";
+    constructor(stderr) {
+        super(`Git authentication failed: ${stderr}`);
+    }
+}
+export class GitRemoteError extends Error {
+    name = "GitRemoteError";
+    constructor(stderr) {
+        super(`Git remote error: ${stderr}`);
+    }
+}
+export class GitMergeError extends Error {
+    name = "GitMergeError";
+    constructor(stderr) {
+        super(`Git merge failed: ${stderr}`);
+    }
+}
+export class GitPermissionError extends Error {
+    name = "GitPermissionError";
+    constructor(stderr) {
+        super(`Push failed: your token doesn't have write access to this repository. Please update your token with 'contents: write' permission. (${stderr})`);
+    }
+}
+export class GitNonFastForwardError extends Error {
+    name = "GitNonFastForwardError";
+    constructor(stderr) {
+        super(`Push rejected (non-fast-forward): ${stderr}`);
+    }
+}
+export class GitLayoutMismatchError extends Error {
+    offendingPath;
+    name = "GitLayoutMismatchError";
+    constructor(offendingPath) {
+        super(`Refusing to sync: the incoming branch uses a project-root layout ` +
+            `(found "${offendingPath}") but this app expects "client/root.tsx" at its root. ` +
+            `Applying it would delete the app entrypoint and break the dev server.`);
+        this.offendingPath = offendingPath;
+    }
+}
+//# sourceMappingURL=errors.js.map

package/dist/git-service/errors.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"errors.js","sourceRoot":"","sources":["../../src/git-service/errors.ts"],"names":[],"mappings":"AAAA,MAAM,OAAO,gBAAiB,SAAQ,KAAK;IAI9B;IAHO,IAAI,GAAG,kBAAkB,CAAC;IAE5C,YACW,KAAe,EACxB,MAAc;QAEd,KAAK,CAAC,qBAAqB,KAAK,CAAC,MAAM,cAAc,MAAM,EAAE,CAAC,CAAC;QAHtD,UAAK,GAAL,KAAK,CAAU;IAI1B,CAAC;CACF;AAED,MAAM,OAAO,YAAa,SAAQ,KAAK;IACnB,IAAI,GAAG,cAAc,CAAC;IAExC,YAAY,MAAc;QACxB,KAAK,CAAC,8BAA8B,MAAM,EAAE,CAAC,CAAC;IAChD,CAAC;CACF;AAED,MAAM,OAAO,cAAe,SAAQ,KAAK;IACrB,IAAI,GAAG,gBAAgB,CAAC;IAE1C,YAAY,MAAc;QACxB,KAAK,CAAC,qBAAqB,MAAM,EAAE,CAAC,CAAC;IACvC,CAAC;CACF;AAED,MAAM,OAAO,aAAc,SAAQ,KAAK;IACpB,IAAI,GAAG,eAAe,CAAC;IAEzC,YAAY,MAAc;QACxB,KAAK,CAAC,qBAAqB,MAAM,EAAE,CAAC,CAAC;IACvC,CAAC;CACF;AAED,MAAM,OAAO,kBAAmB,SAAQ,KAAK;IACzB,IAAI,GAAG,oBAAoB,CAAC;IAE9C,YAAY,MAAc;QACxB,KAAK,CACH,sIAAsI,MAAM,GAAG,CAChJ,CAAC;IACJ,CAAC;CACF;AAED,MAAM,OAAO,sBAAuB,SAAQ,KAAK;IAC7B,IAAI,GAAG,wBAAwB,CAAC;IAElD,YAAY,MAAc;QACxB,KAAK,CAAC,qCAAqC,MAAM,EAAE,CAAC,CAAC;IACvD,CAAC;CACF;AAED,MAAM,OAAO,sBAAuB,SAAQ,KAAK;IAG1B;IAFH,IAAI,GAAG,wBAAwB,CAAC;IAElD,YAAqB,aAAqB;QACxC,KAAK,CACH,mEAAmE;YACjE,WAAW,aAAa,yDAAyD;YACjF,uEAAuE,CAC1E,CAAC;QALiB,kBAAa,GAAb,aAAa,CAAQ;IAM1C,CAAC;CACF"}

package/dist/git-service/github-workflow.d.ts

@@ -0,0 +1,6 @@
+import type { GitService } from "./index.js";
+export declare const GITHUB_WORKFLOW_PATH = ".github/workflows/superblocks-sync.yml";
+export declare function ensureGithubWorkflowFile(gitService: GitService, superblocksBaseUrl?: string): Promise<{
+    created: boolean;
+}>;
+//# sourceMappingURL=github-workflow.d.ts.map

package/dist/git-service/github-workflow.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"github-workflow.d.ts","sourceRoot":"","sources":["../../src/git-service/github-workflow.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AAE7C,eAAO,MAAM,oBAAoB,2CAA2C,CAAC;AAE7E,wBAAgB,wBAAwB,CACtC,UAAU,EAAE,UAAU,EACtB,kBAAkB,CAAC,EAAE,MAAM,GAC1B,OAAO,CAAC;IAAE,OAAO,EAAE,OAAO,CAAA;CAAE,CAAC,CAW/B"}

package/dist/git-service/github-workflow.js

@@ -0,0 +1,12 @@
+import { buildGithubSuperblocksSyncWorkflowFromBaseUrl, isGitHubRemoteUrl, } from "@superblocksteam/shared";
+import { ensureWorkflowFile } from "./ensure-workflow-file.js";
+export const GITHUB_WORKFLOW_PATH = ".github/workflows/superblocks-sync.yml";
+export function ensureGithubWorkflowFile(gitService, superblocksBaseUrl) {
+    return ensureWorkflowFile(gitService, {
+        providerName: "github",
+        workflowPath: GITHUB_WORKFLOW_PATH,
+        isProviderRemoteUrl: isGitHubRemoteUrl,
+        buildWorkflowFromBaseUrl: buildGithubSuperblocksSyncWorkflowFromBaseUrl,
+    }, superblocksBaseUrl);
+}
+//# sourceMappingURL=github-workflow.js.map

package/dist/git-service/github-workflow.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"github-workflow.js","sourceRoot":"","sources":["../../src/git-service/github-workflow.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,6CAA6C,EAC7C,iBAAiB,GAClB,MAAM,yBAAyB,CAAC;AAEjC,OAAO,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAC;AAG/D,MAAM,CAAC,MAAM,oBAAoB,GAAG,wCAAwC,CAAC;AAE7E,MAAM,UAAU,wBAAwB,CACtC,UAAsB,EACtB,kBAA2B;IAE3B,OAAO,kBAAkB,CACvB,UAAU,EACV;QACE,YAAY,EAAE,QAAQ;QACtB,YAAY,EAAE,oBAAoB;QAClC,mBAAmB,EAAE,iBAAiB;QACtC,wBAAwB,EAAE,6CAA6C;KACxE,EACD,kBAAkB,CACnB,CAAC;AACJ,CAAC"}

package/dist/git-service/gitlab-workflow.d.ts

@@ -0,0 +1,6 @@
+import type { GitService } from "./index.js";
+export declare const GITLAB_WORKFLOW_PATH = ".gitlab-ci.yml";
+export declare function ensureGitlabWorkflowFile(gitService: GitService, superblocksBaseUrl?: string): Promise<{
+    created: boolean;
+}>;
+//# sourceMappingURL=gitlab-workflow.d.ts.map

package/dist/git-service/gitlab-workflow.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"gitlab-workflow.d.ts","sourceRoot":"","sources":["../../src/git-service/gitlab-workflow.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AAE7C,eAAO,MAAM,oBAAoB,mBAAmB,CAAC;AAErD,wBAAgB,wBAAwB,CACtC,UAAU,EAAE,UAAU,EACtB,kBAAkB,CAAC,EAAE,MAAM,GAC1B,OAAO,CAAC;IAAE,OAAO,EAAE,OAAO,CAAA;CAAE,CAAC,CAW/B"}

package/dist/git-service/gitlab-workflow.js

@@ -0,0 +1,12 @@
+import { buildGitlabSuperblocksSyncWorkflowFromBaseUrl, isGitLabRemoteUrl, } from "@superblocksteam/shared";
+import { ensureWorkflowFile } from "./ensure-workflow-file.js";
+export const GITLAB_WORKFLOW_PATH = ".gitlab-ci.yml";
+export function ensureGitlabWorkflowFile(gitService, superblocksBaseUrl) {
+    return ensureWorkflowFile(gitService, {
+        providerName: "gitlab",
+        workflowPath: GITLAB_WORKFLOW_PATH,
+        isProviderRemoteUrl: isGitLabRemoteUrl,
+        buildWorkflowFromBaseUrl: buildGitlabSuperblocksSyncWorkflowFromBaseUrl,
+    }, superblocksBaseUrl);
+}
+//# sourceMappingURL=gitlab-workflow.js.map

package/dist/git-service/gitlab-workflow.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"gitlab-workflow.js","sourceRoot":"","sources":["../../src/git-service/gitlab-workflow.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,6CAA6C,EAC7C,iBAAiB,GAClB,MAAM,yBAAyB,CAAC;AAEjC,OAAO,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAC;AAG/D,MAAM,CAAC,MAAM,oBAAoB,GAAG,gBAAgB,CAAC;AAErD,MAAM,UAAU,wBAAwB,CACtC,UAAsB,EACtB,kBAA2B;IAE3B,OAAO,kBAAkB,CACvB,UAAU,EACV;QACE,YAAY,EAAE,QAAQ;QACtB,YAAY,EAAE,oBAAoB;QAClC,mBAAmB,EAAE,iBAAiB;QACtC,wBAAwB,EAAE,6CAA6C;KACxE,EACD,kBAAkB,CACnB,CAAC;AACJ,CAAC"}

package/dist/git-service/index.d.ts

@@ -0,0 +1,30 @@
+import type { SimpleGit } from "simple-git";
+import { GitAuthError, GitConflictError, GitLayoutMismatchError, GitNonFastForwardError, GitRemoteError } from "./errors.js";
+export { GitAuthError, GitConflictError, GitLayoutMismatchError, GitNonFastForwardError, GitRemoteError, };
+export interface GitService extends SimpleGit {
+    readonly workDir: string;
+    configure(options?: {
+        credentials?: {
+            username: string;
+            token: string;
+        };
+        userName?: string;
+        userEmail?: string;
+    }): Promise<void>;
+    mergeRef(ref: string): Promise<{
+        alreadyUpToDate: boolean;
+    }>;
+    stashPop(): Promise<{
+        clean: boolean;
+    }>;
+    revList(left: string, right: string): Promise<{
+        ahead: number;
+        behind: number;
+    }>;
+    checkoutOrCreate(branch: string, startPoint?: string): Promise<void>;
+    getConflictedFiles(): Promise<string[]>;
+    getDefaultBranch(): Promise<string>;
+}
+export declare function createGitService(cwd: string): GitService;
+export declare function classifyGitError(error: unknown): Error;
+//# sourceMappingURL=index.d.ts.map

package/dist/git-service/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/git-service/index.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAK5C,OAAO,EACL,YAAY,EACZ,gBAAgB,EAChB,sBAAsB,EAEtB,sBAAsB,EAEtB,cAAc,EACf,MAAM,aAAa,CAAC;AAErB,OAAO,EACL,YAAY,EACZ,gBAAgB,EAChB,sBAAsB,EACtB,sBAAsB,EACtB,cAAc,GACf,CAAC;AAEF,MAAM,WAAW,UAAW,SAAQ,SAAS;IAC3C,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IAEzB,SAAS,CAAC,OAAO,CAAC,EAAE;QAClB,WAAW,CAAC,EAAE;YAAE,QAAQ,EAAE,MAAM,CAAC;YAAC,KAAK,EAAE,MAAM,CAAA;SAAE,CAAC;QAClD,QAAQ,CAAC,EAAE,MAAM,CAAC;QAClB,SAAS,CAAC,EAAE,MAAM,CAAC;KACpB,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAElB,QAAQ,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;QAAE,eAAe,EAAE,OAAO,CAAA;KAAE,CAAC,CAAC;IAE7D,QAAQ,IAAI,OAAO,CAAC;QAAE,KAAK,EAAE,OAAO,CAAA;KAAE,CAAC,CAAC;IAExC,OAAO,CACL,IAAI,EAAE,MAAM,EACZ,KAAK,EAAE,MAAM,GACZ,OAAO,CAAC;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IAE9C,gBAAgB,CAAC,MAAM,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAErE,kBAAkB,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC;IAExC,gBAAgB,IAAI,OAAO,CAAC,MAAM,CAAC,CAAC;CACrC;AAED,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,MAAM,GAAG,UAAU,CAqMxD;AAED,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,OAAO,GAAG,KAAK,CA8DtD"}

package/dist/git-service/index.js

@@ -0,0 +1,217 @@
+import { simpleGit } from "simple-git";
+import { isGitAuthErrorMessage } from "@superblocksteam/shared";
+import { getLogger, getErrorMeta } from "../util/logger.js";
+import { GitAuthError, GitConflictError, GitLayoutMismatchError, GitMergeError, GitNonFastForwardError, GitPermissionError, GitRemoteError, } from "./errors.js";
+export { GitAuthError, GitConflictError, GitLayoutMismatchError, GitNonFastForwardError, GitRemoteError, };
+export function createGitService(cwd) {
+    // simple-git ≥3.35 rejects `git config credential.helper …` unless the
+    // caller opts in to `unsafe.allowUnsafeCredentialHelper`. The repo's
+    // pnpm override (`simple-git@3.27.0` → `3.36.0`, PR #19519) made the
+    // guard live in this codebase, which silently broke `configure()`
+    // below — it writes a credential.helper for the per-app PAT, so
+    // every native-git connect started failing with `Configuring
+    // credential.helper is not permitted without enabling
+    // allowUnsafeCredentialHelper` (see APPS-4329).
+    //
+    // We are the only caller of `git.addConfig("credential.helper", …)`
+    // and the helper string is built from server-fetched credentials —
+    // not user input — so the unsafe path is what we want.
+    const git = simpleGit(cwd, {
+        unsafe: { allowUnsafeCredentialHelper: true },
+    });
+    const logger = getLogger();
+    async function getConflictedFiles() {
+        const result = await git.diff(["--name-only", "--diff-filter=U"]);
+        if (!result.trim())
+            return [];
+        return result.trimEnd().split("\n");
+    }
+    return Object.assign(git, {
+        workDir: cwd,
+        configure: async (options) => {
+            await git.addConfig("user.name", options?.userName || "Superblocks", false, "global");
+            await git.addConfig("user.email", options?.userEmail || "noreply@superblocks.com", false, "global");
+            await git.addConfig("init.defaultBranch", "main", false, "global");
+            if (options?.credentials) {
+                const helper = `!f() { echo username=${options.credentials.username}; ` +
+                    `echo password=${options.credentials.token}; }; f`;
+                await git.addConfig("credential.helper", helper, false, "global");
+            }
+        },
+        mergeRef: async (ref) => {
+            try {
+                const summary = await git.merge([ref, "--no-edit"]);
+                const alreadyUpToDate = summary.result === "already up-to-date" ||
+                    summary.result === "up to date";
+                return {
+                    alreadyUpToDate,
+                };
+            }
+            catch (error) {
+                const classified = classifyGitError(error);
+                if (classified instanceof GitAuthError ||
+                    classified instanceof GitRemoteError) {
+                    logger.error(`[git] merge failed: auth or remote error while merging ${ref}`, getErrorMeta(classified));
+                    throw classified;
+                }
+                const msg = extractMessage(error);
+                if (msg.includes("CONFLICT") || msg.includes("Merge conflict")) {
+                    let files = [];
+                    try {
+                        files = await getConflictedFiles();
+                    }
+                    catch {
+                        // Best effort
+                    }
+                    logger.warn("[git] merge conflict detected", {
+                        gitCategory: "pull",
+                        gitOperation: "merge",
+                        gitOutcome: "conflict",
+                        ref,
+                        workDir: cwd,
+                        conflictedFileCount: files.length,
+                        conflictedFiles: files,
+                    });
+                    throw new GitConflictError(files, msg);
+                }
+                logger.error(`[git] merge failed: unexpected error while merging ${ref}`, getErrorMeta(error));
+                throw new GitMergeError(msg);
+            }
+        },
+        stashPop: async () => {
+            try {
+                await git.stash(["pop"]);
+                return { clean: true };
+            }
+            catch (error) {
+                const classified = classifyGitError(error);
+                if (classified instanceof GitAuthError ||
+                    classified instanceof GitRemoteError) {
+                    logger.error("[git] stash pop failed: auth or remote error", getErrorMeta(classified));
+                    throw classified;
+                }
+                const msg = extractMessage(error);
+                if (msg.includes("CONFLICT") || msg.includes("Merge conflict")) {
+                    let files = [];
+                    try {
+                        files = await getConflictedFiles();
+                    }
+                    catch {
+                        // Best effort
+                    }
+                    logger.warn("[git] stash pop conflict detected", {
+                        gitCategory: "pull",
+                        gitOperation: "stash-pop",
+                        gitOutcome: "conflict",
+                        workDir: cwd,
+                        conflictedFileCount: files.length,
+                        conflictedFiles: files,
+                    });
+                    throw new GitConflictError(files, msg);
+                }
+                logger.error("[git] stash pop failed: unexpected error", getErrorMeta(error));
+                throw error instanceof Error ? error : new Error(String(error));
+            }
+        },
+        revList: async (left, right) => {
+            const result = await git.raw([
+                "rev-list",
+                "--left-right",
+                "--count",
+                `${left}...${right}`,
+            ]);
+            const parts = result.trim().split("\t");
+            return { ahead: Number(parts[0]), behind: Number(parts[1]) };
+        },
+        checkoutOrCreate: async (branch, startPoint) => {
+            try {
+                await git.checkout(branch);
+            }
+            catch {
+                const args = ["-B", branch];
+                if (startPoint)
+                    args.push(startPoint);
+                await git.checkout(args);
+            }
+        },
+        getConflictedFiles,
+        getDefaultBranch: async () => {
+            const result = await git.raw(["ls-remote", "--symref", "origin", "HEAD"]);
+            const match = result.match(/^ref: refs\/heads\/(.+)\t/);
+            if (!match?.[1]) {
+                throw new Error("Failed to resolve default branch from remote HEAD");
+            }
+            const discoveredDefaultBranch = match[1];
+            await git
+                .raw([
+                "config",
+                "--local",
+                "superblocks.defaultBranch",
+                discoveredDefaultBranch,
+            ])
+                .catch(() => {
+                // Best effort: status flow can still proceed without local persistence.
+            });
+            return discoveredDefaultBranch;
+        },
+    });
+}
+export function classifyGitError(error) {
+    const message = extractMessage(error);
+    const lower = message.toLowerCase();
+    if (isGitAuthErrorMessage(message)) {
+        getLogger().warn("[git] auth failure classified", {
+            gitCategory: "setup",
+            gitOperation: "classify-error",
+            gitOutcome: "failed",
+            gitErrorKind: "auth",
+            message,
+        });
+        return new GitAuthError(message);
+    }
+    if (lower.includes("denied to") ||
+        lower.includes("permission to") ||
+        lower.includes("the requested url returned error: 403")) {
+        getLogger().warn("[git] permission error classified", {
+            gitCategory: "commit",
+            gitOperation: "classify-error",
+            gitOutcome: "failed",
+            gitErrorKind: "permission",
+            message,
+        });
+        return new GitPermissionError(message);
+    }
+    if (lower.includes("could not resolve host") ||
+        (lower.includes("repository") && lower.includes("not found")) ||
+        lower.includes("fatal: unable to access")) {
+        getLogger().warn("[git] remote error classified", {
+            gitCategory: "setup",
+            gitOperation: "classify-error",
+            gitOutcome: "failed",
+            gitErrorKind: "remote",
+            message,
+        });
+        return new GitRemoteError(message);
+    }
+    if (lower.includes("non-fast-forward") ||
+        lower.includes("updates were rejected") ||
+        lower.includes("fetch first") ||
+        lower.includes("cannot be resolved to branch")) {
+        getLogger().warn("[git] non-fast-forward classified", {
+            gitCategory: "commit",
+            gitOperation: "classify-error",
+            gitOutcome: "failed",
+            gitErrorKind: "non_fast_forward",
+            message,
+        });
+        return new GitNonFastForwardError(message);
+    }
+    return error instanceof Error ? error : new Error(String(error));
+}
+function extractMessage(error) {
+    if (error !== null && typeof error === "object" && "message" in error) {
+        return String(error.message);
+    }
+    return String(error);
+}
+//# sourceMappingURL=index.js.map