@loucompanion/forge-bridge 0.1.1-dev.03b8ba168599

package/dist/worktree/worktree.service.js

@@ -0,0 +1,301 @@
+import fs from "node:fs/promises";
+import path from "node:path";
+import { GitClient } from "../shared/git/git.js";
+import { ensureDirectory, isSubPath, resolveExistingDirectoryPath, safeSegment } from "../shared/path/path.js";
+import { injectWorktreeArtifacts } from "./artifact-injector.js";
+import { warmWorktreeDependencies } from "./dependency-warmer.js";
+export class GitWorktreeService {
+    git;
+    constructor(git = new GitClient()) {
+        this.git = git;
+    }
+    async prepare(request) {
+        const allowedRoot = await ensureDirectory(request.allowedRepoRoot);
+        const baseBranch = normalizeBranchName(request.baseBranch, "develop");
+        const repoPath = await this.resolveRepoPath(request.repo, allowedRoot, baseBranch);
+        await this.ensureGitIdentity(repoPath);
+        await this.ensureBaseBranch(repoPath, baseBranch);
+        const shortId = request.workItem.id.replace(/-/g, "").slice(0, 12);
+        const kind = safeSegment(request.workItem.kind, "work-item");
+        const branchName = normalizeBranchName(`${kind}/${shortId}`, "work-item/unknown");
+        const worktreeRoot = resolveWorktreeRoot(allowedRoot, repoPath);
+        const worktreePath = path.join(worktreeRoot, kind, shortId);
+        const resolvedWorktreeParent = await ensureDirectory(path.dirname(worktreePath));
+        if (!isSubPath(allowedRoot, resolvedWorktreeParent)) {
+            throw new Error(`Worktree path must stay under ${allowedRoot}.`);
+        }
+        const exists = await directoryExists(worktreePath);
+        let resolvedWorktreePath;
+        if (!exists) {
+            await this.git.run(repoPath, ["worktree", "add", "-B", branchName, worktreePath, baseBranch]);
+            resolvedWorktreePath = await resolveExistingDirectoryPath(worktreePath);
+        }
+        else {
+            resolvedWorktreePath = await resolveExistingDirectoryPath(worktreePath);
+            if (!isSubPath(allowedRoot, resolvedWorktreePath)) {
+                throw new Error(`Worktree path must stay under ${allowedRoot}.`);
+            }
+        }
+        await this.ensureGitIdentity(resolvedWorktreePath);
+        if (request.artifacts.length > 0) {
+            await injectWorktreeArtifacts(resolvedWorktreePath, request.artifacts);
+        }
+        const dependencyWarm = await warmWorktreeDependencies({
+            baseCheckoutPath: repoPath,
+            worktreePath: resolvedWorktreePath,
+            allowedRoot,
+            warmPathOverrides: request.warmPathOverrides
+        });
+        return {
+            repoPath,
+            worktreePath: resolvedWorktreePath,
+            branchName,
+            baseBranch,
+            cleanupWorktrees: request.cleanupWorktrees,
+            dependencyWarm
+        };
+    }
+    async release(handle) {
+        if (!handle.cleanupWorktrees || !(await directoryExists(handle.worktreePath))) {
+            return;
+        }
+        try {
+            await this.git.run(handle.repoPath, ["worktree", "remove", "--force", handle.worktreePath]);
+            await this.git.run(handle.repoPath, ["worktree", "prune"]);
+        }
+        catch {
+            await fs.rm(handle.worktreePath, { recursive: true, force: true });
+        }
+    }
+    async resolveRepoPath(repo, allowedRoot, baseBranch) {
+        if (repo.serverLocalPath && repo.serverLocalPath.trim().length > 0) {
+            const requestedPath = await resolveExistingDirectoryPath(repo.serverLocalPath);
+            if (!isSubPath(allowedRoot, requestedPath) || !(await gitMetadataExists(requestedPath, allowedRoot))) {
+                throw new Error(`Repo server-local path must be an existing Git repository under ${allowedRoot}.`);
+            }
+            return requestedPath;
+        }
+        if (!repo.cloneOnDemand) {
+            throw new Error("Repo has no server-local path and cloneOnDemand is disabled.");
+        }
+        const discovered = await this.findExistingRepoPath(repo, allowedRoot);
+        if (discovered) {
+            return discovered;
+        }
+        const repoPath = path.join(managedRepoRoot(allowedRoot), `${safeSegment(repo.name, "repo")}-${repo.id.replace(/-/g, "")}`);
+        if (!(await gitMetadataExists(repoPath, allowedRoot))) {
+            const repoPathExists = await pathExists(repoPath);
+            if (repoPathExists) {
+                throw new Error(`Repository path ${repoPath} exists but is not a git checkout.`);
+            }
+            if (isCloneableRemote(repo.remoteUrl)) {
+                await fs.mkdir(path.dirname(repoPath), { recursive: true });
+                try {
+                    await this.git.run(path.dirname(repoPath), ["clone", "--origin", "origin", repo.remoteUrl.trim(), repoPath]);
+                }
+                catch (err) {
+                    await fs.rm(repoPath, { recursive: true, force: true });
+                    throw err;
+                }
+            }
+            else {
+                await fs.mkdir(repoPath, { recursive: true });
+                await this.git.run(repoPath, ["init", "-b", baseBranch]);
+                await this.ensureGitIdentity(repoPath);
+                await fs.writeFile(path.join(repoPath, "README.md"), `# ${repo.name}\n`, "utf8");
+                await this.git.run(repoPath, ["add", "README.md"]);
+                await this.git.run(repoPath, ["commit", "-m", "seed forge bridge repo"]);
+            }
+        }
+        const resolved = await resolveExistingDirectoryPath(repoPath);
+        if (!isSubPath(allowedRoot, resolved)) {
+            throw new Error(`Repo path must stay under ${allowedRoot}.`);
+        }
+        return resolved;
+    }
+    async findExistingRepoPath(repo, allowedRoot) {
+        const expectedRemote = normalizeRemote(repo.remoteUrl);
+        const rawName = repo.name.trim();
+        const nameCandidates = uniqueStrings([
+            isSinglePathSegment(rawName) ? path.join(allowedRoot, rawName) : "",
+            path.join(allowedRoot, safeSegment(repo.name, "repo"))
+        ]);
+        for (const candidate of nameCandidates) {
+            const resolved = await this.resolveMatchingRepo(candidate, allowedRoot, expectedRemote);
+            if (resolved) {
+                return resolved;
+            }
+        }
+        if (expectedRemote.length > 0) {
+            const entries = await fs.readdir(allowedRoot, { withFileTypes: true }).catch(() => []);
+            for (const entry of entries) {
+                if (!entry.isDirectory() || entry.name === ".forge-worktrees") {
+                    continue;
+                }
+                const resolved = await this.resolveMatchingRepo(path.join(allowedRoot, entry.name), allowedRoot, expectedRemote);
+                if (resolved) {
+                    return resolved;
+                }
+            }
+        }
+        return null;
+    }
+    async resolveMatchingRepo(candidate, allowedRoot, expectedRemote) {
+        if (!(await gitMetadataExists(candidate, allowedRoot))) {
+            return null;
+        }
+        if (expectedRemote.length > 0) {
+            const origin = await this.git.run(candidate, ["remote", "get-url", "origin"]).catch(() => "");
+            if (normalizeRemote(origin) !== expectedRemote) {
+                return null;
+            }
+        }
+        const resolved = await resolveExistingDirectoryPath(candidate);
+        return isSubPath(allowedRoot, resolved) ? resolved : null;
+    }
+    async ensureBaseBranch(repoPath, baseBranch) {
+        if (await this.gitRefExists(repoPath, `refs/heads/${baseBranch}`)) {
+            return;
+        }
+        const origin = await this.git.run(repoPath, ["remote", "get-url", "origin"]).catch(() => "");
+        if (origin.trim().length === 0) {
+            throw new Error(`Base branch '${baseBranch}' was not found in the local checkout.`);
+        }
+        await this.git.run(repoPath, ["fetch", "origin", `${baseBranch}:refs/remotes/origin/${baseBranch}`]).catch(() => "");
+        if (await this.gitRefExists(repoPath, `refs/remotes/origin/${baseBranch}`)) {
+            await this.git.run(repoPath, ["branch", baseBranch, `refs/remotes/origin/${baseBranch}`]);
+            return;
+        }
+        throw new Error(`Base branch '${baseBranch}' was not found locally or on origin.`);
+    }
+    async gitRefExists(repoPath, gitRef) {
+        return this.git.run(repoPath, ["show-ref", "--verify", "--quiet", gitRef]).then(() => true).catch(() => false);
+    }
+    async ensureGitIdentity(repoPath) {
+        await this.git.run(repoPath, ["config", "user.email", "forge-bridge@forge.local"]);
+        await this.git.run(repoPath, ["config", "user.name", "Forge Bridge"]);
+    }
+}
+function managedRepoRoot(allowedRoot) {
+    return path.join(allowedRoot, ".forge-worktrees", "_repos");
+}
+function resolveWorktreeRoot(allowedRoot, repoPath) {
+    const baseName = path.basename(repoPath);
+    return isSubPath(managedRepoRoot(allowedRoot), repoPath)
+        ? path.join(allowedRoot, ".forge-worktrees", baseName)
+        : path.join(path.dirname(repoPath), ".forge-worktrees", baseName);
+}
+function isCloneableRemote(remoteUrl) {
+    const trimmed = remoteUrl?.trim() ?? "";
+    if (trimmed.length === 0 || trimmed.startsWith("local://")) {
+        return false;
+    }
+    return trimmed.startsWith("git@") || trimmed.includes("://") || path.isAbsolute(trimmed);
+}
+export function normalizeBranchName(value, fallback) {
+    const branch = (value?.trim() || fallback).trim();
+    if (branch.length === 0 ||
+        branch.startsWith("-") ||
+        branch === "@" ||
+        branch.includes("..") ||
+        branch.includes("//") ||
+        branch.includes("@{") ||
+        branch.endsWith("/") ||
+        branch.endsWith(".") ||
+        branch.toLowerCase().endsWith(".lock") ||
+        /\s/.test(branch) ||
+        /[\u0000-\u001f~^:?*[\\]/.test(branch) ||
+        branch.split("/").some((part) => part.length === 0 || part.startsWith(".") || part.toLowerCase().endsWith(".lock"))) {
+        throw new Error("Git branch name must be valid, without whitespace, and cannot start with '-'.");
+    }
+    return branch;
+}
+async function gitMetadataExists(repoPath, allowedRoot) {
+    const gitPath = path.join(repoPath, ".git");
+    const stat = await fs.lstat(gitPath).catch(() => null);
+    if (!stat) {
+        return false;
+    }
+    if (stat.isSymbolicLink()) {
+        const resolvedGitPath = await resolveExistingDirectoryPath(gitPath);
+        return isSubPath(allowedRoot, resolvedGitPath);
+    }
+    if (stat.isDirectory()) {
+        const resolvedGitPath = await resolveExistingDirectoryPath(gitPath);
+        return isSubPath(allowedRoot, resolvedGitPath);
+    }
+    if (!stat.isFile()) {
+        return false;
+    }
+    const content = (await fs.readFile(gitPath, "utf8")).trim();
+    const prefix = "gitdir:";
+    if (!content.toLowerCase().startsWith(prefix)) {
+        return false;
+    }
+    const gitDir = content.slice(prefix.length).trim();
+    if (gitDir.length === 0) {
+        return false;
+    }
+    const gitDirPath = path.isAbsolute(gitDir) ? gitDir : path.join(repoPath, gitDir);
+    const resolvedGitDir = await resolveExistingDirectoryPath(gitDirPath);
+    return isSubPath(allowedRoot, resolvedGitDir);
+}
+async function pathExists(inputPath) {
+    return fs.stat(inputPath).then(() => true).catch(() => false);
+}
+async function directoryExists(inputPath) {
+    const stat = await fs.stat(inputPath).catch(() => null);
+    return stat?.isDirectory() ?? false;
+}
+function uniqueStrings(values) {
+    const seen = new Set();
+    const result = [];
+    for (const value of values) {
+        if (!value || seen.has(value)) {
+            continue;
+        }
+        seen.add(value);
+        result.push(value);
+    }
+    return result;
+}
+function isSinglePathSegment(value) {
+    return value.length > 0 && value !== "." && value !== ".." && !value.includes("/") && !value.includes("\\");
+}
+function normalizeRemote(remoteUrl) {
+    const trimmed = remoteUrl?.trim() ?? "";
+    if (trimmed.length === 0) {
+        return "";
+    }
+    const gitHubSsh = /^git@github\.com:(.+)$/i.exec(trimmed);
+    if (gitHubSsh) {
+        return stripGitSuffix(`https://github.com/${gitHubSsh[1]}`).toLowerCase();
+    }
+    if (path.isAbsolute(trimmed)) {
+        return normalizeLocalPath(trimmed);
+    }
+    try {
+        const url = new URL(trimmed);
+        if (url.protocol === "file:") {
+            return normalizeLocalPath(normalizeFileUrlPath(url));
+        }
+        url.username = "";
+        url.password = "";
+        url.hash = "";
+        return stripGitSuffix(url.toString().replace(/\/$/, "")).toLowerCase();
+    }
+    catch {
+        return stripGitSuffix(trimmed.replace(/\\/g, "/")).toLowerCase();
+    }
+}
+function stripGitSuffix(value) {
+    return value.replace(/\.git$/i, "").replace(/\/$/, "");
+}
+function normalizeFileUrlPath(url) {
+    const pathname = decodeURIComponent(url.pathname);
+    return /^\/[A-Za-z]:[\\/]/.test(pathname) ? pathname.slice(1) : pathname;
+}
+function normalizeLocalPath(value) {
+    const normalized = path.resolve(value).replace(/\\/g, "/");
+    return process.platform === "win32" ? normalized.toLowerCase() : normalized;
+}

package/dist/worktree/worktree.types.d.ts

@@ -0,0 +1,19 @@
+import type { DispatchRepo, DispatchWorkItem, DispatchResolvedArtifact } from "../session/session.types.js";
+import type { WarmDependenciesResult } from "./dependency-warmer.js";
+export interface WorktreePrepareRequest {
+    readonly repo: DispatchRepo;
+    readonly workItem: DispatchWorkItem;
+    readonly baseBranch: string;
+    readonly allowedRepoRoot: string;
+    readonly cleanupWorktrees: boolean;
+    readonly artifacts: readonly DispatchResolvedArtifact[];
+    readonly warmPathOverrides?: readonly string[];
+}
+export interface WorktreeHandle {
+    readonly repoPath: string;
+    readonly worktreePath: string;
+    readonly branchName: string;
+    readonly baseBranch: string;
+    readonly cleanupWorktrees: boolean;
+    readonly dependencyWarm?: WarmDependenciesResult;
+}

package/dist/worktree/worktree.types.js

@@ -0,0 +1 @@
+export {};

package/package.json

@@ -0,0 +1,52 @@
+{
+  "name": "@loucompanion/forge-bridge",
+  "version": "0.1.1-dev.03b8ba168599",
+  "description": "Forge runner bridge CLI for connecting local developer machines to Forge dispatch.",
+  "license": "UNLICENSED",
+  "type": "module",
+  "bin": {
+    "forge-bridge": "dist/cli/bin.js"
+  },
+  "main": "./dist/index.js",
+  "types": "./dist/index.d.ts",
+  "exports": {
+    ".": {
+      "types": "./dist/index.d.ts",
+      "import": "./dist/index.js"
+    },
+    "./package.json": "./package.json"
+  },
+  "files": [
+    "dist",
+    "README.md"
+  ],
+  "repository": {
+    "type": "git",
+    "url": "git+ssh://git@github.com/coleman399/Forge.git",
+    "directory": "tools/forge-bridge"
+  },
+  "homepage": "https://github.com/coleman399/Forge/tree/develop/tools/forge-bridge#readme",
+  "bugs": {
+    "url": "https://github.com/coleman399/Forge/issues"
+  },
+  "engines": {
+    "node": ">=22.0.0"
+  },
+  "publishConfig": {
+    "access": "public"
+  },
+  "scripts": {
+    "build": "tsc -p tsconfig.json",
+    "test": "vitest run",
+    "test:watch": "vitest",
+    "smoke:package": "npm run build && node scripts/smoke-package.mjs"
+  },
+  "dependencies": {
+    "@microsoft/signalr": "^8.0.17"
+  },
+  "devDependencies": {
+    "@types/node": "^22.15.32",
+    "typescript": "^5.8.3",
+    "vitest": "^3.2.3"
+  }
+}