merge-steward 0.8.8 → 0.8.10

package/dist/github/shell-git.d.ts

@@ -1,11 +1,17 @@
 import type { GitOperations, SpeculativeBranchBuilder } from "../interfaces.ts";
 import type { MergeResult } from "../types.ts";
+export interface BotIdentity {
+    name: string;
+    email: string;
+}
 export declare class ShellGitOperations implements GitOperations, SpeculativeBranchBuilder {
     private readonly clonePath;
     private readonly repoFullName;
     private readonly gitBin;
     private readonly worktreeBase;
+    private botIdentity;
     constructor(clonePath: string, repoFullName: string, gitBin?: string);
+    setBotIdentity(identity: BotIdentity): void;
     private git;
     /** Run a git command in a specific directory (worktree). */
     private gitIn;

package/dist/github/shell-git.js

@@ -17,12 +17,16 @@ export class ShellGitOperations {
     repoFullName;
     gitBin;
     worktreeBase;
+    botIdentity;
     constructor(clonePath, repoFullName, gitBin = "git") {
         this.clonePath = clonePath;
         this.repoFullName = repoFullName;
         this.gitBin = gitBin;
         this.worktreeBase = `${clonePath}-worktrees`;
     }
+    setBotIdentity(identity) {
+        this.botIdentity = identity;
+    }
     git(args, opts) {
         return exec(this.gitBin, ["-C", this.clonePath, ...args], {
             timeoutMs: opts?.timeoutMs ?? 120_000,
@@ -77,6 +81,11 @@ export class ShellGitOperations {
         // Create isolated worktree with spec branch starting at baseBranch.
         mkdirSync(this.worktreeBase, { recursive: true });
         await this.git(["worktree", "add", "-B", specName, wtPath, baseBranch]);
+        // Override git identity so merge commits are attributed to the steward, not the clone owner.
+        if (this.botIdentity) {
+            await this.gitIn(wtPath, ["config", "user.name", this.botIdentity.name]);
+            await this.gitIn(wtPath, ["config", "user.email", this.botIdentity.email]);
+        }
         // Merge PR into spec branch inside the worktree.
         // PR branches are always remote refs — use explicit origin/ prefix
         // because git DWIM doesn't reliably resolve bare names in worktrees.

package/dist/github-auth.d.ts

@@ -21,6 +21,7 @@ export interface GitHubAppTokenManager extends RuntimeGitHubAuthProvider {
     start(): Promise<void>;
     stop(): void;
 }
+export declare function resolveAppSlug(credentials: GitHubAppCredentials): Promise<string>;
 export declare function issueGitHubAppToken(credentials: GitHubAppCredentials, options?: {
     repoFullName?: string;
 }): Promise<{

package/dist/github-auth.js

@@ -30,6 +30,11 @@ function githubHeaders(token) {
         "X-GitHub-Api-Version": "2022-11-28",
     };
 }
+export async function resolveAppSlug(credentials) {
+    const jwt = generateJwt(credentials.appId, credentials.privateKey);
+    const data = await fetchJson("https://api.github.com/app", { headers: githubHeaders(jwt) });
+    return data.slug;
+}
 async function resolveInstallationIdForRepo(jwt, repoFullName) {
     const encodedRepo = repoFullName
         .split("/")

package/dist/reconciler.js

@@ -222,6 +222,8 @@ async function prepareEntry(ctx, entry, isHead, prevEntry) {
     }
     const specSha = result.sha ?? entry.headSha;
     emit(ctx, entry, "spec_build_succeeded", { specBranch: specName, ...(prevEntry ? { dependsOn: prevEntry.id } : {}) });
+    // Push spec to remote so CI can access it.
+    await ctx.git.push(specName, true);
     // Trigger CI on the spec branch.
     const runId = await ctx.ci.triggerRun(specName, specSha);
     emit(ctx, entry, "ci_triggered", { ciRunId: runId, specBranch: specName });

package/dist/server.js

@@ -10,18 +10,20 @@ import { buildMultiRepoHttpServer } from "./http-multi.js";
 import { loadAllRepoConfigs } from "./install.js";
 import { parseHomeConfigObject } from "./steward-home.js";
 import { getMergeStewardPathLayout } from "./runtime-paths.js";
-import { createGitHubAppTokenManager, resolveGitHubAuthConfig } from "./github-auth.js";
+import { createGitHubAppTokenManager, resolveGitHubAuthConfig, resolveAppSlug } from "./github-auth.js";
 import { discoverRepoSettings } from "./github-repo-discovery.js";
 import { resolveSecret } from "./resolve-secret.js";
 import { setRuntimeGitHubAuthProvider } from "./exec.js";
 import { readFileSync, existsSync } from "node:fs";
-async function createRepoInstance(config, logger) {
+async function createRepoInstance(config, logger, botIdentity) {
     const repoUrl = `https://github.com/${config.repoFullName}.git`;
     const clone = new CloneManager(config.clonePath, repoUrl, config.repoFullName, config.gitBin, logger);
     await clone.ensureClone();
     await clone.fetch();
     const store = new SqliteStore(config.database.path);
     const git = new ShellGitOperations(clone.path, config.repoFullName, config.gitBin);
+    if (botIdentity)
+        git.setBotIdentity(botIdentity);
     const ci = new GitHubActionsRunner(config.repoFullName, config.requiredChecks);
     const github = new GitHubPRClient(config.repoFullName);
     const eviction = new GitHubCheckRunReporter(config.repoFullName, config.server.bind, config.server.port, config.server.publicBaseUrl, config.admissionLabel, config.mergeQueueCheckName);
@@ -41,6 +43,7 @@ export async function startMultiServer() {
     const configs = await loadAllRepoConfigs();
     const githubAuth = resolveGitHubAuthConfig();
     let githubAppTokenManager;
+    let botIdentity;
     let githubRuntimeStatus = {
         mode: "none",
         configured: false,
@@ -64,6 +67,17 @@ export async function startMultiServer() {
         setRuntimeGitHubAuthProvider(githubAppTokenManager);
         try {
             await githubAppTokenManager.start();
+            try {
+                const slug = await resolveAppSlug(githubAuth.credentials);
+                botIdentity = {
+                    name: `${slug}[bot]`,
+                    email: `${githubAuth.credentials.appId}+${slug}[bot]@users.noreply.github.com`,
+                };
+                logger.info({ botName: botIdentity.name }, "Resolved GitHub App bot identity");
+            }
+            catch {
+                logger.warn("Could not resolve GitHub App slug, merge commits will use clone owner identity");
+            }
             githubRuntimeStatus = {
                 ...githubRuntimeStatus,
                 ready: true,
@@ -97,7 +111,7 @@ export async function startMultiServer() {
     const instances = new Map();
     for (const config of configs) {
         logger.info({ repoId: config.repoId, repoFullName: config.repoFullName }, "Initializing repo");
-        const instance = await createRepoInstance(config, logger.child({ repoId: config.repoId }));
+        const instance = await createRepoInstance(config, logger.child({ repoId: config.repoId }), botIdentity);
         instances.set(config.repoFullName, instance);
     }
     const app = await buildMultiRepoHttpServer({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "merge-steward",
-  "version": "0.8.8",
+  "version": "0.8.10",
   "description": "Serial merge queue for GitHub — rebase, CI-gate, and merge PRs one at a time",
   "type": "module",
   "repository": {