@websitelabs/n8n-nodes-software-teams 0.12.3

package/dist/src/output/github.js.map

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

package/dist/src/repo/git.d.ts

@@ -0,0 +1,71 @@
+import type { ChangeRef } from "./repo-context.js";
+/**
+ * Shallow-clone `cloneUrl` at `branch` into `destDir`.
+ * Fails fast with an actionable message if `git` is missing (mirrors findClaude).
+ * All args are passed as argv arrays — never shell-concatenated (R-08).
+ * Diagnostics go to stderr to protect stream-json purity (R-09).
+ */
+export declare function cloneRepo(opts: {
+    readonly cloneUrl: string;
+    readonly branch: string;
+    readonly destDir: string;
+}): Promise<void>;
+/**
+ * Create an isolated git worktree for an agent turn under `<repoDir>/worktrees/<agentId>`.
+ * The worktree is checked out at a new branch named after the agentId + correlationId suffix.
+ * Returns the absolute path to the new worktree.
+ */
+export declare function createWorktree(opts: {
+    readonly repoDir: string;
+    readonly agentId: string;
+    readonly correlationId: string;
+    readonly baseBranch: string;
+}): Promise<string>;
+/**
+ * Remove the worktree rooted at `worktreePath` and prune the tracking entry.
+ */
+export declare function removeWorktree(opts: {
+    readonly repoDir: string;
+    readonly worktreePath: string;
+}): Promise<void>;
+/**
+ * Capture the agent turn's changes as a portable `ChangeRef`.
+ * Uses `git format-patch` from the merge-base of the worktree branch and
+ * `baseBranch`, encodes the combined patch bytes as base64.
+ * If there are no commits ahead of baseBranch, stages and commits any
+ * uncommitted changes first. Returns null when the worktree is clean and
+ * has no diverging commits.
+ */
+export declare function capturePortableChange(opts: {
+    readonly worktreePath: string;
+    readonly baseBranch: string;
+}): Promise<ChangeRef | null>;
+/**
+ * Apply a portable `ChangeRef` in `targetDir` via `git am`.
+ * Decodes base64 patch bytes and pipes them to `git am`.
+ * Queue-mode-safe: the targetDir may be on a different worker than where
+ * the ChangeRef was produced.
+ */
+export declare function applyPortableChange(opts: {
+    readonly changeRef: ChangeRef;
+    readonly targetDir: string;
+}): Promise<void>;
+/**
+ * List files that differ between `targetRef` and `sourceRef` (or HEAD if absent).
+ * Returns an array of relative file paths. Used by the Finaliser to detect
+ * conflicts and build the run summary.
+ */
+export declare function listChangedFiles(opts: {
+    readonly repoDir: string;
+    readonly baseRef: string;
+    readonly headRef?: string;
+}): Promise<readonly string[]>;
+/**
+ * Return the short git status of `repoDir` (porcelain v1).
+ * Each line is in the form `XY filename`. Used by the Finaliser to detect
+ * conflict markers in the working tree.
+ */
+export declare function gitStatus(opts: {
+    readonly repoDir: string;
+}): Promise<readonly string[]>;
+//# sourceMappingURL=git.d.ts.map

package/dist/src/repo/git.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"git.d.ts","sourceRoot":"","sources":["../../../src/repo/git.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AA6BnD;;;;;GAKG;AACH,wBAAsB,SAAS,CAAC,IAAI,EAAE;IACpC,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;CAC1B,GAAG,OAAO,CAAC,IAAI,CAAC,CAoBhB;AAED;;;;GAIG;AACH,wBAAsB,cAAc,CAAC,IAAI,EAAE;IACzC,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,aAAa,EAAE,MAAM,CAAC;IAC/B,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;CAC7B,GAAG,OAAO,CAAC,MAAM,CAAC,CAmBlB;AAED;;GAEG;AACH,wBAAsB,cAAc,CAAC,IAAI,EAAE;IACzC,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAC;CAC/B,GAAG,OAAO,CAAC,IAAI,CAAC,CAiBhB;AA4BD;;;;;;;GAOG;AACH,wBAAsB,qBAAqB,CAAC,IAAI,EAAE;IAChD,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAC;IAC9B,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;CAC7B,GAAG,OAAO,CAAC,SAAS,GAAG,IAAI,CAAC,CA8B5B;AAED;;;;;GAKG;AACH,wBAAsB,mBAAmB,CAAC,IAAI,EAAE;IAC9C,QAAQ,CAAC,SAAS,EAAE,SAAS,CAAC;IAC9B,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;CAC5B,GAAG,OAAO,CAAC,IAAI,CAAC,CA8BhB;AAED;;;;GAIG;AACH,wBAAsB,gBAAgB,CAAC,IAAI,EAAE;IAC3C,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,OAAO,CAAC,EAAE,MAAM,CAAC;CAC3B,GAAG,OAAO,CAAC,SAAS,MAAM,EAAE,CAAC,CAY7B;AAED;;;;GAIG;AACH,wBAAsB,SAAS,CAAC,IAAI,EAAE;IACpC,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;CAC1B,GAAG,OAAO,CAAC,SAAS,MAAM,EAAE,CAAC,CAS7B"}

package/dist/src/repo/git.js

@@ -0,0 +1,207 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.cloneRepo = cloneRepo;
+exports.createWorktree = createWorktree;
+exports.removeWorktree = removeWorktree;
+exports.capturePortableChange = capturePortableChange;
+exports.applyPortableChange = applyPortableChange;
+exports.listChangedFiles = listChangedFiles;
+exports.gitStatus = gitStatus;
+const node_child_process_1 = require("node:child_process");
+const node_util_1 = require("node:util");
+const node_path_1 = require("node:path");
+const execFile = (0, node_util_1.promisify)(node_child_process_1.execFile);
+async function run(cmd, args, opts) {
+    return execFile(cmd, [...args], { cwd: opts === null || opts === void 0 ? void 0 : opts.cwd });
+}
+async function findGit() {
+    try {
+        const { stdout } = await execFile("which", ["git"]);
+        const path = stdout.trim();
+        if (path)
+            return path;
+    }
+    catch {
+        // not found via which
+    }
+    throw new Error("git binary not found. Install git and ensure it is on PATH. " +
+        "@websitelabs/n8n-nodes-software-teams requires a self-hosted n8n instance " +
+        "with the `git` binary available on the worker.");
+}
+/**
+ * Shallow-clone `cloneUrl` at `branch` into `destDir`.
+ * Fails fast with an actionable message if `git` is missing (mirrors findClaude).
+ * All args are passed as argv arrays — never shell-concatenated (R-08).
+ * Diagnostics go to stderr to protect stream-json purity (R-09).
+ */
+async function cloneRepo(opts) {
+    const git = await findGit();
+    const { cloneUrl, branch, destDir } = opts;
+    const result = await run(git, [
+        "clone",
+        "--depth=1",
+        "--branch",
+        branch,
+        "--",
+        cloneUrl,
+        destDir,
+    ]).catch((err) => {
+        process.stderr.write(`[git] clone failed: ${err.message}\n`);
+        throw err;
+    });
+    if (result.stderr) {
+        process.stderr.write(`[git] clone: ${result.stderr}\n`);
+    }
+}
+/**
+ * Create an isolated git worktree for an agent turn under `<repoDir>/worktrees/<agentId>`.
+ * The worktree is checked out at a new branch named after the agentId + correlationId suffix.
+ * Returns the absolute path to the new worktree.
+ */
+async function createWorktree(opts) {
+    const git = await findGit();
+    const { repoDir, agentId, correlationId, baseBranch } = opts;
+    const slug = correlationId.slice(0, 8);
+    const branchName = `wt/${agentId}/${slug}`;
+    const worktreePath = (0, node_path_1.join)(repoDir, "worktrees", `${agentId}-${slug}`);
+    const result = await run(git, ["worktree", "add", "-b", branchName, "--", worktreePath, baseBranch], { cwd: repoDir }).catch((err) => {
+        process.stderr.write(`[git] worktree add failed: ${err.message}\n`);
+        throw err;
+    });
+    if (result.stderr) {
+        process.stderr.write(`[git] worktree add: ${result.stderr}\n`);
+    }
+    return worktreePath;
+}
+/**
+ * Remove the worktree rooted at `worktreePath` and prune the tracking entry.
+ */
+async function removeWorktree(opts) {
+    const git = await findGit();
+    const { repoDir, worktreePath } = opts;
+    const result = await run(git, ["worktree", "remove", "--force", "--", worktreePath], { cwd: repoDir }).catch((err) => {
+        process.stderr.write(`[git] worktree remove failed: ${err.message}\n`);
+        throw err;
+    });
+    if (result.stderr) {
+        process.stderr.write(`[git] worktree remove: ${result.stderr}\n`);
+    }
+    await run(git, ["worktree", "prune"], { cwd: repoDir }).catch(() => {
+        // best-effort
+    });
+}
+/**
+ * Stage all changes in `worktreePath` and commit them.
+ * Returns the commit SHA of the new commit, or null if there is nothing to commit.
+ */
+async function stageAndCommit(opts) {
+    const { git, worktreePath, message } = opts;
+    const statusResult = await run(git, ["status", "--porcelain"], {
+        cwd: worktreePath,
+    });
+    if (!statusResult.stdout.trim())
+        return null;
+    await run(git, ["add", "--all"], { cwd: worktreePath });
+    await run(git, ["commit", "-m", message, "--allow-empty"], {
+        cwd: worktreePath,
+    });
+    const revResult = await run(git, ["rev-parse", "HEAD"], {
+        cwd: worktreePath,
+    });
+    return revResult.stdout.trim();
+}
+/**
+ * Capture the agent turn's changes as a portable `ChangeRef`.
+ * Uses `git format-patch` from the merge-base of the worktree branch and
+ * `baseBranch`, encodes the combined patch bytes as base64.
+ * If there are no commits ahead of baseBranch, stages and commits any
+ * uncommitted changes first. Returns null when the worktree is clean and
+ * has no diverging commits.
+ */
+async function capturePortableChange(opts) {
+    const git = await findGit();
+    const { worktreePath, baseBranch } = opts;
+    await stageAndCommit({
+        git,
+        worktreePath,
+        message: "chore: capture agent turn changes",
+    });
+    const mergeBaseResult = await run(git, ["merge-base", "HEAD", baseBranch], { cwd: worktreePath }).catch(() => ({ stdout: "", stderr: "" }));
+    const mergeBase = mergeBaseResult.stdout.trim();
+    const patchRange = mergeBase ? `${mergeBase}..HEAD` : baseBranch;
+    const patchResult = await run(git, ["format-patch", "--stdout", patchRange], { cwd: worktreePath });
+    const patchBytes = patchResult.stdout;
+    if (!patchBytes.trim())
+        return null;
+    const patchBase64 = Buffer.from(patchBytes, "utf8").toString("base64");
+    return { kind: "format-patch", patchBase64 };
+}
+/**
+ * Apply a portable `ChangeRef` in `targetDir` via `git am`.
+ * Decodes base64 patch bytes and pipes them to `git am`.
+ * Queue-mode-safe: the targetDir may be on a different worker than where
+ * the ChangeRef was produced.
+ */
+async function applyPortableChange(opts) {
+    const git = await findGit();
+    const { changeRef, targetDir } = opts;
+    const patchBytes = Buffer.from(changeRef.patchBase64, "base64").toString("utf8");
+    await new Promise((resolve, reject) => {
+        var _a, _b, _c;
+        const proc = (0, node_child_process_1.spawn)(git, ["am", "--3way"], {
+            cwd: targetDir,
+            stdio: ["pipe", "inherit", "pipe"],
+        });
+        const stderrChunks = [];
+        (_a = proc.stderr) === null || _a === void 0 ? void 0 : _a.on("data", (chunk) => {
+            stderrChunks.push(chunk);
+        });
+        proc.on("close", (code) => {
+            const stderrText = Buffer.concat(stderrChunks).toString("utf8");
+            if (stderrText)
+                process.stderr.write(`[git] am: ${stderrText}\n`);
+            if (code === 0) {
+                resolve();
+            }
+            else {
+                reject(new Error(`git am failed with exit code ${code}`));
+            }
+        });
+        proc.on("error", reject);
+        (_b = proc.stdin) === null || _b === void 0 ? void 0 : _b.write(patchBytes);
+        (_c = proc.stdin) === null || _c === void 0 ? void 0 : _c.end();
+    });
+}
+/**
+ * List files that differ between `targetRef` and `sourceRef` (or HEAD if absent).
+ * Returns an array of relative file paths. Used by the Finaliser to detect
+ * conflicts and build the run summary.
+ */
+async function listChangedFiles(opts) {
+    const git = await findGit();
+    const { repoDir, baseRef, headRef } = opts;
+    const args = headRef
+        ? ["diff", "--name-only", baseRef, headRef]
+        : ["diff", "--name-only", baseRef, "HEAD"];
+    const result = await run(git, args, { cwd: repoDir });
+    return result.stdout
+        .split("\n")
+        .map((l) => l.trim())
+        .filter(Boolean);
+}
+/**
+ * Return the short git status of `repoDir` (porcelain v1).
+ * Each line is in the form `XY filename`. Used by the Finaliser to detect
+ * conflict markers in the working tree.
+ */
+async function gitStatus(opts) {
+    const git = await findGit();
+    const result = await run(git, ["status", "--porcelain"], {
+        cwd: opts.repoDir,
+    });
+    return result.stdout
+        .split("\n")
+        .map((l) => l.trim())
+        .filter(Boolean);
+}
+//# sourceMappingURL=git.js.map

package/dist/src/repo/git.js.map

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

package/dist/src/repo/merge.d.ts

@@ -0,0 +1,36 @@
+import type { ChangeRef } from "./repo-context.js";
+export interface MergeSuccess {
+    readonly kind: "success";
+    readonly branch: string;
+}
+export interface MergeFailure {
+    readonly kind: "bounded-failure";
+    readonly conflictingFiles: readonly string[];
+    readonly turnsExhausted: number;
+}
+export type MergeResult = MergeSuccess | MergeFailure;
+export interface ApplyAndResolveOpts {
+    readonly repoDir: string;
+    readonly branchName: string;
+    readonly baseBranch: string;
+    readonly changeRefs: readonly ChangeRef[];
+    readonly resolver: (conflictingFiles: readonly string[]) => Promise<void>;
+}
+/**
+ * Apply each changeRef onto branchName (forked from baseBranch in repoDir),
+ * then run up to MAX_RESOLVER_TURNS of the injected resolver for any conflicts.
+ *
+ * The resolver is injected so T11 can mock it without invoking claude.
+ * Returns MergeSuccess when the tree is conflict-free, MergeFailure (with the
+ * conflicting file list) when MAX_RESOLVER_TURNS are exhausted.
+ *
+ * NEVER pushes. NEVER loops beyond MAX_RESOLVER_TURNS (R-16).
+ */
+export declare function applyAndResolve(opts: ApplyAndResolveOpts): Promise<MergeResult>;
+export declare function pushBranch(opts: {
+    readonly repoDir: string;
+    readonly branchName: string;
+    readonly remote: string;
+    readonly githubToken: string;
+}): Promise<void>;
+//# sourceMappingURL=merge.d.ts.map

package/dist/src/repo/merge.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"merge.d.ts","sourceRoot":"","sources":["../../../src/repo/merge.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AA6EnD,MAAM,WAAW,YAAY;IAC3B,QAAQ,CAAC,IAAI,EAAE,SAAS,CAAC;IACzB,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;CACzB;AAED,MAAM,WAAW,YAAY;IAC3B,QAAQ,CAAC,IAAI,EAAE,iBAAiB,CAAC;IACjC,QAAQ,CAAC,gBAAgB,EAAE,SAAS,MAAM,EAAE,CAAC;IAC7C,QAAQ,CAAC,cAAc,EAAE,MAAM,CAAC;CACjC;AAED,MAAM,MAAM,WAAW,GAAG,YAAY,GAAG,YAAY,CAAC;AAItD,MAAM,WAAW,mBAAmB;IAClC,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;IAC5B,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;IAC5B,QAAQ,CAAC,UAAU,EAAE,SAAS,SAAS,EAAE,CAAC;IAC1C,QAAQ,CAAC,QAAQ,EAAE,CAAC,gBAAgB,EAAE,SAAS,MAAM,EAAE,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;CAC3E;AAED;;;;;;;;;GASG;AACH,wBAAsB,eAAe,CAAC,IAAI,EAAE,mBAAmB,GAAG,OAAO,CAAC,WAAW,CAAC,CAiDrF;AAED,wBAAsB,UAAU,CAAC,IAAI,EAAE;IACrC,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;IAC5B,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC;CAC9B,GAAG,OAAO,CAAC,IAAI,CAAC,CA0BhB"}

package/dist/src/repo/merge.js

@@ -0,0 +1,133 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.applyAndResolve = applyAndResolve;
+exports.pushBranch = pushBranch;
+const node_child_process_1 = require("node:child_process");
+const node_util_1 = require("node:util");
+const git_js_1 = require("./git.js");
+const execFile = (0, node_util_1.promisify)(node_child_process_1.execFile);
+async function run(cmd, args, opts) {
+    return execFile(cmd, [...args], { cwd: opts === null || opts === void 0 ? void 0 : opts.cwd });
+}
+async function findGit() {
+    try {
+        const { stdout } = await execFile("which", ["git"]);
+        const path = stdout.trim();
+        if (path)
+            return path;
+    }
+    catch {
+        // not found via which
+    }
+    throw new Error("git binary not found. Install git and ensure it is on PATH.");
+}
+async function hasConflictMarkers(git, repoDir) {
+    const statusResult = await run(git, ["status", "--porcelain"], { cwd: repoDir }).catch(() => ({ stdout: "" }));
+    const conflicted = statusResult.stdout
+        .split("\n")
+        .filter((l) => /^(UU|AA|DD|AU|UA|DU|UD)\s/.test(l.trim()))
+        .map((l) => l.trim().slice(3).trim())
+        .filter(Boolean);
+    if (conflicted.length > 0)
+        return conflicted;
+    const checkResult = await run(git, ["diff", "--check"], { cwd: repoDir }).catch((err) => { var _a; return ({ stdout: (_a = err.stdout) !== null && _a !== void 0 ? _a : "" }); });
+    if (checkResult.stdout.trim()) {
+        return checkResult.stdout
+            .split("\n")
+            .map((l) => { var _a, _b; return (_b = (_a = l.split(":")[0]) === null || _a === void 0 ? void 0 : _a.trim()) !== null && _b !== void 0 ? _b : ""; })
+            .filter(Boolean)
+            .filter((f, idx, arr) => arr.indexOf(f) === idx);
+    }
+    return [];
+}
+async function checkoutBranch(opts) {
+    const { git, repoDir, branchName, baseBranch } = opts;
+    await run(git, ["checkout", "-b", branchName, baseBranch], { cwd: repoDir }).catch(async () => {
+        await run(git, ["checkout", branchName], { cwd: repoDir });
+    });
+}
+async function stageAndCommit(opts) {
+    const { git, repoDir, message } = opts;
+    const statusResult = await run(git, ["status", "--porcelain"], { cwd: repoDir });
+    if (!statusResult.stdout.trim())
+        return;
+    await run(git, ["add", "--all"], { cwd: repoDir });
+    await run(git, ["commit", "-m", message, "--allow-empty"], { cwd: repoDir });
+}
+const MAX_RESOLVER_TURNS = 3;
+/**
+ * Apply each changeRef onto branchName (forked from baseBranch in repoDir),
+ * then run up to MAX_RESOLVER_TURNS of the injected resolver for any conflicts.
+ *
+ * The resolver is injected so T11 can mock it without invoking claude.
+ * Returns MergeSuccess when the tree is conflict-free, MergeFailure (with the
+ * conflicting file list) when MAX_RESOLVER_TURNS are exhausted.
+ *
+ * NEVER pushes. NEVER loops beyond MAX_RESOLVER_TURNS (R-16).
+ */
+async function applyAndResolve(opts) {
+    const { repoDir, branchName, baseBranch, changeRefs, resolver } = opts;
+    const git = await findGit();
+    await checkoutBranch({ git, repoDir, branchName, baseBranch });
+    for (const changeRef of changeRefs) {
+        await (0, git_js_1.applyPortableChange)({ changeRef, targetDir: repoDir }).catch(async (err) => {
+            process.stderr.write(`[merge] applyPortableChange failed: ${err.message}\n`);
+            const conflicts = await hasConflictMarkers(git, repoDir);
+            if (conflicts.length === 0) {
+                await run(git, ["am", "--abort"], { cwd: repoDir }).catch(() => undefined);
+            }
+        });
+    }
+    const initialConflicts = await hasConflictMarkers(git, repoDir);
+    if (initialConflicts.length === 0) {
+        await stageAndCommit({ git, repoDir, message: "chore: merge agent changes" });
+        return { kind: "success", branch: branchName };
+    }
+    for (const attempt of Array.from({ length: MAX_RESOLVER_TURNS }, (_value, index) => index)) {
+        const conflictsBeforeTurn = await hasConflictMarkers(git, repoDir);
+        if (conflictsBeforeTurn.length === 0) {
+            await stageAndCommit({ git, repoDir, message: "chore: merge agent changes" });
+            return { kind: "success", branch: branchName };
+        }
+        await resolver(conflictsBeforeTurn);
+        const conflictsAfterTurn = await hasConflictMarkers(git, repoDir);
+        if (conflictsAfterTurn.length === 0) {
+            await stageAndCommit({
+                git,
+                repoDir,
+                message: `chore: merge agent changes (resolved, attempt ${attempt + 1})`,
+            });
+            return { kind: "success", branch: branchName };
+        }
+    }
+    const remainingConflicts = await hasConflictMarkers(git, repoDir);
+    return {
+        kind: "bounded-failure",
+        conflictingFiles: remainingConflicts,
+        turnsExhausted: MAX_RESOLVER_TURNS,
+    };
+}
+async function pushBranch(opts) {
+    const { repoDir, branchName, remote, githubToken } = opts;
+    await new Promise((resolve, reject) => {
+        var _a;
+        const proc = (0, node_child_process_1.spawn)("git", ["push", "--set-upstream", remote, branchName], {
+            cwd: repoDir,
+            env: { ...process.env, GITHUB_TOKEN: githubToken, GIT_ASKPASS: "echo" },
+            stdio: ["ignore", "inherit", "pipe"],
+        });
+        const stderrChunks = [];
+        (_a = proc.stderr) === null || _a === void 0 ? void 0 : _a.on("data", (chunk) => stderrChunks.push(chunk));
+        proc.on("close", (code) => {
+            const stderrText = Buffer.concat(stderrChunks).toString("utf8");
+            if (stderrText)
+                process.stderr.write(`[merge] git push: ${stderrText}\n`);
+            if (code === 0)
+                resolve();
+            else
+                reject(new Error(`git push failed with exit code ${code}`));
+        });
+        proc.on("error", reject);
+    });
+}
+//# sourceMappingURL=merge.js.map

package/dist/src/repo/merge.js.map

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

package/dist/src/repo/repo-context.d.ts

@@ -0,0 +1,23 @@
+/**
+ * ADR-002 Decision D — canonical type for repo-scoped execution.
+ * This is the SINGLE source of truth imported by T2, T7, T8, T9.
+ * This type is OFF-WIRE: never serialised into NodeEnvelope or assemblePrompt.
+ *
+ * ChangeRef is the shared on-wire contract type; import it from @websitelabs/software-teams.
+ */
+import type { ChangeRef } from "@websitelabs/software-teams";
+export type { ChangeRef };
+/**
+ * ADR-002 Decision D — the run's repository checkout descriptor.
+ * Threaded as a typed optional parameter on `runAgentTurn(input, repoContext?)`.
+ * Members are fixed and exhaustive; none may be added or removed without a new ADR.
+ */
+export interface RepoContext {
+    readonly cloneUrl: string;
+    readonly ownerRepo: string;
+    readonly baseBranch: string;
+    readonly correlationId: string;
+    readonly worktreePath: string;
+    readonly changeRef?: ChangeRef;
+}
+//# sourceMappingURL=repo-context.d.ts.map

package/dist/src/repo/repo-context.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"repo-context.d.ts","sourceRoot":"","sources":["../../../src/repo/repo-context.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,6BAA6B,CAAC;AAE7D,YAAY,EAAE,SAAS,EAAE,CAAC;AAE1B;;;;GAIG;AACH,MAAM,WAAW,WAAW;IAC1B,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;IAC5B,QAAQ,CAAC,aAAa,EAAE,MAAM,CAAC;IAC/B,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAC;IAC9B,QAAQ,CAAC,SAAS,CAAC,EAAE,SAAS,CAAC;CAChC"}

package/dist/src/repo/repo-context.js

@@ -0,0 +1,10 @@
+"use strict";
+/**
+ * ADR-002 Decision D — canonical type for repo-scoped execution.
+ * This is the SINGLE source of truth imported by T2, T7, T8, T9.
+ * This type is OFF-WIRE: never serialised into NodeEnvelope or assemblePrompt.
+ *
+ * ChangeRef is the shared on-wire contract type; import it from @websitelabs/software-teams.
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+//# sourceMappingURL=repo-context.js.map

package/dist/src/repo/repo-context.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"repo-context.js","sourceRoot":"","sources":["../../../src/repo/repo-context.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG"}

package/dist/src/repo/teardown.d.ts

@@ -0,0 +1,38 @@
+export interface TeardownResult {
+    readonly removed: boolean;
+    readonly detail?: string;
+}
+/**
+ * Assert that `targetPath` is strictly inside `basePath` after resolving both
+ * to absolute canonical paths. Throws if the target IS the base, is above it,
+ * or escapes via `..` traversal.
+ *
+ * Used by the rm-based helpers to prevent accidental deletion of the repo root,
+ * `/`, or any path outside the allowed run base (R-04).
+ */
+export declare function assertWithinBase(targetPath: string, basePath: string): void;
+/**
+ * Idempotently remove a git worktree rooted at `worktreePath` inside
+ * `repoRoot`. Delegates to the existing headless `removeWorktree` from
+ * `src/repo/git.ts`. Returns `{ removed: false }` (never throws) when the
+ * worktree path does not exist or git reports it is not a working tree.
+ */
+export declare function teardownWorktree(repoRoot: string, worktreePath: string): Promise<TeardownResult>;
+/**
+ * Idempotently remove a clone directory at `clonePath`, guarded by
+ * `assertWithinBase` against `runsBaseDir`. Skips silently if absent.
+ */
+export declare function teardownClone(clonePath: string, runsBaseDir: string): TeardownResult;
+/**
+ * Remove per-run agent-memory files and directories whose name contains the
+ * `correlationId` under `memoriesBase`. No-op if none match or the base does
+ * not exist.
+ */
+export declare function teardownAgentMemories(correlationId: string, memoriesBase: string): TeardownResult;
+/**
+ * Remove run-scoped plan/task artefact files under `plansDir` whose name
+ * encodes the `correlationId`. Never deletes the plans directory itself.
+ * Also removes a per-run subdirectory named after the correlationId if present.
+ */
+export declare function teardownPlanArtefacts(correlationId: string, plansDir: string): TeardownResult;
+//# sourceMappingURL=teardown.d.ts.map

package/dist/src/repo/teardown.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"teardown.d.ts","sourceRoot":"","sources":["../../../src/repo/teardown.ts"],"names":[],"mappings":"AAMA,MAAM,WAAW,cAAc;IAC7B,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC;IAC1B,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC;CAC1B;AAID;;;;;;;GAOG;AACH,wBAAgB,gBAAgB,CAAC,UAAU,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,IAAI,CAmB3E;AAID;;;;;GAKG;AACH,wBAAsB,gBAAgB,CACpC,QAAQ,EAAE,MAAM,EAChB,YAAY,EAAE,MAAM,GACnB,OAAO,CAAC,cAAc,CAAC,CAkBzB;AAID;;;GAGG;AACH,wBAAgB,aAAa,CAC3B,SAAS,EAAE,MAAM,EACjB,WAAW,EAAE,MAAM,GAClB,cAAc,CAiBhB;AAID;;;;GAIG;AACH,wBAAgB,qBAAqB,CACnC,aAAa,EAAE,MAAM,EACrB,YAAY,EAAE,MAAM,GACnB,cAAc,CAoChB;AAID;;;;GAIG;AACH,wBAAgB,qBAAqB,CACnC,aAAa,EAAE,MAAM,EACrB,QAAQ,EAAE,MAAM,GACf,cAAc,CA8ChB"}