@seawork/server 1.0.0

package/dist/server/server/checkout-diff-manager.d.ts

@@ -0,0 +1,45 @@
+import type pino from "pino";
+import type { SubscribeCheckoutDiffRequest, SessionOutboundMessage } from "./messages.js";
+export type CheckoutDiffCompareInput = SubscribeCheckoutDiffRequest["compare"];
+export type CheckoutDiffSnapshotPayload = Omit<Extract<SessionOutboundMessage, {
+    type: "checkout_diff_update";
+}>["payload"], "subscriptionId">;
+export type CheckoutDiffMetrics = {
+    checkoutDiffTargetCount: number;
+    checkoutDiffSubscriptionCount: number;
+    checkoutDiffWatcherCount: number;
+    checkoutDiffFallbackRefreshTargetCount: number;
+};
+export declare class CheckoutDiffManager {
+    private readonly logger;
+    private readonly seaworkHome;
+    private readonly targets;
+    constructor(options: {
+        logger: pino.Logger;
+        seaworkHome: string;
+    });
+    subscribe(params: {
+        cwd: string;
+        compare: CheckoutDiffCompareInput;
+    }, listener: (snapshot: CheckoutDiffSnapshotPayload) => void): Promise<{
+        initial: CheckoutDiffSnapshotPayload;
+        unsubscribe: () => void;
+    }>;
+    scheduleRefreshForCwd(cwd: string): void;
+    getMetrics(): CheckoutDiffMetrics;
+    dispose(): void;
+    private normalizeCompare;
+    private buildTargetKey;
+    private closeTarget;
+    private removeListener;
+    private resolveCheckoutWatchRoot;
+    private scheduleTargetRefresh;
+    private computeCheckoutDiffSnapshot;
+    private refreshTarget;
+    private ensureTarget;
+    private addWatcher;
+    private ensureLinuxRepoTreeWatchers;
+    private refreshLinuxRepoTreeWatchers;
+    private listLinuxWatchDirectories;
+}
+//# sourceMappingURL=checkout-diff-manager.d.ts.map

package/dist/server/server/checkout-diff-manager.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"checkout-diff-manager.d.ts","sourceRoot":"","sources":["../../../src/server/checkout-diff-manager.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,IAAI,MAAM,MAAM,CAAC;AAC7B,OAAO,KAAK,EAAE,4BAA4B,EAAE,sBAAsB,EAAE,MAAM,eAAe,CAAC;AAU1F,MAAM,MAAM,wBAAwB,GAAG,4BAA4B,CAAC,SAAS,CAAC,CAAC;AAE/E,MAAM,MAAM,2BAA2B,GAAG,IAAI,CAC5C,OAAO,CAAC,sBAAsB,EAAE;IAAE,IAAI,EAAE,sBAAsB,CAAA;CAAE,CAAC,CAAC,SAAS,CAAC,EAC5E,gBAAgB,CACjB,CAAC;AAEF,MAAM,MAAM,mBAAmB,GAAG;IAChC,uBAAuB,EAAE,MAAM,CAAC;IAChC,6BAA6B,EAAE,MAAM,CAAC;IACtC,wBAAwB,EAAE,MAAM,CAAC;IACjC,sCAAsC,EAAE,MAAM,CAAC;CAChD,CAAC;AAqBF,qBAAa,mBAAmB;IAC9B,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAc;IACrC,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAS;IACrC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAA8C;gBAE1D,OAAO,EAAE;QAAE,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC;QAAC,WAAW,EAAE,MAAM,CAAA;KAAE;IAK3D,SAAS,CACb,MAAM,EAAE;QACN,GAAG,EAAE,MAAM,CAAC;QACZ,OAAO,EAAE,wBAAwB,CAAC;KACnC,EACD,QAAQ,EAAE,CAAC,QAAQ,EAAE,2BAA2B,KAAK,IAAI,GACxD,OAAO,CAAC;QAAE,OAAO,EAAE,2BAA2B,CAAC;QAAC,WAAW,EAAE,MAAM,IAAI,CAAA;KAAE,CAAC;IAqB7E,qBAAqB,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI;IAUxC,UAAU,IAAI,mBAAmB;IAqBjC,OAAO,IAAI,IAAI;IAOf,OAAO,CAAC,gBAAgB;IAWxB,OAAO,CAAC,cAAc;IAStB,OAAO,CAAC,WAAW;IAiBnB,OAAO,CAAC,cAAc;YAgBR,wBAAwB;IAatC,OAAO,CAAC,qBAAqB;YAUf,2BAA2B;YAoC3B,aAAa;YA8Bb,YAAY;IA2E1B,OAAO,CAAC,UAAU;YAgEJ,2BAA2B;YAe3B,4BAA4B;YAoC5B,yBAAyB;CA4BxC"}

package/dist/server/server/checkout-diff-manager.js

@@ -0,0 +1,374 @@
+import { watch } from "node:fs";
+import { readdir } from "node:fs/promises";
+import { join } from "node:path";
+import { exec } from "child_process";
+import { promisify } from "util";
+import { getCheckoutDiff } from "../utils/checkout-git.js";
+import { expandTilde } from "../utils/path.js";
+import { READ_ONLY_GIT_ENV, resolveCheckoutGitDir, toCheckoutError } from "./checkout-git-utils.js";
+const execAsync = promisify(exec);
+const CHECKOUT_DIFF_WATCH_DEBOUNCE_MS = 150;
+const CHECKOUT_DIFF_FALLBACK_REFRESH_MS = 5000;
+export class CheckoutDiffManager {
+    constructor(options) {
+        this.targets = new Map();
+        this.logger = options.logger.child({ module: "checkout-diff-manager" });
+        this.seaworkHome = options.seaworkHome;
+    }
+    async subscribe(params, listener) {
+        const cwd = params.cwd;
+        const compare = this.normalizeCompare(params.compare);
+        const target = await this.ensureTarget(cwd, compare);
+        target.listeners.add(listener);
+        const initial = target.latestPayload ??
+            (await this.computeCheckoutDiffSnapshot(target.cwd, target.compare, {
+                diffCwd: target.diffCwd,
+            }));
+        target.latestPayload = initial;
+        target.latestFingerprint = JSON.stringify(initial);
+        return {
+            initial,
+            unsubscribe: () => {
+                this.removeListener(target.key, listener);
+            },
+        };
+    }
+    scheduleRefreshForCwd(cwd) {
+        const resolvedCwd = expandTilde(cwd);
+        for (const target of this.targets.values()) {
+            if (target.cwd !== resolvedCwd && target.diffCwd !== resolvedCwd) {
+                continue;
+            }
+            this.scheduleTargetRefresh(target);
+        }
+    }
+    getMetrics() {
+        let checkoutDiffSubscriptionCount = 0;
+        let checkoutDiffWatcherCount = 0;
+        let checkoutDiffFallbackRefreshTargetCount = 0;
+        for (const target of this.targets.values()) {
+            checkoutDiffSubscriptionCount += target.listeners.size;
+            checkoutDiffWatcherCount += target.watchers.length;
+            if (target.fallbackRefreshInterval) {
+                checkoutDiffFallbackRefreshTargetCount += 1;
+            }
+        }
+        return {
+            checkoutDiffTargetCount: this.targets.size,
+            checkoutDiffSubscriptionCount,
+            checkoutDiffWatcherCount,
+            checkoutDiffFallbackRefreshTargetCount,
+        };
+    }
+    dispose() {
+        for (const target of this.targets.values()) {
+            this.closeTarget(target);
+        }
+        this.targets.clear();
+    }
+    normalizeCompare(compare) {
+        const ignoreWhitespace = compare.ignoreWhitespace === true;
+        if (compare.mode === "uncommitted") {
+            return { mode: "uncommitted", ignoreWhitespace };
+        }
+        const trimmedBaseRef = compare.baseRef?.trim();
+        return trimmedBaseRef
+            ? { mode: "base", baseRef: trimmedBaseRef, ignoreWhitespace }
+            : { mode: "base", ignoreWhitespace };
+    }
+    buildTargetKey(cwd, compare) {
+        return JSON.stringify([
+            cwd,
+            compare.mode,
+            compare.mode === "base" ? (compare.baseRef ?? "") : "",
+            compare.ignoreWhitespace === true,
+        ]);
+    }
+    closeTarget(target) {
+        if (target.debounceTimer) {
+            clearTimeout(target.debounceTimer);
+            target.debounceTimer = null;
+        }
+        if (target.fallbackRefreshInterval) {
+            clearInterval(target.fallbackRefreshInterval);
+            target.fallbackRefreshInterval = null;
+        }
+        for (const watcher of target.watchers) {
+            watcher.close();
+        }
+        target.watchers = [];
+        target.watchedPaths.clear();
+        target.listeners.clear();
+    }
+    removeListener(targetKey, listener) {
+        const target = this.targets.get(targetKey);
+        if (!target) {
+            return;
+        }
+        target.listeners.delete(listener);
+        if (target.listeners.size > 0) {
+            return;
+        }
+        this.closeTarget(target);
+        this.targets.delete(targetKey);
+    }
+    async resolveCheckoutWatchRoot(cwd) {
+        try {
+            const { stdout } = await execAsync("git rev-parse --path-format=absolute --show-toplevel", {
+                cwd,
+                env: READ_ONLY_GIT_ENV,
+            });
+            const root = stdout.trim();
+            return root.length > 0 ? root : null;
+        }
+        catch {
+            return null;
+        }
+    }
+    scheduleTargetRefresh(target) {
+        if (target.debounceTimer) {
+            clearTimeout(target.debounceTimer);
+        }
+        target.debounceTimer = setTimeout(() => {
+            target.debounceTimer = null;
+            void this.refreshTarget(target);
+        }, CHECKOUT_DIFF_WATCH_DEBOUNCE_MS);
+    }
+    async computeCheckoutDiffSnapshot(cwd, compare, options) {
+        const diffCwd = options?.diffCwd ?? cwd;
+        try {
+            const diffResult = await getCheckoutDiff(diffCwd, {
+                mode: compare.mode,
+                baseRef: compare.baseRef,
+                ignoreWhitespace: compare.ignoreWhitespace,
+                includeStructured: true,
+            }, { seaworkHome: this.seaworkHome });
+            const files = [...(diffResult.structured ?? [])];
+            files.sort((a, b) => {
+                if (a.path === b.path)
+                    return 0;
+                return a.path < b.path ? -1 : 1;
+            });
+            return {
+                cwd,
+                files,
+                error: null,
+            };
+        }
+        catch (error) {
+            return {
+                cwd,
+                files: [],
+                error: toCheckoutError(error),
+            };
+        }
+    }
+    async refreshTarget(target) {
+        if (target.refreshPromise) {
+            target.refreshQueued = true;
+            return;
+        }
+        target.refreshPromise = (async () => {
+            do {
+                target.refreshQueued = false;
+                const snapshot = await this.computeCheckoutDiffSnapshot(target.cwd, target.compare, {
+                    diffCwd: target.diffCwd,
+                });
+                target.latestPayload = snapshot;
+                const fingerprint = JSON.stringify(snapshot);
+                if (fingerprint !== target.latestFingerprint) {
+                    target.latestFingerprint = fingerprint;
+                    for (const listener of target.listeners) {
+                        listener(snapshot);
+                    }
+                }
+            } while (target.refreshQueued);
+        })();
+        try {
+            await target.refreshPromise;
+        }
+        finally {
+            target.refreshPromise = null;
+        }
+    }
+    async ensureTarget(cwd, compare) {
+        const targetKey = this.buildTargetKey(cwd, compare);
+        const existing = this.targets.get(targetKey);
+        if (existing) {
+            return existing;
+        }
+        const watchRoot = await this.resolveCheckoutWatchRoot(cwd);
+        const target = {
+            key: targetKey,
+            cwd,
+            diffCwd: watchRoot ?? cwd,
+            compare,
+            listeners: new Set(),
+            watchers: [],
+            fallbackRefreshInterval: null,
+            debounceTimer: null,
+            refreshPromise: null,
+            refreshQueued: false,
+            latestPayload: null,
+            latestFingerprint: null,
+            watchedPaths: new Set(),
+            repoWatchPath: null,
+            linuxTreeRefreshPromise: null,
+            linuxTreeRefreshQueued: false,
+        };
+        const repoWatchPath = watchRoot ?? cwd;
+        target.repoWatchPath = repoWatchPath;
+        const watchPaths = new Set([repoWatchPath]);
+        const gitDir = await resolveCheckoutGitDir(cwd);
+        if (gitDir) {
+            watchPaths.add(gitDir);
+        }
+        let hasRecursiveRepoCoverage = false;
+        const allowRecursiveRepoWatch = process.platform !== "linux";
+        if (process.platform === "linux") {
+            hasRecursiveRepoCoverage = await this.ensureLinuxRepoTreeWatchers(target, repoWatchPath);
+        }
+        for (const watchPath of watchPaths) {
+            if (process.platform === "linux" && watchPath === repoWatchPath) {
+                continue;
+            }
+            const shouldTryRecursive = watchPath === repoWatchPath && allowRecursiveRepoWatch;
+            const watcherIsRecursive = this.addWatcher(target, watchPath, shouldTryRecursive);
+            if (watchPath === repoWatchPath && watcherIsRecursive) {
+                hasRecursiveRepoCoverage = true;
+            }
+        }
+        const missingRepoCoverage = !hasRecursiveRepoCoverage;
+        if (target.watchers.length === 0 || missingRepoCoverage) {
+            target.fallbackRefreshInterval = setInterval(() => {
+                this.scheduleTargetRefresh(target);
+            }, CHECKOUT_DIFF_FALLBACK_REFRESH_MS);
+            this.logger.warn({
+                cwd,
+                compare,
+                intervalMs: CHECKOUT_DIFF_FALLBACK_REFRESH_MS,
+                reason: target.watchers.length === 0 ? "no_watchers" : "missing_recursive_repo_root_coverage",
+            }, "Checkout diff watchers unavailable; using timed refresh fallback");
+        }
+        this.targets.set(targetKey, target);
+        return target;
+    }
+    addWatcher(target, watchPath, shouldTryRecursive) {
+        if (target.watchedPaths.has(watchPath)) {
+            return false;
+        }
+        const { cwd, compare } = target;
+        const onChange = () => {
+            if (process.platform === "linux" && target.repoWatchPath) {
+                void this.refreshLinuxRepoTreeWatchers(target);
+            }
+            this.scheduleTargetRefresh(target);
+        };
+        const createWatcher = (recursive) => watch(watchPath, { recursive }, () => {
+            onChange();
+        });
+        let watcher = null;
+        let watcherIsRecursive = false;
+        try {
+            if (shouldTryRecursive) {
+                watcher = createWatcher(true);
+                watcherIsRecursive = true;
+            }
+            else {
+                watcher = createWatcher(false);
+            }
+        }
+        catch (error) {
+            if (shouldTryRecursive) {
+                try {
+                    watcher = createWatcher(false);
+                    this.logger.warn({ err: error, watchPath, cwd, compare }, "Checkout diff recursive watch unavailable; using non-recursive fallback");
+                }
+                catch (fallbackError) {
+                    this.logger.warn({ err: fallbackError, watchPath, cwd, compare }, "Failed to start checkout diff watcher");
+                }
+            }
+            else {
+                this.logger.warn({ err: error, watchPath, cwd, compare }, "Failed to start checkout diff watcher");
+            }
+        }
+        if (!watcher) {
+            return false;
+        }
+        watcher.on("error", (error) => {
+            this.logger.warn({ err: error, watchPath, cwd, compare }, "Checkout diff watcher error");
+        });
+        target.watchers.push(watcher);
+        target.watchedPaths.add(watchPath);
+        return watcherIsRecursive;
+    }
+    async ensureLinuxRepoTreeWatchers(target, rootPath) {
+        const directories = await this.listLinuxWatchDirectories(rootPath);
+        let complete = true;
+        for (const directory of directories) {
+            const watcherWasRecursive = this.addWatcher(target, directory, false);
+            if (!watcherWasRecursive && !target.watchedPaths.has(directory)) {
+                complete = false;
+            }
+        }
+        return complete && target.watchedPaths.has(rootPath);
+    }
+    async refreshLinuxRepoTreeWatchers(target) {
+        if (process.platform !== "linux" || !target.repoWatchPath) {
+            return;
+        }
+        const rootPath = target.repoWatchPath;
+        if (target.linuxTreeRefreshPromise) {
+            target.linuxTreeRefreshQueued = true;
+            return;
+        }
+        target.linuxTreeRefreshPromise = (async () => {
+            do {
+                target.linuxTreeRefreshQueued = false;
+                try {
+                    await this.ensureLinuxRepoTreeWatchers(target, rootPath);
+                }
+                catch (error) {
+                    this.logger.warn({
+                        err: error,
+                        cwd: target.cwd,
+                        compare: target.compare,
+                        rootPath,
+                    }, "Failed to refresh Linux checkout diff tree watchers");
+                }
+            } while (target.linuxTreeRefreshQueued);
+        })();
+        try {
+            await target.linuxTreeRefreshPromise;
+        }
+        finally {
+            target.linuxTreeRefreshPromise = null;
+        }
+    }
+    async listLinuxWatchDirectories(rootPath) {
+        const directories = [];
+        const pending = [rootPath];
+        while (pending.length > 0) {
+            const directory = pending.pop();
+            if (!directory) {
+                continue;
+            }
+            directories.push(directory);
+            let entries;
+            try {
+                entries = await readdir(directory, { withFileTypes: true });
+            }
+            catch {
+                continue;
+            }
+            for (const entry of entries) {
+                if (!entry.isDirectory() || entry.name === ".git") {
+                    continue;
+                }
+                pending.push(join(directory, entry.name));
+            }
+        }
+        return directories;
+    }
+}
+//# sourceMappingURL=checkout-diff-manager.js.map

package/dist/server/server/checkout-diff-manager.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"checkout-diff-manager.js","sourceRoot":"","sources":["../../../src/server/checkout-diff-manager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAkB,MAAM,SAAS,CAAC;AAChD,OAAO,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAC3C,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EAAE,IAAI,EAAE,MAAM,eAAe,CAAC;AACrC,OAAO,EAAE,SAAS,EAAE,MAAM,MAAM,CAAC;AAGjC,OAAO,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAC;AAC3D,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC/C,OAAO,EAAE,iBAAiB,EAAE,qBAAqB,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAEpG,MAAM,SAAS,GAAG,SAAS,CAAC,IAAI,CAAC,CAAC;AAElC,MAAM,+BAA+B,GAAG,GAAG,CAAC;AAC5C,MAAM,iCAAiC,GAAG,IAAK,CAAC;AAmChD,MAAM,OAAO,mBAAmB;IAK9B,YAAY,OAAqD;QAFhD,YAAO,GAAG,IAAI,GAAG,EAAmC,CAAC;QAGpE,IAAI,CAAC,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,MAAM,EAAE,uBAAuB,EAAE,CAAC,CAAC;QACxE,IAAI,CAAC,WAAW,GAAG,OAAO,CAAC,WAAW,CAAC;IACzC,CAAC;IAED,KAAK,CAAC,SAAS,CACb,MAGC,EACD,QAAyD;QAEzD,MAAM,GAAG,GAAG,MAAM,CAAC,GAAG,CAAC;QACvB,MAAM,OAAO,GAAG,IAAI,CAAC,gBAAgB,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;QACtD,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;QACrD,MAAM,CAAC,SAAS,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QAE/B,MAAM,OAAO,GACX,MAAM,CAAC,aAAa;YACpB,CAAC,MAAM,IAAI,CAAC,2BAA2B,CAAC,MAAM,CAAC,GAAG,EAAE,MAAM,CAAC,OAAO,EAAE;gBAClE,OAAO,EAAE,MAAM,CAAC,OAAO;aACxB,CAAC,CAAC,CAAC;QACN,MAAM,CAAC,aAAa,GAAG,OAAO,CAAC;QAC/B,MAAM,CAAC,iBAAiB,GAAG,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;QACnD,OAAO;YACL,OAAO;YACP,WAAW,EAAE,GAAG,EAAE;gBAChB,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;YAC5C,CAAC;SACF,CAAC;IACJ,CAAC;IAED,qBAAqB,CAAC,GAAW;QAC/B,MAAM,WAAW,GAAG,WAAW,CAAC,GAAG,CAAC,CAAC;QACrC,KAAK,MAAM,MAAM,IAAI,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC;YAC3C,IAAI,MAAM,CAAC,GAAG,KAAK,WAAW,IAAI,MAAM,CAAC,OAAO,KAAK,WAAW,EAAE,CAAC;gBACjE,SAAS;YACX,CAAC;YACD,IAAI,CAAC,qBAAqB,CAAC,MAAM,CAAC,CAAC;QACrC,CAAC;IACH,CAAC;IAED,UAAU;QACR,IAAI,6BAA6B,GAAG,CAAC,CAAC;QACtC,IAAI,wBAAwB,GAAG,CAAC,CAAC;QACjC,IAAI,sCAAsC,GAAG,CAAC,CAAC;QAE/C,KAAK,MAAM,MAAM,IAAI,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC;YAC3C,6BAA6B,IAAI,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC;YACvD,wBAAwB,IAAI,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC;YACnD,IAAI,MAAM,CAAC,uBAAuB,EAAE,CAAC;gBACnC,sCAAsC,IAAI,CAAC,CAAC;YAC9C,CAAC;QACH,CAAC;QAED,OAAO;YACL,uBAAuB,EAAE,IAAI,CAAC,OAAO,CAAC,IAAI;YAC1C,6BAA6B;YAC7B,wBAAwB;YACxB,sCAAsC;SACvC,CAAC;IACJ,CAAC;IAED,OAAO;QACL,KAAK,MAAM,MAAM,IAAI,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC;YAC3C,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;QAC3B,CAAC;QACD,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,CAAC;IACvB,CAAC;IAEO,gBAAgB,CAAC,OAAiC;QACxD,MAAM,gBAAgB,GAAG,OAAO,CAAC,gBAAgB,KAAK,IAAI,CAAC;QAC3D,IAAI,OAAO,CAAC,IAAI,KAAK,aAAa,EAAE,CAAC;YACnC,OAAO,EAAE,IAAI,EAAE,aAAa,EAAE,gBAAgB,EAAE,CAAC;QACnD,CAAC;QACD,MAAM,cAAc,GAAG,OAAO,CAAC,OAAO,EAAE,IAAI,EAAE,CAAC;QAC/C,OAAO,cAAc;YACnB,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,cAAc,EAAE,gBAAgB,EAAE;YAC7D,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,gBAAgB,EAAE,CAAC;IACzC,CAAC;IAEO,cAAc,CAAC,GAAW,EAAE,OAAiC;QACnE,OAAO,IAAI,CAAC,SAAS,CAAC;YACpB,GAAG;YACH,OAAO,CAAC,IAAI;YACZ,OAAO,CAAC,IAAI,KAAK,MAAM,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE;YACtD,OAAO,CAAC,gBAAgB,KAAK,IAAI;SAClC,CAAC,CAAC;IACL,CAAC;IAEO,WAAW,CAAC,MAA+B;QACjD,IAAI,MAAM,CAAC,aAAa,EAAE,CAAC;YACzB,YAAY,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC;YACnC,MAAM,CAAC,aAAa,GAAG,IAAI,CAAC;QAC9B,CAAC;QACD,IAAI,MAAM,CAAC,uBAAuB,EAAE,CAAC;YACnC,aAAa,CAAC,MAAM,CAAC,uBAAuB,CAAC,CAAC;YAC9C,MAAM,CAAC,uBAAuB,GAAG,IAAI,CAAC;QACxC,CAAC;QACD,KAAK,MAAM,OAAO,IAAI,MAAM,CAAC,QAAQ,EAAE,CAAC;YACtC,OAAO,CAAC,KAAK,EAAE,CAAC;QAClB,CAAC;QACD,MAAM,CAAC,QAAQ,GAAG,EAAE,CAAC;QACrB,MAAM,CAAC,YAAY,CAAC,KAAK,EAAE,CAAC;QAC5B,MAAM,CAAC,SAAS,CAAC,KAAK,EAAE,CAAC;IAC3B,CAAC;IAEO,cAAc,CACpB,SAAiB,EACjB,QAAyD;QAEzD,MAAM,MAAM,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;QAC3C,IAAI,CAAC,MAAM,EAAE,CAAC;YACZ,OAAO;QACT,CAAC;QACD,MAAM,CAAC,SAAS,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;QAClC,IAAI,MAAM,CAAC,SAAS,CAAC,IAAI,GAAG,CAAC,EAAE,CAAC;YAC9B,OAAO;QACT,CAAC;QACD,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;QACzB,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;IACjC,CAAC;IAEO,KAAK,CAAC,wBAAwB,CAAC,GAAW;QAChD,IAAI,CAAC;YACH,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,SAAS,CAAC,sDAAsD,EAAE;gBACzF,GAAG;gBACH,GAAG,EAAE,iBAAiB;aACvB,CAAC,CAAC;YACH,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,EAAE,CAAC;YAC3B,OAAO,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC;QACvC,CAAC;QAAC,MAAM,CAAC;YACP,OAAO,IAAI,CAAC;QACd,CAAC;IACH,CAAC;IAEO,qBAAqB,CAAC,MAA+B;QAC3D,IAAI,MAAM,CAAC,aAAa,EAAE,CAAC;YACzB,YAAY,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC;QACrC,CAAC;QACD,MAAM,CAAC,aAAa,GAAG,UAAU,CAAC,GAAG,EAAE;YACrC,MAAM,CAAC,aAAa,GAAG,IAAI,CAAC;YAC5B,KAAK,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC;QAClC,CAAC,EAAE,+BAA+B,CAAC,CAAC;IACtC,CAAC;IAEO,KAAK,CAAC,2BAA2B,CACvC,GAAW,EACX,OAAiC,EACjC,OAA8B;QAE9B,MAAM,OAAO,GAAG,OAAO,EAAE,OAAO,IAAI,GAAG,CAAC;QACxC,IAAI,CAAC;YACH,MAAM,UAAU,GAAG,MAAM,eAAe,CACtC,OAAO,EACP;gBACE,IAAI,EAAE,OAAO,CAAC,IAAI;gBAClB,OAAO,EAAE,OAAO,CAAC,OAAO;gBACxB,gBAAgB,EAAE,OAAO,CAAC,gBAAgB;gBAC1C,iBAAiB,EAAE,IAAI;aACxB,EACD,EAAE,WAAW,EAAE,IAAI,CAAC,WAAW,EAAE,CAClC,CAAC;YACF,MAAM,KAAK,GAAG,CAAC,GAAG,CAAC,UAAU,CAAC,UAAU,IAAI,EAAE,CAAC,CAAC,CAAC;YACjD,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE;gBAClB,IAAI,CAAC,CAAC,IAAI,KAAK,CAAC,CAAC,IAAI;oBAAE,OAAO,CAAC,CAAC;gBAChC,OAAO,CAAC,CAAC,IAAI,GAAG,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;YAClC,CAAC,CAAC,CAAC;YACH,OAAO;gBACL,GAAG;gBACH,KAAK;gBACL,KAAK,EAAE,IAAI;aACZ,CAAC;QACJ,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,OAAO;gBACL,GAAG;gBACH,KAAK,EAAE,EAAE;gBACT,KAAK,EAAE,eAAe,CAAC,KAAK,CAAC;aAC9B,CAAC;QACJ,CAAC;IACH,CAAC;IAEO,KAAK,CAAC,aAAa,CAAC,MAA+B;QACzD,IAAI,MAAM,CAAC,cAAc,EAAE,CAAC;YAC1B,MAAM,CAAC,aAAa,GAAG,IAAI,CAAC;YAC5B,OAAO;QACT,CAAC;QAED,MAAM,CAAC,cAAc,GAAG,CAAC,KAAK,IAAI,EAAE;YAClC,GAAG,CAAC;gBACF,MAAM,CAAC,aAAa,GAAG,KAAK,CAAC;gBAC7B,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,2BAA2B,CAAC,MAAM,CAAC,GAAG,EAAE,MAAM,CAAC,OAAO,EAAE;oBAClF,OAAO,EAAE,MAAM,CAAC,OAAO;iBACxB,CAAC,CAAC;gBACH,MAAM,CAAC,aAAa,GAAG,QAAQ,CAAC;gBAChC,MAAM,WAAW,GAAG,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC;gBAC7C,IAAI,WAAW,KAAK,MAAM,CAAC,iBAAiB,EAAE,CAAC;oBAC7C,MAAM,CAAC,iBAAiB,GAAG,WAAW,CAAC;oBACvC,KAAK,MAAM,QAAQ,IAAI,MAAM,CAAC,SAAS,EAAE,CAAC;wBACxC,QAAQ,CAAC,QAAQ,CAAC,CAAC;oBACrB,CAAC;gBACH,CAAC;YACH,CAAC,QAAQ,MAAM,CAAC,aAAa,EAAE;QACjC,CAAC,CAAC,EAAE,CAAC;QAEL,IAAI,CAAC;YACH,MAAM,MAAM,CAAC,cAAc,CAAC;QAC9B,CAAC;gBAAS,CAAC;YACT,MAAM,CAAC,cAAc,GAAG,IAAI,CAAC;QAC/B,CAAC;IACH,CAAC;IAEO,KAAK,CAAC,YAAY,CACxB,GAAW,EACX,OAAiC;QAEjC,MAAM,SAAS,GAAG,IAAI,CAAC,cAAc,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;QACpD,MAAM,QAAQ,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;QAC7C,IAAI,QAAQ,EAAE,CAAC;YACb,OAAO,QAAQ,CAAC;QAClB,CAAC;QAED,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,wBAAwB,CAAC,GAAG,CAAC,CAAC;QAC3D,MAAM,MAAM,GAA4B;YACtC,GAAG,EAAE,SAAS;YACd,GAAG;YACH,OAAO,EAAE,SAAS,IAAI,GAAG;YACzB,OAAO;YACP,SAAS,EAAE,IAAI,GAAG,EAAE;YACpB,QAAQ,EAAE,EAAE;YACZ,uBAAuB,EAAE,IAAI;YAC7B,aAAa,EAAE,IAAI;YACnB,cAAc,EAAE,IAAI;YACpB,aAAa,EAAE,KAAK;YACpB,aAAa,EAAE,IAAI;YACnB,iBAAiB,EAAE,IAAI;YACvB,YAAY,EAAE,IAAI,GAAG,EAAU;YAC/B,aAAa,EAAE,IAAI;YACnB,uBAAuB,EAAE,IAAI;YAC7B,sBAAsB,EAAE,KAAK;SAC9B,CAAC;QAEF,MAAM,aAAa,GAAG,SAAS,IAAI,GAAG,CAAC;QACvC,MAAM,CAAC,aAAa,GAAG,aAAa,CAAC;QACrC,MAAM,UAAU,GAAG,IAAI,GAAG,CAAS,CAAC,aAAa,CAAC,CAAC,CAAC;QACpD,MAAM,MAAM,GAAG,MAAM,qBAAqB,CAAC,GAAG,CAAC,CAAC;QAChD,IAAI,MAAM,EAAE,CAAC;YACX,UAAU,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QACzB,CAAC;QAED,IAAI,wBAAwB,GAAG,KAAK,CAAC;QACrC,MAAM,uBAAuB,GAAG,OAAO,CAAC,QAAQ,KAAK,OAAO,CAAC;QAC7D,IAAI,OAAO,CAAC,QAAQ,KAAK,OAAO,EAAE,CAAC;YACjC,wBAAwB,GAAG,MAAM,IAAI,CAAC,2BAA2B,CAAC,MAAM,EAAE,aAAa,CAAC,CAAC;QAC3F,CAAC;QACD,KAAK,MAAM,SAAS,IAAI,UAAU,EAAE,CAAC;YACnC,IAAI,OAAO,CAAC,QAAQ,KAAK,OAAO,IAAI,SAAS,KAAK,aAAa,EAAE,CAAC;gBAChE,SAAS;YACX,CAAC;YACD,MAAM,kBAAkB,GAAG,SAAS,KAAK,aAAa,IAAI,uBAAuB,CAAC;YAClF,MAAM,kBAAkB,GAAG,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE,SAAS,EAAE,kBAAkB,CAAC,CAAC;YAClF,IAAI,SAAS,KAAK,aAAa,IAAI,kBAAkB,EAAE,CAAC;gBACtD,wBAAwB,GAAG,IAAI,CAAC;YAClC,CAAC;QACH,CAAC;QAED,MAAM,mBAAmB,GAAG,CAAC,wBAAwB,CAAC;QACtD,IAAI,MAAM,CAAC,QAAQ,CAAC,MAAM,KAAK,CAAC,IAAI,mBAAmB,EAAE,CAAC;YACxD,MAAM,CAAC,uBAAuB,GAAG,WAAW,CAAC,GAAG,EAAE;gBAChD,IAAI,CAAC,qBAAqB,CAAC,MAAM,CAAC,CAAC;YACrC,CAAC,EAAE,iCAAiC,CAAC,CAAC;YACtC,IAAI,CAAC,MAAM,CAAC,IAAI,CACd;gBACE,GAAG;gBACH,OAAO;gBACP,UAAU,EAAE,iCAAiC;gBAC7C,MAAM,EACJ,MAAM,CAAC,QAAQ,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,sCAAsC;aACxF,EACD,kEAAkE,CACnE,CAAC;QACJ,CAAC;QAED,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;QACpC,OAAO,MAAM,CAAC;IAChB,CAAC;IAEO,UAAU,CAChB,MAA+B,EAC/B,SAAiB,EACjB,kBAA2B;QAE3B,IAAI,MAAM,CAAC,YAAY,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE,CAAC;YACvC,OAAO,KAAK,CAAC;QACf,CAAC;QAED,MAAM,EAAE,GAAG,EAAE,OAAO,EAAE,GAAG,MAAM,CAAC;QAChC,MAAM,QAAQ,GAAG,GAAG,EAAE;YACpB,IAAI,OAAO,CAAC,QAAQ,KAAK,OAAO,IAAI,MAAM,CAAC,aAAa,EAAE,CAAC;gBACzD,KAAK,IAAI,CAAC,4BAA4B,CAAC,MAAM,CAAC,CAAC;YACjD,CAAC;YACD,IAAI,CAAC,qBAAqB,CAAC,MAAM,CAAC,CAAC;QACrC,CAAC,CAAC;QACF,MAAM,aAAa,GAAG,CAAC,SAAkB,EAAa,EAAE,CACtD,KAAK,CAAC,SAAS,EAAE,EAAE,SAAS,EAAE,EAAE,GAAG,EAAE;YACnC,QAAQ,EAAE,CAAC;QACb,CAAC,CAAC,CAAC;QAEL,IAAI,OAAO,GAAqB,IAAI,CAAC;QACrC,IAAI,kBAAkB,GAAG,KAAK,CAAC;QAC/B,IAAI,CAAC;YACH,IAAI,kBAAkB,EAAE,CAAC;gBACvB,OAAO,GAAG,aAAa,CAAC,IAAI,CAAC,CAAC;gBAC9B,kBAAkB,GAAG,IAAI,CAAC;YAC5B,CAAC;iBAAM,CAAC;gBACN,OAAO,GAAG,aAAa,CAAC,KAAK,CAAC,CAAC;YACjC,CAAC;QACH,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,IAAI,kBAAkB,EAAE,CAAC;gBACvB,IAAI,CAAC;oBACH,OAAO,GAAG,aAAa,CAAC,KAAK,CAAC,CAAC;oBAC/B,IAAI,CAAC,MAAM,CAAC,IAAI,CACd,EAAE,GAAG,EAAE,KAAK,EAAE,SAAS,EAAE,GAAG,EAAE,OAAO,EAAE,EACvC,yEAAyE,CAC1E,CAAC;gBACJ,CAAC;gBAAC,OAAO,aAAa,EAAE,CAAC;oBACvB,IAAI,CAAC,MAAM,CAAC,IAAI,CACd,EAAE,GAAG,EAAE,aAAa,EAAE,SAAS,EAAE,GAAG,EAAE,OAAO,EAAE,EAC/C,uCAAuC,CACxC,CAAC;gBACJ,CAAC;YACH,CAAC;iBAAM,CAAC;gBACN,IAAI,CAAC,MAAM,CAAC,IAAI,CACd,EAAE,GAAG,EAAE,KAAK,EAAE,SAAS,EAAE,GAAG,EAAE,OAAO,EAAE,EACvC,uCAAuC,CACxC,CAAC;YACJ,CAAC;QACH,CAAC;QAED,IAAI,CAAC,OAAO,EAAE,CAAC;YACb,OAAO,KAAK,CAAC;QACf,CAAC;QAED,OAAO,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,KAAK,EAAE,EAAE;YAC5B,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,GAAG,EAAE,KAAK,EAAE,SAAS,EAAE,GAAG,EAAE,OAAO,EAAE,EAAE,6BAA6B,CAAC,CAAC;QAC3F,CAAC,CAAC,CAAC;QACH,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAC9B,MAAM,CAAC,YAAY,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;QACnC,OAAO,kBAAkB,CAAC;IAC5B,CAAC;IAEO,KAAK,CAAC,2BAA2B,CACvC,MAA+B,EAC/B,QAAgB;QAEhB,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,yBAAyB,CAAC,QAAQ,CAAC,CAAC;QACnE,IAAI,QAAQ,GAAG,IAAI,CAAC;QACpB,KAAK,MAAM,SAAS,IAAI,WAAW,EAAE,CAAC;YACpC,MAAM,mBAAmB,GAAG,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE,SAAS,EAAE,KAAK,CAAC,CAAC;YACtE,IAAI,CAAC,mBAAmB,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE,CAAC;gBAChE,QAAQ,GAAG,KAAK,CAAC;YACnB,CAAC;QACH,CAAC;QACD,OAAO,QAAQ,IAAI,MAAM,CAAC,YAAY,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;IACvD,CAAC;IAEO,KAAK,CAAC,4BAA4B,CAAC,MAA+B;QACxE,IAAI,OAAO,CAAC,QAAQ,KAAK,OAAO,IAAI,CAAC,MAAM,CAAC,aAAa,EAAE,CAAC;YAC1D,OAAO;QACT,CAAC;QACD,MAAM,QAAQ,GAAG,MAAM,CAAC,aAAa,CAAC;QACtC,IAAI,MAAM,CAAC,uBAAuB,EAAE,CAAC;YACnC,MAAM,CAAC,sBAAsB,GAAG,IAAI,CAAC;YACrC,OAAO;QACT,CAAC;QAED,MAAM,CAAC,uBAAuB,GAAG,CAAC,KAAK,IAAI,EAAE;YAC3C,GAAG,CAAC;gBACF,MAAM,CAAC,sBAAsB,GAAG,KAAK,CAAC;gBACtC,IAAI,CAAC;oBACH,MAAM,IAAI,CAAC,2BAA2B,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;gBAC3D,CAAC;gBAAC,OAAO,KAAK,EAAE,CAAC;oBACf,IAAI,CAAC,MAAM,CAAC,IAAI,CACd;wBACE,GAAG,EAAE,KAAK;wBACV,GAAG,EAAE,MAAM,CAAC,GAAG;wBACf,OAAO,EAAE,MAAM,CAAC,OAAO;wBACvB,QAAQ;qBACT,EACD,qDAAqD,CACtD,CAAC;gBACJ,CAAC;YACH,CAAC,QAAQ,MAAM,CAAC,sBAAsB,EAAE;QAC1C,CAAC,CAAC,EAAE,CAAC;QAEL,IAAI,CAAC;YACH,MAAM,MAAM,CAAC,uBAAuB,CAAC;QACvC,CAAC;gBAAS,CAAC;YACT,MAAM,CAAC,uBAAuB,GAAG,IAAI,CAAC;QACxC,CAAC;IACH,CAAC;IAEO,KAAK,CAAC,yBAAyB,CAAC,QAAgB;QACtD,MAAM,WAAW,GAAa,EAAE,CAAC;QACjC,MAAM,OAAO,GAAG,CAAC,QAAQ,CAAC,CAAC;QAE3B,OAAO,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAC1B,MAAM,SAAS,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC;YAChC,IAAI,CAAC,SAAS,EAAE,CAAC;gBACf,SAAS;YACX,CAAC;YACD,WAAW,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;YAE5B,IAAI,OAAO,CAAC;YACZ,IAAI,CAAC;gBACH,OAAO,GAAG,MAAM,OAAO,CAAC,SAAS,EAAE,EAAE,aAAa,EAAE,IAAI,EAAE,CAAC,CAAC;YAC9D,CAAC;YAAC,MAAM,CAAC;gBACP,SAAS;YACX,CAAC;YAED,KAAK,MAAM,KAAK,IAAI,OAAO,EAAE,CAAC;gBAC5B,IAAI,CAAC,KAAK,CAAC,WAAW,EAAE,IAAI,KAAK,CAAC,IAAI,KAAK,MAAM,EAAE,CAAC;oBAClD,SAAS;gBACX,CAAC;gBACD,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC;YAC5C,CAAC;QACH,CAAC;QAED,OAAO,WAAW,CAAC;IACrB,CAAC;CACF"}

package/dist/server/server/checkout-git-utils.d.ts

@@ -0,0 +1,9 @@
+export declare const READ_ONLY_GIT_ENV: NodeJS.ProcessEnv;
+export type CheckoutErrorCode = "NOT_GIT_REPO" | "NOT_ALLOWED" | "MERGE_CONFLICT" | "UNKNOWN";
+export type CheckoutErrorPayload = {
+    code: CheckoutErrorCode;
+    message: string;
+};
+export declare function resolveCheckoutGitDir(cwd: string): Promise<string | null>;
+export declare function toCheckoutError(error: unknown): CheckoutErrorPayload;
+//# sourceMappingURL=checkout-git-utils.d.ts.map

package/dist/server/server/checkout-git-utils.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"checkout-git-utils.d.ts","sourceRoot":"","sources":["../../../src/server/checkout-git-utils.ts"],"names":[],"mappings":"AAUA,eAAO,MAAM,iBAAiB,EAAE,MAAM,CAAC,UAGtC,CAAC;AAEF,MAAM,MAAM,iBAAiB,GAAG,cAAc,GAAG,aAAa,GAAG,gBAAgB,GAAG,SAAS,CAAC;AAE9F,MAAM,MAAM,oBAAoB,GAAG;IACjC,IAAI,EAAE,iBAAiB,CAAC;IACxB,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF,wBAAsB,qBAAqB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAW/E;AAED,wBAAgB,eAAe,CAAC,KAAK,EAAE,OAAO,GAAG,oBAAoB,CAcpE"}

package/dist/server/server/checkout-git-utils.js

@@ -0,0 +1,37 @@
+import { exec } from "child_process";
+import { promisify } from "util";
+import { MergeConflictError, MergeFromBaseConflictError, NotGitRepoError, } from "../utils/checkout-git.js";
+const execAsync = promisify(exec);
+export const READ_ONLY_GIT_ENV = {
+    ...process.env,
+    GIT_OPTIONAL_LOCKS: "0",
+};
+export async function resolveCheckoutGitDir(cwd) {
+    try {
+        const { stdout } = await execAsync("git rev-parse --absolute-git-dir", {
+            cwd,
+            env: READ_ONLY_GIT_ENV,
+        });
+        const gitDir = stdout.trim();
+        return gitDir.length > 0 ? gitDir : null;
+    }
+    catch {
+        return null;
+    }
+}
+export function toCheckoutError(error) {
+    if (error instanceof NotGitRepoError) {
+        return { code: "NOT_GIT_REPO", message: error.message };
+    }
+    if (error instanceof MergeConflictError) {
+        return { code: "MERGE_CONFLICT", message: error.message };
+    }
+    if (error instanceof MergeFromBaseConflictError) {
+        return { code: "MERGE_CONFLICT", message: error.message };
+    }
+    if (error instanceof Error) {
+        return { code: "UNKNOWN", message: error.message };
+    }
+    return { code: "UNKNOWN", message: String(error) };
+}
+//# sourceMappingURL=checkout-git-utils.js.map

package/dist/server/server/checkout-git-utils.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"checkout-git-utils.js","sourceRoot":"","sources":["../../../src/server/checkout-git-utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,eAAe,CAAC;AACrC,OAAO,EAAE,SAAS,EAAE,MAAM,MAAM,CAAC;AACjC,OAAO,EACL,kBAAkB,EAClB,0BAA0B,EAC1B,eAAe,GAChB,MAAM,0BAA0B,CAAC;AAElC,MAAM,SAAS,GAAG,SAAS,CAAC,IAAI,CAAC,CAAC;AAElC,MAAM,CAAC,MAAM,iBAAiB,GAAsB;IAClD,GAAG,OAAO,CAAC,GAAG;IACd,kBAAkB,EAAE,GAAG;CACxB,CAAC;AASF,MAAM,CAAC,KAAK,UAAU,qBAAqB,CAAC,GAAW;IACrD,IAAI,CAAC;QACH,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,SAAS,CAAC,kCAAkC,EAAE;YACrE,GAAG;YACH,GAAG,EAAE,iBAAiB;SACvB,CAAC,CAAC;QACH,MAAM,MAAM,GAAG,MAAM,CAAC,IAAI,EAAE,CAAC;QAC7B,OAAO,MAAM,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC;IAC3C,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,IAAI,CAAC;IACd,CAAC;AACH,CAAC;AAED,MAAM,UAAU,eAAe,CAAC,KAAc;IAC5C,IAAI,KAAK,YAAY,eAAe,EAAE,CAAC;QACrC,OAAO,EAAE,IAAI,EAAE,cAAc,EAAE,OAAO,EAAE,KAAK,CAAC,OAAO,EAAE,CAAC;IAC1D,CAAC;IACD,IAAI,KAAK,YAAY,kBAAkB,EAAE,CAAC;QACxC,OAAO,EAAE,IAAI,EAAE,gBAAgB,EAAE,OAAO,EAAE,KAAK,CAAC,OAAO,EAAE,CAAC;IAC5D,CAAC;IACD,IAAI,KAAK,YAAY,0BAA0B,EAAE,CAAC;QAChD,OAAO,EAAE,IAAI,EAAE,gBAAgB,EAAE,OAAO,EAAE,KAAK,CAAC,OAAO,EAAE,CAAC;IAC5D,CAAC;IACD,IAAI,KAAK,YAAY,KAAK,EAAE,CAAC;QAC3B,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,OAAO,EAAE,KAAK,CAAC,OAAO,EAAE,CAAC;IACrD,CAAC;IACD,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC;AACrD,CAAC"}

package/dist/server/server/client-message-id.d.ts

@@ -0,0 +1,3 @@
+export declare function normalizeClientMessageId(clientMessageId: string | undefined): string | undefined;
+export declare function resolveClientMessageId(clientMessageId: string | undefined, generateId?: () => string): string;
+//# sourceMappingURL=client-message-id.d.ts.map

package/dist/server/server/client-message-id.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"client-message-id.d.ts","sourceRoot":"","sources":["../../../src/server/client-message-id.ts"],"names":[],"mappings":"AAEA,wBAAgB,wBAAwB,CAAC,eAAe,EAAE,MAAM,GAAG,SAAS,GAAG,MAAM,GAAG,SAAS,CAMhG;AAED,wBAAgB,sBAAsB,CACpC,eAAe,EAAE,MAAM,GAAG,SAAS,EACnC,UAAU,GAAE,MAAM,MAAe,GAChC,MAAM,CAER"}

package/dist/server/server/client-message-id.js

@@ -0,0 +1,12 @@
+import { v4 as uuidv4 } from "uuid";
+export function normalizeClientMessageId(clientMessageId) {
+    if (typeof clientMessageId !== "string") {
+        return undefined;
+    }
+    const trimmed = clientMessageId.trim();
+    return trimmed.length > 0 ? trimmed : undefined;
+}
+export function resolveClientMessageId(clientMessageId, generateId = uuidv4) {
+    return normalizeClientMessageId(clientMessageId) ?? generateId();
+}
+//# sourceMappingURL=client-message-id.js.map

package/dist/server/server/client-message-id.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"client-message-id.js","sourceRoot":"","sources":["../../../src/server/client-message-id.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,IAAI,MAAM,EAAE,MAAM,MAAM,CAAC;AAEpC,MAAM,UAAU,wBAAwB,CAAC,eAAmC;IAC1E,IAAI,OAAO,eAAe,KAAK,QAAQ,EAAE,CAAC;QACxC,OAAO,SAAS,CAAC;IACnB,CAAC;IACD,MAAM,OAAO,GAAG,eAAe,CAAC,IAAI,EAAE,CAAC;IACvC,OAAO,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC;AAClD,CAAC;AAED,MAAM,UAAU,sBAAsB,CACpC,eAAmC,EACnC,aAA2B,MAAM;IAEjC,OAAO,wBAAwB,CAAC,eAAe,CAAC,IAAI,UAAU,EAAE,CAAC;AACnE,CAAC"}

package/dist/server/server/config.d.ts

@@ -0,0 +1,14 @@
+import type { SeaworkDaemonConfig } from "./bootstrap.js";
+import { type AllowedHostsConfig } from "./allowed-hosts.js";
+export type CliConfigOverrides = Partial<{
+    listen: string;
+    relayEnabled: boolean;
+    mcpEnabled: boolean;
+    mcpInjectIntoAgents: boolean;
+    allowedHosts: AllowedHostsConfig;
+}>;
+export declare function loadConfig(seaworkHome: string, options?: {
+    env?: NodeJS.ProcessEnv;
+    cli?: CliConfigOverrides;
+}): SeaworkDaemonConfig;
+//# sourceMappingURL=config.d.ts.map

package/dist/server/server/config.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../../src/server/config.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,gBAAgB,CAAC;AAK1D,OAAO,EAGL,KAAK,kBAAkB,EACxB,MAAM,oBAAoB,CAAC;AAwB5B,MAAM,MAAM,kBAAkB,GAAG,OAAO,CAAC;IACvC,MAAM,EAAE,MAAM,CAAC;IACf,YAAY,EAAE,OAAO,CAAC;IACtB,UAAU,EAAE,OAAO,CAAC;IACpB,mBAAmB,EAAE,OAAO,CAAC;IAC7B,YAAY,EAAE,kBAAkB,CAAC;CAClC,CAAC,CAAC;AAcH,wBAAgB,UAAU,CACxB,WAAW,EAAE,MAAM,EACnB,OAAO,CAAC,EAAE;IACR,GAAG,CAAC,EAAE,MAAM,CAAC,UAAU,CAAC;IACxB,GAAG,CAAC,EAAE,kBAAkB,CAAC;CAC1B,GACA,mBAAmB,CAoFrB"}

package/dist/server/server/config.js

@@ -0,0 +1,96 @@
+import path from "node:path";
+import { z } from "zod";
+import { loadPersistedConfig } from "./persisted-config.js";
+import { AgentProviderSchema } from "./agent/provider-manifest.js";
+import { resolveSpeechConfig } from "./speech/speech-config-resolver.js";
+import { mergeAllowedHosts, parseAllowedHostsEnv, } from "./allowed-hosts.js";
+const DEFAULT_PORT = 6767;
+// Defaults can be overridden via SEAWORK_RELAY_ENDPOINT and SEAWORK_APP_BASE_URL env vars
+// or persisted config. Replace these with your own domain after Cloudflare setup.
+const DEFAULT_RELAY_ENDPOINT = "relay.seawork.ai:443";
+const DEFAULT_APP_BASE_URL = "https://app.seawork.ai";
+function parseBooleanEnv(value) {
+    if (value === undefined) {
+        return undefined;
+    }
+    const normalized = value.trim().toLowerCase();
+    if (["1", "true", "yes", "on"].includes(normalized)) {
+        return true;
+    }
+    if (["0", "false", "no", "off"].includes(normalized)) {
+        return false;
+    }
+    return undefined;
+}
+const OptionalVoiceLlmProviderSchema = z
+    .union([z.string(), z.null(), z.undefined()])
+    .transform((value) => typeof value === "string" ? value.trim().toLowerCase() : null)
+    .pipe(z.union([AgentProviderSchema, z.null()]));
+function parseOptionalVoiceLlmProvider(value) {
+    const parsed = OptionalVoiceLlmProviderSchema.safeParse(value);
+    return parsed.success ? parsed.data : null;
+}
+export function loadConfig(seaworkHome, options) {
+    const env = options?.env ?? process.env;
+    const persisted = loadPersistedConfig(seaworkHome);
+    // SEAWORK_LISTEN can be:
+    // - host:port (TCP)
+    // - /path/to/socket (Unix socket)
+    // - unix:///path/to/socket (Unix socket)
+    // Default is TCP at 127.0.0.1:6767
+    const listen = options?.cli?.listen ??
+        env.SEAWORK_LISTEN ??
+        persisted.daemon?.listen ??
+        `127.0.0.1:${env.PORT ?? DEFAULT_PORT}`;
+    const envCorsOrigins = env.SEAWORK_CORS_ORIGINS
+        ? env.SEAWORK_CORS_ORIGINS.split(",").map((s) => s.trim())
+        : [];
+    const persistedCorsOrigins = persisted.daemon?.cors?.allowedOrigins ?? [];
+    const allowedHosts = mergeAllowedHosts([
+        persisted.daemon?.allowedHosts,
+        parseAllowedHostsEnv(env.SEAWORK_ALLOWED_HOSTS),
+        options?.cli?.allowedHosts,
+    ]);
+    const mcpEnabled = options?.cli?.mcpEnabled ?? persisted.daemon?.mcp?.enabled ?? true;
+    const mcpInjectIntoAgents = options?.cli?.mcpInjectIntoAgents ?? persisted.daemon?.mcp?.injectIntoAgents ?? false;
+    const relayEnabled = options?.cli?.relayEnabled ??
+        parseBooleanEnv(env.SEAWORK_RELAY_ENABLED) ??
+        persisted.daemon?.relay?.enabled ??
+        true;
+    const relayEndpoint = env.SEAWORK_RELAY_ENDPOINT ?? persisted.daemon?.relay?.endpoint ?? DEFAULT_RELAY_ENDPOINT;
+    const relayPublicEndpoint = env.SEAWORK_RELAY_PUBLIC_ENDPOINT ?? persisted.daemon?.relay?.publicEndpoint ?? relayEndpoint;
+    const appBaseUrl = env.SEAWORK_APP_BASE_URL ?? persisted.app?.baseUrl ?? DEFAULT_APP_BASE_URL;
+    const { openai, speech } = resolveSpeechConfig({
+        seaworkHome,
+        env,
+        persisted,
+    });
+    const envVoiceLlmProvider = parseOptionalVoiceLlmProvider(env.SEAWORK_VOICE_LLM_PROVIDER);
+    const persistedVoiceLlmProvider = parseOptionalVoiceLlmProvider(persisted.features?.voiceMode?.llm?.provider);
+    const voiceLlmProvider = envVoiceLlmProvider ?? persistedVoiceLlmProvider ?? null;
+    const voiceLlmProviderExplicit = envVoiceLlmProvider !== null || persistedVoiceLlmProvider !== null;
+    const voiceLlmModel = persisted.features?.voiceMode?.llm?.model ?? null;
+    return {
+        listen,
+        seaworkHome,
+        corsAllowedOrigins: Array.from(new Set([...persistedCorsOrigins, ...envCorsOrigins].filter((s) => s.length > 0))),
+        allowedHosts,
+        mcpEnabled,
+        mcpInjectIntoAgents,
+        mcpDebug: env.MCP_DEBUG === "1",
+        agentStoragePath: path.join(seaworkHome, "agents"),
+        staticDir: "public",
+        agentClients: {},
+        relayEnabled,
+        relayEndpoint,
+        relayPublicEndpoint,
+        appBaseUrl,
+        openai,
+        speech,
+        voiceLlmProvider,
+        voiceLlmProviderExplicit,
+        voiceLlmModel,
+        agentProviderSettings: persisted.agents?.providers,
+    };
+}
+//# sourceMappingURL=config.js.map

package/dist/server/server/config.js.map

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