gsd-pi 2.3.11 → 2.5.0

package/src/resources/extensions/gsd/git-service.ts

@@ -0,0 +1,588 @@
+/**
+ * GSD Git Service
+ *
+ * Core git operations for GSD: types, constants, and pure helpers.
+ * Higher-level operations (commit, staging, branching) build on these.
+ *
+ * This module centralizes the GitPreferences interface, runtime exclusion
+ * paths, commit type inference, and the runGit shell helper.
+ */
+
+import { execSync } from "node:child_process";
+import { existsSync, readFileSync } from "node:fs";
+import { join, sep } from "node:path";
+
+import {
+  detectWorktreeName,
+  getSliceBranchName,
+  SLICE_BRANCH_RE,
+} from "./worktree.ts";
+
+// ─── Types ─────────────────────────────────────────────────────────────────
+
+export interface GitPreferences {
+  auto_push?: boolean;
+  push_branches?: boolean;
+  remote?: string;
+  snapshots?: boolean;
+  pre_merge_check?: boolean | string;
+  commit_type?: string;
+}
+
+export interface CommitOptions {
+  message: string;
+  allowEmpty?: boolean;
+}
+
+export interface MergeSliceResult {
+  branch: string;
+  mergedCommitMessage: string;
+  deletedBranch: boolean;
+}
+
+export interface PreMergeCheckResult {
+  passed: boolean;
+  skipped?: boolean;
+  command?: string;
+  error?: string;
+}
+
+// ─── Constants ─────────────────────────────────────────────────────────────
+
+/**
+ * GSD runtime paths that should be excluded from smart staging.
+ * These are transient/generated artifacts that should never be committed.
+ * Matches the union of SKIP_PATHS + SKIP_EXACT in worktree-manager.ts
+ * and the first 6 entries in gitignore.ts BASELINE_PATTERNS.
+ */
+export const RUNTIME_EXCLUSION_PATHS: readonly string[] = [
+  ".gsd/activity/",
+  ".gsd/runtime/",
+  ".gsd/worktrees/",
+  ".gsd/auto.lock",
+  ".gsd/metrics.json",
+  ".gsd/STATE.md",
+];
+
+// ─── Git Helper ────────────────────────────────────────────────────────────
+
+/**
+ * Run a git command in the given directory.
+ * Returns trimmed stdout. Throws on non-zero exit unless allowFailure is set.
+ * When `input` is provided, it is piped to stdin.
+ */
+export function runGit(basePath: string, args: string[], options: { allowFailure?: boolean; input?: string } = {}): string {
+  try {
+    return execSync(`git ${args.join(" ")}`, {
+      cwd: basePath,
+      stdio: [options.input != null ? "pipe" : "ignore", "pipe", "pipe"],
+      encoding: "utf-8",
+      ...(options.input != null ? { input: options.input } : {}),
+    }).trim();
+  } catch (error) {
+    if (options.allowFailure) return "";
+    const message = error instanceof Error ? error.message : String(error);
+    throw new Error(`git ${args.join(" ")} failed in ${basePath}: ${message}`);
+  }
+}
+
+// ─── Commit Type Inference ─────────────────────────────────────────────────
+
+/**
+ * Keyword-to-commit-type mapping. Order matters — first match wins.
+ * Each entry: [keywords[], commitType]
+ */
+const COMMIT_TYPE_RULES: [string[], string][] = [
+  [["fix", "bug", "patch", "hotfix"], "fix"],
+  [["refactor", "restructure", "reorganize"], "refactor"],
+  [["doc", "docs", "documentation"], "docs"],
+  [["test", "tests", "testing"], "test"],
+  [["chore", "cleanup", "clean up", "archive", "remove", "delete"], "chore"],
+];
+
+/**
+ * Infer a conventional commit type from a slice title.
+ * Uses case-insensitive word-boundary matching against known keywords.
+ * Returns "feat" when no keywords match.
+ */
+// ─── GitServiceImpl ────────────────────────────────────────────────────
+
+export class GitServiceImpl {
+  readonly basePath: string;
+  readonly prefs: GitPreferences;
+
+  constructor(basePath: string, prefs: GitPreferences = {}) {
+    this.basePath = basePath;
+    this.prefs = prefs;
+  }
+
+  /** Convenience wrapper: run git in this repo's basePath. */
+  private git(args: string[], options: { allowFailure?: boolean; input?: string } = {}): string {
+    return runGit(this.basePath, args, options);
+  }
+
+  /**
+   * Smart staging: `git add -A` excluding GSD runtime paths via pathspec.
+   * Falls back to plain `git add -A` if the exclusion pathspec fails.
+   */
+  private smartStage(): void {
+    const excludes = RUNTIME_EXCLUSION_PATHS.map(p => `':(exclude)${p}'`);
+    const args = ["add", "-A", "--", ".", ...excludes];
+    try {
+      this.git(args);
+    } catch {
+      console.error("GitService: smart staging failed, falling back to git add -A");
+      this.git(["add", "-A"]);
+    }
+  }
+
+  /**
+   * Stage files (smart staging) and commit.
+   * Returns the commit message string on success, or null if nothing to commit.
+   * Uses `git commit -F -` with stdin pipe for safe multi-line message handling.
+   */
+  commit(opts: CommitOptions): string | null {
+    this.smartStage();
+
+    // Check if anything was actually staged
+    const staged = this.git(["diff", "--cached", "--stat"], { allowFailure: true });
+    if (!staged && !opts.allowEmpty) return null;
+
+    this.git(
+      ["commit", "-F", "-", ...(opts.allowEmpty ? ["--allow-empty"] : [])],
+      { input: opts.message },
+    );
+    return opts.message;
+  }
+
+  /**
+   * Auto-commit dirty working tree with a conventional chore message.
+   * Returns the commit message on success, or null if nothing to commit.
+   */
+  autoCommit(unitType: string, unitId: string): string | null {
+    // Quick check: is there anything dirty at all?
+    const status = this.git(["status", "--short"], { allowFailure: true });
+    if (!status) return null;
+
+    this.smartStage();
+
+    // After smart staging, check if anything was actually staged
+    // (all changes might have been runtime files that got excluded)
+    const staged = this.git(["diff", "--cached", "--stat"], { allowFailure: true });
+    if (!staged) return null;
+
+    const message = `chore(${unitId}): auto-commit after ${unitType}`;
+    this.git(["commit", "-F", "-"], { input: message });
+    return message;
+  }
+
+  // ─── Branch Queries ────────────────────────────────────────────────────
+
+  /**
+   * Get the "main" branch for this repo.
+   * In a worktree: returns worktree/<name> (the worktree's base branch).
+   * In the main tree: origin/HEAD symbolic-ref → main/master fallback → current branch.
+   */
+  getMainBranch(): string {
+    const wtName = detectWorktreeName(this.basePath);
+    if (wtName) {
+      const wtBranch = `worktree/${wtName}`;
+      const exists = this.git(["show-ref", "--verify", `refs/heads/${wtBranch}`], { allowFailure: true });
+      if (exists) return wtBranch;
+      return this.git(["branch", "--show-current"]);
+    }
+
+    const symbolic = this.git(["symbolic-ref", "refs/remotes/origin/HEAD"], { allowFailure: true });
+    if (symbolic) {
+      const match = symbolic.match(/refs\/remotes\/origin\/(.+)$/);
+      if (match) return match[1]!;
+    }
+
+    const mainExists = this.git(["show-ref", "--verify", "refs/heads/main"], { allowFailure: true });
+    if (mainExists) return "main";
+
+    const masterExists = this.git(["show-ref", "--verify", "refs/heads/master"], { allowFailure: true });
+    if (masterExists) return "master";
+
+    return this.git(["branch", "--show-current"]);
+  }
+
+  /** Get the current branch name. */
+  getCurrentBranch(): string {
+    return this.git(["branch", "--show-current"]);
+  }
+
+  /** True if currently on a GSD slice branch. */
+  isOnSliceBranch(): boolean {
+    const current = this.getCurrentBranch();
+    return SLICE_BRANCH_RE.test(current);
+  }
+
+  /** Returns the slice branch name if on one, null otherwise. */
+  getActiveSliceBranch(): string | null {
+    try {
+      const current = this.getCurrentBranch();
+      return SLICE_BRANCH_RE.test(current) ? current : null;
+    } catch {
+      return null;
+    }
+  }
+
+  // ─── Branch Lifecycle ──────────────────────────────────────────────────
+
+  /**
+   * Check if a local branch exists.
+   */
+  private branchExists(branch: string): boolean {
+    try {
+      this.git(["show-ref", "--verify", "--quiet", `refs/heads/${branch}`]);
+      return true;
+    } catch {
+      return false;
+    }
+  }
+
+  /**
+   * Ensure the slice branch exists and is checked out.
+   *
+   * Creates the branch from the current working branch if it's not a slice
+   * branch (preserves planning artifacts). Falls back to main when on another
+   * slice branch (avoids chaining slice branches).
+   *
+   * When creating a new branch, fetches from remote first (best-effort) to
+   * ensure the local main is up-to-date.
+   *
+   * Auto-commits dirty state via smart staging before checkout so runtime
+   * files are never accidentally committed during branch switches.
+   *
+   * Returns true if the branch was newly created.
+   */
+  ensureSliceBranch(milestoneId: string, sliceId: string): boolean {
+    const wtName = detectWorktreeName(this.basePath);
+    const branch = getSliceBranchName(milestoneId, sliceId, wtName);
+    const current = this.getCurrentBranch();
+
+    if (current === branch) return false;
+
+    let created = false;
+
+    if (!this.branchExists(branch)) {
+      // Fetch from remote before creating a new branch (best-effort).
+      const remotes = this.git(["remote"], { allowFailure: true });
+      if (remotes) {
+        const remote = this.prefs.remote ?? "origin";
+        const fetchResult = this.git(["fetch", "--prune", remote], { allowFailure: true });
+        // fetchResult is empty string on both success and allowFailure-caught error.
+        // Check if local is behind upstream (informational only).
+        if (remotes.split("\n").includes(remote)) {
+          const behind = this.git(
+            ["rev-list", "--count", "HEAD..@{upstream}"],
+            { allowFailure: true },
+          );
+          if (behind && parseInt(behind, 10) > 0) {
+            console.error(`GitService: local branch is ${behind} commit(s) behind upstream`);
+          }
+        }
+      }
+
+      // Branch from current when it's a normal working branch (not a slice).
+      // If already on a slice branch, fall back to main to avoid chaining.
+      const mainBranch = this.getMainBranch();
+      const base = SLICE_BRANCH_RE.test(current) ? mainBranch : current;
+      this.git(["branch", branch, base]);
+      created = true;
+    } else {
+      // Branch exists — check it's not checked out in another worktree
+      const worktreeList = this.git(["worktree", "list", "--porcelain"]);
+      if (worktreeList.includes(`branch refs/heads/${branch}`)) {
+        throw new Error(
+          `Branch "${branch}" is already in use by another worktree. ` +
+          `Remove that worktree first, or switch it to a different branch.`,
+        );
+      }
+    }
+
+    // Auto-commit dirty state via smart staging before checkout
+    this.autoCommit("pre-switch", current);
+
+    this.git(["checkout", branch]);
+    return created;
+  }
+
+  /**
+   * Switch to main, auto-committing dirty state via smart staging first.
+   */
+  switchToMain(): void {
+    const mainBranch = this.getMainBranch();
+    const current = this.getCurrentBranch();
+    if (current === mainBranch) return;
+
+    this.autoCommit("pre-switch", current);
+
+    this.git(["checkout", mainBranch]);
+  }
+
+  // ─── S05 Features ─────────────────────────────────────────────────────
+
+  /**
+   * Create a snapshot ref for the given label (typically a slice branch name).
+   * Gated on prefs.snapshots === true. Ref path: refs/gsd/snapshots/<label>/<timestamp>
+   * The ref points at HEAD, capturing the current commit before destructive operations.
+   */
+  createSnapshot(label: string): void {
+    if (this.prefs.snapshots !== true) return;
+
+    const now = new Date();
+    const ts = now.getFullYear().toString()
+      + String(now.getMonth() + 1).padStart(2, "0")
+      + String(now.getDate()).padStart(2, "0")
+      + "-"
+      + String(now.getHours()).padStart(2, "0")
+      + String(now.getMinutes()).padStart(2, "0")
+      + String(now.getSeconds()).padStart(2, "0");
+
+    const refPath = `refs/gsd/snapshots/${label}/${ts}`;
+    this.git(["update-ref", refPath, "HEAD"]);
+  }
+
+  /**
+   * Run pre-merge verification check. Auto-detects test runner from project
+   * files, or uses custom command from prefs.pre_merge_check.
+   *
+   * Gating:
+   * - `false` → skip (return passed:true, skipped:true)
+   * - non-empty string (not "auto") → use as custom command
+   * - `true`, `"auto"`, or `undefined` → auto-detect from project files
+   *
+   * Auto-detection order:
+   *   package.json scripts.test → npm test
+   *   package.json scripts.build (only if no test) → npm run build
+   *   Cargo.toml → cargo test
+   *   Makefile with test: target → make test
+   *   pyproject.toml → python -m pytest
+   *
+   * If no runner detected in auto mode, returns passed:true (don't block).
+   */
+  runPreMergeCheck(): PreMergeCheckResult {
+    const pref = this.prefs.pre_merge_check;
+
+    // Explicitly disabled
+    if (pref === false) {
+      return { passed: true, skipped: true };
+    }
+
+    let command: string | null = null;
+
+    // Custom string command (not "auto")
+    if (typeof pref === "string" && pref !== "auto" && pref.trim() !== "") {
+      command = pref.trim();
+    }
+
+    // Auto-detect (true, "auto", or undefined)
+    if (command === null) {
+      command = this.detectTestRunner();
+    }
+
+    if (command === null) {
+      return { passed: true, command: "none", error: "no test runner detected" };
+    }
+
+    // Execute the command
+    try {
+      execSync(command, {
+        cwd: this.basePath,
+        timeout: 300_000,
+        stdio: ["ignore", "pipe", "pipe"],
+        encoding: "utf-8",
+      });
+      return { passed: true, command };
+    } catch (err) {
+      const stderr = err instanceof Error && "stderr" in err
+        ? String((err as { stderr: unknown }).stderr).slice(0, 2000)
+        : String(err).slice(0, 2000);
+      return { passed: false, command, error: stderr };
+    }
+  }
+
+  /**
+   * Detect a test/build runner from project files in basePath.
+   * Returns the command string or null if nothing detected.
+   */
+  private detectTestRunner(): string | null {
+    const pkgPath = join(this.basePath, "package.json");
+    if (existsSync(pkgPath)) {
+      try {
+        const pkg = JSON.parse(readFileSync(pkgPath, "utf-8"));
+        if (pkg?.scripts?.test) return "npm test";
+        if (pkg?.scripts?.build) return "npm run build";
+      } catch { /* invalid JSON — skip */ }
+    }
+
+    if (existsSync(join(this.basePath, "Cargo.toml"))) {
+      return "cargo test";
+    }
+
+    const makefilePath = join(this.basePath, "Makefile");
+    if (existsSync(makefilePath)) {
+      try {
+        const content = readFileSync(makefilePath, "utf-8");
+        if (/^test\s*:/m.test(content)) return "make test";
+      } catch { /* skip */ }
+    }
+
+    if (existsSync(join(this.basePath, "pyproject.toml"))) {
+      return "python -m pytest";
+    }
+
+    return null;
+  }
+
+  // ─── Merge ─────────────────────────────────────────────────────────────
+
+  /**
+   * Build a rich squash-commit message with a task list from branch commits.
+   *
+   * Format:
+   *   type(scope): title
+   *
+   *   Tasks:
+   *   - commit subject 1
+   *   - commit subject 2
+   *
+   *   Branch: gsd/M001/S01
+   */
+  private buildRichCommitMessage(
+    commitType: string,
+    milestoneId: string,
+    sliceId: string,
+    sliceTitle: string,
+    mainBranch: string,
+    branch: string,
+  ): string {
+    const subject = `${commitType}(${milestoneId}/${sliceId}): ${sliceTitle}`;
+
+    // Collect branch commit subjects
+    const logOutput = this.git(
+      ["log", "--oneline", "--format=%s", `${mainBranch}..${branch}`],
+      { allowFailure: true },
+    );
+
+    if (!logOutput) return subject;
+
+    const subjects = logOutput.split("\n").filter(Boolean);
+    const MAX_ENTRIES = 20;
+    const truncated = subjects.length > MAX_ENTRIES;
+    const displayed = truncated ? subjects.slice(0, MAX_ENTRIES) : subjects;
+
+    const taskLines = displayed.map(s => `- ${s}`).join("\n");
+    const truncationLine = truncated ? `\n- ... and ${subjects.length - MAX_ENTRIES} more` : "";
+
+    return `${subject}\n\nTasks:\n${taskLines}${truncationLine}\n\nBranch: ${branch}`;
+  }
+
+  /**
+   * Squash-merge a slice branch into main and delete it.
+   *
+   * Flow: snapshot branch HEAD → squash merge → rich commit via stdin →
+   * auto-push (if enabled) → delete branch.
+   *
+   * Must be called from the main branch. Uses `inferCommitType(sliceTitle)`
+   * for the conventional commit type instead of hardcoding `feat`.
+   *
+   * Throws when:
+   * - Not currently on the main branch
+   * - The slice branch does not exist
+   * - The slice branch has no commits ahead of main
+   */
+  mergeSliceToMain(milestoneId: string, sliceId: string, sliceTitle: string): MergeSliceResult {
+    const mainBranch = this.getMainBranch();
+    const current = this.getCurrentBranch();
+
+    if (current !== mainBranch) {
+      throw new Error(
+        `mergeSliceToMain must be called from the main branch ("${mainBranch}"), ` +
+        `but currently on "${current}"`,
+      );
+    }
+
+    const wtName = detectWorktreeName(this.basePath);
+    const branch = getSliceBranchName(milestoneId, sliceId, wtName);
+
+    if (!this.branchExists(branch)) {
+      throw new Error(
+        `Slice branch "${branch}" does not exist. Nothing to merge.`,
+      );
+    }
+
+    // Check commits ahead
+    const aheadCount = this.git(["rev-list", "--count", `${mainBranch}..${branch}`]);
+    if (aheadCount === "0") {
+      throw new Error(
+        `Slice branch "${branch}" has no commits ahead of "${mainBranch}". Nothing to merge.`,
+      );
+    }
+
+    // Snapshot the branch HEAD before merge (gated on prefs.snapshots)
+    this.createSnapshot(branch);
+
+    // Build rich commit message before squash (needs branch history)
+    const commitType = inferCommitType(sliceTitle);
+    const message = this.buildRichCommitMessage(
+      commitType, milestoneId, sliceId, sliceTitle, mainBranch, branch,
+    );
+
+    // Squash merge
+    this.git(["merge", "--squash", branch]);
+
+    // Pre-merge check: run after squash (tests merged result), reset on failure
+    const checkResult = this.runPreMergeCheck();
+    if (!checkResult.passed && !checkResult.skipped) {
+      // Undo the squash merge — nothing committed yet, reset staging area
+      this.git(["reset", "--hard", "HEAD"]);
+      const cmdInfo = checkResult.command ? ` (command: ${checkResult.command})` : "";
+      const errInfo = checkResult.error ? `\n${checkResult.error}` : "";
+      throw new Error(
+        `Pre-merge check failed${cmdInfo}. Merge aborted.${errInfo}`,
+      );
+    }
+
+    // Commit with rich message via stdin pipe
+    this.git(["commit", "-F", "-"], { input: message });
+
+    // Delete the merged branch
+    this.git(["branch", "-D", branch]);
+
+    // Auto-push to remote if enabled
+    if (this.prefs.auto_push === true) {
+      const remote = this.prefs.remote ?? "origin";
+      this.git(["push", remote, mainBranch], { allowFailure: true });
+    }
+
+    return {
+      branch,
+      mergedCommitMessage: `${commitType}(${milestoneId}/${sliceId}): ${sliceTitle}`,
+      deletedBranch: true,
+    };
+  }
+}
+
+// ─── Commit Type Inference ─────────────────────────────────────────────────
+
+export function inferCommitType(sliceTitle: string): string {
+  const lower = sliceTitle.toLowerCase();
+
+  for (const [keywords, commitType] of COMMIT_TYPE_RULES) {
+    for (const keyword of keywords) {
+      // "clean up" is multi-word — use indexOf for it
+      if (keyword.includes(" ")) {
+        if (lower.includes(keyword)) return commitType;
+      } else {
+        // Word boundary match: keyword must not be surrounded by word chars
+        const re = new RegExp(`\\b${keyword}\\b`, "i");
+        if (re.test(lower)) return commitType;
+      }
+    }
+  }
+
+  return "feat";
+}

package/src/resources/extensions/gsd/index.ts

@@ -158,14 +158,19 @@ export default function (pi: ExtensionAPI) {
 
   // ── session_start: render branded GSD header + remote channel status ──
   pi.on("session_start", async (_event, ctx) => {
-    const theme = ctx.ui.theme;
-    const version = process.env.GSD_VERSION || "0.0.0";
+    // Theme access throws in RPC mode (no TUI) — header is decorative, skip it
+    try {
+      const theme = ctx.ui.theme;
+      const version = process.env.GSD_VERSION || "0.0.0";
 
-    const logoText = GSD_LOGO_LINES.map((line) => theme.fg("accent", line)).join("\n");
-    const titleLine = `  ${theme.bold("Get Shit Done")} ${theme.fg("dim", `v${version}`)}`;
+      const logoText = GSD_LOGO_LINES.map((line) => theme.fg("accent", line)).join("\n");
+      const titleLine = `  ${theme.bold("Get Shit Done")} ${theme.fg("dim", `v${version}`)}`;
 
-    const headerContent = `${logoText}\n${titleLine}`;
-    ctx.ui.setHeader((_ui, _theme) => new Text(headerContent, 1, 0));
+      const headerContent = `${logoText}\n${titleLine}`;
+      ctx.ui.setHeader((_ui, _theme) => new Text(headerContent, 1, 0));
+    } catch {
+      // RPC mode — no TUI, skip header rendering
+    }
 
     // Notify remote questions status if configured
     try {

package/src/resources/extensions/gsd/preferences.ts

@@ -2,6 +2,7 @@ import { existsSync, readdirSync, readFileSync, statSync } from "node:fs";
 import { homedir } from "node:os";
 import { isAbsolute, join } from "node:path";
 import { getAgentDir } from "@mariozechner/pi-coding-agent";
+import type { GitPreferences } from "./git-service.ts";
 
 const GLOBAL_PREFERENCES_PATH = join(homedir(), ".gsd", "preferences.md");
 const LEGACY_GLOBAL_PREFERENCES_PATH = join(homedir(), ".pi", "agent", "gsd-preferences.md");
@@ -51,6 +52,7 @@ export interface GSDPreferences {
   uat_dispatch?: boolean;
   budget_ceiling?: number;
   remote_questions?: RemoteQuestionsConfig;
+  git?: GitPreferences;
 }
 
 export interface LoadedGSDPreferences {
@@ -511,6 +513,9 @@ function mergePreferences(base: GSDPreferences, override: GSDPreferences): GSDPr
     remote_questions: override.remote_questions
       ? { ...(base.remote_questions ?? {}), ...override.remote_questions }
       : base.remote_questions,
+    git: (base.git || override.git)
+      ? { ...(base.git ?? {}), ...(override.git ?? {}) }
+      : undefined,
   };
 }
 
@@ -594,6 +599,52 @@ function validatePreferences(preferences: GSDPreferences): {
     }
   }
 
+  // ─── Git Preferences ───────────────────────────────────────────────────
+  if (preferences.git && typeof preferences.git === "object") {
+    const git: Record<string, unknown> = {};
+    const g = preferences.git as Record<string, unknown>;
+
+    if (g.auto_push !== undefined) {
+      if (typeof g.auto_push === "boolean") git.auto_push = g.auto_push;
+      else errors.push("git.auto_push must be a boolean");
+    }
+    if (g.push_branches !== undefined) {
+      if (typeof g.push_branches === "boolean") git.push_branches = g.push_branches;
+      else errors.push("git.push_branches must be a boolean");
+    }
+    if (g.remote !== undefined) {
+      if (typeof g.remote === "string" && g.remote.trim() !== "") git.remote = g.remote.trim();
+      else errors.push("git.remote must be a non-empty string");
+    }
+    if (g.snapshots !== undefined) {
+      if (typeof g.snapshots === "boolean") git.snapshots = g.snapshots;
+      else errors.push("git.snapshots must be a boolean");
+    }
+    if (g.pre_merge_check !== undefined) {
+      if (typeof g.pre_merge_check === "boolean") {
+        git.pre_merge_check = g.pre_merge_check;
+      } else if (typeof g.pre_merge_check === "string" && g.pre_merge_check.trim() !== "") {
+        git.pre_merge_check = g.pre_merge_check.trim();
+      } else {
+        errors.push("git.pre_merge_check must be a boolean or a non-empty string command");
+      }
+    }
+    if (g.commit_type !== undefined) {
+      const validCommitTypes = new Set([
+        "feat", "fix", "refactor", "docs", "test", "chore", "perf", "ci", "build", "style",
+      ]);
+      if (typeof g.commit_type === "string" && validCommitTypes.has(g.commit_type)) {
+        git.commit_type = g.commit_type;
+      } else {
+        errors.push(`git.commit_type must be one of: feat, fix, refactor, docs, test, chore, perf, ci, build, style`);
+      }
+    }
+
+    if (Object.keys(git).length > 0) {
+      validated.git = git as GitPreferences;
+    }
+  }
+
   return { preferences: validated, errors };
 }