fix: address GitHub Copilot review feedback for isomorphic-git migration

- Fix Node.js fs import to use promises-based interface with sync methods
- Fix memfs Volume type to properly implement PromiseFsClient
- Fix test setup order - create directory before git init
- Fix branch name expectation from 'master' to 'main'
- Fix main execution guard to use reliable endsWith check
- Fix README table formatting (remove extra pipe characters)
- Fix loadConfig call to use correct parameter order
- Add defaultBranch: 'main' to git init in tests

All tests now pass successfully.

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>

Author: retsohuang

README.md

@@ -134,7 +134,7 @@ The marketplace is configured in `.claude-plugin/marketplace.json`. Key fields:
 ## Available Plugins
 
 | Plugin Name | Description | Version |
-|-------------|-------------|---------|||
+|-------------|-------------|---------|
 | [code-review](./plugins/code-review/README.md) | Review code changes commit-by-commit with custom rules support. Includes interactive setup and rule creation. | 2.1.0 |
 
 ## Contributing

plugins/code-review-tools/scripts/dist/cli.js

@@ -17004,7 +17004,7 @@ gpgsig`));
 
 // src/cli.ts
 var import_isomorphic_git = __toESM(require_isomorphic_git(), 1);
-import nodeFs from "node:fs";
+import * as nodeFs from "node:fs";
 import { join } from "node:path";
 
 // node_modules/zod/v4/classic/external.js
@@ -29632,26 +29632,32 @@ function parseConfig(input) {
 
 // src/cli.ts
 var DEFAULT_DIR = process.cwd();
+var defaultFs = {
+  promises: nodeFs.promises,
+  existsSync: nodeFs.existsSync,
+  readFileSync: nodeFs.readFileSync,
+  writeFileSync: nodeFs.writeFileSync,
+  mkdirSync: nodeFs.mkdirSync
+};
 function success2(data) {
   return { success: true, data };
 }
 function error46(message) {
   return { success: false, error: message };
 }
-function loadConfig(configPath, fs = nodeFs) {
-  const path = configPath || ".claude/code-review-tools/config.json";
+function loadConfig(configPath = ".claude/code-review-tools/config.json", fs = defaultFs) {
   try {
-    if (!fs.existsSync(path)) {
+    if (!fs.existsSync(configPath)) {
       return success2(DEFAULT_CONFIG);
     }
-    const userConfig = JSON.parse(fs.readFileSync(path, "utf-8"));
+    const userConfig = JSON.parse(fs.readFileSync(configPath, "utf-8"));
     const config2 = parseConfig(userConfig);
     return success2(config2);
   } catch (err) {
     return error46(`Failed to load config: ${err.message}`);
   }
 }
-async function collectCommits(commitHash, dir = DEFAULT_DIR, fs = nodeFs) {
+async function collectCommits(commitHash, dir = DEFAULT_DIR, fs = defaultFs) {
   try {
     const branch = await import_isomorphic_git.currentBranch({ fs, dir }) ?? "HEAD";
     const allCommits = await import_isomorphic_git.log({ fs, dir, ref: "HEAD" });
@@ -29695,7 +29701,7 @@ async function collectCommits(commitHash, dir = DEFAULT_DIR, fs = nodeFs) {
     return error46(`Failed to collect commits: ${err.message}`);
   }
 }
-function buildRules(config2, pluginRoot, fs = nodeFs) {
+function buildRules(config2, pluginRoot, fs = defaultFs) {
   try {
     const rulesSections = [];
     let enabledCount = 0;
@@ -29760,7 +29766,7 @@ ${content}
     return error46(`Failed to build rules: ${err.message}`);
   }
 }
-function loadTemplate(customTemplate, pluginRoot, defaultTemplateName, fs = nodeFs) {
+function loadTemplate(customTemplate, pluginRoot, defaultTemplateName, fs = defaultFs) {
   let templatePath;
   if (customTemplate) {
     templatePath = `.claude/code-review-tools/templates/${customTemplate}`;
@@ -29777,7 +29783,7 @@ function loadTemplate(customTemplate, pluginRoot, defaultTemplateName, fs = node
   }
   throw new Error(`Template not found: ${defaultPath}`);
 }
-async function prepareReview(commitHash, pluginRoot, dir = DEFAULT_DIR, fs = nodeFs) {
+async function prepareReview(commitHash, pluginRoot, dir = DEFAULT_DIR, fs = defaultFs) {
   try {
     const configResult = loadConfig(undefined, fs);
     if (!configResult.success) {
@@ -29879,7 +29885,7 @@ async function main() {
     process.exit(1);
   }
 }
-if (import.meta.url === `file://${process.argv[1]}`) {
+if (import.meta.url.endsWith(process.argv[1])) {
   main().catch((err) => {
     console.error("Fatal error:", err.message);
     process.exit(1);

plugins/code-review-tools/scripts/src/cli.ts

@@ -6,7 +6,7 @@ import {
   readCommit,
   type PromiseFsClient,
 } from "isomorphic-git"
-import nodeFs from "node:fs"
+import * as nodeFs from "node:fs"
 import { join } from "node:path"
 import {
   DEFAULT_CONFIG,
@@ -19,8 +19,18 @@ const DEFAULT_DIR = process.cwd()
 interface FsLike extends PromiseFsClient {
   existsSync(path: string): boolean
   readFileSync(path: string, encoding: BufferEncoding): string
+  writeFileSync(path: string, data: string): void
+  mkdirSync(path: string, options?: { recursive?: boolean }): void
 }
 
+const defaultFs: FsLike = {
+  promises: nodeFs.promises,
+  existsSync: nodeFs.existsSync,
+  readFileSync: nodeFs.readFileSync,
+  writeFileSync: nodeFs.writeFileSync,
+  mkdirSync: nodeFs.mkdirSync,
+} as FsLike
+
 interface SuccessOutput<T = unknown> {
   success: true
   data: T
@@ -42,17 +52,15 @@ function error(message: string): ErrorOutput {
 }
 
 function loadConfig(
-  configPath?: string,
-  fs: FsLike = nodeFs,
+  configPath: string = ".claude/code-review-tools/config.json",
+  fs: FsLike = defaultFs,
 ): Output<ReviewConfig> {
-  const path = configPath || ".claude/code-review-tools/config.json"
-
   try {
-    if (!fs.existsSync(path)) {
+    if (!fs.existsSync(configPath)) {
       return success(DEFAULT_CONFIG)
     }
 
-    const userConfig = JSON.parse(fs.readFileSync(path, "utf-8"))
+    const userConfig = JSON.parse(fs.readFileSync(configPath, "utf-8"))
     const config = parseConfig(userConfig)
 
     return success(config)
@@ -79,7 +87,7 @@ interface CollectCommitsResult {
 async function collectCommits(
   commitHash: string,
   dir: string = DEFAULT_DIR,
-  fs: FsLike = nodeFs,
+  fs: FsLike = defaultFs,
 ): Promise<Output<CollectCommitsResult>> {
   try {
     const branch = (await currentBranch({ fs, dir })) ?? "HEAD"
@@ -141,7 +149,7 @@ interface BuildRulesResult {
 function buildRules(
   config: ReviewConfig,
   pluginRoot: string,
-  fs: FsLike = nodeFs,
+  fs: FsLike = defaultFs,
 ): Output<BuildRulesResult> {
   try {
     const rulesSections: string[] = []
@@ -219,7 +227,7 @@ function loadTemplate(
   customTemplate: string | undefined,
   pluginRoot: string,
   defaultTemplateName: string,
-  fs: FsLike = nodeFs,
+  fs: FsLike = defaultFs,
 ): string {
   let templatePath: string
 
@@ -246,7 +254,7 @@ async function prepareReview(
   commitHash: string,
   pluginRoot: string,
   dir: string = DEFAULT_DIR,
-  fs: FsLike = nodeFs,
+  fs: FsLike = defaultFs,
 ): Promise<Output<PrepareReviewResult>> {
   try {
     const configResult = loadConfig(undefined, fs)
@@ -397,7 +405,7 @@ async function main(): Promise<void> {
   }
 }
 
-if (import.meta.url === `file://${process.argv[1]}`) {
+if (import.meta.url.endsWith(process.argv[1])) {
   main().catch((err) => {
     console.error("Fatal error:", (err as Error).message)
     process.exit(1)

plugins/code-review-tools/scripts/tests/cli.test.ts

@@ -1,6 +1,6 @@
 import { afterEach, beforeEach, describe, expect, test } from "bun:test"
 import { add, commit, init, setConfig } from "isomorphic-git"
-import { Volume } from "memfs"
+import { Volume, createFsFromVolume } from "memfs"
 import { join } from "node:path"
 import {
   collectCommits,
@@ -11,23 +11,34 @@ import {
 
 const PLUGIN_ROOT = join(__dirname, "../../")
 
-let fs: FsLike & Volume
+let fs: FsLike
+let vol: Volume
 let testCommits: string[] = []
 const TEST_DIR = "/repo"
 
 beforeEach(async () => {
-  fs = new Volume() as FsLike & Volume
+  vol = new Volume()
+  const memfsInstance = createFsFromVolume(vol)
 
-  await init({ fs, dir: TEST_DIR })
+  // Create FsLike by combining memfs with sync methods
+  fs = {
+    promises: memfsInstance.promises,
+    existsSync: memfsInstance.existsSync.bind(memfsInstance),
+    readFileSync: memfsInstance.readFileSync.bind(memfsInstance),
+    writeFileSync: memfsInstance.writeFileSync.bind(memfsInstance),
+    mkdirSync: memfsInstance.mkdirSync.bind(memfsInstance),
+  } as FsLike
+
+  vol.mkdirSync(TEST_DIR, { recursive: true })
+
+  await init({ fs, dir: TEST_DIR, defaultBranch: "main" })
   await setConfig({
     fs,
     dir: TEST_DIR,
     path: "user.email",
     value: "test@example.com",
   })
   await setConfig({ fs, dir: TEST_DIR, path: "user.name", value: "Test User" })
-
-  fs.mkdirSync(TEST_DIR, { recursive: true })
   fs.writeFileSync(join(TEST_DIR, "file1.txt"), "initial content")
   await add({ fs, dir: TEST_DIR, filepath: "file1.txt" })
   const commit1 = await commit({
@@ -87,7 +98,7 @@ beforeEach(async () => {
 })
 
 afterEach(() => {
-  fs.reset()
+  vol.reset()
 })
 
 describe("collectCommits", () => {
@@ -100,7 +111,7 @@ describe("collectCommits", () => {
     if (result.success) {
       expect(result.data.totalCommits).toBe(2)
       expect(result.data.commits).toHaveLength(2)
-      expect(result.data.branch).toBe("master")
+      expect(result.data.branch).toBe("main")
       expect(result.data.commitRange).toContain("..")
     }
   })