Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions src/tools/checkpoint.ts
Original file line number Diff line number Diff line change
Expand Up @@ -84,11 +84,16 @@ ${dirty || "clean"}

if (commitResult === "no uncommitted changes") {
// Stage the checkpoint file too
run(`git add "${checkpointFile}"`);
const result = run(`${addCmd} && git commit -m "${commitMsg.replace(/"/g, '\\"')}" 2>&1`);
run(["add", checkpointFile]);
if (addCmd !== "true") {
// Run the staging command (e.g. "add -u" or "add -A")
const addArgs = addCmd.replace(/^git\s+/, "").split(/\s+/);
run(addArgs);
}
const result = run(["commit", "-m", commitMsg]);
if (result.includes("commit failed") || result.includes("nothing to commit")) {
// Rollback: unstage if commit failed
run("git reset HEAD 2>/dev/null");
run(["reset", "HEAD"]);
commitResult = `commit failed: ${result}`;
} else {
commitResult = result;
Expand Down
3 changes: 2 additions & 1 deletion src/tools/session-health.ts
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,8 @@ export function registerSessionHealth(server: McpServer): void {
const dirtyCount = dirty ? dirty.split("\n").filter(Boolean).length : 0;
const lastCommit = getLastCommit();
const lastCommitTimeStr = getLastCommitTime();
const uncommittedDiff = run("git diff --stat | tail -1");
const fullDiffStat = run(["diff", "--stat"]);
const uncommittedDiff = fullDiffStat.split("\n").filter(Boolean).pop() || "";

// Parse commit time safely
const commitDate = parseGitDate(lastCommitTimeStr);
Expand Down
7 changes: 4 additions & 3 deletions src/tools/what-changed.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { z } from "zod";
import type { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
import { run, getBranch, getDiffStat } from "../lib/git.js";
import { run, getBranch, getDiffStat, getDiffFiles } from "../lib/git.js";

export function registerWhatChanged(server: McpServer): void {
server.tool(
Expand All @@ -12,8 +12,9 @@ export function registerWhatChanged(server: McpServer): void {
async ({ since }) => {
const ref = since || "HEAD~5";
const diffStat = getDiffStat(ref);
const diffFiles = run(`git diff ${ref} --name-only 2>/dev/null || git diff HEAD~3 --name-only`);
const log = run(`git log ${ref}..HEAD --oneline 2>/dev/null || git log -5 --oneline`);
const diffFiles = getDiffFiles(ref);
const logResult = run(["log", `${ref}..HEAD`, "--oneline"]);
const log = logResult.startsWith("[") ? run(["log", "-5", "--oneline"]) : logResult;
const branch = getBranch();

const fileList = diffFiles.split("\n").filter(Boolean);
Expand Down
Loading