safe-push 0.5.0 → 0.7.0

package/.claude/settings.local.json

@@ -1,12 +1,13 @@
 {
   "permissions": {
     "allow": [
-      "WebFetch(domain:github.com)",
-      "Bash(bun add:*)"
+      "WebFetch(domain:api.github.com)",
+      "WebFetch(domain:raw.githubusercontent.com)",
+      "WebFetch(domain:ai.acsim.app)"
     ]
   },
   "enableAllProjectMcpServers": true,
   "enabledMcpjsonServers": [
-    "safe-push"
+    "memory"
   ]
 }

package/dist/index.js

@@ -20429,7 +20429,7 @@ async function getLocalEmail() {
     return execGit(["config", "user.email"]);
   });
 }
-async function getDiffFiles(remote = "origin") {
+async function getDiffFiles(remote = "origin", authorEmail) {
   return withSpan("safe-push.git.getDiffFiles", async () => {
     const branch = await getCurrentBranch();
     const isNew = await isNewBranch(remote);
@@ -20449,12 +20449,27 @@ async function getDiffFiles(remote = "origin") {
     } else {
       baseBranch = `${remote}/${branch}`;
     }
-    const output = await execGit(["diff", "--name-only", baseBranch, "HEAD"]);
+    let output;
+    if (authorEmail) {
+      output = await execGit([
+        "log",
+        `--author=${authorEmail}`,
+        "--name-only",
+        "--format=",
+        `${baseBranch}..HEAD`
+      ]);
+    } else {
+      output = await execGit([
+        "diff",
+        "--name-only",
+        `${baseBranch}...HEAD`
+      ]);
+    }
     if (!output) {
       return [];
     }
-    return output.split(`
-`).filter(Boolean);
+    return [...new Set(output.split(`
+`).filter(Boolean))];
   });
 }
 async function execPush(args = [], remote = "origin") {
@@ -20586,7 +20601,7 @@ async function checkPush(config) {
     const newBranch = await isNewBranch();
     const authorEmail = await getLastCommitAuthorEmail();
     const localEmail = await getLocalEmail();
-    const diffFiles = await getDiffFiles();
+    const diffFiles = await getDiffFiles("origin", localEmail);
     const forbiddenFiles = findForbiddenFiles(diffFiles, config.forbiddenPaths);
     const hasForbiddenChanges = forbiddenFiles.length > 0;
     const isOwnLastCommit = authorEmail.toLowerCase() === localEmail.toLowerCase();
@@ -31292,7 +31307,7 @@ function createMcpCommand() {
 // package.json
 var package_default = {
   name: "safe-push",
-  version: "0.4.0",
+  version: "0.7.0",
   description: "Git push safety checker - blocks pushes to forbidden areas",
   type: "module",
   bin: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "safe-push",
-  "version": "0.5.0",
+  "version": "0.7.0",
   "description": "Git push safety checker - blocks pushes to forbidden areas",
   "type": "module",
   "bin": {

package/src/checker.ts

@@ -101,7 +101,7 @@ export async function checkPush(config: Config): Promise<CheckResult> {
     const newBranch = await isNewBranch();
     const authorEmail = await getLastCommitAuthorEmail();
     const localEmail = await getLocalEmail();
-    const diffFiles = await getDiffFiles();
+    const diffFiles = await getDiffFiles("origin", localEmail);
 
     const forbiddenFiles = findForbiddenFiles(diffFiles, config.forbiddenPaths);
     const hasForbiddenChanges = forbiddenFiles.length > 0;

package/src/git.ts

@@ -77,7 +77,10 @@ export async function getLocalEmail(): Promise<string> {
  * リモートとの差分ファイル一覧を取得
  * 新規ブランチの場合はmainまたはmasterとの差分を取得
  */
-export async function getDiffFiles(remote = "origin"): Promise<string[]> {
+export async function getDiffFiles(
+  remote = "origin",
+  authorEmail?: string
+): Promise<string[]> {
   return withSpan("safe-push.git.getDiffFiles", async () => {
     const branch = await getCurrentBranch();
     const isNew = await isNewBranch(remote);
@@ -101,12 +104,29 @@ export async function getDiffFiles(remote = "origin"): Promise<string[]> {
       baseBranch = `${remote}/${branch}`;
     }
 
-    const output = await execGit(["diff", "--name-only", baseBranch, "HEAD"]);
+    let output: string;
+    if (authorEmail) {
+      // 自分のコミットで変更されたファイルのみ取得
+      output = await execGit([
+        "log",
+        `--author=${authorEmail}`,
+        "--name-only",
+        "--format=",
+        `${baseBranch}..HEAD`,
+      ]);
+    } else {
+      output = await execGit([
+        "diff",
+        "--name-only",
+        `${baseBranch}...HEAD`,
+      ]);
+    }
     if (!output) {
       return [];
     }
 
-    return output.split("\n").filter(Boolean);
+    // 重複を除去して返す
+    return [...new Set(output.split("\n").filter(Boolean))];
   });
 }